Changeset 1415 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

Timestamp:

2009-02-16T15:14:34+01:00 (16 years ago)

Author:

stoecker

Message:

applied patch #2185 by bruce89

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -13 +12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -33 +29 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.BorderFactory;
-import javax.swing.Box;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.visitor.MapPaintVisitor;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
-import org.openstreetmap.josm.gui.layer.GpxLayer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.MapScaler;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
@@ -77 +70 @@
                 colorKeyList.put(getName(key), key);
         }
-        for (Entry k : colorKeyList.entrySet()) {
+        for (Entry<String, String> k : colorKeyList.entrySet()) {
             Vector<Object> row = new Vector<Object>(2);
             row.add(k.getValue());
@@ -83 +76 @@
             tableModel.addRow(row);
         }
-        for (Entry k : colorKeyList_mappaint.entrySet()) {
+        for (Entry<String, String> k : colorKeyList_mappaint.entrySet()) {
             Vector<Object> row = new Vector<Object>(2);
             row.add(k.getValue());