Changeset 32904 in osm

Timestamp:

2016-09-03T15:27:40+02:00 (8 years ago)

Author:

donvip

Message:

fix java9 warnings

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• gui/ModulePreferencesModel.java (modified) (5 diffs)
• io/tabular/OdsDocument.java (modified) (4 diffs)
• modules/AbstractModule.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreferencesModel.java

@@ -11 +11 @@
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Observable;
 import java.util.Set;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.util.ChangeNotifier;
 import org.openstreetmap.josm.plugins.opendata.OdPlugin;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
@@ -20 +20 @@
 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleInformation;
 
-public class ModulePreferencesModel extends Observable {
+public class ModulePreferencesModel extends ChangeNotifier {
     private final ArrayList<ModuleInformation> availableModules = new ArrayList<>();
     private final ArrayList<ModuleInformation> displayedModules = new ArrayList<>();
@@ -51 +51 @@
         }
         filterExpression = filter;
-        clearChanged();
-        notifyObservers();
+        fireStateChanged();
     }
 
@@ -71 +70 @@
             }
         }
-        clearChanged();
-        notifyObservers();
+        fireStateChanged();
     }
 
@@ -106 +104 @@
             }
         }
-        clearChanged();
-        notifyObservers();
+        fireStateChanged();
     }
 

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsDocument.java

@@ -12 +12 @@
 import org.jopendocument.model.OpenDocument;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 public class OdsDocument extends OpenDocument {
@@ -21 +21 @@
         loadFrom(in);
     }
-    
+
     private InputSource getEntryInputSource(ZipInputStream zis) throws IOException {
-        int n = -1;
+        int n;
         final byte[] buffer = new byte[4096];
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -37 +37 @@
         try {
             final ZipInputStream zis = new ZipInputStream(in);
-            final XMLReader rdr = XMLReaderFactory.createXMLReader();
-            
-            ZipEntry entry = null;
+            final XMLReader rdr = Utils.newSafeSAXParser().getXMLReader();
+
+            ZipEntry entry;
             boolean contentParsed = false;
-            
+
             while (!contentParsed && (entry = zis.getNextEntry()) != null) {
                 if (entry.getName().equals("content.xml")) {
@@ -50 +50 @@
                 }
             }
-            
-        } catch (final Exception e) {
-            e.printStackTrace();
+
+        } catch (Exception e) {
+            Main.error(e);
         }
-        
+
         init(contentHandler.getBody());
     }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java

@@ -106 +106 @@
             if (handlerClass != null) {
                 try {
-                    result.add(handlerClass.newInstance());
-                } catch (InstantiationException | IllegalAccessException t) {
-                    Main.error("Cannot instantiate "+handlerClass+" because of "+t.getClass().getName()+": "+t.getMessage());
+                    result.add(handlerClass.getConstructor().newInstance());
+                } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException t) {
+                    Main.error(t, "Cannot instantiate "+handlerClass+" because of "+t.getClass().getName());
                 }
             }