[Geotools-commits] CVS: geotools/src/uk/ac/leeds/ccg/geotools ShapefileReader.java,1.32,1.33

[James M. <jma...@us...>]

Update of /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/geotools
In directory usw-pr-cvs1:/tmp/cvs-serv14901/uk/ac/leeds/ccg/geotools

Modified Files:
	ShapefileReader.java 
Log Message:
removed even more of the code for threaded loading as there was still a data race occuring.


Index: ShapefileReader.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/geotools/ShapefileReader.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -w -C2 -d -r1.32 -r1.33
*** ShapefileReader.java	2001/11/21 13:37:28	1.32
--- ShapefileReader.java	2001/12/09 16:06:40	1.33
***************
*** 85,97 ****
          name = base.getFile();
          loader = new Loader();
!         loader.start();
          
          //the following block of code effectivly dissables the threaded loading system for now
!         try{
          loader.join();
          }
          catch(InterruptedException ie){
              System.err.println("Shapefile not loaded by loader "+ie);
!         }
          System.out.println("Shapefile Constructor Finished - tread loading disabled");
      }
--- 85,98 ----
          name = base.getFile();
          loader = new Loader();
!         //loader.start();
          
          //the following block of code effectivly dissables the threaded loading system for now
!         /*try{
          loader.join();
          }
          catch(InterruptedException ie){
              System.err.println("Shapefile not loaded by loader "+ie);
!         }*/
!         loader.run();//bypass threading and run from here
          System.out.println("Shapefile Constructor Finished - tread loading disabled");
      }
***************
*** 271,275 ****
                  }
                  
!              map.notifyLayerChangedListeners(LayerChangedEvent.DATA);   
              
          }
--- 272,276 ----
                  }
                  
!              //map.notifyLayerChangedListeners(LayerChangedEvent.DATA);   
              
          }
***************
*** 534,538 ****
          data.setName(colName);
          AddDataWhenReady dataWatch = new AddDataWhenReady(data,colName);
!         dataWatch.start();
          return data;
      }
--- 535,539 ----
          data.setName(colName);
          AddDataWhenReady dataWatch = new AddDataWhenReady(data,colName);
!         dataWatch.run();//run directly instead of as a thread...
          return data;
      }
***************
*** 636,640 ****
      class Loader extends Thread{
          public void run(){
!             System.out.println("Hello from sf threaded loader!");
              
              String sub="";
--- 637,641 ----
      class Loader extends Thread{
          public void run(){
!             //System.out.println("Hello from sf threaded loader!");
              
              String sub="";