Changeset 30738 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

Timestamp:

2014-10-19T01:27:04+02:00 (12 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (modified) (20 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -97 +97 @@
 /**
  * The new, advanced relation editing panel.
- * 
+ *
  * @author Zverik
  */
@@ -103 +103 @@
 
     public final static String PREF_PREFIX = "reltoolbox";
-    
+
     private final DefaultTableModel relationsData;
     private ChosenRelation chosenRelation;
@@ -142 +142 @@
         roleBox.addMouseListener(relationMouseAdapter);
         roleBox.addItemListener(new ItemListener() {
+            @Override
             public void itemStateChanged( ItemEvent e ) {
                 if( e.getStateChange() == ItemEvent.DESELECTED ) return;
@@ -174 +175 @@
 
         roleBox.addPropertyChangeListener("enabled", new PropertyChangeListener() {
+            @Override
             public void propertyChange( PropertyChangeEvent evt ) {
                 boolean showRoleBox = roleBox.isEnabled();
@@ -182 +184 @@
 
         sortAndFixAction.addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
             public void propertyChange( PropertyChangeEvent evt ) {
                 sortAndFixButton.setVisible(sortAndFixAction.isEnabled());
@@ -189 +192 @@
 
         downloadChosenRelationAction.addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
             public void propertyChange( PropertyChangeEvent evt ) {
                 downloadButton.setVisible(downloadChosenRelationAction.isEnabled());
@@ -304 +308 @@
         columns.getColumn(0).setPreferredWidth(220);
         relationsTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+            @Override
             public void valueChanged( ListSelectionEvent e ) {
                 int selectedRow = relationsTable.getSelectedRow();
@@ -339 +344 @@
     }
 
+    @Override
     public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
         if( chosenRelationPanel != null && Main.pref.getBoolean(PREF_PREFIX + ".hidetopline", false) )
@@ -348 +354 @@
     }
 
+    @Override
     public void selectionChanged( Collection<? extends OsmPrimitive> newSelection ) {
         if( !isVisible() || relationsData == null )
@@ -397 +404 @@
     }
 
+    @Override
     public void editLayerChanged( OsmDataLayer oldLayer, OsmDataLayer newLayer ) {
         updateSelection();
@@ -410 +418 @@
         super.destroy();
     }
-    
+
     private static final String POSSIBLE_ROLES_FILE = "relcontext/possible_roles.txt";
     private static final Map<String, List<String>> possibleRoles = loadRoles();
@@ -416 +424 @@
     private static Map<String, List<String>> loadRoles() {
         Map<String, List<String>> result = new HashMap<>();
-        try {
-            ClassLoader classLoader = RelContextDialog.class.getClassLoader();
-            final InputStream possibleRolesStream = classLoader.getResourceAsStream(POSSIBLE_ROLES_FILE);
+        ClassLoader classLoader = RelContextDialog.class.getClassLoader();
+        try (
+            InputStream possibleRolesStream = classLoader.getResourceAsStream(POSSIBLE_ROLES_FILE);
             BufferedReader r = new BufferedReader(new InputStreamReader(possibleRolesStream));
+        ) {
             while( r.ready() ) {
                 String line = r.readLine();
@@ -431 +440 @@
                 }
             }
-            r.close();
         } catch( Exception e ) {
-            System.err.println("[RelToolbox] Error reading possible roles file.");
-            e.printStackTrace();
+            Main.error("[RelToolbox] Error reading possible roles file.");
+            Main.error(e);
         }
         return result;
@@ -466 +474 @@
 
         role.getEditor().addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed( ActionEvent e ) {
                 dlg.setVisible(false);
@@ -589 +598 @@
         }
 
+        @Override
         public void actionPerformed( ActionEvent e ) {
             String property = e.getActionCommand();
@@ -609 +619 @@
         }
 
+        @Override
         public void actionPerformed( ActionEvent e ) {
             if( roleBoxModel.membersRole != null ) {
@@ -617 +628 @@
         }
 
+        @Override
         public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
             setEnabled(newRelation != null);
         }
     }
-        
+
     private class RoleComboBoxModel extends AbstractListModel<String> implements ComboBoxModel<String> {
         private List<String> roles = new ArrayList<>();
@@ -704 +716 @@
         }
 
+        @Override
         public int getSize() {
             return roles.size();
         }
 
+        @Override
         public String getElementAt( int index ) {
             return getRole(index);
@@ -716 +730 @@
         }
 
+        @Override
         public void setSelectedItem( Object anItem ) {
             int newIndex = anItem == null ? -1 : roles.indexOf(anItem);
@@ -724 +739 @@
         }
 
+        @Override
         public Object getSelectedItem() {
             return selectedIndex < 0 || selectedIndex >= getSize() ? null : getRole(selectedIndex);