perfsonar development work

Author: mac
Date: 2008-06-19 08:32:03 -0400 (Thu, 19 Jun 2008)
New Revision: 364

Added:
   trunk/nmwg/java/org/ogf/schema/network/topology/base/v20070828/
   trunk/nmwg/java/org/ogf/schema/network/topology/base/v20070828/Domain.java
   trunk/nmwg/java/org/ogf/schema/network/topology/base/v20070828/Name.java
   trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/
   trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Address.java
   trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Netmask.java
   trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Network.java
   trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Subnet.java
Modified:
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/summarization/v2_0/Parameters.java
Log:
Support for multiple parameters with the same name inside summary:parameters.
New ogf namespace 20070828

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/summarization/v2_0/Parameters.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/summarization/v2_0/Parameters.java
       2008-06-19 11:25:13 UTC (rev 363)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/summarization/v2_0/Parameters.java
       2008-06-19 12:32:03 UTC (rev 364)
@@ -11,10 +11,9 @@
  */
 package 
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.summarization.v2_0;
 
-import java.util.Collection;
-import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Map;
+import java.util.Set;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
@@ -25,15 +24,11 @@
 public class Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {
 
        /**
-        * map of datum elements
-        */     
-       protected Map parameterMap;     
-
-       /**
         * Constructor.
         */
        public Parameters() {   
-               parameterMap = new HashMap();
+               parameters = new HashSet<Parameter>();
+        parameterMap = null;
 
                parent = null;
                id = "";                
@@ -44,5 +39,219 @@
         qName = "summary:parameters";
         fileName = 
"org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/summarization/v2_0/Parameters.java";
        }
+    
+
+    /**
+     * map of datum elements
+     */ 
+    protected Set<Parameter> parameters; 
+
+    /**
+     * clear the Message of all Parameter elements
+     */ 
+    public void clearParameter() {
+        parameters = new HashSet<Parameter>();
+    }
+    
+    /**
+     * Return the parameter map
+     */ 
+    public Set getParameterSet() {
+        return this.parameters;
+    }
+
+    /**
+     * Convert and return the parameter block in array form
+     */
+    public Parameter[] getParameterArray() {
+        return (Parameter [])parameters.toArray(new 
Parameter[parameters.size()]);
+    }
+
+    /**
+     * Get an iterartor to the parameter map
+     */
+    public Iterator getParameterIterator() {
+        return parameters.iterator();
+    }
+    
+    /**
+     * Return set of parameters by name.
+     */     
+    public Set<Parameter> getParametersByName(String name) {
+        
+        if(!(name.equals(""))) {
+            HashSet<Parameter> hs = new HashSet<Parameter>();
+            
+            for (Parameter p : parameters) {
+                if (name.equals( p.getParameterName() )) 
+                    hs.add(p);
+            }
+            return hs;
+        }
+        
+        else {
+            System.err.println("Error: " + getFileName() + " 
'getParameterByName(String)' name cannont be nil.");                       
+            return null;
+        }
+    }
+
+    /**
+     * Adds a parameter to the map
+     */ 
+    public void addParameter(Parameter newParameter) {
+            if (newParameter != null) {
+                parameters.add(newParameter);     
+            }
+            else {
+            System.err.println("Error: " + getFileName() + " 
'addParameter(Paramter)' Parameter cannont be nil.");                         
         
+                return;
+         }
+    }
+
+    public void addParameter(String name, String value) {
+        if(!(name.equals("")) && !(value.equals(""))) {
+            Parameter p = new Parameter();
+            p.setParameterName(name);
+            p.setParameterValue(value);
+            this.addParameter(p);
+        }
+        else {
+            System.err.println("Error: " + getFileName() + " 
'addParameter(String, String)' cannot have nil value for name or value.");    
             
+            return;
+        }
+    }
+
+    /**
+     * Recognize only the id attribute.
+     */
+    public boolean addAttr(String attr, String value, NamespaceSupport nss) {
+        if(attr.equals("id")) {
+            setId(value);
+        }       
+        else if(attr.indexOf("xmlns") >= 0) {   
+            if(attr.split(":").length == 1) {
+                if(nss.getURI("") == null) {
+                    nss.declarePrefix("", value);
+                }
+                if((prefix.equals("")) && !(value.equals(uri))) {
+                    uri = value;
+                }
+            }
+            else {
+                if(nss.getURI(attr.split(":")[1]) == null) {
+                    nss.declarePrefix(attr.split(":")[1], value);
+                }           
+                if((prefix.equals(attr.split(":")[1])) && 
!(value.equals(uri))) {
+                    uri = value;
+                }
+            }                       
+        }   
+        else {
+            System.err.println("Error: " + getFileName() + " addAttr(String, 
String, NamespaceSupport) unrecognized attribute pair: " + attr + " - " + 
value);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Adds a new parameter to the list.
+     */
+    public boolean addChild(Element newChild) {
+        if(newChild.getLocalName().equals("parameter")) {       
+            addParameter((Parameter)newChild);
+        }
+        else {                      
+            System.err.println("Error: " + getFileName() + " 
addChild(Element) unrecognized child: " + newChild);
+            return false;       
+        }
+        return true;
+    }
+
+    /**
+     * Converts the contents of this object into an xml tag.
+     */
+    public ContentHandler toXML(ContentHandler handler, NamespaceSupport 
nss) throws Exception {
+        try {
+            handler.startElement(getUri(), getLocalName(), getQName(), 
getAttributes(nss));
+            handler = getChildren(handler, nss);
+            handler.endElement(getUri(), getLocalName(), getQName());   
+        
+            if(getCompleted()) {
+                nss.popContext();
+                unSetCompleted();
+            }           
+        }
+        catch(Exception e) {
+            System.err.println("Error: " + getFileName() + " 
toXML(ContentHandler, NamespaceSupport) XML formulation error.");
+        }
+        return handler;
+    }   
+    
+    /**
+     * Converts items into attributes for an xml tag.
+     */
+    public AttributesImpl getAttributes(NamespaceSupport nss) {
+        AttributesImpl atts = new AttributesImpl();
+    
+        if(!(getId().equals(""))) {
+            atts.addAttribute(getUri(), "id", "id", "CDATA", getId());
+        }       
+        if(nss.getURI(getPrefix()) == null) {       
+            nss.pushContext();      
+            if(getPrefix().equals("")) {
+                atts.addAttribute(getUri(), "xmlns", "xmlns", "CDATA", 
getUri());           
+            }
+            else {
+                atts.addAttribute(getUri(), "xmlns:" + getPrefix(), "xmlns:" 
+ getPrefix(), "CDATA", getUri());         
+            }
+            nss.declarePrefix(getPrefix(), getUri());           
+            setCompleted();
+        }       
+    
+        return atts;
+    }       
+    
+    /**
+     * Chases children references down to print out all related xml tags.
+     */
+    public ContentHandler getChildren(ContentHandler handler, 
NamespaceSupport nss) throws Exception {
+        for(Parameter p : parameters ){
+            handler = p.toXML(handler, nss);
+        }       
+        return handler;
+    }
+
+    /** 
+     * Given a DOM element (a parent), construct
+     * the children elements.
+     */ 
+    public void getDOM(org.w3c.dom.Element parent) {
+
+                
+            org.w3c.dom.Document doc = parent.getOwnerDocument();
+            org.w3c.dom.Element parameter = doc.createElementNS(getUri(), 
getQName()); 
+        parent.appendChild(parameter);    
+        if(!(getId().equals(""))) {
+            parameter.setAttribute("id", getId());
+        }
+
+        for (Parameter p : parameters) {
+            p.getDOM(parameter);
+        }       
+    }
+
+    /**
+     * Called when the object is placed in
+     * an output stream.
+     */     
+    public String toString() {
+        String p = "";
+        for (Parameter par : parameters) {    
+            p = p + par.toString();
+        }   
+        return getFileName() + ": ---> " + getId() + " parameters: " + p;
+    }       
+    
+    
 }
 

Added: 
trunk/nmwg/java/org/ogf/schema/network/topology/base/v20070828/Domain.java


Property changes on: 
trunk/nmwg/java/org/ogf/schema/network/topology/base/v20070828/Domain.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/nmwg/java/org/ogf/schema/network/topology/base/v20070828/Name.java


Property changes on: 
trunk/nmwg/java/org/ogf/schema/network/topology/base/v20070828/Name.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Address.java


Property changes on: 
trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Address.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Netmask.java


Property changes on: 
trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Netmask.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Network.java


Property changes on: 
trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Network.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Subnet.java


Property changes on: 
trunk/nmwg/java/org/ogf/schema/network/topology/l3/v20070828/Subnet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native