perfsonar-dev - nmwg: r214 - in trunk/nmwg/java/org/ggf/ns/nmwg: base/v2_0 event/status/base/v2_0 result/v2_0 time/v2_0 tools/netflow/v2_0 tools/org/perfsonar/service/lookup/sql/v1_0 tools/org/perfsonar/service/lookup/xpath/v1_0 tools/org/perfsonar/service/lookup/xquery/v1_0 tools/org/perfsonar/service/v1_0 topology/base/v3_0 topology/l2/v3_0 topology/l3/v3_0 topology/v2_0
Subject: perfsonar development work
List archive
nmwg: r214 - in trunk/nmwg/java/org/ggf/ns/nmwg: base/v2_0 event/status/base/v2_0 result/v2_0 time/v2_0 tools/netflow/v2_0 tools/org/perfsonar/service/lookup/sql/v1_0 tools/org/perfsonar/service/lookup/xpath/v1_0 tools/org/perfsonar/service/lookup/xquery/v1_0 tools/org/perfsonar/service/v1_0 topology/base/v3_0 topology/l2/v3_0 topology/l3/v3_0 topology/v2_0
Chronological Thread
- From:
- To: ,
- Subject: nmwg: r214 - in trunk/nmwg/java/org/ggf/ns/nmwg: base/v2_0 event/status/base/v2_0 result/v2_0 time/v2_0 tools/netflow/v2_0 tools/org/perfsonar/service/lookup/sql/v1_0 tools/org/perfsonar/service/lookup/xpath/v1_0 tools/org/perfsonar/service/lookup/xquery/v1_0 tools/org/perfsonar/service/v1_0 topology/base/v3_0 topology/l2/v3_0 topology/l3/v3_0 topology/v2_0
- Date: Fri, 16 Mar 2007 16:58:04 -0400
Author: zurawski
Date: 2007-03-16 16:58:04 -0400 (Fri, 16 Mar 2007)
New Revision: 214
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Datum.java
trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/EventType.java
trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Handler.java
trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameter.java
trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Subject.java
trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateAdmin.java
trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateOper.java
trunk/nmwg/java/org/ggf/ns/nmwg/result/v2_0/Datum.java
trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Value.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/Description.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/FlowFormat.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/Name.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/TransportFormat.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Datum.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Subject.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Datum.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Subject.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Datum.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Subject.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/AccessPoint.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Datum.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceDescription.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceName.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceType.java
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Subject.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Address.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cage.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Capacity.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/City.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Country.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cpu.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Description.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Floor.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/GlobalName.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/HostName.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfDescription.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfIndex.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfName.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Index.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Institution.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Latitude.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Location.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Longitude.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Name.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/OperSys.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Rack.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Role.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Room.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Shelf.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/State.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/StreetAddress.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Type.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/ZipCode.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfHostName.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Vlan.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Asn.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfAddress.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfHostName.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IpAddress.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Netmask.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/AuthRealm.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Capacity.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/ClassOfService.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Direction.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Dst.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPoint.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/HostName.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfAddress.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfDescription.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfIndex.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfName.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IpAddress.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Src.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Type.java
Log:
Turning on the string 'cleaning' feature in most of the logical places.
In other locations it may still be omitted for fear of munging with the
sent data.
-jason
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Datum.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Datum.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Datum.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -320,9 +320,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setDatum(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setDatum(clean);
}
else {
System.err.println("Error: " + getFileName() + "
datum can't have a witespace value.");
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/EventType.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/EventType.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/EventType.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -93,8 +93,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setEventType(text);
+ if(!(clean.equals(""))) {
+ setEventType(clean);
}
else {
System.err.println("Error: " + getFileName() + "
eventType can't have a witespace value.");
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Handler.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Handler.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Handler.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -126,9 +126,9 @@
String text = new String(ch, offset, length);
String clean = text.trim();
- if (clean.length() > 0) {
- ((Element)st.peek()).addText(text);
- }
+ if(!(clean.equals(""))) {
+ ((Element)st.peek()).addText(clean);
+ }
}
/**
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameter.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameter.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameter.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -226,9 +226,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setParameterValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setParameterValue(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Subject.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Subject.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Subject.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -246,9 +246,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setSubject(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setSubject(clean);
}
else {
System.err.println("Error: " + getFileName() + "
subject can't have a witespace value.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateAdmin.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateAdmin.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateAdmin.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -99,8 +99,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setStateAdmin(text);
+ if(!(clean.equals(""))) {
+ setStateAdmin(clean);
}
else {
System.err.println("Error: " + getFileName() + "
stateAdmin can't have a witespace value.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateOper.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateOper.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateOper.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -99,8 +99,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setStateOper(text);
+ if(!(clean.equals(""))) {
+ setStateOper(clean);
}
else {
System.err.println("Error: " + getFileName() + "
stateOper can't have a witespace value.");
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/result/v2_0/Datum.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/result/v2_0/Datum.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/result/v2_0/Datum.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -101,9 +101,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setValue(clean);
}
else {
System.err.println("Error: " + getFileName() + "
datum can't have a witespace value.");
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Value.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Value.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Value.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -66,8 +66,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setValue(text);
+ if(!(clean.equals(""))) {
+ setValue(clean);
}
else {
System.err.println("Error: " + getFileName() + "
value can't have a witespace value.");
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/Description.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/Description.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/Description.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setDescription(text);
+ if(!(clean.equals(""))) {
+ setDescription(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/FlowFormat.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/FlowFormat.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/FlowFormat.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -116,9 +116,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setFlowFormatValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setFlowFormatValue(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/Name.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/Name.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/Name.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setName(text);
+ if(!(clean.equals(""))) {
+ setName(clean);
return true;
}
else {
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/TransportFormat.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/TransportFormat.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/netflow/v2_0/TransportFormat.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -116,9 +116,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setTransportFormatValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setTransportFormatValue(clean);
setUseText();
}
else {
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Datum.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Datum.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Datum.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -101,9 +101,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setValue(clean);
}
else {
//logger.warn("Characteristic: Can't store
whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Subject.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Subject.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Subject.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -110,9 +110,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setSubject(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setSubject(clean);
}
else {
//logger.warn("Subject: Can't store whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Datum.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Datum.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Datum.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -101,9 +101,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setValue(clean);
}
else {
//logger.warn("Characteristic: Can't store
whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Subject.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Subject.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Subject.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -110,9 +110,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setSubject(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setSubject(clean);
}
else {
//logger.warn("Subject: Can't store whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Datum.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Datum.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Datum.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -114,9 +114,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setValue(clean);
}
else {
//logger.warn("Characteristic: Can't store
whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Subject.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Subject.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Subject.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -110,9 +110,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setSubject(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setSubject(clean);
}
else {
//logger.warn("Subject: Can't store whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/AccessPoint.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/AccessPoint.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/AccessPoint.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -105,8 +105,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setAccessPoint(text);
+ if(!(clean.equals(""))) {
+ setAccessPoint(clean);
}
else {
//logger.warn("accessPoint: Can't store whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Datum.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Datum.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Datum.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -122,9 +122,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setValue(clean);
}
else {
//logger.warn("Datum: Can't store whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceDescription.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceDescription.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceDescription.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -106,8 +106,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setServiceDescription(text);
+ if(!(clean.equals(""))) {
+ setServiceDescription(clean);
}
else {
//logger.warn("serviceDescription: Can't store
whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceName.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceName.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceName.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -106,8 +106,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setServiceName(text);
+ if(!(clean.equals(""))) {
+ setServiceName(clean);
}
else {
//logger.warn("serviceName: Can't store whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceType.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceType.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceType.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -106,8 +106,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setServiceType(text);
+ if(!(clean.equals(""))) {
+ setServiceType(clean);
}
else {
//logger.warn("serviceType: Can't store whitespace.");
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Subject.java
===================================================================
---
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Subject.java
2007-03-08 20:41:35 UTC (rev 213)
+++
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Subject.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -101,8 +101,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setSubjectValue(text);
+ if(!(clean.equals(""))) {
+ setSubjectValue(clean);
}
else {
//logger.warn("serviceType: Can't store whitespace.");
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Address.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Address.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Address.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -110,8 +110,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setAddress(text);
+ if(!(clean.equals(""))) {
+ setAddress(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cage.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cage.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cage.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setCage(text);
+ if(!(clean.equals(""))) {
+ setCage(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Capacity.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Capacity.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Capacity.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -90,8 +90,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setCapacity(text);
+ if(!(clean.equals(""))) {
+ setCapacity(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/City.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/City.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/City.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setCity(text);
+ if(!(clean.equals(""))) {
+ setCity(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Country.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Country.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Country.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setCountry(text);
+ if(!(clean.equals(""))) {
+ setCountry(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cpu.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cpu.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cpu.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setCpu(text);
+ if(!(clean.equals(""))) {
+ setCpu(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Description.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Description.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Description.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setDescription(text);
+ if(!(clean.equals(""))) {
+ setDescription(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Floor.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Floor.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Floor.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setFloor(text);
+ if(!(clean.equals(""))) {
+ setFloor(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/GlobalName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/GlobalName.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/GlobalName.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -113,8 +113,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setGlobalName(text);
+ if(!(clean.equals(""))) {
+ setGlobalName(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/HostName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/HostName.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/HostName.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -91,8 +91,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setHostName(text);
+ if(!(clean.equals(""))) {
+ setHostName(clean);
return true;
}
else {
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfDescription.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfDescription.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfDescription.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -90,8 +90,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfDescription(text);
+ if(!(clean.equals(""))) {
+ setIfDescription(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfIndex.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfIndex.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfIndex.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -90,8 +90,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfIndex(text);
+ if(!(clean.equals(""))) {
+ setIfIndex(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfName.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfName.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -90,8 +90,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfName(text);
+ if(!(clean.equals(""))) {
+ setIfName(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Index.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Index.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Index.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIndex(text);
+ if(!(clean.equals(""))) {
+ setIndex(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Institution.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Institution.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Institution.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setInstitution(text);
+ if(!(clean.equals(""))) {
+ setInstitution(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Latitude.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Latitude.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Latitude.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setLatitude(Float.valueOf(text).floatValue());
+ if(!(clean.equals(""))) {
+ setLatitude(Float.valueOf(clean).floatValue());
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Location.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Location.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Location.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -426,8 +426,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setLocation(text);
+ if(!(clean.equals(""))) {
+ setLocation(clean);
setUseText();
return true;
}
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Longitude.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Longitude.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Longitude.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setLongitude(Float.valueOf(text).floatValue());
+ if(!(clean.equals(""))) {
+ setLongitude(Float.valueOf(clean).floatValue());
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Name.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Name.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Name.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -113,8 +113,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setName(text);
+ if(!(clean.equals(""))) {
+ setName(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/OperSys.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/OperSys.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/OperSys.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setOperSys(text);
+ if(!(clean.equals(""))) {
+ setOperSys(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Rack.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Rack.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Rack.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setRack(text);
+ if(!(clean.equals(""))) {
+ setRack(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Role.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Role.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Role.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setRole(text);
+ if(!(clean.equals(""))) {
+ setRole(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Room.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Room.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Room.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setRoom(text);
+ if(!(clean.equals(""))) {
+ setRoom(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Shelf.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Shelf.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Shelf.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setShelf(text);
+ if(!(clean.equals(""))) {
+ setShelf(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/State.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/State.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/State.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setState(text);
+ if(!(clean.equals(""))) {
+ setState(clean);
return true;
}
else {
Modified:
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/StreetAddress.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/StreetAddress.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/StreetAddress.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setStreetAddress(text);
+ if(!(clean.equals(""))) {
+ setStreetAddress(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Type.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Type.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Type.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -91,8 +91,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setType(text);
+ if(!(clean.equals(""))) {
+ setType(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/ZipCode.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/ZipCode.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/ZipCode.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setZipCode(Integer.parseInt(text));
+ if(!(clean.equals(""))) {
+ setZipCode(Integer.parseInt(clean));
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfHostName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfHostName.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfHostName.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -91,8 +91,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfHostName(text);
+ if(!(clean.equals(""))) {
+ setIfHostName(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Vlan.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Vlan.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Vlan.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setVlan(text);
+ if(!(clean.equals(""))) {
+ setVlan(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Asn.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Asn.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Asn.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setAsn(text);
+ if(!(clean.equals(""))) {
+ setAsn(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfAddress.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfAddress.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfAddress.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -112,8 +112,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfAddress(text);
+ if(!(clean.equals(""))) {
+ setIfAddress(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfHostName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfHostName.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfHostName.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -91,8 +91,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfHostName(text);
+ if(!(clean.equals(""))) {
+ setIfHostName(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IpAddress.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IpAddress.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IpAddress.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -112,8 +112,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIpAddress(text);
+ if(!(clean.equals(""))) {
+ setIpAddress(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Netmask.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Netmask.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Netmask.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setNetmask(text);
+ if(!(clean.equals(""))) {
+ setNetmask(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setSubnet(text);
+ if(!(clean.equals(""))) {
+ setSubnet(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/AuthRealm.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/AuthRealm.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/AuthRealm.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -88,8 +88,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setAuthRealm(text);
+ if(!(clean.equals(""))) {
+ setAuthRealm(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Capacity.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Capacity.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Capacity.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setCapacity(text);
+ if(!(clean.equals(""))) {
+ setCapacity(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/ClassOfService.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/ClassOfService.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/ClassOfService.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -86,8 +86,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setClassOfService(text);
+ if(!(clean.equals(""))) {
+ setClassOfService(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Direction.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Direction.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Direction.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -86,8 +86,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setDirection(text);
+ if(!(clean.equals(""))) {
+ setDirection(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Dst.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Dst.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Dst.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -124,9 +124,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setValue(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPoint.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPoint.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPoint.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -124,9 +124,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setValue(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/HostName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/HostName.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/HostName.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -86,8 +86,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setHostName(text);
+ if(!(clean.equals(""))) {
+ setHostName(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfAddress.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfAddress.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfAddress.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -108,8 +108,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfAddress(text);
+ if(!(clean.equals(""))) {
+ setIfAddress(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfDescription.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfDescription.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfDescription.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfDescription(text);
+ if(!(clean.equals(""))) {
+ setIfDescription(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfIndex.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfIndex.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfIndex.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfIndex(text);
+ if(!(clean.equals(""))) {
+ setIfIndex(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfName.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfName.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -85,8 +85,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIfName(text);
+ if(!(clean.equals(""))) {
+ setIfName(clean);
return true;
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IpAddress.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IpAddress.java
2007-03-08 20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IpAddress.java
2007-03-16 20:58:04 UTC (rev 214)
@@ -107,8 +107,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setIpAddress(text);
+ if(!(clean.equals(""))) {
+ setIpAddress(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Src.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Src.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Src.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -124,9 +124,9 @@
* whitespace.
*/
public boolean addText(String text) {
- //String clean = text.trim();
- if(!(text.equals(""))) {
- setValue(text);
+ String clean = text.trim();
+ if(!(clean.equals(""))) {
+ setValue(clean);
setUseText();
}
else {
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Type.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Type.java 2007-03-08
20:41:35 UTC (rev 213)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Type.java 2007-03-16
20:58:04 UTC (rev 214)
@@ -86,8 +86,8 @@
*/
public boolean addText(String text) {
String clean = text.trim();
- if(!(text.equals(""))) {
- setType(text);
+ if(!(clean.equals(""))) {
+ setType(clean);
return true;
}
else {
- nmwg: r214 - in trunk/nmwg/java/org/ggf/ns/nmwg: base/v2_0 event/status/base/v2_0 result/v2_0 time/v2_0 tools/netflow/v2_0 tools/org/perfsonar/service/lookup/sql/v1_0 tools/org/perfsonar/service/lookup/xpath/v1_0 tools/org/perfsonar/service/lookup/xquery/v1_0 tools/org/perfsonar/service/v1_0 topology/base/v3_0 topology/l2/v3_0 topology/l3/v3_0 topology/v2_0, svnlog, 03/16/2007
Archive powered by MHonArc 2.6.16.