Merge pull request #45 from gbburkhardt/WCS-error-handling

wcmatthysen · web-flow · commit f3849e206745 · 2019-09-02T22:18:41.000+02:00
Wcs error handling
diff --git a/src/gov/nasa/worldwind/data/BasicRasterServer.java b/src/gov/nasa/worldwind/data/BasicRasterServer.java
@@ -140,6 +140,8 @@ protected void init(Object o)
             String message = Logging.getMessage("generic.DataSetLimitedAvailability", this.getDataSetName() );
             Logging.logger().severe(message);
         }
+        
+        config.dispose();
     }
 
     protected String getDataSetName()
diff --git a/src/gov/nasa/worldwind/data/RasterServerConfiguration.java b/src/gov/nasa/worldwind/data/RasterServerConfiguration.java
@@ -143,6 +143,20 @@ public RasterServerConfiguration(Object docSource)
 
         this.initialize();
     }
+    
+    public void dispose()
+    {
+        try
+        {
+            eventReader.close();
+        }
+        catch (XMLStreamException e)
+        {
+            e.printStackTrace();
+        }
+        WWXML.closeEventReader(eventReader, "RasterServerConfiguration");
+        freeResources();
+    }
 
     protected void initialize()
     {
diff --git a/src/gov/nasa/worldwind/terrain/BasicElevationModel.java b/src/gov/nasa/worldwind/terrain/BasicElevationModel.java
@@ -385,6 +385,8 @@ protected ElevationTile createTile(TileKey key)
         Angle minLongitude = ElevationTile.computeColumnLongitude(key.getColumn(), dLon, lonOrigin);
 
         Sector tileSector = new Sector(minLatitude, minLatitude.add(dLat), minLongitude, minLongitude.add(dLon));
+        // Clip tile sector by the layer's coverage extent
+        tileSector = levels.getSector().intersection(tileSector);
 
         return new ElevationTile(tileSector, level, key.getRow(), key.getColumn());
     }
