perfsonar development work

Author: loukik
Date: 2006-07-13 10:28:44 -0400 (Thu, 13 Jul 2006)
New Revision: 1423

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/snmpType/SNMPXPathExpressionGenerator.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/snmpType/SNMPXQueryExpressionGenerator.java
Log:
XMLUtils was previously returning only one Element when given an element 
name, xml string and objects.config file. Now, it returns a Map. Hence, the 
code using this method from XMLUtils needed to be changed.

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/snmpType/SNMPXPathExpressionGenerator.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/snmpType/SNMPXPathExpressionGenerator.java
       2006-07-13 14:27:16 UTC (rev 1422)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/snmpType/SNMPXPathExpressionGenerator.java
       2006-07-13 14:28:44 UTC (rev 1423)
@@ -5,6 +5,8 @@
  */
 package org.perfsonar.service.measurementPoint.snmpType;
 
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Vector;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
@@ -228,7 +230,13 @@
                 + "unable to read service.sax_parser.config property 
properly");
         }
 
-        return XMLUtils.getElementFromXML(xmlPart, tagName, f);
+        Map map = XMLUtils.getElementFromXML(xmlPart, tagName, f);
+        if(map.isEmpty())
+            return null ;
+        else {
+             Iterator mapCollectionIterator = map.values().iterator();
+             return (Element) mapCollectionIterator.next();
+        }
 
     }
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/snmpType/SNMPXQueryExpressionGenerator.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/snmpType/SNMPXQueryExpressionGenerator.java
      2006-07-13 14:27:16 UTC (rev 1422)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/snmpType/SNMPXQueryExpressionGenerator.java
      2006-07-13 14:28:44 UTC (rev 1423)
@@ -5,6 +5,8 @@
  */
 package org.perfsonar.service.measurementPoint.snmpType;
 
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Vector;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
@@ -321,7 +323,14 @@
                  + "unable to read service.sax_parser.config property 
properly");
          }
 
-         return XMLUtils.getElementFromXML(xmlPart, tagName, f);
+         Map map = XMLUtils.getElementFromXML(xmlPart, tagName, f);
+         if(map.isEmpty())
+             return null ;
+         else {
+              Iterator mapCollectionIterator = map.values().iterator();
+              return (Element) mapCollectionIterator.next();
+         }
+         
 
      }
 }