Adjusted Parse of LatoLonJS for Mid, PLink, Link. Now LatLonJsDataSou…

…rce is OK!!!

Added also getNodeByIp method to DataSource class.
Added some Constructor to MapNode and Link.
AddNode form must be revisioned.
(Broken but not for too much time...!) :-D

src/freimapgsoc/DataSource.java

@@ -140,6 +140,8 @@ public String getCurrentID(){
 
     public MapNode getNodeById(String id);
 
+    public MapNode getNodeByIp(String ip);
+
     public Vector<Link> getLinks(long time);
 
     /** @param 	dsl	A DataSourceListener listening on events from this DataSource */

src/freimapgsoc/Layer.java

@@ -64,7 +64,7 @@ public void initLayout() {
     public double id;
     public Vector<MapNode> nodes = new Vector<MapNode>();
     public Vector<Link> links = new Vector<Link>();
-    public DataSource currentDs;
+    public DataSource currentDs =null;
     public HashMap<Vector<MapNode>, Vector<Link>> datasources;
     public HashMap<Double, String> sources;
 }

src/freimapgsoc/Link.java

@@ -20,6 +20,11 @@ public Link(MapNode source, MapNode dest, float lq, float nlq, boolean HNA) {
         this.nlq = nlq;
         this.HNA = HNA;
 
+    }
+
+    public Link(MapNode source, MapNode dest){
+        this(source,dest,1,false);
+
     }
 
      public Link(MapNode source, MapNode dest, float lq, float nlq, float etx) {

src/freimapgsoc/MapNode.java

@@ -46,6 +46,14 @@ public MapNode(String ip, String name, double uptime) {
         this.uptime = uptime;
     }
 
+    public MapNode(String ip, String name, double lat, double lon, Vector<String> ifaces){
+        this.name=name;
+                this.ip=ip;
+                this.lat=lat;
+                this.lon=lon;
+                this.inter=ifaces;
+    }
+
 
     public MapNode(String ip, String name, double uptime, Connections conn) {
         this.name = name;

src/freimapgsoc/resources/addNode.properties

@@ -2,17 +2,26 @@ jLabel1.text=Latitude:
 jLabel2.text=Longitude:
 jLabel3.text=Ip Address:
 jLabel4.text=Name:
-jLabel5.text=Unlocated:
+jLabel5.text=Interface 1:
 Form.title=Add Node
 latField.text=
 lonField.text=
 nameField.text=
 ipField.text=
-noRButton.text=No
-yesRButton.text=Yes
 backButton.text=Back
 #NOI18N
 backButton.icon=back.png
 addIt.text=Add It!
 #NOI18N
 addIt.icon=add.png
+jLabel6.text=Interface 3:
+jLabel7.text=Interface 2:
+jLabel8.text=Interface 4:
+jLabel9.text=HNA:
+jLabel10.text=Gateway:
+jLabel11.text=connected to:
+jLabel12.text=connected to:
+jLabel13.text=connected to:
+jLabel14.text=connected to:
+#NOI18N
+jLabel6.font=Lucida Grande-Plain-12