From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: More code cleanup: Refactored Entity Proxy Subscription to handle
 generics better Rewrote RemoteMap to use TreeMap instead of the internal
 array for order. It now sorts its keys by number if they parse, else as
 strings. Removed a no-longer-in-progress outcome form class

---
 source/com/c2kernel/utils/XmlElementParser.java | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'source/com/c2kernel/utils/XmlElementParser.java')

diff --git a/source/com/c2kernel/utils/XmlElementParser.java b/source/com/c2kernel/utils/XmlElementParser.java
index 0f138d3..69cee31 100644
--- a/source/com/c2kernel/utils/XmlElementParser.java
+++ b/source/com/c2kernel/utils/XmlElementParser.java
@@ -24,7 +24,7 @@ public class XmlElementParser
             return parseOld(data, xpath);
         }
 	}
-    
+
     public static String[] parseOld(String data, String path)
         {
             Vector<String> returnData = new Vector<String>();
@@ -41,13 +41,13 @@ public class XmlElementParser
                 int i=taille;
                 while (pathTokens.hasMoreElements())
                     pathElements[--i] = pathTokens.nextToken();
-                
+
                 if (Logger.doLog(6)) {
                     Logger.msg(6, "Path elements:");
-                    for (int x=0;x<pathElements.length;x++)
-                        Logger.debug(6, pathElements[x]);
+                    for (String pathElement : pathElements)
+						Logger.debug(6, pathElement);
                 }
-                
+
                 Logger.msg(6, "Looking for attribute "+pathElements[0]+" in "+pathElements[1]);
                 NodeList nl = doc.getElementsByTagName(pathElements[1]);
                 for (int j = 0; j < nl.getLength(); j++)
@@ -59,21 +59,21 @@ public class XmlElementParser
                     for (int k=2;k<taille&&match;k++)
                         {
                             Logger.msg(6, "Checking parent "+pathElements[k]);
-                            child = child.getParentNode(); 
-                            if (!child.getNodeName().equals(pathElements[k])) 
+                            child = child.getParentNode();
+                            if (!child.getNodeName().equals(pathElements[k]))
                                 {
                                 Logger.msg(6, "No match for "+child.getNodeName());
-                                match=false; 
+                                match=false;
                                 }
                             else
                                 Logger.msg(6, "Match");
                         }
                     if (match&&e.hasAttribute(pathElements[0])) {
-                        Logger.msg(6, "Matching Attribute "+pathElements[0]+"="+e.getAttribute(pathElements[0]));   
+                        Logger.msg(6, "Matching Attribute "+pathElements[0]+"="+e.getAttribute(pathElements[0]));
                         returnData.add(e.getAttribute(pathElements[0]));
                     }
                 }
-            
+
                 Logger.msg(6, "Looking for element "+pathElements[0]);
                 nl = doc.getElementsByTagName(pathElements[0]);
                 for (int j = 0; j < nl.getLength(); j++)
@@ -85,16 +85,16 @@ public class XmlElementParser
                     for (int k=1;k<taille&&match;k++)
                         {
                             Logger.msg(6, "Checking parent "+pathElements[k]);
-                            child = child.getParentNode(); 
-                            if (!child.getNodeName().equals(pathElements[k])) 
+                            child = child.getParentNode();
+                            if (!child.getNodeName().equals(pathElements[k]))
                                 {
                                 Logger.msg(6, "No match for "+child.getNodeName());
-                                match=false; 
+                                match=false;
                                 }
                             else
                                 Logger.msg(6, "Match");
                         }
-                    if (match) 
+                    if (match)
                         {
                         String s =e.getFirstChild().getNodeValue();
                         Logger.msg(6, "Found Element "+pathElements[0]+"="+s);
@@ -109,7 +109,7 @@ public class XmlElementParser
             Logger.msg(3, returnData.size()+" values found for "+path);
             returnArray=new String[returnData.size()];
             for (int i=0;i<returnArray.length;i++)
-                returnArray[i] = (String)returnData.get(i);
+                returnArray[i] = returnData.get(i);
             return returnArray;
-        }    
+        }
 }
-- 
cgit v1.2.3