Changeset 20197 in osm for applications/editors/josm

Timestamp:

2010-02-28T07:51:34+01:00 (14 years ago)

Author:

guggis

Message:

'Fixed rendering of background color for selected cells'

Location:

applications/editors/josm/plugins/tageditor

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java (modified) (3 diffs)

applications/editors/josm/plugins/tageditor/build.xml

@@ -28 +28 @@
 
 
-        <property name="commit.message" value="Tageditor: fixed josm bug 2416" />
+        <property name="commit.message" value="Fixed rendering of background color for selected cells" />
         <property name="plugin.main.version" value="3015" />
 

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java

@@ -120 +120 @@
          * @param model the tag editor model 
          */
-        protected void renderBackgroundColor(TagModel tagModel, TagEditorModel model) {
-                setBackground(UIManager.getColor("Table.background")); 
+        protected void renderColor(TagModel tagModel, TagEditorModel model, boolean isSelected) {
+                if (isSelected){
+                        setBackground(UIManager.getColor("Table.selectionBackground"));
+                        setForeground(UIManager.getColor("Table.selectionForeground"));
+                } else {
+                        setBackground(UIManager.getColor("Table.background"));
+                        setForeground(UIManager.getColor("Table.foreground"));
+                }               
                 if (belongsToSelectedPreset(tagModel, model)) {
                         setBackground(BG_COLOR_HIGHLIGHTED);
@@ -143 +149 @@
                 
                 resetRenderer();
-                
-                // set background color
-                //
-                if (isSelected){
-                        setBackground(UIManager.getColor("Table.selectionBackground"));
-                        setForeground(UIManager.getColor("Table.selectionForeground"));
-                } else {
-                        setBackground(UIManager.getColor("Table.background"));
-                        setForeground(UIManager.getColor("Table.foreground"));
-                }
-
                 TagModel tagModel  = (TagModel)value;
                 switch(vColIndex) { 
@@ -159 +154 @@
                         case 1: renderTagValue(tagModel); break;
                 }
-                renderBackgroundColor(tagModel, (TagEditorModel)table.getModel());
+                renderColor(tagModel, (TagEditorModel)table.getModel(),isSelected);
                 if (hasFocus && isSelected) {
                         if (table.getSelectedColumnCount() == 1 && table.getSelectedRowCount() == 1) {