[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/eyes/tools/java/de/tub/eyes/gis Textfile.java, 1.1, 1.2

[Till Wimmer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/eyes/tools/java/de/tub/eyes/gis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21679

Modified Files:
	Textfile.java 
Log Message:
adapted to GIS change (TreeMap)

Index: Textfile.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/eyes/tools/java/de/tub/eyes/gis/Textfile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Textfile.java	4 Apr 2006 21:46:25 -0000	1.1
--- Textfile.java	18 May 2006 17:07:25 -0000	1.2
***************
*** 55,59 ****
          try {
              while ((line = in.readLine()) != null) {
!                 MapXY node = new MapXY();
                  String [] data  = Pattern.compile("\t").split(line);
                  if (data.length < 4) {
--- 55,61 ----
          try {
              while ((line = in.readLine()) != null) {
!                 MapXY node;
!                 int x,y,map;
!                 
                  String [] data  = Pattern.compile("\t").split(line);
                  if (data.length < 4) {
***************
*** 62,70 ****
                  }
                  Integer id = new Integer(data[0]);
!                 node.x = Integer.parseInt(data[1]);
!                 node.y = Integer.parseInt(data[2]);
!                 node.map = Integer.parseInt(data[3]);
                  
                  //nodeMap.put(new Integer(nodeData.ID), nodeData);
                  nodes.put(id, node);
              }
--- 64,75 ----
                  }
                  Integer id = new Integer(data[0]);
!                 x = Integer.parseInt(data[1]);
!                 y = Integer.parseInt(data[2]);
!                 map = Integer.parseInt(data[3]);
                  
+                 if ( (node = (MapXY)nodes.get(id)) == null)
+                     node = new MapXY();
                  //nodeMap.put(new Integer(nodeData.ID), nodeData);
+                 node.set(map,x,y);
                  nodes.put(id, node);
              }