Skip to Content.
Sympa Menu

perfsonar-dev - nmwg: r374 - in trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp: . summary summary/v2_0 v2_0

Subject: perfsonar development work

List archive

nmwg: r374 - in trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp: . summary summary/v2_0 v2_0


Chronological Thread 
  • From:
  • To: ,
  • Subject: nmwg: r374 - in trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp: . summary summary/v2_0 v2_0
  • Date: Tue, 16 Sep 2008 16:44:55 -0400
Author: fernandes
Date: 2008-09-16 16:44:55 -0400 (Tue, 16 Sep 2008)
New Revision: 374

Added:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/Datum.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/Parameters.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/Subject.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/TTLBucket.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/TTLBuckets.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/ValueBucket.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/ValueBuckets.java
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/v2_0/Parameters.java
Log:
New eventType for CL-MP: http://ggf.org/ns/nmwg/tools/owamp/summary/2.0

Added: trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/Datum.java

Added:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/Parameters.java

Added: trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/Subject.java

Added: trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/TTLBucket.java

Added:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/TTLBuckets.java

Added:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/ValueBucket.java

Added:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/summary/v2_0/ValueBuckets.java

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/v2_0/Parameters.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/v2_0/Parameters.java
2008-09-12 11:27:02 UTC (rev 373)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/v2_0/Parameters.java
2008-09-16 20:44:55 UTC (rev 374)
@@ -13,16 +13,6 @@

import org.ggf.ns.nmwg.base.v2_0.Parameter;

