Fixed the formatting.

wcmatthysen · wcmatthysen · commit f8d2af5cd572 · 2019-08-07T23:03:28.000+02:00
Removed the tabs and added some curly braces here and there to keep it
consistent with the rest of the code-base.
diff --git a/src/gov/nasa/worldwind/data/RasterServerConfiguration.java b/src/gov/nasa/worldwind/data/RasterServerConfiguration.java
@@ -144,14 +144,18 @@ public RasterServerConfiguration(Object docSource)
         this.initialize();
     }
     
-    public void dispose() {
-    	try {
-			eventReader.close();
-		} catch (XMLStreamException e) {
-			e.printStackTrace();
-		}
-    	WWXML.closeEventReader(eventReader, "RasterServerConfiguration");
-    	freeResources();
+    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/util/DataConfigurationUtils.java b/src/gov/nasa/worldwind/util/DataConfigurationUtils.java
@@ -919,7 +919,7 @@ public static AVList getWCSConfigParameters(WCS100Capabilities caps, WCS100Descr
 
         if (coverage.getCoverageOfferings().size() == 0)
         {
-        	String message = Logging.getMessage("AbsentResourceList.WCSDescribeCoverage");
+            String message = Logging.getMessage("AbsentResourceList.WCSDescribeCoverage");
             Logging.logger().severe(message);
             throw new IllegalArgumentException(message);
         }
@@ -1156,7 +1156,10 @@ 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
+            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/WWXML.java b/src/gov/nasa/worldwind/util/WWXML.java
@@ -172,11 +172,14 @@ public static Document openDocumentFile(String filePath, Class c)
             throw new IllegalArgumentException(message);
         }
 
-        try (InputStream inputStream = WWIO.openFileOrResourceStream(filePath, c)) {
-        	return inputStream != null ? openDocumentStream(inputStream) : null;
-        } catch (IOException e) {
-        	e.printStackTrace();
-        	return null;
+        try (InputStream inputStream = WWIO.openFileOrResourceStream(filePath, c))
+        {
+            return inputStream != null ? openDocumentStream(inputStream) : null;
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+            return null;
         }
     }
 
@@ -278,7 +281,8 @@ public static void saveDocumentToFile(Document doc, String filePath)
             throw new IllegalArgumentException(message);
         }
 
-        try (java.io.FileOutputStream outputStream = new java.io.FileOutputStream(filePath)) {
+        try (java.io.FileOutputStream outputStream = new java.io.FileOutputStream(filePath))
+        {
             saveDocumentToStream(doc, outputStream);
         }
         catch (IOException e)
@@ -358,7 +362,7 @@ public static XMLEventReader openEventReaderStream(InputStream inputStream, bool
 
         try
         {
-        	XMLEventReader reader = inputFactory.createXMLEventReader(inputStream);
+            XMLEventReader reader = inputFactory.createXMLEventReader(inputStream);
             inputSources.put(reader, inputStream);
             return reader;
         }
@@ -532,19 +536,25 @@ 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) {
-					e.printStackTrace();
-				}
-            	inputSources.remove(eventReader);
+            if (is != null)
+            {
+                try
+                {
+                    is.close();
+                }
+                catch (IOException e)
+                {
+                    e.printStackTrace();
+                }
+                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,19 +137,26 @@ protected boolean isUpToDate(WorldWindow wwd)
 
         if (!(wwd.getModel().getGlobe().getElevationModel() instanceof CompoundElevationModel))
         {
-           if (this.modelPanels.size() == 0) return false;
+           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
@@ -101,7 +101,9 @@ protected void load()
             e.printStackTrace();
             Container c = WCSCoveragePanel.this.getParent();
             if (c != null)
-            	c.remove(WCSCoveragePanel.this);
+            {
+                c.remove(WCSCoveragePanel.this);
+            }
             
             JOptionPane.showMessageDialog((Component) wwd, "Unable to connect to server " + serverURI.toString(),
                 "Server Error", JOptionPane.ERROR_MESSAGE);
@@ -110,7 +112,9 @@ protected void load()
 
         final java.util.List<WCS100CoverageOfferingBrief> coverages = caps.getContentMetadata().getCoverageOfferings();
         if (coverages == null)
+        {
             return;
+        }
 
         try
         {
@@ -194,17 +198,23 @@ public void actionPerformed(ActionEvent actionEvent)
             // If the coverage is selected, add it to the WorldWindow's current model, else remove it from the model.
             if (((JCheckBox) actionEvent.getSource()).isSelected())
             {
-                if (this.component == null) {
+                if (this.component == null)
+                {
                     this.component = createComponent(coverageInfo.caps, coverageInfo);
-                    if (this.component == null) return;
+                    if (this.component == null)
+                    {
+                        return;
+                    }
                 }
 
                 updateComponent(this.component, true);
             }
             else
             {
                 if (this.component != null)
+                {
                     updateComponent(this.component, false);
+                }
             }
 
             // Tell the WorldWindow to update.
@@ -233,18 +243,23 @@ protected void updateComponent(Object component, boolean enable)
         // 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 (!(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
         {
