diff --git a/fluentinterface/etc/fluentinterface.ucls b/fluentinterface/etc/fluentinterface.ucls index aab2c9ad7..e30c45bb2 100644 --- a/fluentinterface/etc/fluentinterface.ucls +++ b/fluentinterface/etc/fluentinterface.ucls @@ -1,8 +1,8 @@ - + @@ -55,7 +55,7 @@ + file="C:/Program Files/Java/jdk1.8.0_25/jre/lib/rt.jar" binary="true" corner="BOTTOM_RIGHT"> @@ -64,33 +64,33 @@ - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/App.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java similarity index 98% rename from fluentinterface/src/main/java/com/iluwatar/fluentinterface/App.java rename to fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java index f7352fe39..81a1ccb6a 100644 --- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/App.java +++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java @@ -1,4 +1,4 @@ -package com.iluwatar.fluentinterface; +package com.iluwatar.fluentinterface.app; import com.iluwatar.fluentinterface.fluentiterable.FluentIterable; import com.iluwatar.fluentinterface.fluentiterable.lazy.LazyFluentIterable; diff --git a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/AppTest.java b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/app/AppTest.java similarity index 59% rename from fluentinterface/src/test/java/com/iluwatar/fluentinterface/AppTest.java rename to fluentinterface/src/test/java/com/iluwatar/fluentinterface/app/AppTest.java index d0abb7bf1..29ad885c0 100644 --- a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/AppTest.java +++ b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/app/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar.fluentinterface; +package com.iluwatar.fluentinterface.app; import org.junit.Test; +import com.iluwatar.fluentinterface.app.App; + public class AppTest { @Test diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/App.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/App.java deleted file mode 100644 index 0b74f4b5a..000000000 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/App.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.iluwatar.model.view.controller.with.observer; - -/** - * - * In this second example the model-view relationship is different. This time we use the Observer pattern to notify - * the {@link GiantView} each time the {@link GiantModel} is changed. This way the {@link GiantController} responsibilities - * are narrowed and it only needs to modify the {@link GiantModel} according to the user input. - * - */ -public class App { - - /** - * Program entry point - * @param args command line args - */ - public static void main( String[] args ) { - // create model, view and controller - GiantModel giant = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED); - GiantView view = new GiantView(); - GiantController controller = new GiantController(giant, view); - // initial display - controller.updateView(); - // controller receives some interactions that affect the giant - // model modifications trigger the view rendering automatically - controller.setHealth(Health.WOUNDED); - controller.setNourishment(Nourishment.HUNGRY); - controller.setFatigue(Fatigue.TIRED); - } -} diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Fatigue.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Fatigue.java deleted file mode 100644 index 301a579fb..000000000 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Fatigue.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.iluwatar.model.view.controller.with.observer; - -/** - * - * Fatigue enumeration - * - */ -public enum Fatigue { - - ALERT("alert"), TIRED("tired"), SLEEPING("sleeping"); - - private String title; - - Fatigue(String title) { - this.title = title; - } - - @Override - public String toString() { - return title; - } -} diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantController.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantController.java deleted file mode 100644 index e892b2946..000000000 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.iluwatar.model.view.controller.with.observer; - -/** - * - * GiantController updates the giant model. - * - */ -public class GiantController { - - private GiantModel giant; - private GiantView view; - - public GiantController(GiantModel giant, GiantView view) { - this.giant = giant; - this.view = view; - this.giant.registerObserver(this.view); - } - - public Health getHealth() { - return giant.getHealth(); - } - - public void setHealth(Health health) { - this.giant.setHealth(health); - } - - public Fatigue getFatigue() { - return giant.getFatigue(); - } - - public void setFatigue(Fatigue fatigue) { - this.giant.setFatigue(fatigue); - } - - public Nourishment getNourishment() { - return giant.getNourishment(); - } - - public void setNourishment(Nourishment nourishment) { - this.giant.setNourishment(nourishment); - } - - public void updateView() { - this.view.displayGiant(giant); - } -} diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModel.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModel.java deleted file mode 100644 index 84b32a50a..000000000 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModel.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.iluwatar.model.view.controller.with.observer; - -import java.util.ArrayList; -import java.util.List; - -/** - * - * GiantModel contains the giant data. - * - */ -public class GiantModel { - - private Health health; - private Fatigue fatigue; - private Nourishment nourishment; - private List observers = new ArrayList<>(); - - GiantModel(Health health, Fatigue fatigue, Nourishment nourishment) { - this.health = health; - this.fatigue = fatigue; - this.nourishment = nourishment; - } - - public Health getHealth() { - return health; - } - - public void setHealth(Health health) { - this.health = health; - notifyObservers(); - } - - public Fatigue getFatigue() { - return fatigue; - } - - public void setFatigue(Fatigue fatigue) { - this.fatigue = fatigue; - notifyObservers(); - } - - public Nourishment getNourishment() { - return nourishment; - } - - public void setNourishment(Nourishment nourishment) { - this.nourishment = nourishment; - notifyObservers(); - } - - @Override - public String toString() { - return String.format("The giant looks %s, %s and %s.", health, fatigue, nourishment); - } - - public void registerObserver(GiantModelObserver observer) { - observers.add(observer); - } - - private void notifyObservers() { - observers.stream().forEach((GiantModelObserver o) -> o.modelChanged(this)); - } -} diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModelObserver.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModelObserver.java deleted file mode 100644 index 6363ef4f7..000000000 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModelObserver.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar.model.view.controller.with.observer; - -/** - * - * GiantModelObserver is the interface for delivering update notifications. - * - */ -public interface GiantModelObserver { - - void modelChanged(GiantModel model); - -} diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantView.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantView.java deleted file mode 100644 index f4cebad80..000000000 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantView.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.iluwatar.model.view.controller.with.observer; - -/** - * - * GiantView displays the giant - * - */ -public class GiantView implements GiantModelObserver { - - public void displayGiant(GiantModel giant) { - System.out.println(giant); - } - - @Override - public void modelChanged(GiantModel model) { - displayGiant(model); - } -} diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Health.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Health.java deleted file mode 100644 index e4b8ed9a7..000000000 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Health.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.iluwatar.model.view.controller.with.observer; - -/** - * - * Health enumeration - * - */ -public enum Health { - - HEALTHY("healthy"), WOUNDED("wounded"), DEAD("dead"); - - private String title; - - Health(String title) { - this.title = title; - } - - @Override - public String toString() { - return title; - } -} diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Nourishment.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Nourishment.java deleted file mode 100644 index c1a8253c3..000000000 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Nourishment.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.iluwatar.model.view.controller.with.observer; - -/** - * - * Nourishment enumeration - * - */ -public enum Nourishment { - - SATURATED("saturated"), HUNGRY("hungry"), STARVING("starving"); - - private String title; - - Nourishment(String title) { - this.title = title; - } - - @Override - public String toString() { - return title; - } -} diff --git a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/with/observer/AppTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/with/observer/AppTest.java deleted file mode 100644 index 9a43ce7bc..000000000 --- a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/with/observer/AppTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.iluwatar.model.view.controller.with.observer; - -import org.junit.Test; - -import com.iluwatar.model.view.controller.with.observer.App; - -/** - * - * Application test - * - */ -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java b/service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java index 2d91b43d9..47eb5231e 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java @@ -4,9 +4,9 @@ import java.util.List; import com.iluwatar.servicelayer.magic.MagicService; import com.iluwatar.servicelayer.magic.MagicServiceImpl; -import com.iluwatar.servicelayer.servicelayer.spell.Spell; -import com.iluwatar.servicelayer.servicelayer.spell.SpellDao; -import com.iluwatar.servicelayer.servicelayer.spell.SpellDaoImpl; +import com.iluwatar.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.spell.SpellDao; +import com.iluwatar.servicelayer.spell.SpellDaoImpl; import com.iluwatar.servicelayer.spellbook.Spellbook; import com.iluwatar.servicelayer.spellbook.SpellbookDao; import com.iluwatar.servicelayer.spellbook.SpellbookDaoImpl; diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java b/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java index 70d586c08..61d0f5d5d 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java @@ -3,7 +3,7 @@ package com.iluwatar.servicelayer.hibernate; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; -import com.iluwatar.servicelayer.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.spell.Spell; import com.iluwatar.servicelayer.spellbook.Spellbook; import com.iluwatar.servicelayer.wizard.Wizard; diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java index a6046742b..38742c78d 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java @@ -2,7 +2,7 @@ package com.iluwatar.servicelayer.magic; import java.util.List; -import com.iluwatar.servicelayer.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.spell.Spell; import com.iluwatar.servicelayer.spellbook.Spellbook; import com.iluwatar.servicelayer.wizard.Wizard; diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java index e5599fc4e..37249894a 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java @@ -3,8 +3,8 @@ package com.iluwatar.servicelayer.magic; import java.util.ArrayList; import java.util.List; -import com.iluwatar.servicelayer.servicelayer.spell.Spell; -import com.iluwatar.servicelayer.servicelayer.spell.SpellDao; +import com.iluwatar.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.spell.SpellDao; import com.iluwatar.servicelayer.spellbook.Spellbook; import com.iluwatar.servicelayer.spellbook.SpellbookDao; import com.iluwatar.servicelayer.wizard.Wizard; diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/Spell.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java similarity index 95% rename from service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/Spell.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java index 5dc7a6acc..ed166eccc 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/Spell.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java @@ -1,4 +1,4 @@ -package com.iluwatar.servicelayer.servicelayer.spell; +package com.iluwatar.servicelayer.spell; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDao.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDao.java similarity index 75% rename from service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDao.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDao.java index 079ef39a0..a59307e7f 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDao.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDao.java @@ -1,4 +1,4 @@ -package com.iluwatar.servicelayer.servicelayer.spell; +package com.iluwatar.servicelayer.spell; import com.iluwatar.servicelayer.common.Dao; diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDaoImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDaoImpl.java similarity index 94% rename from service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDaoImpl.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDaoImpl.java index d8655ac3a..d278defe2 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDaoImpl.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDaoImpl.java @@ -1,4 +1,4 @@ -package com.iluwatar.servicelayer.servicelayer.spell; +package com.iluwatar.servicelayer.spell; import org.hibernate.Criteria; import org.hibernate.Session; diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java index 5bf42c7ed..c596c9926 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java @@ -13,7 +13,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import com.iluwatar.servicelayer.common.BaseEntity; -import com.iluwatar.servicelayer.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.spell.Spell; import com.iluwatar.servicelayer.wizard.Wizard; /**