diff --git a/src/gov/nasa/worldwind/util/DataConfigurationUtils.java b/src/gov/nasa/worldwind/util/DataConfigurationUtils.java
@@ -766,8 +766,9 @@ public static AVList getWMSLayerConfigParams(WMSCapabilities caps, String[] form
                 WMSLayerCapabilities layerCaps = caps.getLayerByName(name);
                 if (layerCaps == null)
                 {
-                    Logging.logger().warning(Logging.getMessage("WMS.LayerNameMissing", name));
-                    continue;
+                    String msg = Logging.getMessage("WMS.LayerNameMissing", name);
+                    Logging.logger().warning(msg);
+                    throw new WWRuntimeException(msg);
                 }
 
                 if (layerCaps.hasCoordinateSystem("EPSG:4326"))
@@ -916,6 +917,13 @@ public static AVList getWCSConfigParameters(WCS100Capabilities caps, WCS100Descr
             throw new IllegalArgumentException(message);
         }
 
+        if (coverage.getCoverageOfferings().size() == 0)
+        {
+            String message = Logging.getMessage("AbsentResourceList.WCSDescribeCoverage");
+            Logging.logger().severe(message);
+            throw new IllegalArgumentException(message);
+        }
+
         if (params == null)
         {
             String message = Logging.getMessage("nullValue.ParametersIsNull");
@@ -1148,6 +1156,11 @@ protected static String makeTitle(WMSCapabilities caps, String layerNames, Strin
 
             String layerName = lNames[i];
             WMSLayerCapabilities layer = caps.getLayerByName(layerName);
+            if (layer == null)
+            {
+                continue; // layer not found
+            }
+
             String layerTitle = layer.getTitle();
             sb.append(layerTitle != null ? layerTitle : layerName);
 
diff --git a/src/gov/nasa/worldwind/util/MessageStrings.properties b/src/gov/nasa/worldwind/util/MessageStrings.properties
@@ -743,6 +743,7 @@ AbsentResourceList.MaxTriesLessThanOne=The specified maximum number of tries is
 AbsentResourceList.CheckIntervalLessThanZero=The specified check interval is less than 0
 AbsentResourceList.RetryIntervalLessThanZero=The specified retry interval is less than 0
 AbsentResourceList.MaximumListSizeLessThanOne=The requested maximum list size is less than 1
+AbsentResourceList.WCSDescribeCoverage=No coverage offering from WCS
 
 AVAAccessibleImpl.AttributeValueForKeyIsNotAString=Attribute value for key is not a String. Key {0}
 
diff --git a/src/gov/nasa/worldwind/util/WWXML.java b/src/gov/nasa/worldwind/util/WWXML.java
@@ -39,6 +39,8 @@ public class WWXML
 {
     public static final String XLINK_URI = "http://www.w3.org/1999/xlink";
 
+    private static Map<XMLEventReader, InputStream> inputSources = new HashMap<XMLEventReader, InputStream>();
+    
     /**
      * Create a DOM builder.
      *
@@ -161,9 +163,16 @@ public static Document openDocumentFile(String filePath, Class c)
             throw new IllegalArgumentException(message);
         }
 
-        InputStream inputStream = WWIO.openFileOrResourceStream(filePath, c);
-
-        return inputStream != null ? openDocumentStream(inputStream) : null;
+        try (InputStream inputStream = WWIO.openFileOrResourceStream(filePath, c))
+        {
+            return inputStream != null ? openDocumentStream(inputStream) : null;
+        }
+        catch (IOException e)
+        {
+            String message = Logging.getMessage("generic.ExceptionClosingStream", filePath);
+            Logging.logger().severe(message);
+            return null;
+        }
     }
 
     /**
@@ -264,10 +273,8 @@ public static void saveDocumentToFile(Document doc, String filePath)
             throw new IllegalArgumentException(message);
         }
 
-        try
+        try (java.io.FileOutputStream outputStream = new java.io.FileOutputStream(filePath))
         {
-            java.io.FileOutputStream outputStream = new java.io.FileOutputStream(filePath);
-
             saveDocumentToStream(doc, outputStream);
         }
         catch (IOException e)
@@ -347,7 +354,9 @@ public static XMLEventReader openEventReaderStream(InputStream inputStream, bool
 
         try
         {
-            return inputFactory.createXMLEventReader(inputStream);
+            XMLEventReader reader = inputFactory.createXMLEventReader(inputStream);
+            inputSources.put(reader, inputStream);
+            return reader;
         }
         catch (XMLStreamException e)
         {
@@ -431,7 +440,9 @@ public static XMLEventReader openEventReaderURL(URL url, boolean isNamespaceAwar
         try
         {
             InputStream inputStream = url.openStream();
-            return openEventReaderStream(inputStream, isNamespaceAware);
+            XMLEventReader reader = openEventReaderStream(inputStream, isNamespaceAware);
+            inputSources.put(reader, inputStream);
+            return reader;
         }
         catch (IOException e)
         {
@@ -517,11 +528,28 @@ else if (!(docSource instanceof String))
     public static void closeEventReader(XMLEventReader eventReader, String name)
     {
         if (eventReader == null)
+        {
             return;
+        }
 
         try
         {
             eventReader.close();
+            InputStream is = inputSources.get(eventReader);
+            if (is != null)
+            {
+                try
+                {
+                    is.close();
+                }
+                catch (IOException e)
+                {
+                    String message = Logging.getMessage("generic.ExceptionClosingStream",
+                        name != null ? name : "Unknown");
+                    Logging.logger().severe(message);
+                }
+                inputSources.remove(eventReader);
+            }
         }
         catch (XMLStreamException e)
         {
diff --git a/src/gov/nasa/worldwindx/examples/layermanager/ElevationModelManagerPanel.java b/src/gov/nasa/worldwindx/examples/layermanager/ElevationModelManagerPanel.java
@@ -55,7 +55,9 @@ public ElevationModelManagerPanel(final WorldWindow wwd)
             public void propertyChange(PropertyChangeEvent propertyChangeEvent)
             {
                 if (propertyChangeEvent.getPropertyName().equals(AVKey.ELEVATION_MODEL))
+                {
                     if (!SwingUtilities.isEventDispatchThread())
+                    {
                         SwingUtilities.invokeLater(new Runnable()
                         {
                             public void run()
@@ -69,8 +71,12 @@ public void run()
                                 });
                             }
                         });
+                    }
                     else
+                    {
                         update(wwd);
+                    }
+                }
             }
         });
     }
@@ -89,7 +95,9 @@ protected void fill(WorldWindow wwd)
         // Populate this manager with an entry for each elevation model in the WorldWindow.
 
         if (this.isUpToDate(wwd))
+        {
             return;
+        }
 
         // First remove all the existing entries.
         this.modelPanels.clear();
@@ -111,7 +119,9 @@ protected void fill(WorldWindow wwd)
             for (ElevationModel elevationModel : cem.getElevationModels())
             {
                 if (elevationModel.getValue(AVKey.IGNORE) != null)
+                {
                     continue;
+                }
 
                 ElevationModelPanel elevationModelPanel = new ElevationModelPanel(wwd, this, elevationModel);
                 this.modelPanels.add(elevationModelPanel);
@@ -127,18 +137,26 @@ protected boolean isUpToDate(WorldWindow wwd)
 
         if (!(wwd.getModel().getGlobe().getElevationModel() instanceof CompoundElevationModel))
         {
-            return this.modelPanels.get(0).getElevationModel() == wwd.getModel().getGlobe().getElevationModel();
+           if (this.modelPanels.size() == 0)
+           {
+               return false;
+           }
+           return this.modelPanels.get(0).getElevationModel() == wwd.getModel().getGlobe().getElevationModel();
         }
 
         CompoundElevationModel cem = (CompoundElevationModel) wwd.getModel().getGlobe().getElevationModel();
 
         if (this.modelPanels.size() != cem.getElevationModels().size())
+        {
             return false;
+        }
 
         for (int i = 0; i < cem.getElevationModels().size(); i++)
         {
             if (cem.getElevationModels().get(i) != this.modelPanels.get(i).getElevationModel())
+            {
                 return false;
+            }
         }
 
         return true;
diff --git a/src/gov/nasa/worldwindx/examples/util/WCSCoveragePanel.java b/src/gov/nasa/worldwindx/examples/util/WCSCoveragePanel.java
@@ -100,15 +100,21 @@ protected void load()
         {
             e.printStackTrace();
             Container c = WCSCoveragePanel.this.getParent();
-            c.remove(WCSCoveragePanel.this);
+            if (c != null)
+            {
+                c.remove(WCSCoveragePanel.this);
+            }
+            
             JOptionPane.showMessageDialog((Component) wwd, "Unable to connect to server " + serverURI.toString(),
                 "Server Error", JOptionPane.ERROR_MESSAGE);
             return;
         }
 
         final java.util.List<WCS100CoverageOfferingBrief> coverages = caps.getContentMetadata().getCoverageOfferings();
         if (coverages == null)
+        {
             return;
+        }
 
         try
         {
@@ -193,14 +199,22 @@ public void actionPerformed(ActionEvent actionEvent)
             if (((JCheckBox) actionEvent.getSource()).isSelected())
             {
                 if (this.component == null)
+                {
                     this.component = createComponent(coverageInfo.caps, coverageInfo);
+                    if (this.component == null)
+                    {
+                        return;
+                    }
+                }
 
                 updateComponent(this.component, true);
             }
             else
             {
                 if (this.component != null)
+                {
                     updateComponent(this.component, false);
+                }
             }
 
             // Tell the WorldWindow to update.
@@ -224,13 +238,28 @@ protected CoverageInfo createCoverageInfo(WCS100Capabilities caps, WCS100Coverag
     protected void updateComponent(Object component, boolean enable)
     {
         ElevationModel model = (ElevationModel) component;
-        CompoundElevationModel compoundModel =
-            (CompoundElevationModel) this.wwd.getModel().getGlobe().getElevationModel();
+        CompoundElevationModel compoundModel;
+
+        // Guarantee that we have a compound elevation model, so additional elevation models can be added.
+        ElevationModel em = this.wwd.getModel().getGlobe().getElevationModel();
+
+        if (!(em instanceof CompoundElevationModel))
+        {
+            compoundModel = new CompoundElevationModel();
+            compoundModel.addElevationModel(em);
+            this.wwd.getModel().getGlobe().setElevationModel(compoundModel);
+        }
+        else
+        {
+            compoundModel = (CompoundElevationModel) em;
+        }
 
         if (enable)
         {
             if (!compoundModel.getElevationModels().contains(model))
+            {
                 compoundModel.addElevationModel(model);
+            }
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,8 @@ protected void init(Object o)`
`140`	`140`	`String message = Logging.getMessage("generic.DataSetLimitedAvailability", this.getDataSetName() );`
`141`	`141`	`Logging.logger().severe(message);`
`142`	`142`	`}`
	`143`	`+`
	`144`	`+ config.dispose();`
`143`	`145`	`}`
`144`	`146`
`145`	`147`	`protected String getDataSetName()`
Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,8 @@ protected ElevationTile createTile(TileKey key)`
`385`	`385`	`Angle minLongitude = ElevationTile.computeColumnLongitude(key.getColumn(), dLon, lonOrigin);`
`386`	`386`
`387`	`387`	`Sector tileSector = new Sector(minLatitude, minLatitude.add(dLat), minLongitude, minLongitude.add(dLon));`
	`388`	`+ // Clip tile sector by the layer's coverage extent`
	`389`	`+ tileSector = levels.getSector().intersection(tileSector);`
`388`	`390`
`389`	`391`	`return new ElevationTile(tileSector, level, key.getRow(), key.getColumn());`
`390`	`392`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ public class WWXML`
`39`	`39`	`{`
`40`	`40`	`public static final String XLINK_URI = "http://www.w3.org/1999/xlink";`
`41`	`41`
	`42`	`+ private static Map<XMLEventReader, InputStream> inputSources = new HashMap<XMLEventReader, InputStream>();`
	`43`	`+`
`42`	`44`	`/**`
`43`	`45`	`* Create a DOM builder.`
`44`	`46`	`*`
`@@ -161,9 +163,16 @@ public static Document openDocumentFile(String filePath, Class c)`
`161`	`163`	`throw new IllegalArgumentException(message);`
`162`	`164`	`}`
`163`	`165`
`164`		`- InputStream inputStream = WWIO.openFileOrResourceStream(filePath, c);`
`165`		`-`
`166`		`- return inputStream != null ? openDocumentStream(inputStream) : null;`
	`166`	`+ try (InputStream inputStream = WWIO.openFileOrResourceStream(filePath, c))`
	`167`	`+ {`
	`168`	`+ return inputStream != null ? openDocumentStream(inputStream) : null;`
	`169`	`+ }`
	`170`	`+ catch (IOException e)`
	`171`	`+ {`
	`172`	`+ String message = Logging.getMessage("generic.ExceptionClosingStream", filePath);`
	`173`	`+ Logging.logger().severe(message);`
	`174`	`+ return null;`
	`175`	`+ }`
`167`	`176`	`}`
`168`	`177`
`169`	`178`	`/**`
`@@ -264,10 +273,8 @@ public static void saveDocumentToFile(Document doc, String filePath)`
`264`	`273`	`throw new IllegalArgumentException(message);`
`265`	`274`	`}`
`266`	`275`
`267`		`- try`
	`276`	`+ try (java.io.FileOutputStream outputStream = new java.io.FileOutputStream(filePath))`
`268`	`277`	`{`
`269`		`- java.io.FileOutputStream outputStream = new java.io.FileOutputStream(filePath);`
`270`		`-`
`271`	`278`	`saveDocumentToStream(doc, outputStream);`
`272`	`279`	`}`
`273`	`280`	`catch (IOException e)`
`@@ -347,7 +354,9 @@ public static XMLEventReader openEventReaderStream(InputStream inputStream, bool`
`347`	`354`
`348`	`355`	`try`
`349`	`356`	`{`
`350`		`- return inputFactory.createXMLEventReader(inputStream);`
	`357`	`+ XMLEventReader reader = inputFactory.createXMLEventReader(inputStream);`
	`358`	`+ inputSources.put(reader, inputStream);`
	`359`	`+ return reader;`
`351`	`360`	`}`
`352`	`361`	`catch (XMLStreamException e)`
`353`	`362`	`{`
`@@ -431,7 +440,9 @@ public static XMLEventReader openEventReaderURL(URL url, boolean isNamespaceAwar`
`431`	`440`	`try`
`432`	`441`	`{`
`433`	`442`	`InputStream inputStream = url.openStream();`
`434`		`- return openEventReaderStream(inputStream, isNamespaceAware);`
	`443`	`+ XMLEventReader reader = openEventReaderStream(inputStream, isNamespaceAware);`
	`444`	`+ inputSources.put(reader, inputStream);`
	`445`	`+ return reader;`
`435`	`446`	`}`
`436`	`447`	`catch (IOException e)`
`437`	`448`	`{`
`@@ -517,11 +528,28 @@ else if (!(docSource instanceof String))`
`517`	`528`	`public static void closeEventReader(XMLEventReader eventReader, String name)`
`518`	`529`	`{`
`519`	`530`	`if (eventReader == null)`
	`531`	`+ {`
`520`	`532`	`return;`
	`533`	`+ }`
`521`	`534`
`522`	`535`	`try`
`523`	`536`	`{`
`524`	`537`	`eventReader.close();`
	`538`	`+ InputStream is = inputSources.get(eventReader);`
	`539`	`+ if (is != null)`
	`540`	`+ {`
	`541`	`+ try`
	`542`	`+ {`
	`543`	`+ is.close();`
	`544`	`+ }`
	`545`	`+ catch (IOException e)`
	`546`	`+ {`
	`547`	`+ String message = Logging.getMessage("generic.ExceptionClosingStream",`
	`548`	`+ name != null ? name : "Unknown");`
	`549`	`+ Logging.logger().severe(message);`
	`550`	`+ }`
	`551`	`+ inputSources.remove(eventReader);`
	`552`	`+ }`
`525`	`553`	`}`
`526`	`554`	`catch (XMLStreamException e)`
`527`	`555`	`{`