Package naming corrections and cleanup.

Author: iluwatar

fluentinterface/etc/fluentinterface.ucls

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
   realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
-  <class id="1" language="java" name="com.iluwatar.fluentinterface.App" project="fluentinterface" 
-    file="/fluentinterface/src/main/java/com/iluwatar/fluentinterface/App.java" binary="false" corner="BOTTOM_RIGHT">    
+  <class id="1" language="java" name="com.iluwatar.fluentinterface.app.App" project="fluentinterface" 
+    file="/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java" binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="289" y="-8"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
@@ -55,7 +55,7 @@
     </display>  
   </class>  
   <interface id="6" language="java" name="java.lang.Iterable" project="fluentinterface" 
-    file="/opt/Softwares/Eclipses/MARS/eclipse/jre/lib/rt.jar" binary="true" corner="BOTTOM_RIGHT">    
+    file="C:/Program Files/Java/jdk1.8.0_25/jre/lib/rt.jar" binary="true" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="793" y="-163"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
@@ -64,33 +64,33 @@
     </display>  
   </interface>  
   <dependency id="7">    
-    <end type="SOURCE" refId="1"/>    
-    <end type="TARGET" refId="2"/>  
-  </dependency>  
-  <realization id="8">    
-    <end type="SOURCE" refId="3"/>    
-    <end type="TARGET" refId="4"/>  
-  </realization>  
-  <dependency id="9">    
     <end type="SOURCE" refId="3"/>    
     <end type="TARGET" refId="5"/>  
   </dependency>  
-  <generalization id="10">    
-    <end type="SOURCE" refId="4"/>    
-    <end type="TARGET" refId="6"/>  
-  </generalization>  
-  <dependency id="11">    
+  <dependency id="8">    
     <end type="SOURCE" refId="1"/>    
     <end type="TARGET" refId="3"/>  
   </dependency>  
-  <dependency id="12">    
+  <dependency id="9">    
     <end type="SOURCE" refId="1"/>    
     <end type="TARGET" refId="4"/>  
   </dependency>  
-  <realization id="13">    
+  <realization id="10">    
     <end type="SOURCE" refId="2"/>    
     <end type="TARGET" refId="4"/>  
   </realization>  
+  <realization id="11">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="4"/>  
+  </realization>  
+  <dependency id="12">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="2"/>  
+  </dependency>  
+  <generalization id="13">    
+    <end type="SOURCE" refId="4"/>    
+    <end type="TARGET" refId="6"/>  
+  </generalization>  
   <classifier-display autosize="true" stereotype="true" package="true" initial-value="true" signature="true" 
     sort-features="false" accessors="true" visibility="true">    
     <attributes public="true" package="true" protected="true" private="true" static="true"/>    

fluentinterface/src/main/java/com/iluwatar/fluentinterface/App.java renamed to 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;

fluentinterface/src/test/java/com/iluwatar/fluentinterface/AppTest.java renamed to 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

model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/App.java

@@ -4,9 +4,9 @@
 
 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;

model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Fatigue.java

@@ -3,7 +3,7 @@
 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;
 

model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantController.java

@@ -2,7 +2,7 @@
 
 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;
 

model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModel.java

@@ -3,8 +3,8 @@
 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;

model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModelObserver.java

@@ -1,4 +1,4 @@
-package com.iluwatar.servicelayer.servicelayer.spell;
+package com.iluwatar.servicelayer.spell;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;