[jboss-cvs] JBossAS SVN: r112487 - projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/rarinfo.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2011-11-30 09:44:35 -0500 (Wed, 30 Nov 2011)
New Revision: 112487

Modified:
   projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/rarinfo/Main.java
Log:
remove multiple properties for same class in rar-info tool

Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/rarinfo/Main.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/rarinfo/Main.java	2011-11-30 14:08:05 UTC (rev 112486)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/rarinfo/Main.java	2011-11-30 14:44:35 UTC (rev 112487)
@@ -311,7 +311,8 @@
             }
             
             int line = 0;
-            String sameClassname = "";
+            Set<String> sameClassnameSet = new HashSet<String>();
+            boolean needPrint = true;
 
             if (ra1516.getOutboundResourceadapter() != null)
             {
@@ -326,16 +327,21 @@
                for (ConnectionDefinition mcf : ra1516.getOutboundResourceadapter().getConnectionDefinitions())
                {
                   classname = mcf.getManagedConnectionFactoryClass().toString();
-                  if (!classname.equals(sameClassname))
+                  if (!sameClassnameSet.contains(classname))
                   {
-                     sameClassname = classname;
+                     sameClassnameSet.add(classname);
                      if (line != 0)
                      {
                         out.println();
                      }
                      line++;
                      out.println("Class: " + classname);
+                     needPrint = true;
                   }
+                  else
+                  {
+                     needPrint = false;
+                  }
                   
                   Map<String, String> configProperty = null;
                   if (mcf.getConfigProperties() != null)
@@ -350,7 +356,8 @@
 
                      removeIntrospectedValue(introspected, cp.getConfigPropertyName().toString());
 
-                     out.println("  Config-property: " + cp.getConfigPropertyName() + " (" +
+                     if (needPrint)
+                        out.println("  Config-property: " + cp.getConfigPropertyName() + " (" +
                            cp.getConfigPropertyType() + ")");
                   }
 
@@ -358,7 +365,8 @@
                   {
                      for (Map.Entry<String, String> entry : introspected.entrySet())
                      {
-                        out.println("  Introspected Config-property: " + entry.getKey() + " (" +
+                        if (needPrint)
+                           out.println("  Introspected Config-property: " + entry.getKey() + " (" +
                                     entry.getValue() + ")");
                      }
                   }
@@ -384,7 +392,7 @@
             }
 
             line = 0;
-            sameClassname = "";
+            sameClassnameSet.clear();
 
             if (ra1516.getAdminObjects() != null && ra1516.getAdminObjects().size() > 0)
             {
@@ -396,16 +404,21 @@
             for (AdminObject ao : ra1516.getAdminObjects())
             {
                String aoClassname = ao.getAdminobjectClass().toString();
-               if (!aoClassname.equals(sameClassname))
+               if (!sameClassnameSet.contains(aoClassname))
                {
-                  sameClassname = aoClassname;
+                  sameClassnameSet.add(aoClassname);
                   if (line != 0)
                   {
                      out.println();
                   }
                   line++;
                   out.println("Class: " + aoClassname);
+                  needPrint = true;
                }
+               else
+               {
+                  needPrint = false;
+               }
 
                String poolName = aoClassname.substring(aoClassname.lastIndexOf('.') + 1);
                Map<String, String> configProperty = null;
@@ -421,7 +434,8 @@
 
                   removeIntrospectedValue(introspected, cp.getConfigPropertyName().toString());
 
-                  out.println("  Config-property: " + cp.getConfigPropertyName() + " (" +
+                  if (needPrint)
+                     out.println("  Config-property: " + cp.getConfigPropertyName() + " (" +
                         cp.getConfigPropertyType() + ")");
                }
 
@@ -429,7 +443,8 @@
                {
                   for (Map.Entry<String, String> entry : introspected.entrySet())
                   {
-                     out.println("  Introspected Config-property: " + entry.getKey() + " (" +
+                     if (needPrint)
+                        out.println("  Introspected Config-property: " + entry.getKey() + " (" +
                                  entry.getValue() + ")");
                   }
                }
@@ -440,7 +455,7 @@
             }
             
             line = 0;
-            sameClassname = "";
+            sameClassnameSet.clear();
 
             if (ra1516.getInboundResourceadapter() != null && 
                ra1516.getInboundResourceadapter().getMessageadapter() != null)
@@ -452,9 +467,9 @@
                   ra1516.getInboundResourceadapter().getMessageadapter().getMessagelisteners())
                {
                   String asClassname = ml.getActivationspec().getActivationspecClass().toString();
-                  if (!asClassname.equals(sameClassname))
+                  if (!sameClassnameSet.contains(asClassname))
                   {
-                     sameClassname = asClassname;
+                     sameClassnameSet.add(asClassname);
                      if (line != 0)
                      {
                         out.println();