iluwatar#108 Consistent package naming throughout the examples

Generickle · Jul 24, 2015 · 3d488ec · 3d488ec
1 parent af92d8d
commit 3d488ec
Show file tree

Hide file tree

Showing 128 changed files with 939 additions and 849 deletions.
diff --git a/business-delegate/etc/business-delegate.ucls b/business-delegate/etc/business-delegate.ucls
@@ -1,62 +1,69 @@
 <?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.BusinessDelegate" project="business-delegate" 
-    file="/business-delegate/src/main/java/com/iluwatar/BusinessDelegate.java" binary="false" corner="BOTTOM_RIGHT">    
+  <class id="1" language="java" name="com.iluwatar.business.delegate.BusinessDelegate" project="business-delegate" 
+    file="/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessDelegate.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="272" y="219"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="2" language="java" name="com.iluwatar.Client" project="business-delegate" 
-    file="/business-delegate/src/main/java/com/iluwatar/Client.java" binary="false" corner="BOTTOM_RIGHT">    
+  <class id="2" language="java" name="com.iluwatar.business.delegate.Client" project="business-delegate" 
+    file="/business-delegate/src/main/java/com/iluwatar/business/delegate/Client.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="272" y="64"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <enumeration id="3" language="java" name="com.iluwatar.ServiceType" project="business-delegate" 
-    file="/business-delegate/src/main/java/com/iluwatar/ServiceType.java" binary="false" corner="BOTTOM_RIGHT">    
+  <enumeration id="3" language="java" name="com.iluwatar.business.delegate.ServiceType" project="business-delegate" 
+    file="/business-delegate/src/main/java/com/iluwatar/business/delegate/ServiceType.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="89" y="383"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </enumeration>  
-  <interface id="4" language="java" name="com.iluwatar.BusinessService" project="business-delegate" 
-    file="/business-delegate/src/main/java/com/iluwatar/BusinessService.java" binary="false" corner="BOTTOM_RIGHT">    
+  <interface id="4" language="java" name="com.iluwatar.business.delegate.BusinessService" project="business-delegate" 
+    file="/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessService.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="630" y="365"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </interface>  
-  <class id="5" language="java" name="com.iluwatar.JmsService" project="business-delegate" 
-    file="/business-delegate/src/main/java/com/iluwatar/JmsService.java" binary="false" corner="BOTTOM_RIGHT">    
+  <class id="5" language="java" name="com.iluwatar.business.delegate.JmsService" project="business-delegate" 
+    file="/business-delegate/src/main/java/com/iluwatar/business/delegate/JmsService.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="489" y="210"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="6" language="java" name="com.iluwatar.BusinessLookup" project="business-delegate" 
-    file="/business-delegate/src/main/java/com/iluwatar/BusinessLookup.java" binary="false" corner="BOTTOM_RIGHT">    
+  <class id="6" language="java" name="com.iluwatar.business.delegate.BusinessLookup" project="business-delegate" 
+    file="/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessLookup.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="360" y="399"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="7" language="java" name="com.iluwatar.EjbService" project="business-delegate" 
-    file="/business-delegate/src/main/java/com/iluwatar/EjbService.java" binary="false" corner="BOTTOM_RIGHT">    
+  <class id="7" language="java" name="com.iluwatar.business.delegate.EjbService" project="business-delegate" 
+    file="/business-delegate/src/main/java/com/iluwatar/business/delegate/EjbService.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="668" y="210"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
@@ -68,40 +75,56 @@
     <end type="SOURCE" refId="7"/>    
     <end type="TARGET" refId="4"/>  
   </realization>  
-  <realization id="9">    
-    <end type="SOURCE" refId="5"/>    
-    <end type="TARGET" refId="4"/>  
-  </realization>  
-  <association id="10">    
+  <association id="9">    
     <end type="SOURCE" refId="1" navigable="false">      
-      <attribute id="11" name="lookupService"/>      
-      <multiplicity id="12" minimum="0" maximum="1"/>    
+      <attribute id="10" name="lookupService">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="11" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
     </end>    
     <end type="TARGET" refId="6" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
-  <association id="13">    
+  <association id="12">    
     <end type="SOURCE" refId="1" navigable="false">      
-      <attribute id="14" name="businessService"/>      
-      <multiplicity id="15" minimum="0" maximum="1"/>    
+      <attribute id="13" name="serviceType">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="14" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
     </end>    
-    <end type="TARGET" refId="4" navigable="true"/>    
+    <end type="TARGET" refId="3" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
+  <realization id="15">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="4"/>  
+  </realization>  
   <association id="16">    
     <end type="SOURCE" refId="2" navigable="false">      
-      <attribute id="17" name="businessDelegate"/>      
-      <multiplicity id="18" minimum="0" maximum="1"/>    
+      <attribute id="17" name="businessDelegate">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="18" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
     </end>    
     <end type="TARGET" refId="1" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
   <association id="19">    
     <end type="SOURCE" refId="1" navigable="false">      
