[Geotools-commits] CVS: geotools/src/uk/ac/leeds/ccg/ogc WMSLayer.java,1.27,1.28

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

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

Modified Files:
	WMSLayer.java 
Log Message:
improved the behaviour if the wttools connection dies completly.


Index: WMSLayer.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/ogc/WMSLayer.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -w -C2 -d -r1.27 -r1.28
*** WMSLayer.java	2001/12/20 15:27:23	1.27
--- WMSLayer.java	2001/12/21 12:00:57	1.28
***************
*** 137,150 ****
              "EXCEPTIONS",this.exceptionFormat
          };
          InputStream instr = remoteWMS.getImageStream(params);
          if (instr != null) {
            return new ImageLayer(instr, extent);
          } // end of if (imageData != null)
          else {
  					System.out.println("instr seems to be null in WMSLayer.buildLayer");
!           return null;
          } // end of if (imageData != null)else
- //         url = this.remoteWMS.getURL(params);
- //         return new ImageLayer(url,extent);
      }
  
--- 137,151 ----
              "EXCEPTIONS",this.exceptionFormat
          };
+ 				System.out.println("buildLayer: about to request Image Str");
          InputStream instr = remoteWMS.getImageStream(params);
          if (instr != null) {
+ 					System.out.println("instr seems to be ok in WMSLayer.buildLayer");
            return new ImageLayer(instr, extent);
          } // end of if (imageData != null)
          else {
  					System.out.println("instr seems to be null in WMSLayer.buildLayer");
!           url = this.remoteWMS.getURL(params);
!           return new ImageLayer(url,extent);
          } // end of if (imageData != null)else
      }
  
***************
*** 165,168 ****
--- 166,172 ----
   *
   * $Log$
+  * Revision 1.28  2001/12/21 12:00:57  ianturton
+  * improved the behaviour if the wttools connection dies completly.
+  *
   * Revision 1.27  2001/12/20 15:27:23  ianturton
   * various fixes and small mods to make WMSExample actually run. Can now