-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-import org.xml.sax.ContentHandler;
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.helpers.NamespaceSupport;
-
public class Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {

/**
@@ -45,29 +35,29 @@
*/
public Parameter getParameterByName(String name) {
if(!(name.equals(""))) {
- if(!(name.equals("value")) ||
!(name.equals("valueUnits")) ||
- !(name.equals("numBytes")) ||
!(name.equals("numBytesUnits")) ||
- !(name.equals("timeType")) ||
!(name.equals("timeValue")) ||
- !(name.equals("seqNum")) ||
!(name.equals("sendTime")) ||
- !(name.equals("sendSynchronized")) ||
!(name.equals("sendTimeError")) ||
- !(name.equals("receiveTime")) ||
!(name.equals("receiveSynchronized")) ||
- !(name.equals("receiveTimeError")) ||
- !(name.equals("ttl")) || !(name.equals("count"))
||
- !(name.equals("dscp")) || !(name.equals("phb")) ||
- !(name.equals("wait")) ||
!(name.equals("timeOut")) ||
- !(name.equals("padding")) ||
!(name.equals("delayStart")) ||
- !(name.equals("direction"))) {
+ if(name.equals("count") ||
+ name.equals("dscp") ||
+ name.equals("phb") ||
+ name.equals("wait") ||
+ name.equals("timeOut") ||
+ name.equals("padding") ||
+ name.equals("endDelay") ||
+ name.equals("portRange") ||
+ name.equals("direction")) {

Parameter p = new Parameter();
p = (Parameter)parameterMap.get(name);
return(p);
}
else {
- System.err.println("Error: " + getFileName()
+ " 'getParameterByName(String)' Parameter's name value must be ''.");

+ System.err.println("Error: " + getFileName()
+
+ "
'getParameterByName(String)' Unrecognized " +
+ " parameter: "+name+".");
return null;
}
}
else {
- System.err.println("Error: " + getFileName() + "
'getParameterByName(String)' name cannont be nil.");

+ System.err.println("Error: " + getFileName() +
+ " 'getParameterByName(String)' name
cannont be nil.");
return null;
}
}
@@ -77,61 +67,65 @@
*/
public void addParameter(Parameter newParameter) {
if(newParameter != null) {
- if(!(newParameter.getParameterName().equals("value"))
|| !(newParameter.getParameterName().equals("valueUnits")) ||
-
!(newParameter.getParameterName().equals("numBytes")) ||
!(newParameter.getParameterName().equals("numBytesUnits")) ||
-
!(newParameter.getParameterName().equals("timeType")) ||
!(newParameter.getParameterName().equals("timeValue")) ||
-
!(newParameter.getParameterName().equals("seqNum")) ||
!(newParameter.getParameterName().equals("sendTime")) ||
-
!(newParameter.getParameterName().equals("sendSynchronized")) ||
!(newParameter.getParameterName().equals("sendTimeError")) ||
-
!(newParameter.getParameterName().equals("receiveTime")) ||
!(newParameter.getParameterName().equals("receiveSynchronized")) ||
-
!(newParameter.getParameterName().equals("receiveTimeError")) ||
- !(newParameter.getParameterName().equals("ttl"))
|| !(newParameter.getParameterName().equals("count")) ||
- !(newParameter.getParameterName().equals("dscp"))
|| !(newParameter.getParameterName().equals("phb")) ||
- !(newParameter.getParameterName().equals("wait"))
|| !(newParameter.getParameterName().equals("timeOut")) ||
-
!(newParameter.getParameterName().equals("padding")) ||
!(newParameter.getParameterName().equals("delayStart")) ||
-
!(newParameter.getParameterName().equals("direction"))) {
-
if(getParameterByName(newParameter.getParameterName()) != null){
- System.err.println("Error: " +
getFileName() + " 'setParameter(Parameter)' Duplicate parameter name: " +
newParameter.getParameterName() + " for id: " + newParameter.getId());
+ if(newParameter.getParameterName().equals("count") ||
+
newParameter.getParameterName().equals("dscp") ||
+
newParameter.getParameterName().equals("phb") ||
+
newParameter.getParameterName().equals("wait") ||
+
newParameter.getParameterName().equals("timeOut") ||
+
newParameter.getParameterName().equals("padding") ||
+
newParameter.getParameterName().equals("direction") ||
+
newParameter.getParameterName().equals("portRange") ||
+
newParameter.getParameterName().equals("endDelay")) {
+
if(getParameterByName(newParameter.getParameterName())!=null){
+ System.err.println("Error: " +
getFileName() +
+ "
'setParameter(Parameter)' Duplicate parameter" +
+ " name: " +
newParameter.getParameterName() +
+ " for id: " +
newParameter.getId());
return;
- }
-
parameterMap.put(newParameter.getParameterName(),newParameter);
+ }
+
parameterMap.put(newParameter.getParameterName(),newParameter);
}
else {
- System.err.println("Error: " + getFileName()
+ " 'addParameter(Parameter)' Parameter's name value must be 'interval' or
'valueUnits'.");

+ System.err.println("Error: " + getFileName()
+
+ " 'addParameter(Parameter)'
Unrecognized " +
+ " parameter:
"+newParameter.getParameterName()+".");
return;
}
}
- else {
- System.err.println("Error: " + getFileName() + "
'addParameter(Paramter)' Parameter cannont be nil.");

- return;
- }
+ 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(""))) {
- if(!(name.equals("value")) ||
!(name.equals("valueUnits")) ||
- !(name.equals("numBytes")) ||
!(name.equals("numBytesUnits")) ||
- !(name.equals("timeType")) ||
!(name.equals("timeValue")) ||
- !(name.equals("seqNum")) ||
!(name.equals("sendTime")) ||
- !(name.equals("sendSynchronized")) ||
!(name.equals("sendTimeError")) ||
- !(name.equals("receiveTime")) ||
!(name.equals("receiveSynchronized")) ||
- !(name.equals("receiveTimeError")) ||
- !(name.equals("ttl")) || !(name.equals("count"))
||
- !(name.equals("dscp")) || !(name.equals("phb")) ||
- !(name.equals("wait")) ||
!(name.equals("timeOut")) ||
- !(name.equals("padding")) ||
!(name.equals("delayStart")) ||
- !(name.equals("direction"))) {
+ if(name.equals("count") ||
+ name.equals("dscp") ||
+ name.equals("phb") ||
+ name.equals("wait") ||
+ name.equals("timeOut") ||
+ name.equals("padding") ||
+ name.equals("endDelay") ||
+ name.equals("portRange") ||
+ name.equals("direction")) {
Parameter p = new Parameter();
p.setParameterName(name);
p.setParameterValue(value);
this.addParameter(p);
}
else {
- System.err.println("Error: " + getFileName()
+ " 'addParameter(String, String)' Parameter's name value must be 'interval'
or 'valueUnits'.");
- return;
+ System.err.println("Error: " + getFileName()
+
+ " 'addParameter(String,
String)' Unrecognized " +
+ " parameter: "+name+".");
+ return;
}
}
else {
- System.err.println("Error: " + getFileName() + "
'addParameter(String, String)' cannot have nil value for name or value.");

+ System.err.println("Error: " + getFileName() +
+ " 'addParameter(String, String)'
cannot have nil value" +
+ " for name or value.");
return;
}
}


  • nmwg: r374 - in trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp: . summary summary/v2_0 v2_0, svnlog, 09/16/2008

Archive powered by MHonArc 2.6.16.

Top of Page