perfsonar development work

Author: roman
Date: 2009-02-10 10:28:30 -0500 (Tue, 10 Feb 2009)
New Revision: 386

Modified:
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/iperf/v2_0/Datum.java
Log:
updated


Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/iperf/v2_0/Datum.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/iperf/v2_0/Datum.java 2009-02-10 
01:37:29 UTC (rev 385)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/iperf/v2_0/Datum.java 2009-02-10 
15:28:30 UTC (rev 386)
@@ -26,14 +26,23 @@
         * The iperf data builds on the base NMWG information, 
         * by adding a interval of time the measurement has run.
         */
-       protected String interval;      
+       protected String interval;
+
+    protected String throughput;
+
+    protected String jitter;
+
+    protected String loss;
                                        
        /**
         * The constructor initializes the variables and 
         * sets xml element information (when applicable).
         */                             
        public Datum() { 
-               interval = "";  
+               interval = "";
+        throughput = "";
+        jitter = "";
+        loss = "";
 
                parent = null;
                id = "";                
@@ -59,7 +68,31 @@
        public void setInterval(String newInterval) {
                interval = newInterval;
        }
-       
+
+    public String getThroughput() {
+        return throughput;
+    }
+
+    public void setThroughput(String newThroughput) {
+        throughput = newThroughput;
+    }
+
+    public String getJitter() {
+        return jitter;
+    }
+
+    public void setJitter(String newJitter) {
+        jitter = newJitter;
+    }
+
+    public String getLoss() {
+        return loss;
+    }
+
+    public void setLoss(String newLoss) {
+        loss = newLoss;
+    }
+
        /**
         * Sets attributes, it is important to note that we
         * access the underlying NMWG Datum information from the
@@ -87,6 +120,15 @@
                else if(attr.equals("interval")) {
                        setInterval(value);
                }       
+        else if(attr.equals("throughput")) {
+            setThroughput(value);
+        }
+        else if(attr.equals("jitter")) {
+            setJitter(value);
+        }
+        else if(attr.equals("loss")) {
+            setLoss(value);
+        }
                 else if(attr.indexOf("xmlns") >= 0) {
                         if(attr.split(":").length == 1) {
                                 if(nss.getURI("") == null) {
@@ -173,7 +215,16 @@
                }               
                if(!(getInterval().equals(""))) {
                        atts.addAttribute(getUri(), "interval", "interval", 
"CDATA", getInterval());
-               }               
+               }
+        if(!(getThroughput().equals(""))) {
+            atts.addAttribute(getUri(), "throughput", "throughput", "CDATA", 
getThroughput());
+        }
+        if(!(getJitter().equals(""))) {
+            atts.addAttribute(getUri(), "jitter", "jitter", "CDATA", 
getJitter());
+        }
+        if(!(getLoss().equals(""))) {
+            atts.addAttribute(getUri(), "loss", "loss", "CDATA", getLoss());
+        }
                if(nss.getURI(getPrefix()) == null) {           
                        nss.pushContext();              
                        if(getPrefix().equals("")) {
@@ -228,6 +279,15 @@
                if(!(getInterval().equals(""))) {
                        datum.setAttribute("interval", getInterval());
                }
+        if(!(getThroughput().equals(""))) {
+            datum.setAttribute("throughput", getThroughput());
+        }
+        if(!(getJitter().equals(""))) {
+            datum.setAttribute("jitter", getJitter());
+        }
+        if(!(getLoss().equals(""))) {
+            datum.setAttribute("loss", getLoss());
+        }
 
                if(getTime() != null) {
                        getTime().getDOM(datum);
@@ -239,7 +299,7 @@
         * an output statement.
         */             
        public String toString() {
-               return getFileName() + ": ---> " + getValue() + " interval:" 
+ getInterval() + " numBytes:" + getNumBytes() + " numBytesUnits:" + 
getNumBytesUnits() + " valueUnits:" + getValueUnits()+ " timeType:" + 
getTimeType() + " timeValue:" + getTimeValue() + getTime();
+               return getFileName() + ": ---> " + getValue() + " interval:" 
+ getInterval() + " throughput:" + getThroughput() + " jitter:" + getJitter() 
+ " loss:" + getLoss()  + " numBytes:" + getNumBytes() + " numBytesUnits:" + 
getNumBytesUnits() + " valueUnits:" + getValueUnits()+ " timeType:" + 
getTimeType() + " timeValue:" + getTimeValue() + getTime();
        }       
 }