[Geotools-commits] CVS: geotools/src/utils ExtractBoundingBox.java,1.2,1.3 ExtractContiguity.java,1.2,1.3 ImageMaker.java,1.1,1.2 LODSet.java,1.1,1.2 ShfFixer.java,1.3,1.4

[Ian T. <ian...@us...>]

Update of /cvsroot/geotools/geotools/src/utils
In directory usw-pr-cvs1:/tmp/cvs-serv24114

Modified Files:
	ExtractBoundingBox.java ExtractContiguity.java ImageMaker.java 
	LODSet.java ShfFixer.java 
Log Message:
added code to wait for the theme to finish loading before continuing


Index: ExtractBoundingBox.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/utils/ExtractBoundingBox.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExtractBoundingBox.java	2001/07/27 10:35:40	1.2
--- ExtractBoundingBox.java	2001/11/21 09:48:21	1.3
***************
*** 15,20 ****
      String out = args[1];
      System.out.println("reading "+base);
! 			ShapefileReader sfr = new ShapefileReader(new URL("file://"+base));
  			Theme t = sfr.getTheme();
  			GeoRectangle box = t.getBounds();
  			PolygonLayer pl = new PolygonLayer();
--- 15,25 ----
      String out = args[1];
      System.out.println("reading "+base);
! 			ShapefileReader sfr = new ShapefileReader(new URL("file:///"+System.getProperty("user.dir")+"/"+base));
  			Theme t = sfr.getTheme();
+ 			try{
+ 				while(t.getLayer().getStatus()!=Layer.COMPLETED)
+ 					/* wait */ Thread.sleep(3000);
+ 			}catch(InterruptedException e){}
+ 
  			GeoRectangle box = t.getBounds();
  			PolygonLayer pl = new PolygonLayer();

Index: ExtractContiguity.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/utils/ExtractContiguity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExtractContiguity.java	2001/06/15 16:04:15	1.2
--- ExtractContiguity.java	2001/11/21 09:48:21	1.3
***************
*** 47,50 ****
--- 47,55 ----
          System.out.println("Using "+sfr.dbf.getFieldName(sfr.getIdCol())+" as ID column");
          Theme t = sfr.getTheme();
+     try{
+       while(t.getLayer().getStatus()!=Layer.COMPLETED)
+         /* wait */ Thread.sleep(3000);
+     }catch(InterruptedException e){}
+ 
          PolygonLayer pl = (PolygonLayer)t.getLayer();
          System.out.println("Building Matrix");

Index: ImageMaker.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/utils/ImageMaker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImageMaker.java	2001/08/20 16:44:45	1.1
--- ImageMaker.java	2001/11/21 09:48:21	1.2
***************
*** 18,21 ****
--- 18,25 ----
  		ShapefileReader sfr = new ShapefileReader(url);
  		Theme t=sfr.getTheme();
+ 		try{
+ 			while(t.getLayer().getStatus()!=Layer.COMPLETED) 
+ 				/* wait */ Thread.sleep(3000);
+ 		}catch(InterruptedException e){}
  		view.addTheme(t);
  										 

Index: LODSet.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/utils/LODSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LODSet.java	2001/04/02 13:02:42	1.1
--- LODSet.java	2001/11/21 09:48:21	1.2
***************
*** 26,29 ****
--- 26,34 ----
  		ShapefileReader read = new ShapefileReader(url);
  		Theme t = read.getTheme();
+     try{
+       while(t.getLayer().getStatus()!=Layer.COMPLETED)
+         /* wait */ Thread.sleep(3000);
+     }catch(InterruptedException e){}
+ 
  		SimpleGeoData[] dbs = new SimpleGeoData[read.dbf.getNumFields()+1];
  		for(int i=0;i<read.dbf.getNumFields();i++){

Index: ShfFixer.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/utils/ShfFixer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ShfFixer.java	2001/08/22 10:57:09	1.3
--- ShfFixer.java	2001/11/21 09:48:21	1.4
***************
*** 18,21 ****
--- 18,26 ----
  		ShapefileReader sfr = new ShapefileReader(url);
  		Theme t = sfr.getTheme();
+     try{
+       while(t.getLayer().getStatus()!=Layer.COMPLETED)
+         /* wait */ Thread.sleep(3000);
+     }catch(InterruptedException e){}
+ 
  		GeoData [] dbs = sfr.readData();
  		if(dbs!=null&&dbs[0]!=null){