perfsonar-dev - r177 - in trunk/nmwg/java/org/ggf/ns/nmwg/topology: base/v3_0 l2/v3_0 l3/v3_0 l4/v3_0
Subject: perfsonar development work
List archive
r177 - in trunk/nmwg/java/org/ggf/ns/nmwg/topology: base/v3_0 l2/v3_0 l3/v3_0 l4/v3_0
Chronological Thread
- From:
- To: ,
- Subject: r177 - in trunk/nmwg/java/org/ggf/ns/nmwg/topology: base/v3_0 l2/v3_0 l3/v3_0 l4/v3_0
- Date: Tue, 7 Nov 2006 18:38:32 -0500
Author: zurawski
Date: 2006-11-07 18:38:30 -0500 (Tue, 07 Nov 2006)
New Revision: 177
Added:
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cage.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/Rack.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/ZipCode.java
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/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/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/Interface.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/Link.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/Network.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Node.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/Path.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/Type.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Address.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Capacity.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Description.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/GlobalName.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/IfIndex.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Index.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Interface.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Link.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Name.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Network.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Path.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Role.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Type.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/Capacity.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/GlobalName.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/IfDescription.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/IfIndex.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfName.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Index.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Interface.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/Link.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Name.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/Network.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Path.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Role.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Type.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Address.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPoint.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPointPair.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Path.java
trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Role.java
Log:
Changes are three fold:
1) Address issues raised by C?\195?\161ndido regarding the toDOM
methods
2) Address issues raised by C?\195?\161ndido regarding constructors
(localName, etc)
3) Address issues raised on topology calls regarding the
'location' element. See the updated schema for new use cases.
-jason
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Address.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -41,6 +41,10 @@
address = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "address";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:address";
@@ -213,21 +217,21 @@
*/
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
- org.w3c.dom.Element ipaddr =
doc.createElement(getLocalName());
- ipaddr = doc.createElementNS(getUri(), getQName());
- parent.appendChild(ipaddr);
+ org.w3c.dom.Element addr = doc.createElement(getLocalName());
+ addr = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(addr);
if(!(getType().equals(""))) {
- ipaddr.setAttribute("type", getType());
+ addr.setAttribute("type", getType());
}
if(!(getAddress().equals(""))) {
if(getUseText()) {
- org.w3c.dom.Text ipaddrtext =
doc.createTextNode(getAddress());
- ipaddr.appendChild(ipaddrtext);
+ org.w3c.dom.Text addrtext =
doc.createTextNode(getAddress());
+ addr.appendChild(addrtext);
}
else {
- ipaddr.setAttribute("value", getAddress());
+ addr.setAttribute("value", getAddress());
}
}
}
Added: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cage.java
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Capacity.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -31,6 +31,10 @@
public Capacity() {
capacity = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "capacity";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:capacity";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/City.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public City() {
city = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "city";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:city";
@@ -139,11 +143,11 @@
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
if(!(getCity().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getCity());
- authrealm.appendChild(authrealmtext);
+ org.w3c.dom.Element city =
doc.createElement(getLocalName());
+ city = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(city);
+ org.w3c.dom.Text citytext =
doc.createTextNode(getCity());
+ city.appendChild(citytext);
}
}
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Country.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Country() {
country = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "country";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:country";
@@ -139,11 +143,11 @@
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
if(!(getCountry().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getCountry());
- authrealm.appendChild(authrealmtext);
+ org.w3c.dom.Element country =
doc.createElement(getLocalName());
+ country = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(country);
+ org.w3c.dom.Text countrytext =
doc.createTextNode(getCountry());
+ country.appendChild(countrytext);
}
}
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 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cpu.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Cpu() {
cpu = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "cpu";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:cpu";
@@ -139,11 +143,11 @@
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
if(!(getCpu().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getCpu());
- authrealm.appendChild(authrealmtext);
+ org.w3c.dom.Element cpu =
doc.createElement(getLocalName());
+ cpu = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(cpu);
+ org.w3c.dom.Text cputext =
doc.createTextNode(getCpu());
+ cpu.appendChild(cputext);
}
}
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Description.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Description() {
description = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "description";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:description";
@@ -139,11 +143,11 @@
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
if(!(getDescription().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getDescription());
- authrealm.appendChild(authrealmtext);
+ org.w3c.dom.Element description =
doc.createElement(getLocalName());
+ description = doc.createElementNS(getUri(),
getQName());
+ parent.appendChild(description);
+ org.w3c.dom.Text descriptiontext =
doc.createTextNode(getDescription());
+ description.appendChild(descriptiontext);
}
}
Added: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Floor.java
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/GlobalName.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -37,6 +37,10 @@
globalName = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "globalName";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:globalName";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/HostName.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -32,6 +32,10 @@
public HostName() {
hostName = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "hostName";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:hostName";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfDescription.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -31,6 +31,10 @@
public IfDescription() {
ifDescription = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifDescription";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:ifDescription";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfIndex.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -31,6 +31,10 @@
public IfIndex() {
ifIndex = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifIndex";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:ifIndex";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfName.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -31,6 +31,10 @@
public IfName() {
ifName = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifName";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:ifName";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Index.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Index() {
index = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "index";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:index";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Institution.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Institution() {
institution = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "institution";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:institution";
@@ -139,11 +143,11 @@
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
if(!(getInstitution().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getInstitution());
- authrealm.appendChild(authrealmtext);
+ org.w3c.dom.Element institution =
doc.createElement(getLocalName());
+ institution = doc.createElementNS(getUri(),
getQName());
+ parent.appendChild(institution);
+ org.w3c.dom.Text institutiontext =
doc.createTextNode(getInstitution());
+ institution.appendChild(institutiontext);
}
}
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Interface.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Interface.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Interface.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -84,6 +84,10 @@
capacityElement = null;
nameElement = null;
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "interface";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:interface";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Latitude.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -18,14 +18,18 @@
public class Latitude extends Element {
- protected String latitude;
+ protected float latitude;
/**
* Constructor.
*/
public Latitude() {
- latitude = "";
+ latitude = 0;
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "latitude";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:latitude";
@@ -36,14 +40,14 @@
/**
* Returns the latitude value.
*/
- public String getLatitude() {
+ public float getLatitude() {
return latitude;
}
/**
* Sets the latitude value.
*/
- public void setLatitude(String newLatitude) {
+ public void setLatitude(float newLatitude) {
latitude = newLatitude;
}
@@ -82,7 +86,7 @@
public boolean addText(String text) {
String clean = text.trim();
if(!(text.equals(""))) {
- setLatitude(text);
+ setLatitude(Float.valueOf(text).floatValue());
return true;
}
else {
@@ -97,7 +101,7 @@
public ContentHandler toXML(ContentHandler handler, NamespaceSupport
nss) throws Exception {
try {
handler.startElement(getUri(), getLocalName(),
getQName(), getAttributes(nss));
-
handler.characters(latitude.toCharArray(),0,latitude.length());
+
handler.characters(Float.toString(latitude).toCharArray(),0,Float.toString(latitude).length());
handler.endElement(getUri(), getLocalName(),
getQName());
if(getCompleted()) {
@@ -138,12 +142,12 @@
*/
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
- if(!(getLatitude().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getLatitude());
- authrealm.appendChild(authrealmtext);
+ if(!(Float.toString(getLatitude()).equals(""))) {
+ org.w3c.dom.Element latitude =
doc.createElement(getLocalName());
+ latitude = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(latitude);
+ org.w3c.dom.Text latitudetext =
doc.createTextNode(Float.toString(getLatitude()));
+ latitude.appendChild(latitudetext);
}
}
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Link.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Link.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Link.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -87,6 +87,10 @@
linkIdRef = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "link";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:link";
@@ -538,41 +542,41 @@
org.w3c.dom.Document doc = parent.getOwnerDocument();
- org.w3c.dom.Element intfc = doc.createElement(getLocalName());
- intfc = doc.createElementNS(getUri(), getQName());
- parent.appendChild(intfc);
+ org.w3c.dom.Element link = doc.createElement(getLocalName());
+ link = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(link);
if(getTypeElement() != null) {
- getTypeElement().getDOM(intfc);
+ getTypeElement().getDOM(link);
}
if(getNameElement() != null) {
- getNameElement().getDOM(intfc);
+ getNameElement().getDOM(link);
}
if(getGlobalNameElement() != null) {
- getGlobalNameElement().getDOM(intfc);
+ getGlobalNameElement().getDOM(link);
}
if(getIndexElement() != null) {
- getIndexElement().getDOM(intfc);
+ getIndexElement().getDOM(link);
}
if(!(getId().equals(""))) {
- intfc.setAttribute("id", getId());
+ link.setAttribute("id", getId());
}
if(!(getLinkIdRef().equals(""))) {
- intfc.setAttribute("linkIdRef", getLinkIdRef());
+ link.setAttribute("linkIdRef", getLinkIdRef());
}
for(Iterator i = lc.iterator(); i.hasNext(); ){
tl = (Link)i.next();
- tl.getDOM(intfc);
+ tl.getDOM(link);
}
for(Iterator i = ic.iterator(); i.hasNext(); ){
ti = (Interface)i.next();
- ti.getDOM(intfc);
+ ti.getDOM(link);
}
for(Iterator i = nc.iterator(); i.hasNext(); ){
tn = (Node)i.next();
- tn.getDOM(intfc);
+ tn.getDOM(link);
}
}
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Location.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -18,14 +18,106 @@
public class Location extends Element {
+ /**
+ *
+ */
+ protected Institution institutionElement;
+
+ /**
+ *
+ */
+ protected Country countryElement;
+
+ /**
+ *
+ */
+ protected ZipCode zipCodeElement;
+
+ /**
+ *
+ */
+ protected State stateElement;
+
+ /**
+ *
+ */
+ protected City cityElement;
+
+ /**
+ *
+ */
+ protected StreetAddress streetAddressElement;
+
+ /**
+ *
+ */
+ protected Floor floorElement;
+
+ /**
+ *
+ */
+ protected Room roomElement;
+
+ /**
+ *
+ */
+ protected Cage cageElement;
+
+ /**
+ *
+ */
+ protected Rack rackElement;
+
+ /**
+ *
+ */
+ protected Shelf shelfElement;
+
+ /**
+ *
+ */
+ protected Latitude latitudeElement;
+
+ /**
+ *
+ */
+ protected Longitude longitudeElement;
+
+ /**
+ *
+ */
protected String location;
/**
+ * Lets us know if we are using an attribute or
+ * a text element.
+ */
+ protected boolean useText;
+
+ /**
* Constructor.
*/
public Location() {
location = "";
-
+ useText = false;
+ institutionElement = null;
+ countryElement = null;
+ zipCodeElement = null;
+ stateElement = null;
+ cityElement = null;
+ streetAddressElement = null;
+ floorElement = null;
+ roomElement = null;
+ cageElement = null;
+ rackElement = null;
+ shelfElement = null;
+ latitudeElement = null;
+ longitudeElement = null;
+
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "location";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:location";
@@ -34,6 +126,27 @@
}
/**
+ * returns the value of the useText variable
+ */
+ public boolean getUseText() {
+ return useText;
+ }
+
+ /**
+ * Sets the value of the useText variable
+ */
+ public void setUseText() {
+ useText = true;
+ }
+
+ /**
+ * Un-sets the value of the useText variable
+ */
+ public void unSetUseText() {
+ useText = false;
+ }
+
+ /**
* Returns the location value.
*/
public String getLocation() {
@@ -48,6 +161,238 @@
}
/**
+ * Returns the institution element.
+ */
+ public Institution getInstitutionElement() {
+ return institutionElement;
+ }
+
+ /**
+ * Sets the institution element.
+ */
+ public void setInstitutionElement(Institution newInstitutionElement) {
+ institutionElement = newInstitutionElement;
+ }
+
+ /**
+ * Returns the country element.
+ */
+ public Country getCountryElement() {
+ return countryElement;
+ }
+
+ /**
+ * Sets the country element.
+ */
+ public void setCountryElement(Country newCountryElement) {
+ countryElement = newCountryElement;
+ }
+
+ /**
+ * Returns the zipcode element.
+ */
+ public ZipCode getZipCodeElement() {
+ return zipCodeElement;
+ }
+
+ /**
+ * Sets the zipCode element.
+ */
+ public void setZipCodeElement(ZipCode newZipCodeElement) {
+ zipCodeElement = newZipCodeElement;
+ }
+
+ /**
+ * Returns the state element.
+ */
+ public State getStateElement() {
+ return stateElement;
+ }
+
+ /**
+ * Sets the state element.
+ */
+ public void setStateElement(State newStateElement) {
+ stateElement = newStateElement;
+ }
+
+ /**
+ * Returns the city element.
+ */
+ public City getCityElement() {
+ return cityElement;
+ }
+
+ /**
+ * Sets the city element.
+ */
+ public void setCityElement(City newCityElement) {
+ cityElement = newCityElement;
+ }
+
+ /**
+ * Returns the StreetAddress element.
+ */
+ public StreetAddress getStreetAddressElement() {
+ return streetAddressElement;
+ }
+
+ /**
+ * Sets the StreetAddress element.
+ */
+ public void setStreetAddressElement(StreetAddress
newStreetAddressElement) {
+ streetAddressElement = newStreetAddressElement;
+ }
+
+ /**
+ * Returns the Floor element.
+ */
+ public Floor getFloorElement() {
+ return floorElement;
+ }
+
+ /**
+ * Sets the Floor element.
+ */
+ public void setFloorElement(Floor newFloorElement) {
+ floorElement = newFloorElement;
+ }
+
+ /**
+ * Returns the Room element.
+ */
+ public Room getRoomElement() {
+ return roomElement;
+ }
+
+ /**
+ * Sets the Room element.
+ */
+ public void setRoomElement(Room newRoomElement) {
+ roomElement = newRoomElement;
+ }
+
+ /**
+ * Returns the Cage element.
+ */
+ public Cage getCageElement() {
+ return cageElement;
+ }
+
+ /**
+ * Sets the Cage element.
+ */
+ public void setCageElement(Cage newCageElement) {
+ cageElement = newCageElement;
+ }
+
+ /**
+ * Returns the Rack element.
+ */
+ public Rack getRackElement() {
+ return rackElement;
+ }
+
+ /**
+ * Sets the Rack element.
+ */
+ public void setRackElement(Rack newRackElement) {
+ rackElement = newRackElement;
+ }
+
+ /**
+ * Returns the Shelf element.
+ */
+ public Shelf getShelfElement() {
+ return shelfElement;
+ }
+
+ /**
+ * Sets the Shelf element.
+ */
+ public void setShelfElement(Shelf newShelfElement) {
+ shelfElement = newShelfElement;
+ }
+
+ /**
+ * Returns the longitude element.
+ */
+ public Longitude getLongitudeElement() {
+ return longitudeElement;
+ }
+
+ /**
+ * Sets the longitude element.
+ */
+ public void setLongitudeElement(Longitude newLongitudeElement) {
+ longitudeElement = newLongitudeElement;
+ }
+
+ /**
+ * Returns the latitude element.
+ */
+ public Latitude getLatitudeElement() {
+ return latitudeElement;
+ }
+
+ /**
+ * Sets the latitude element.
+ */
+ public void setLatitudeElement(Latitude newLatitudeElement) {
+ latitudeElement = newLatitudeElement;
+ }
+
+ /**
+ * Add only children related to the location.
+ */
+ public boolean addChild(Element newChild) {
+ if(newChild.getLocalName().equals("institution")) {
+ setInstitutionElement((Institution)newChild);
+ }
+ else if(newChild.getLocalName().equals("country")) {
+ setCountryElement((Country)newChild);
+ }
+ else if(newChild.getLocalName().equals("zipCode")) {
+ setZipCodeElement((ZipCode)newChild);
+ }
+ else if(newChild.getLocalName().equals("state")) {
+ setStateElement((State)newChild);
+ }
+ else if(newChild.getLocalName().equals("city")) {
+ setCityElement((City)newChild);
+ }
+ else if(newChild.getLocalName().equals("streetAddress")) {
+ setStreetAddressElement((StreetAddress)newChild);
+ }
+ else if(newChild.getLocalName().equals("floor")) {
+ setFloorElement((Floor)newChild);
+ }
+ else if(newChild.getLocalName().equals("room")) {
+ setRoomElement((Room)newChild);
+ }
+ else if(newChild.getLocalName().equals("cage")) {
+ setCageElement((Cage)newChild);
+ }
+ else if(newChild.getLocalName().equals("rack")) {
+ setRackElement((Rack)newChild);
+ }
+ else if(newChild.getLocalName().equals("shelf")) {
+ setShelfElement((Shelf)newChild);
+ }
+ else if(newChild.getLocalName().equals("latitude")) {
+ setLatitudeElement((Latitude)newChild);
+ }
+ else if(newChild.getLocalName().equals("longitude")) {
+ setLongitudeElement((Longitude)newChild);
+ }
+ else {
+ System.err.println("Error: " + getFileName() + "
addChild(Element) unrecognized child: " + newChild);
+ return false;
+ }
+ return true;
+ }
+
+ /**
* Not used in this element.
*/
public boolean addAttr(String attr, String value, NamespaceSupport
nss) {
@@ -83,6 +428,7 @@
String clean = text.trim();
if(!(text.equals(""))) {
setLocation(text);
+ setUseText();
return true;
}
else {
@@ -97,8 +443,15 @@
public ContentHandler toXML(ContentHandler handler, NamespaceSupport
nss) throws Exception {
try {
handler.startElement(getUri(), getLocalName(),
getQName(), getAttributes(nss));
-
handler.characters(location.toCharArray(),0,location.length());
- handler.endElement(getUri(), getLocalName(),
getQName());
+ if(getUseText()) {
+ if(!(getLocation().equals(""))) {
+
handler.characters(getLocation().toCharArray(),0,getLocation().length());
+ }
+ }
+ else {
+ handler = getChildren(handler, nss);
+ }
+ handler.endElement(getUri(), getLocalName(),
getQName());
if(getCompleted()) {
nss.popContext();
@@ -112,6 +465,49 @@
}
/**
+ * Chases children references down to pring out all related xml tags.
+ */
+ public ContentHandler getChildren(ContentHandler handler,
NamespaceSupport nss) throws Exception {
+ if(getInstitutionElement() != null) {
+ handler = getInstitutionElement().toXML(handler, nss);
+ }
+ if(getCountryElement() != null) {
+ handler = getCountryElement().toXML(handler, nss);
+ }
+ if(getZipCodeElement() != null) {
+ handler = getZipCodeElement().toXML(handler, nss);
+ }
+ if(getCityElement() != null) {
+ handler = getCityElement().toXML(handler, nss);
+ }
+ if(getStreetAddressElement() != null) {
+ handler = getStreetAddressElement().toXML(handler,
nss);
+ }
+ if(getFloorElement() != null) {
+ handler = getFloorElement().toXML(handler, nss);
+ }
+ if(getRoomElement() != null) {
+ handler = getRoomElement().toXML(handler, nss);
+ }
+ if(getCageElement() != null) {
+ handler = getCageElement().toXML(handler, nss);
+ }
+ if(getRackElement() != null) {
+ handler = getRackElement().toXML(handler, nss);
+ }
+ if(getShelfElement() != null) {
+ handler = getShelfElement().toXML(handler, nss);
+ }
+ if(getLatitudeElement() != null) {
+ handler = getLatitudeElement().toXML(handler, nss);
+ }
+ if(getLongitudeElement() != null) {
+ handler = getLongitudeElement().toXML(handler, nss);
+ }
+ return handler;
+ }
+
+ /**
* Converts items into attributes for an xml tag.
*/
public AttributesImpl getAttributes(NamespaceSupport nss) {
@@ -136,15 +532,55 @@
* 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();
- if(!(getLocation().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getLocation());
- authrealm.appendChild(authrealmtext);
+ public void getDOM(org.w3c.dom.Element parent) {
+ org.w3c.dom.Document doc = parent.getOwnerDocument();
+ org.w3c.dom.Element location =
doc.createElement(getLocalName());
+ location = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(location);
+ if(getUseText()) {
+ if(!(getLocation().equals(""))) {
+ org.w3c.dom.Text locationtext =
doc.createTextNode(getLocation());
+ location.appendChild(locationtext);
+ }
}
+ else {
+ if(getInstitutionElement() != null) {
+ getInstitutionElement().getDOM(location);
+ }
+ if(getCountryElement() != null) {
+ getCountryElement().getDOM(location);
+ }
+ if(getZipCodeElement() != null) {
+ getZipCodeElement().getDOM(location);
+ }
+ if(getCityElement() != null) {
+ getCityElement().getDOM(location);
+ }
+ if(getStreetAddressElement() != null) {
+ getStreetAddressElement().getDOM(location);
+ }
+ if(getFloorElement() != null) {
+ getFloorElement().getDOM(location);
+ }
+ if(getRoomElement() != null) {
+ getRoomElement().getDOM(location);
+ }
+ if(getCageElement() != null) {
+ getCageElement().getDOM(location);
+ }
+ if(getRackElement() != null) {
+ getRackElement().getDOM(location);
+ }
+ if(getShelfElement() != null) {
+ getShelfElement().getDOM(location);
+ }
+ if(getLatitudeElement() != null) {
+ getLatitudeElement().getDOM(location);
+ }
+ if(getLongitudeElement() != null) {
+ getLongitudeElement().getDOM(location);
+ }
+ }
}
/**
@@ -152,6 +588,6 @@
* an output statement.
*/
public String toString() {
- return getFileName() + ": ---> " + getLocation();
+ return getFileName() + ": ---> " + getLocation() +
getInstitutionElement() + getCountryElement() + getZipCodeElement() +
getStateElement() + getCityElement() + getStreetAddressElement() +
getFloorElement() + getRoomElement() + getCageElement() + getRackElement() +
getShelfElement() + getLongitudeElement() + getLatitudeElement();
}
}
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Longitude.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -18,14 +18,18 @@
public class Longitude extends Element {
- protected String longitude;
+ protected float longitude;
/**
* Constructor.
*/
public Longitude() {
- longitude = "";
+ longitude = 0;
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "longitude";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:longitude";
@@ -36,14 +40,14 @@
/**
* Returns the longitude value.
*/
- public String getLongitude() {
+ public float getLongitude() {
return longitude;
}
/**
* Sets the longitude value.
*/
- public void setLongitude(String newLongitude) {
+ public void setLongitude(float newLongitude) {
longitude = newLongitude;
}
@@ -82,7 +86,7 @@
public boolean addText(String text) {
String clean = text.trim();
if(!(text.equals(""))) {
- setLongitude(text);
+ setLongitude(Float.valueOf(text).floatValue());
return true;
}
else {
@@ -97,7 +101,7 @@
public ContentHandler toXML(ContentHandler handler, NamespaceSupport
nss) throws Exception {
try {
handler.startElement(getUri(), getLocalName(),
getQName(), getAttributes(nss));
-
handler.characters(longitude.toCharArray(),0,longitude.length());
+
handler.characters(Float.toString(longitude).toCharArray(),0,Float.toString(longitude).length());
handler.endElement(getUri(), getLocalName(),
getQName());
if(getCompleted()) {
@@ -138,12 +142,12 @@
*/
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
- if(!(getLongitude().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getLongitude());
- authrealm.appendChild(authrealmtext);
+ if(!(Float.toString(getLongitude()).equals(""))) {
+ org.w3c.dom.Element longitude =
doc.createElement(getLocalName());
+ longitude = doc.createElementNS(getUri(),
getQName());
+ parent.appendChild(longitude);
+ org.w3c.dom.Text longitudetext =
doc.createTextNode(Float.toString(getLongitude()));
+ longitude.appendChild(longitudetext);
}
}
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Name.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -37,6 +37,10 @@
name = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "name";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:name";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Network.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Network.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Network.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -72,6 +72,10 @@
networkIdRef = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "network";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:network";
@@ -483,35 +487,35 @@
Collection nc = getNodeMap().values();
org.w3c.dom.Document doc = parent.getOwnerDocument();
- org.w3c.dom.Element intfc = doc.createElement(getLocalName());
- intfc = doc.createElementNS(getUri(), getQName());
- parent.appendChild(intfc);
+ org.w3c.dom.Element network =
doc.createElement(getLocalName());
+ network = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(network);
if(!(getId().equals(""))) {
- intfc.setAttribute("id", getId());
+ network.setAttribute("id", getId());
}
if(!(getNetworkIdRef().equals(""))) {
- intfc.setAttribute("networkIdRef",
getNetworkIdRef());
+ network.setAttribute("networkIdRef",
getNetworkIdRef());
}
if(getNameElement() != null) {
- getNameElement().getDOM(intfc);
+ getNameElement().getDOM(network);
}
if(getTypeElement() != null) {
- getTypeElement().getDOM(intfc);
+ getTypeElement().getDOM(network);
}
for(Iterator i = lc.iterator(); i.hasNext(); ){
tl = (Link)i.next();
- tl.getDOM(intfc);
+ tl.getDOM(network);
}
for(Iterator i = ic.iterator(); i.hasNext(); ){
ti = (Interface)i.next();
- ti.getDOM(intfc);
+ ti.getDOM(network);
}
for(Iterator i = nc.iterator(); i.hasNext(); ){
tn = (Node)i.next();
- tn.getDOM(intfc);
+ tn.getDOM(network);
}
}
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Node.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Node.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Node.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -13,11 +13,6 @@
* @see org.ggf.ns.nmwg.topology.base.v3_0.Cpu
* @see org.ggf.ns.nmwg.topology.base.v3_0.OperSys
* @see org.ggf.ns.nmwg.topology.base.v3_0.Location
- * @see org.ggf.ns.nmwg.topology.base.v3_0.Country
- * @see org.ggf.ns.nmwg.topology.base.v3_0.City
- * @see org.ggf.ns.nmwg.topology.base.v3_0.Longitude
- * @see org.ggf.ns.nmwg.topology.base.v3_0.Latitude
- * @see org.ggf.ns.nmwg.topology.base.v3_0.Institution
* @see org.ggf.ns.nmwg.topology.base.v3_0.Interface
* @see org.w3c.dom.Document
* @see org.w3c.dom.Element
@@ -82,31 +77,6 @@
*
*/
protected Name nameElement;
-
- /**
- *
- */
- protected Country countryElement;
-
- /**
- *
- */
- protected City cityElement;
-
- /**
- *
- */
- protected Longitude longitudeElement;
-
- /**
- *
- */
- protected Latitude latitudeElement;
-
- /**
- *
- */
- protected Institution institutionElement;
/**
* attribute for nodeIdRef
@@ -126,21 +96,18 @@
role = "";
hostNameElement = null;
typeElement = null;
-
roleElement = null;
descriptionElement = null;
cpuElement = null;
operSysElement = null;
locationElement = null;
nameElement = null;
- countryElement = null;
- cityElement = null;
- longitudeElement = null;
- latitudeElement = null;
- institutionElement = null;
-
interfaceMap = new HashMap();
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "node";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:node";
@@ -289,76 +256,6 @@
}
/**
- * Returns the country element.
- */
- public Country getCountryElement() {
- return countryElement;
- }
-
- /**
- * Sets the country element.
- */
- public void setCountryElement(Country newCountryElement) {
- countryElement = newCountryElement;
- }
-
- /**
- * Returns the city element.
- */
- public City getCityElement() {
- return cityElement;
- }
-
- /**
- * Sets the city element.
- */
- public void setCityElement(City newCityElement) {
- cityElement = newCityElement;
- }
-
- /**
- * Returns the longitude element.
- */
- public Longitude getLongitudeElement() {
- return longitudeElement;
- }
-
- /**
- * Sets the longitude element.
- */
- public void setLongitudeElement(Longitude newLongitudeElement) {
- longitudeElement = newLongitudeElement;
- }
-
- /**
- * Returns the latitude element.
- */
- public Latitude getLatitudeElement() {
- return latitudeElement;
- }
-
- /**
- * Sets the latitude element.
- */
- public void setLatitudeElement(Latitude newLatitudeElement) {
- latitudeElement = newLatitudeElement;
- }
-
- /**
- * Returns the institution element.
- */
- public Institution getInstitutionElement() {
- return institutionElement;
- }
-
- /**
- * Sets the institution element.
- */
- public void setInstitutionElement(Institution newInstitutionElement) {
- institutionElement = newInstitutionElement;
- }
-
- /**
* clear all Interface elements
*/
public void clearInterface() {
@@ -448,21 +345,6 @@
else if(newChild.getLocalName().equals("name")) {
setNameElement((Name)newChild);
}
- else if(newChild.getLocalName().equals("country")) {
- setCountryElement((Country)newChild);
- }
- else if(newChild.getLocalName().equals("city")) {
- setCityElement((City)newChild);
- }
- else if(newChild.getLocalName().equals("longitude")) {
- setLongitudeElement((Longitude)newChild);
- }
- else if(newChild.getLocalName().equals("latitude")) {
- setLatitudeElement((Latitude)newChild);
- }
- else if(newChild.getLocalName().equals("institution")) {
- setInstitutionElement((Institution)newChild);
- }
else if(newChild.getLocalName().equals("interface")) {
setInterface((Interface)newChild);
}
@@ -596,21 +478,6 @@
if(getNameElement() != null) {
handler = getNameElement().toXML(handler, nss);
}
- if(getCountryElement() != null) {
- handler = getCountryElement().toXML(handler, nss);
- }
- if(getCityElement() != null) {
- handler = getCityElement().toXML(handler, nss);
- }
- if(getLongitudeElement() != null) {
- handler = getLongitudeElement().toXML(handler, nss);
- }
- if(getLatitudeElement() != null) {
- handler = getLatitudeElement().toXML(handler, nss);
- }
- if(getInstitutionElement() != null) {
- handler = getInstitutionElement().toXML(handler, nss);
- }
return handler;
}
@@ -624,65 +491,49 @@
Collection ic = getInterfaceMap().values();
org.w3c.dom.Document doc = parent.getOwnerDocument();
- org.w3c.dom.Element intfc = doc.createElement(getLocalName());
- intfc = doc.createElementNS(getUri(), getQName());
- parent.appendChild(intfc);
+ org.w3c.dom.Element node = doc.createElement(getLocalName());
+ node = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(node);
if(!(getId().equals(""))) {
- intfc.setAttribute("id", getId());
+ node.setAttribute("id", getId());
}
if(!(getNodeIdRef().equals(""))) {
- intfc.setAttribute("nodeIdRef", getNodeIdRef());
+ node.setAttribute("nodeIdRef", getNodeIdRef());
}
if(!(getRole().equals(""))) {
- intfc.setAttribute("role", getRole());
+ node.setAttribute("role", getRole());
}
for(Iterator i = ic.iterator(); i.hasNext(); ){
ti = (Interface)i.next();
- ti.getDOM(intfc);
+ ti.getDOM(node);
}
if(getHostNameElement() != null) {
- getHostNameElement().getDOM(intfc);
+ getHostNameElement().getDOM(node);
}
if(getTypeElement() != null) {
- getTypeElement().getDOM(intfc);
+ getTypeElement().getDOM(node);
}
if(getRoleElement() != null) {
- getRoleElement().getDOM(intfc);
+ getRoleElement().getDOM(node);
}
if(getDescriptionElement() != null) {
- getDescriptionElement().getDOM(intfc);
+ getDescriptionElement().getDOM(node);
}
if(getCpuElement() != null) {
- getCpuElement().getDOM(intfc);
+ getCpuElement().getDOM(node);
}
if(getOperSysElement() != null) {
- getOperSysElement().getDOM(intfc);
+ getOperSysElement().getDOM(node);
}
if(getLocationElement() != null) {
- getLocationElement().getDOM(intfc);
+ getLocationElement().getDOM(node);
}
if(getNameElement() != null) {
- getNameElement().getDOM(intfc);
- }
- if(getCountryElement() != null) {
- getCountryElement().getDOM(intfc);
- }
- if(getCityElement() != null) {
- getCityElement().getDOM(intfc);
- }
- if(getLongitudeElement() != null) {
- getLongitudeElement().getDOM(intfc);
- }
- if(getLatitudeElement() != null) {
- getLatitudeElement().getDOM(intfc);
- }
- if(getInstitutionElement() != null) {
- getInstitutionElement().getDOM(intfc);
- }
-
+ getNameElement().getDOM(node);
+ }
}
/**
@@ -700,7 +551,7 @@
is = is + ti.toString();
}
- return getFileName() + ": ---> " + getId() + getNodeIdRef() +
getHostNameElement() + getTypeElement() + getRoleElement() +
getDescriptionElement() + getCpuElement() + getOperSysElement() +
getLocationElement() + getNameElement() + getCountryElement() +
getCityElement() + getLongitudeElement() + getLatitudeElement() +
getInstitutionElement() + " interface:" + is;
+ return getFileName() + ": ---> " + getId() + getNodeIdRef() +
getHostNameElement() + getTypeElement() + getRoleElement() +
getDescriptionElement() + getCpuElement() + getOperSysElement() +
getLocationElement() + getNameElement() + " interface:" + is;
}
}
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/OperSys.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public OperSys() {
operSys = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "operSys";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:operSys";
@@ -139,11 +143,11 @@
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
if(!(getOperSys().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getOperSys());
- authrealm.appendChild(authrealmtext);
+ org.w3c.dom.Element opersys =
doc.createElement(getLocalName());
+ opersys = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(opersys);
+ org.w3c.dom.Text opersystext =
doc.createTextNode(getOperSys());
+ opersys.appendChild(opersystext);
}
}
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Path.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Path.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Path.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -42,6 +42,10 @@
linkMap = new HashMap();
pathIdRef = "";
+
+ parent = null;
+ id = "";
+ completed = false;
localName = "path";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
@@ -249,20 +253,20 @@
Collection lc = getLinkMap().values();
org.w3c.dom.Document doc = parent.getOwnerDocument();
- org.w3c.dom.Element intfc = doc.createElement(getLocalName());
- intfc = doc.createElementNS(getUri(), getQName());
- parent.appendChild(intfc);
+ org.w3c.dom.Element path = doc.createElement(getLocalName());
+ path = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(path);
if(!(getId().equals(""))) {
- intfc.setAttribute("id", getId());
+ path.setAttribute("id", getId());
}
if(!(getPathIdRef().equals(""))) {
- intfc.setAttribute("pathIdRef", getPathIdRef());
+ path.setAttribute("pathIdRef", getPathIdRef());
}
for(Iterator i = lc.iterator(); i.hasNext(); ){
tl = (Link)i.next();
- tl.getDOM(intfc);
+ tl.getDOM(path);
}
}
Added: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Rack.java
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Role.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Role() {
role = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "role";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:role";
@@ -139,11 +143,11 @@
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
if(!(getRole().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getRole());
- authrealm.appendChild(authrealmtext);
+ org.w3c.dom.Element role =
doc.createElement(getLocalName());
+ role = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(role);
+ org.w3c.dom.Text roletext =
doc.createTextNode(getRole());
+ role.appendChild(roletext);
}
}
Added: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Room.java
Added: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Shelf.java
Added: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/State.java
Added: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/StreetAddress.java
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Type.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -32,6 +32,10 @@
public Type() {
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "type";
uri = "http://ggf.org/ns/nmwg/topology/base/3.0/";;
qName = "nmwgtopo3:type";
Added: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/ZipCode.java
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Address.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Address.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Address.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -24,7 +24,11 @@
public Address() {
address = "";
type = "";
-
+
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "address";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:address";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Capacity.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Capacity.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Capacity.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -24,6 +24,10 @@
public Capacity() {
capacity = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "capacity";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:capacity";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Description.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Description.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Description.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -21,6 +21,10 @@
*/
public Description() {
description = "";
+
+ parent = null;
+ id = "";
+ completed = false;
localName = "description";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/GlobalName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/GlobalName.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/GlobalName.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -25,6 +25,10 @@
globalName = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "globalName";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:globalName";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfHostName.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -32,6 +32,10 @@
public IfHostName() {
ifHostName = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifHostName";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:ifHostName";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfIndex.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfIndex.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfIndex.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -24,6 +24,10 @@
public IfIndex() {
ifIndex = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifIndex";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:ifIndex";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Index.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Index.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Index.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -22,6 +22,10 @@
public Index() {
index = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "index";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:index";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Interface.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Interface.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Interface.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -72,6 +72,10 @@
capacityElement = null;
nameElement = null;
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "interface";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:interface";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Link.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Link.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Link.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -43,13 +43,15 @@
nameElement = null;
globalNameElement = null;
indexElement = null;
-
linkMap = new HashMap();
interfaceMap = new HashMap();
nodeMap = new HashMap();
-
linkIdRef = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "link";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:link";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Name.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Name.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Name.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -25,6 +25,10 @@
name = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "name";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:name";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Network.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Network.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Network.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -45,15 +45,16 @@
public Network() {
nameElement = null;
typeElement = null;
-
vlanElement = null;
-
linkMap = new HashMap();
interfaceMap = new HashMap();
- nodeMap = new HashMap();
-
+ nodeMap = new HashMap();
networkIdRef = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "network";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:network";
@@ -157,39 +158,39 @@
Collection nc = getNodeMap().values();
org.w3c.dom.Document doc = parent.getOwnerDocument();
- org.w3c.dom.Element intfc = doc.createElement(getLocalName());
- intfc = doc.createElementNS(getUri(), getQName());
- parent.appendChild(intfc);
+ org.w3c.dom.Element network =
doc.createElement(getLocalName());
+ network = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(network);
if(!(getId().equals(""))) {
- intfc.setAttribute("id", getId());
+ network.setAttribute("id", getId());
}
if(!(getNetworkIdRef().equals(""))) {
- intfc.setAttribute("networkIdRef",
getNetworkIdRef());
+ network.setAttribute("networkIdRef",
getNetworkIdRef());
}
if(getNameElement() != null) {
- getNameElement().getDOM(intfc);
+ getNameElement().getDOM(network);
}
if(getTypeElement() != null) {
- getTypeElement().getDOM(intfc);
+ getTypeElement().getDOM(network);
}
if(getVlanElement() != null) {
- getVlanElement().getDOM(intfc);
+ getVlanElement().getDOM(network);
}
for(Iterator i = lc.iterator(); i.hasNext(); ){
tl = (Link)i.next();
- tl.getDOM(intfc);
+ tl.getDOM(network);
}
for(Iterator i = ic.iterator(); i.hasNext(); ){
ti = (Interface)i.next();
- ti.getDOM(intfc);
+ ti.getDOM(network);
}
for(Iterator i = nc.iterator(); i.hasNext(); ){
tn = (Node)i.next();
- tn.getDOM(intfc);
+ tn.getDOM(network);
}
}
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Path.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Path.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Path.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -30,9 +30,12 @@
*/
public Path() {
linkMap = new HashMap();
-
- pathIdRef = "";
+ pathIdRef = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "path";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:path";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Role.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Role.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Role.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -22,6 +22,10 @@
public Role() {
role = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "role";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:role";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Type.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Type.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Type.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -24,6 +24,10 @@
public Type() {
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "type";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:type";
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 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Vlan.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Vlan() {
vlan = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "vlan";
uri = "http://ggf.org/ns/nmwg/topology/l2/3.0/";;
qName = "nmwgtopol2:vlan";
@@ -139,11 +143,11 @@
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
if(!(getVlan().equals(""))) {
- org.w3c.dom.Element authrealm =
doc.createElement(getLocalName());
- authrealm = doc.createElementNS(getUri(),
getQName());
- parent.appendChild(authrealm);
- org.w3c.dom.Text authrealmtext =
doc.createTextNode(getVlan());
- authrealm.appendChild(authrealmtext);
+ org.w3c.dom.Element vlan =
doc.createElement(getLocalName());
+ vlan = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(vlan);
+ org.w3c.dom.Text vlantext =
doc.createTextNode(getVlan());
+ vlan.appendChild(vlantext);
}
}
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 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Asn.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Asn() {
asn = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "asn";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:asn";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Capacity.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Capacity.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Capacity.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -24,6 +24,10 @@
public Capacity() {
capacity = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "capacity";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:capacity";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/GlobalName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/GlobalName.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/GlobalName.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -25,6 +25,10 @@
globalName = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "globalName";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:globalName";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfAddress.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -43,6 +43,10 @@
ifAddress = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifAddress";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:ifAddress";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfDescription.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfDescription.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfDescription.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -24,6 +24,10 @@
public IfDescription() {
ifDescription = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifDescription";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:ifDescription";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfHostName.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -32,6 +32,10 @@
public IfHostName() {
ifHostName = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifHostName";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:ifHostName";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfIndex.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfIndex.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfIndex.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -24,6 +24,10 @@
public IfIndex() {
ifIndex = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifIndex";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:ifIndex";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfName.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfName.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -24,6 +24,10 @@
public IfName() {
ifName = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ifName";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:ifName";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Index.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Index.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Index.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -22,6 +22,10 @@
public Index() {
index = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "index";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:index";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Interface.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Interface.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Interface.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -69,6 +69,10 @@
ifIndexElement = null;
capacityElement = null;
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "interface";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:interface";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IpAddress.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -43,6 +43,10 @@
ipAddress = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "ipAddress";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:ipAddress";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Link.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Link.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Link.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -43,13 +43,15 @@
nameElement = null;
globalNameElement = null;
indexElement = null;
-
linkMap = new HashMap();
interfaceMap = new HashMap();
- nodeMap = new HashMap();
-
+ nodeMap = new HashMap();
linkIdRef = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "link";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:link";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Name.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Name.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Name.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -25,6 +25,10 @@
name = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "name";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:name";
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Netmask.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Netmask() {
netmask = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "netmask";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:netmask";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Network.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Network.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Network.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -53,18 +53,19 @@
*/
public Network() {
nameElement = null;
- typeElement = null;
-
+ typeElement = null;
subnetElement = null;
netmaskElement = null;
- asnElement = null;
-
+ asnElement = null;
linkMap = new HashMap();
interfaceMap = new HashMap();
- nodeMap = new HashMap();
-
+ nodeMap = new HashMap();
networkIdRef = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "network";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:network";
@@ -207,45 +208,45 @@
Collection nc = getNodeMap().values();
org.w3c.dom.Document doc = parent.getOwnerDocument();
- org.w3c.dom.Element intfc = doc.createElement(getLocalName());
- intfc = doc.createElementNS(getUri(), getQName());
- parent.appendChild(intfc);
+ org.w3c.dom.Element network =
doc.createElement(getLocalName());
+ network = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(network);
if(!(getId().equals(""))) {
- intfc.setAttribute("id", getId());
+ network.setAttribute("id", getId());
}
if(!(getNetworkIdRef().equals(""))) {
- intfc.setAttribute("networkIdRef",
getNetworkIdRef());
+ network.setAttribute("networkIdRef",
getNetworkIdRef());
}
if(getNameElement() != null) {
- getNameElement().getDOM(intfc);
+ getNameElement().getDOM(network);
}
if(getTypeElement() != null) {
- getTypeElement().getDOM(intfc);
+ getTypeElement().getDOM(network);
}
if(getNetmaskElement() != null) {
- getNetmaskElement().getDOM(intfc);
+ getNetmaskElement().getDOM(network);
}
if(getSubnetElement() != null) {
- getSubnetElement().getDOM(intfc);
+ getSubnetElement().getDOM(network);
}
if(getAsnElement() != null) {
- getAsnElement().getDOM(intfc);
+ getAsnElement().getDOM(network);
}
for(Iterator i = lc.iterator(); i.hasNext(); ){
tl = (Link)i.next();
- tl.getDOM(intfc);
+ tl.getDOM(network);
}
for(Iterator i = ic.iterator(); i.hasNext(); ){
ti = (Interface)i.next();
- ti.getDOM(intfc);
+ ti.getDOM(network);
}
for(Iterator i = nc.iterator(); i.hasNext(); ){
tn = (Node)i.next();
- tn.getDOM(intfc);
+ tn.getDOM(network);
}
}
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Path.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Path.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Path.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -29,10 +29,13 @@
* Constructor.
*/
public Path() {
- linkMap = new HashMap();
-
+ linkMap = new HashMap();
pathIdRef = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "path";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:path";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Role.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Role.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Role.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -21,6 +21,10 @@
*/
public Role() {
role = "";
+
+ parent = null;
+ id = "";
+ completed = false;
localName = "role";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
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
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -26,6 +26,10 @@
public Subnet() {
subnet = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "subnet";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:subnet";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Type.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Type.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Type.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -24,6 +24,10 @@
public Type() {
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "type";
uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
qName = "nmwgtopol3:type";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Address.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Address.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Address.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -25,6 +25,10 @@
address = "";
type = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "address";
uri = "http://ggf.org/ns/nmwg/topology/l4/3.0/";;
qName = "nmwgtopol4:address";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPoint.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPoint.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPoint.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -67,6 +67,10 @@
interfaceElement = null;
addressElement = null;
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "endPoint";
uri = "http://ggf.org/ns/nmwg/topology/l4/3.0/";;
qName = "nmwgtopol4:endPoint";
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPointPair.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPointPair.java
2006-11-02 15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPointPair.java
2006-11-07 23:38:30 UTC (rev 177)
@@ -36,6 +36,10 @@
srcElement = null;
dstElement = null;
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "endPointPair";
uri = "http://ggf.org/ns/nmwg/topology/l4/3.0/";;
qName = "nmwgtopol4:endPointPair";
@@ -182,15 +186,15 @@
*/
public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
- org.w3c.dom.Element endpt = doc.createElement(getLocalName());
- endpt = doc.createElementNS(getUri(), getQName());
- parent.appendChild(endpt);
+ org.w3c.dom.Element endpointpair =
doc.createElement(getLocalName());
+ endpointpair = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(endpointpair);
if(getSourceElement() != null) {
- getSourceElement().getDOM(endpt);
+ getSourceElement().getDOM(endpointpair);
}
if(getDestinationElement() != null) {
- getDestinationElement().getDOM(endpt);
+ getDestinationElement().getDOM(endpointpair);
}
}
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Path.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Path.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Path.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -38,6 +38,10 @@
endPointMap = new HashMap();
linkMap = null;
pathIdRef = "";
+
+ parent = null;
+ id = "";
+ completed = false;
localName = "path";
uri = "http://ggf.org/ns/nmwg/topology/l4/3.0/";;
@@ -195,20 +199,20 @@
Collection lc = getEndPointMap().values();
org.w3c.dom.Document doc = parent.getOwnerDocument();
- org.w3c.dom.Element intfc = doc.createElement(getLocalName());
- intfc = doc.createElementNS(getUri(), getQName());
- parent.appendChild(intfc);
+ org.w3c.dom.Element path = doc.createElement(getLocalName());
+ path = doc.createElementNS(getUri(), getQName());
+ parent.appendChild(path);
if(!(getId().equals(""))) {
- intfc.setAttribute("id", getId());
+ path.setAttribute("id", getId());
}
if(!(getPathIdRef().equals(""))) {
- intfc.setAttribute("pathIdRef", getPathIdRef());
+ path.setAttribute("pathIdRef", getPathIdRef());
}
for(Iterator i = lc.iterator(); i.hasNext(); ){
tl = (EndPoint)i.next();
- tl.getDOM(intfc);
+ tl.getDOM(path);
}
}
Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Role.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Role.java 2006-11-02
15:15:48 UTC (rev 176)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Role.java 2006-11-07
23:38:30 UTC (rev 177)
@@ -22,6 +22,10 @@
public Role() {
role = "";
+ parent = null;
+ id = "";
+ completed = false;
+
localName = "role";
uri = "http://ggf.org/ns/nmwg/topology/l4/3.0/";;
qName = "nmwgtopol4:role";
- r177 - in trunk/nmwg/java/org/ggf/ns/nmwg/topology: base/v3_0 l2/v3_0 l3/v3_0 l4/v3_0, svnlog, 11/07/2006
Archive powered by MHonArc 2.6.16.