From 22b64fd33e448ffc54134b28c7226342f54b4683 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Sun, 29 Jan 2012 13:05:07 +0000
Subject: QPID-3789 : [Java] code tidyups

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1237273 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/qpid/example/Drain.java   | 18 ++++++++----------
 .../java/org/apache/qpid/example/OptionParser.java | 22 ++++++++++++++++------
 .../main/java/org/apache/qpid/example/Spout.java   | 20 ++++++++++----------
 3 files changed, 34 insertions(+), 26 deletions(-)

(limited to 'java/client/example/src')

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Drain.java b/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
index b43031ad23..28e1d5a87e 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
@@ -27,8 +27,6 @@ import javax.jms.MessageConsumer;
 import javax.jms.Session;
 
 import org.apache.qpid.client.AMQAnyDestination;
-import org.apache.qpid.client.AMQConnection;
-import org.slf4j.Logger;
 
 public class Drain extends OptionParser
 {
@@ -50,13 +48,13 @@ public class Drain extends OptionParser
 
     static 
     {        
-        optDefs.add(BROKER);
-        optDefs.add(HELP);
-        optDefs.add(TIMEOUT);
-        optDefs.add(FOREVER);
-        optDefs.add(COUNT);
-        optDefs.add(CON_OPTIONS);
-        optDefs.add(BROKER_OPTIONS);
+        addOption(BROKER);
+        addOption(HELP);
+        addOption(TIMEOUT);
+        addOption(FOREVER);
+        addOption(COUNT);
+        addOption(CON_OPTIONS);
+        addOption(BROKER_OPTIONS);
     }
     
     public Drain(String[] args, String usage, String desc) throws Exception
@@ -66,7 +64,7 @@ public class Drain extends OptionParser
         Connection con = createConnection();
         con.start();
         Session ssn = con.createSession(false,Session.AUTO_ACKNOWLEDGE);     
-        Destination dest = new AMQAnyDestination(address);
+        Destination dest = new AMQAnyDestination(getAddress());
         MessageConsumer consumer = ssn.createConsumer(dest);
         Message msg;
         
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java b/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
index 6cc6db1974..6aa12f07fa 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
@@ -68,12 +68,12 @@ public class OptionParser
             String.class);
     
     
-    protected Map<String,Object> optMap = new HashMap<String,Object>();
-    protected static final List<Option> optDefs = new ArrayList<Option>();
+    private Map<String,Object> optMap = new HashMap<String,Object>();
+    private static final List<Option> optDefs = new ArrayList<Option>();
     
-    protected String usage;
-    protected String desc;
-    protected String address;
+    private String usage;
+    private String desc;
+    private String address;
     
     public OptionParser(String[] args, String usage, String desc)
     {   
@@ -283,7 +283,17 @@ public class OptionParser
         Connection con = new AMQConnection(buf.toString());
         return con;
     }
-    
+
+    public static void addOption(Option opt)
+    {
+        optDefs.add(opt);
+    }
+
+    protected String getAddress()
+    {
+        return address;
+    }
+
     static class Option
     {
         private final String shortForm;
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Spout.java b/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
index 5da319a658..61ff2dfc19 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
@@ -69,15 +69,15 @@ public class Spout extends OptionParser
 
     static 
     {        
-        optDefs.add(BROKER);
-        optDefs.add(HELP);
-        optDefs.add(TIMEOUT);
-        optDefs.add(COUNT);
-        optDefs.add(MSG_PROPERTY);
-        optDefs.add(MAP_ENTRY);
-        optDefs.add(CONTENT);
-        optDefs.add(CON_OPTIONS);
-        optDefs.add(BROKER_OPTIONS);
+        addOption(BROKER);
+        addOption(HELP);
+        addOption(TIMEOUT);
+        addOption(COUNT);
+        addOption(MSG_PROPERTY);
+        addOption(MAP_ENTRY);
+        addOption(CONTENT);
+        addOption(CON_OPTIONS);
+        addOption(BROKER_OPTIONS);
     }
     
     public Spout(String[] args, String usage, String desc) throws Exception
@@ -87,7 +87,7 @@ public class Spout extends OptionParser
         Connection con = createConnection();
         con.start();
         Session ssn = con.createSession(false,Session.AUTO_ACKNOWLEDGE);     
-        Destination dest = new AMQAnyDestination(address);
+        Destination dest = new AMQAnyDestination(getAddress());
         MessageProducer producer = ssn.createProducer(dest);
         
         int count = Integer.parseInt(getOp(COUNT));
-- 
cgit v1.2.1