From 95c16200e7590ef698212fc244da59b6c18be189 Mon Sep 17 00:00:00 2001 From: Ankur Kaushal Date: Sun, 1 Nov 2015 17:26:57 -0500 Subject: [PATCH] Reformat Adapter Pattern - Issue #224 --- .../main/java/com/iluwatar/adapter/App.java | 39 +++++++++---------- .../java/com/iluwatar/adapter/Engineer.java | 3 +- .../com/iluwatar/adapter/GnomeEngineer.java | 25 ++++++------ .../adapter/GnomeEngineeringManager.java | 16 ++++---- .../com/iluwatar/adapter/GoblinGlider.java | 18 ++++----- .../java/com/iluwatar/adapter/AppTest.java | 10 ++--- 6 files changed, 54 insertions(+), 57 deletions(-) diff --git a/adapter/src/main/java/com/iluwatar/adapter/App.java b/adapter/src/main/java/com/iluwatar/adapter/App.java index ed036b391..f912efb03 100644 --- a/adapter/src/main/java/com/iluwatar/adapter/App.java +++ b/adapter/src/main/java/com/iluwatar/adapter/App.java @@ -2,30 +2,29 @@ package com.iluwatar.adapter; /** * - * An adapter helps two incompatible interfaces to work together. This is the real - * world definition for an adapter. Interfaces may be incompatible but the inner - * functionality should suit the need. The Adapter design pattern allows otherwise - * incompatible classes to work together by converting the interface of one class - * into an interface expected by the clients. + * An adapter helps two incompatible interfaces to work together. This is the real world definition + * for an adapter. Interfaces may be incompatible but the inner functionality should suit the need. + * The Adapter design pattern allows otherwise incompatible classes to work together by converting + * the interface of one class into an interface expected by the clients. *

- * There are two variations of the Adapter pattern: The class adapter implements - * the adaptee's interface whereas the object adapter uses composition to - * contain the adaptee in the adapter object. This example uses the object - * adapter approach. + * There are two variations of the Adapter pattern: The class adapter implements the adaptee's + * interface whereas the object adapter uses composition to contain the adaptee in the adapter + * object. This example uses the object adapter approach. *

- * The Adapter ({@link GnomeEngineer}) converts the interface of the target class - * ({@link GoblinGlider}) into a suitable one expected by the client - * ({@link GnomeEngineeringManager}). + * The Adapter ({@link GnomeEngineer}) converts the interface of the target class ( + * {@link GoblinGlider}) into a suitable one expected by the client ({@link GnomeEngineeringManager} + * ). * */ public class App { - /** - * Program entry point - * @param args command line args - */ - public static void main(String[] args) { - Engineer manager = new GnomeEngineeringManager(); - manager.operateDevice(); - } + /** + * Program entry point + * + * @param args command line args + */ + public static void main(String[] args) { + Engineer manager = new GnomeEngineeringManager(); + manager.operateDevice(); + } } diff --git a/adapter/src/main/java/com/iluwatar/adapter/Engineer.java b/adapter/src/main/java/com/iluwatar/adapter/Engineer.java index 7478b5b69..a973cb530 100644 --- a/adapter/src/main/java/com/iluwatar/adapter/Engineer.java +++ b/adapter/src/main/java/com/iluwatar/adapter/Engineer.java @@ -7,6 +7,5 @@ package com.iluwatar.adapter; */ public interface Engineer { - void operateDevice(); - + void operateDevice(); } diff --git a/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java index 35cbc9573..70e166ac3 100644 --- a/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java +++ b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java @@ -2,23 +2,22 @@ package com.iluwatar.adapter; /** * - * Adapter class. Adapts the interface of the device ({@link GoblinGlider}) into - * {@link Engineer} interface expected by the client ({@link GnomeEngineeringManager}). + * Adapter class. Adapts the interface of the device ({@link GoblinGlider}) into {@link Engineer} + * interface expected by the client ({@link GnomeEngineeringManager}). * */ public class GnomeEngineer implements Engineer { - private GoblinGlider glider; + private GoblinGlider glider; - public GnomeEngineer() { - glider = new GoblinGlider(); - } - - @Override - public void operateDevice() { - glider.attachGlider(); - glider.gainSpeed(); - glider.takeOff(); - } + public GnomeEngineer() { + glider = new GoblinGlider(); + } + @Override + public void operateDevice() { + glider.attachGlider(); + glider.gainSpeed(); + glider.takeOff(); + } } diff --git a/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java index d95065b88..a2faf1e54 100644 --- a/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java +++ b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java @@ -7,14 +7,14 @@ package com.iluwatar.adapter; */ public class GnomeEngineeringManager implements Engineer { - private Engineer engineer; + private Engineer engineer; - public GnomeEngineeringManager() { - engineer = new GnomeEngineer(); - } + public GnomeEngineeringManager() { + engineer = new GnomeEngineer(); + } - @Override - public void operateDevice() { - engineer.operateDevice(); - } + @Override + public void operateDevice() { + engineer.operateDevice(); + } } diff --git a/adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java b/adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java index ff1dbeb8d..79a9acef6 100644 --- a/adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java +++ b/adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java @@ -7,15 +7,15 @@ package com.iluwatar.adapter; */ public class GoblinGlider { - public void attachGlider() { - System.out.println("Glider attached."); - } + public void attachGlider() { + System.out.println("Glider attached."); + } - public void gainSpeed() { - System.out.println("Gaining speed."); - } + public void gainSpeed() { + System.out.println("Gaining speed."); + } - public void takeOff() { - System.out.println("Lift-off!"); - } + public void takeOff() { + System.out.println("Lift-off!"); + } } diff --git a/adapter/src/test/java/com/iluwatar/adapter/AppTest.java b/adapter/src/test/java/com/iluwatar/adapter/AppTest.java index 3d877815a..a7462bd9a 100644 --- a/adapter/src/test/java/com/iluwatar/adapter/AppTest.java +++ b/adapter/src/test/java/com/iluwatar/adapter/AppTest.java @@ -11,9 +11,9 @@ import com.iluwatar.adapter.App; */ public class AppTest { - @Test - public void test() { - String[] args = {}; - App.main(args); - } + @Test + public void test() { + String[] args = {}; + App.main(args); + } }