-      <attribute id="20" name="serviceType"/>      
-      <multiplicity id="21" minimum="0" maximum="1"/>    
+      <attribute id="20" name="businessService">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="21" minimum="0" maximum="1">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
     </end>    
-    <end type="TARGET" refId="3" navigable="true"/>    
+    <end type="TARGET" refId="4" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
   <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 

diff --git a/...egate/src/main/java/com/iluwatar/App.java → ...a/com/iluwatar/business/delegate/App.java b/...egate/src/main/java/com/iluwatar/App.java → ...a/com/iluwatar/business/delegate/App.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.business.delegate;
 
 /**
  * 

diff --git a/...n/java/com/iluwatar/BusinessDelegate.java → ...r/business/delegate/BusinessDelegate.java b/...n/java/com/iluwatar/BusinessDelegate.java → ...r/business/delegate/BusinessDelegate.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.business.delegate;
 
 /**
  * 

diff --git a/...ain/java/com/iluwatar/BusinessLookup.java → ...tar/business/delegate/BusinessLookup.java b/...ain/java/com/iluwatar/BusinessLookup.java → ...tar/business/delegate/BusinessLookup.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.business.delegate;
 
 /**
  * 

diff --git a/...in/java/com/iluwatar/BusinessService.java → ...ar/business/delegate/BusinessService.java b/...in/java/com/iluwatar/BusinessService.java → ...ar/business/delegate/BusinessService.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.business.delegate;
 
 /**
  * 

diff --git a/...te/src/main/java/com/iluwatar/Client.java → ...om/iluwatar/business/delegate/Client.java b/...te/src/main/java/com/iluwatar/Client.java → ...om/iluwatar/business/delegate/Client.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.business.delegate;
 
 /**
  * 

diff --git a/...rc/main/java/com/iluwatar/EjbService.java → ...luwatar/business/delegate/EjbService.java b/...rc/main/java/com/iluwatar/EjbService.java → ...luwatar/business/delegate/EjbService.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.business.delegate;
 
 /**
  * 

diff --git a/...rc/main/java/com/iluwatar/JmsService.java → ...luwatar/business/delegate/JmsService.java b/...rc/main/java/com/iluwatar/JmsService.java → ...luwatar/business/delegate/JmsService.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.business.delegate;
 
 /**
  * 

diff --git a/...c/main/java/com/iluwatar/ServiceType.java → ...uwatar/business/delegate/ServiceType.java b/...c/main/java/com/iluwatar/ServiceType.java → ...uwatar/business/delegate/ServiceType.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.business.delegate;
 
 /**
  * 

diff --git a/...java/com/iluwatar/objectpool/AppTest.java → ...m/iluwatar/business/delegate/AppTest.java b/...java/com/iluwatar/objectpool/AppTest.java → ...m/iluwatar/business/delegate/AppTest.java
@@ -1,14 +1,14 @@
-package com.iluwatar.objectpool;
-
-import org.junit.Test;
-
-import com.iluwatar.objectpool.App;
-
-public class AppTest {
-
-	@Test
-	public void test() {
-		String[] args = {};
-		App.main(args);
-	}
-}
+package com.iluwatar.business.delegate;
+
+import org.junit.Test;
+
+import com.iluwatar.business.delegate.App;
+
+public class AppTest {
+
+	@Test
+	public void test() {
+		String[] args = {};
+		App.main(args);
+	}
+}
diff --git a/...r/dependencyinjection/AdvancedWizard.java → .../dependency/injection/AdvancedWizard.java b/...r/dependencyinjection/AdvancedWizard.java → .../dependency/injection/AdvancedWizard.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 /**
  * 

diff --git a/...com/iluwatar/dependencyinjection/App.java → ...om/iluwatar/dependency/injection/App.java b/...com/iluwatar/dependencyinjection/App.java → ...om/iluwatar/dependency/injection/App.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;

diff --git a/...atar/dependencyinjection/GuiceWizard.java → ...tar/dependency/injection/GuiceWizard.java b/...atar/dependencyinjection/GuiceWizard.java → ...tar/dependency/injection/GuiceWizard.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 import javax.inject.Inject;
 

diff --git a/...r/dependencyinjection/OldTobyTobacco.java → .../dependency/injection/OldTobyTobacco.java b/...r/dependencyinjection/OldTobyTobacco.java → .../dependency/injection/OldTobyTobacco.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 /**
  * 

diff --git a/...dependencyinjection/RivendellTobacco.java → ...ependency/injection/RivendellTobacco.java b/...dependencyinjection/RivendellTobacco.java → ...ependency/injection/RivendellTobacco.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 /**
  * 

diff --git a/...encyinjection/SecondBreakfastTobacco.java → ...ncy/injection/SecondBreakfastTobacco.java b/...encyinjection/SecondBreakfastTobacco.java → ...ncy/injection/SecondBreakfastTobacco.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 /**
  * 

diff --git a/...tar/dependencyinjection/SimpleWizard.java → ...ar/dependency/injection/SimpleWizard.java b/...tar/dependencyinjection/SimpleWizard.java → ...ar/dependency/injection/SimpleWizard.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 /**
  * 

diff --git a/...iluwatar/dependencyinjection/Tobacco.java → ...luwatar/dependency/injection/Tobacco.java b/...iluwatar/dependencyinjection/Tobacco.java → ...luwatar/dependency/injection/Tobacco.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 /**
  * 

diff --git a/...ar/dependencyinjection/TobaccoModule.java → ...r/dependency/injection/TobaccoModule.java b/...ar/dependencyinjection/TobaccoModule.java → ...r/dependency/injection/TobaccoModule.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 import com.google.inject.AbstractModule;
 

diff --git a/.../iluwatar/dependencyinjection/Wizard.java → ...iluwatar/dependency/injection/Wizard.java b/.../iluwatar/dependencyinjection/Wizard.java → ...iluwatar/dependency/injection/Wizard.java
@@ -1,4 +1,4 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 /**
  * 

diff --git a/...iluwatar/dependencyinjection/AppTest.java → ...luwatar/dependency/injection/AppTest.java b/...iluwatar/dependencyinjection/AppTest.java → ...luwatar/dependency/injection/AppTest.java
@@ -1,8 +1,8 @@
-package com.iluwatar.dependencyinjection;
+package com.iluwatar.dependency.injection;
 
 import org.junit.Test;
 
-import com.iluwatar.dependencyinjection.App;
+import com.iluwatar.dependency.injection.App;
 
 public class AppTest {
 

diff --git a/double-checked-locking/etc/double-checked-locking.ucls b/double-checked-locking/etc/double-checked-locking.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.doublecheckedlocking.Item" project="double-checked-locking" 
-    file="/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java" binary="false" 
+  <class id="1" language="java" name="com.iluwatar.doublechecked.locking.Item" project="double-checked-locking" 
+    file="/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java" binary="false" 
     corner="BOTTOM_RIGHT">    
     <position height="124" width="205" x="146" y="504"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
@@ -11,8 +11,8 @@
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="2" language="java" name="com.iluwatar.doublecheckedlocking.Inventory" project="double-checked-locking" 
-    file="/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java" binary="false" 
+  <class id="2" language="java" name="com.iluwatar.doublechecked.locking.Inventory" project="double-checked-locking" 
+    file="/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java" binary="false" 
     corner="BOTTOM_RIGHT">    
     <position height="142" width="205" x="146" y="322"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
@@ -23,8 +23,12 @@
   </class>  
   <association id="3">    
     <end type="SOURCE" refId="2" navigable="false">      
-      <attribute id="4" name="items"/>      
-      <multiplicity id="5" minimum="0" maximum="2147483647"/>    
+      <attribute id="4" name="items">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </attribute>      
+      <multiplicity id="5" minimum="0" maximum="2147483647">        
+        <position height="0" width="0" x="0" y="0"/>      
+      </multiplicity>    
     </end>    
     <end type="TARGET" refId="1" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  

diff --git a/...om/iluwatar/doublecheckedlocking/App.java → ...m/iluwatar/doublechecked/locking/App.java b/...om/iluwatar/doublecheckedlocking/App.java → ...m/iluwatar/doublechecked/locking/App.java
@@ -1,4 +1,4 @@
-package com.iluwatar.doublecheckedlocking;
+package com.iluwatar.doublechecked.locking;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

diff --git a/...watar/doublecheckedlocking/Inventory.java → ...atar/doublechecked/locking/Inventory.java b/...watar/doublecheckedlocking/Inventory.java → ...atar/doublechecked/locking/Inventory.java
@@ -1,4 +1,4 @@
-package com.iluwatar.doublecheckedlocking;
+package com.iluwatar.doublechecked.locking;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...m/iluwatar/doublecheckedlocking/Item.java → .../iluwatar/doublechecked/locking/Item.java b/...m/iluwatar/doublecheckedlocking/Item.java → .../iluwatar/doublechecked/locking/Item.java
@@ -1,4 +1,4 @@
-package com.iluwatar.doublecheckedlocking;
+package com.iluwatar.doublechecked.locking;
 
 public class Item {
 	String name;

diff --git a/...a/com/iluwatar/factorymethod/AppTest.java → ...uwatar/doublechecked/locking/AppTest.java b/...a/com/iluwatar/factorymethod/AppTest.java → ...uwatar/doublechecked/locking/AppTest.java
@@ -1,14 +1,14 @@
-package com.iluwatar.factorymethod;
-
-import org.junit.Test;
-
-import com.iluwatar.factorymethod.App;
-
-public class AppTest {
-
-	@Test
-	public void test() {
-		String[] args = {};
-		App.main(args);
-	}
-}
+package com.iluwatar.doublechecked.locking;
+
+import org.junit.Test;
+
+import com.iluwatar.doublechecked.locking.App;
+
+public class AppTest {
+
+	@Test
+	public void test() {
+		String[] args = {};
+		App.main(args);
+	}
+}