Changeset 4426 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-09-16T12:13:44+02:00 (13 years ago)

Author:

stoecker

Message:

show select standard entries in imagery preferences

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (2 diffs)
• gui/preferences/ImageryPreference.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -34 +34 @@
 
 import javax.swing.JOptionPane;
+import javax.swing.UIManager;
 
 import org.openstreetmap.josm.Main;
@@ -549 +550 @@
     }
 
+    synchronized public Color getUIColor(String colName) {
+        return UIManager.getColor(colName);
+    }
+
     /* only for preferences */
     synchronized public String getColorName(String o) {

trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.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;
 import static org.openstreetmap.josm.tools.I18n.trc;
@@ -23 +24 @@
 import java.util.Locale;
 import java.util.Map;
-
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -48 +48 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumnModel;
@@ -377 +378 @@
         final PreferenceTabbedPane gui;
 
-        public ImageryProvidersPanel(final PreferenceTabbedPane gui, ImageryLayerInfo layerInfo) {
+        public ImageryProvidersPanel(final PreferenceTabbedPane gui, ImageryLayerInfo layerInfoArg) {
             super(new GridBagLayout());
             this.gui = gui;
-            this.layerInfo = layerInfo;
+            this.layerInfo = layerInfoArg;
             this.model = new ImageryLayerTableModel();
 
@@ -404 +405 @@
             mod.getColumn(1).setPreferredWidth(400);
             mod.getColumn(0).setPreferredWidth(50);
+
+            mod.getColumn(2).setCellRenderer(new DefaultTableCellRenderer() {
+                @Override
+                public Component getTableCellRendererComponent(JTable table,
+                Object value, boolean isSelected, boolean hasFocus, int row,
+                int column) {
+                    JLabel label = (JLabel) super.getTableCellRendererComponent(
+                    table, value, isSelected, hasFocus, row, column);
+                    String t = value.toString();
+                    label.setBackground(Main.pref.getUIColor("Table.background"));
+                    for(ImageryInfo l : layerInfo.getLayers())
+                    {
+                        if(l.getExtendedUrl().equals(t)) {
+                            label.setBackground(Main.pref.getColor(
+                            marktr("Imagery Background: Default"),
+                            new Color(200,255,200)));
+                            break;
+                        }
+                    }
+                    return label;
+                };
+            });
+
             mod = listActive.getColumnModel();
             mod.getColumn(2).setPreferredWidth(50);
             mod.getColumn(1).setPreferredWidth(800);
             mod.getColumn(0).setPreferredWidth(200);
+
+            mod.getColumn(1).setCellRenderer(new DefaultTableCellRenderer() {
+                @Override
+                public Component getTableCellRendererComponent(JTable table,
+                Object value, boolean isSelected, boolean hasFocus, int row,
+                int column) {
+                    JLabel label = (JLabel) super.getTableCellRendererComponent(
+                    table, value, isSelected, hasFocus, row, column);
+                    String t = value.toString();
+                    label.setBackground(Main.pref.getUIColor("Table.background"));
+                    for(ImageryInfo l : layerInfo.getDefaultLayers())
+                    {
+                        if(l.getExtendedUrl().equals(t)) {
+                            label.setBackground(Main.pref.getColor(
+                            marktr("Imagery Background: Default"),
+                            new Color(200,255,200)));
+                            break;
+                        }
+                    }
+                    return label;
+                };
+            });
 
             RemoveEntryAction remove = new RemoveEntryAction();
@@ -493 +539 @@
                 }
             }
-            
+
             private void updateBoundsAndShapes(int i) {
                 ImageryBounds bounds = modeldef.getRow(i).getBounds();