Changeset 31890 in osm for applications/editors/josm/plugins/utilsplugin2

Timestamp:

2015-12-30T23:11:38+01:00 (9 years ago)

Author:

donvip

Message:

[josm_utilsplugin2] update to JOSM 9224

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java (modified) (13 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java

@@ -34 +34 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
+import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -68 +69 @@
     private final HistoryComboBox cbTagSet = new HistoryComboBox();
     private List<OsmPrimitive> currentSelection;
-    
+
     private static final String HISTORY_KEY = "utilsplugin2.multitaghistory";
     String defaultHistory[] = {"addr:street, addr:housenumber, building, ${area}",
         "highway, name, ${id}, ${length}",
         "name name:en name:ru name:de"};
-    
+
     public MultiTagDialog() {
         super(Main.parent,  tr("Edit tags"), new String[]{tr("Ok"), tr("Cancel")}, false);
         JPanel pnl = new JPanel(new GridBagLayout());
         tbl = createTable();
-        
+
         cbTagSet.addItemListener(tagSetChanger);
         cbTagSet.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
            .put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, true), "applyTagSet");
         cbTagSet.getActionMap().put("applyTagSet", tagSetChanger);
-        
+
         tbl.addMouseListener(new PopupMenuLauncher(createPopupMenu()));
-        
+
         pnl.add(cbTagSet,GBC.std().fill(GBC.HORIZONTAL));
         pnl.add(new JButton(new DeleteFromHistoryAction()),GBC.std());
@@ -97 +98 @@
         });
         pnl.add(jt,GBC.eol());
-        
+
 
         pnl.add(createTypeFilterPanel(), GBC.eol().fill(GBC.HORIZONTAL));
         pnl.add(tbl.getTableHeader(),GBC.eop().fill(GBC.HORIZONTAL));
-        
+
         pnl.add(new JScrollPane(tbl), GBC.eol().fill(GBC.BOTH));
         setContent(pnl);
         setDefaultButton(-1);
         loadHistory();
-        
+
         WindowGeometry defaultGeometry = WindowGeometry.centerInWindow(Main.parent, new Dimension(500, 500));
         setRememberWindowGeometry(getClass().getName() + ".geometry", defaultGeometry);
@@ -158 +159 @@
         highlightHelper.clear();
         tbl.getSelectionModel().removeListSelectionListener(selectionListener);
-        super.buttonAction(buttonIndex, evt); 
-    }
-    
+        super.buttonAction(buttonIndex, evt);
+    }
+
     @Override
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
         tableModel.selectionChanged(newSelection);
     }
-    
+
     /*private OsmPrimitive getSelectedPrimitive() {
         int idx = tbl.getSelectedRow();
@@ -174 +175 @@
         }
     }*/
-    
+
    private final MouseAdapter tableMouseAdapter = new MouseAdapter() {
         @Override
@@ -182 +183 @@
             }
         }
-        
+
     };
     private final ListSelectionListener selectionListener = new ListSelectionListener() {
@@ -195 +196 @@
         }
     };
-    
+
     public List<OsmPrimitive> getSelectedPrimitives() {
         ArrayList<OsmPrimitive> sel = new ArrayList<>(100);
@@ -203 +204 @@
         return sel;
     }
-    
+
     private final TagSetChanger tagSetChanger = new TagSetChanger();
 
@@ -302 +303 @@
         }
     }
-   
+
     private class FindMatchingAction extends AbstractAction {
         public FindMatchingAction() {
@@ -314 +315 @@
         }
     }
-   
+
     private class TagSetChanger extends AbstractAction implements ItemListener {
         String oldTags;
-        
- 
+
         @Override
         public void itemStateChanged(ItemEvent e) {
@@ -337 +337 @@
 
     };
-    
+
     private void specifyTagSet(String s) {
         Main.info("Multitagger tags="+s);
@@ -352 +352 @@
         tableModel.fireTableDataChanged();
     }
-    
+
     class ColoredRenderer extends DefaultTableCellRenderer {
-        private final Color highlightColor = 
+        private final Color highlightColor =
                 Main.pref.getColor( marktr("Multitag Background: highlight"),
                         new Color(255,255,200));
@@ -367 +367 @@
             } else {
                 if (isSelected) {
-                    label.setBackground(Main.pref.getUIColor("Table.selectionBackground"));
+                    label.setBackground(UIManager.getColor("Table.selectionBackground"));
                 } else {
-                    label.setBackground(Main.pref.getUIColor("Table.background"));
+                    label.setBackground(UIManager.getColor("Table.background"));
                 }
             }