Improved the adapter pattern example. Updated the class diagram.

iluwatar · iluwatar · commit b8365e9e4cf0 · 2014-09-07T15:08:43.000+03:00
diff --git a/adapter/etc/adapter.jpg b/adapter/etc/adapter.jpg
diff --git a/adapter/src/main/java/com/iluwatar/App.java b/adapter/src/main/java/com/iluwatar/App.java
@@ -3,14 +3,15 @@
 /**
  * 
  * Adapter (GnomeEngineer) converts the interface of the
- * target class (GoblinGlider) into suitable one.
+ * target class (GoblinGlider) into suitable one expected
+ * by the client (GnomeEngineeringManager).
  *
  */
 public class App 
 {
     public static void main( String[] args )
     {
-    	GnomeEngineer engineer = new GnomeEngineer();
-    	engineer.operateDevice();
+    	GnomeEngineeringManager manager = new GnomeEngineeringManager();
+    	manager.operateDevice();
     }
 }
diff --git a/adapter/src/main/java/com/iluwatar/Engineer.java b/adapter/src/main/java/com/iluwatar/Engineer.java
@@ -2,8 +2,7 @@
 
 /**
  * 
- * The interface the client knows how
- * to use.
+ * Engineers can operate devices.
  *
  */
 public interface Engineer {
diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineer.java b/adapter/src/main/java/com/iluwatar/GnomeEngineer.java
@@ -2,9 +2,9 @@
 
 /**
  * 
- * Adapter class. Adapts the interface of the
- * GoblinGlider into Engineer expected by the
- * client.
+ * Adapter class. Adapts the interface of the device
+ * (GoblinGlider) into Engineer interface expected 
+ * by the client (GnomeEngineeringManager).
  *
  */
 public class GnomeEngineer implements Engineer {
diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java b/adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java
@@ -0,0 +1,21 @@
+package com.iluwatar;
+
+/**
+ * 
+ * GnomeEngineering manager uses Engineer to
+ * operate devices.
+ *
+ */
+public class GnomeEngineeringManager implements Engineer {
+
+	private Engineer engineer;
+	
+	public GnomeEngineeringManager() {
+		engineer = new GnomeEngineer();
+	}
+	
+	@Override
+	public void operateDevice() {
+		engineer.operateDevice();
+	}
+}
diff --git a/adapter/src/main/java/com/iluwatar/GoblinGlider.java b/adapter/src/main/java/com/iluwatar/GoblinGlider.java
@@ -2,21 +2,20 @@
 
 /**
  * 
- * Adaptee class.
+ * Device class (adaptee in the pattern).
  *
  */
 public class GoblinGlider {
 
 	public void attachGlider() {
-		System.out.println("glider attached");
+		System.out.println("Glider attached.");
 	}
 	
 	public void gainSpeed() {
-		System.out.println("gaining speed");
+		System.out.println("Gaining speed.");
 	}
 	
 	public void takeOff() {
-		System.out.println("lift-off!");
+		System.out.println("Lift-off!");
 	}
-	
 }

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,15 @@`
`3`	`3`	`/**`
`4`	`4`	`*`
`5`	`5`	`* Adapter (GnomeEngineer) converts the interface of the`
`6`		`- * target class (GoblinGlider) into suitable one.`
	`6`	`+ * target class (GoblinGlider) into suitable one expected`
	`7`	`+ * by the client (GnomeEngineeringManager).`
`7`	`8`	`*`
`8`	`9`	`*/`
`9`	`10`	`public class App`
`10`	`11`	`{`
`11`	`12`	`public static void main( String[] args )`
`12`	`13`	`{`
`13`		`- GnomeEngineer engineer = new GnomeEngineer();`
`14`		`- engineer.operateDevice();`
	`14`	`+ GnomeEngineeringManager manager = new GnomeEngineeringManager();`
	`15`	`+ manager.operateDevice();`
`15`	`16`	`}`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`*`
`5`		`- * The interface the client knows how`
`6`		`- * to use.`
	`5`	`+ * Engineers can operate devices.`
`7`	`6`	`*`
`8`	`7`	`*/`
`9`	`8`	`public interface Engineer {`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`*`
`5`		`- * Adapter class. Adapts the interface of the`
`6`		`- * GoblinGlider into Engineer expected by the`
`7`		`- * client.`
	`5`	`+ * Adapter class. Adapts the interface of the device`
	`6`	`+ * (GoblinGlider) into Engineer interface expected`
	`7`	`+ * by the client (GnomeEngineeringManager).`
`8`	`8`	`*`
`9`	`9`	`*/`
`10`	`10`	`public class GnomeEngineer implements Engineer {`
Original file line number	Diff line number	Diff line change
`@@ -2,21 +2,20 @@`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`*`
`5`		`- * Adaptee class.`
	`5`	`+ * Device class (adaptee in the pattern).`
`6`	`6`	`*`
`7`	`7`	`*/`
`8`	`8`	`public class GoblinGlider {`
`9`	`9`
`10`	`10`	`public void attachGlider() {`
`11`		`- System.out.println("glider attached");`
	`11`	`+ System.out.println("Glider attached.");`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public void gainSpeed() {`
`15`		`- System.out.println("gaining speed");`
	`15`	`+ System.out.println("Gaining speed.");`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public void takeOff() {`
`19`		`- System.out.println("lift-off!");`
	`19`	`+ System.out.println("Lift-off!");`
`20`	`20`	`}`
`21`		`-`
`22`	`21`	`}`