Changeset 4072 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

Timestamp:

2011-05-04T07:09:56+02:00 (13 years ago)

Author:

jttt

Message:

Fix #6301 Check for null mandatory in TableCellRenderer.getTableCellRendererComponent

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (10 diffs)

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

@@ -84 +84 @@
 
     final protected boolean isMapPaint;
-    
+
     protected JTable tblActiveSources;
     protected ActiveSourcesModel activeSourcesModel;
@@ -113 +113 @@
             // some kind of hack to prevent the table from scrolling slightly to the
             // right when clicking on the text
+            @Override
             public void scrollRectToVisible(Rectangle aRect) {
                 super.scrollRectToVisible(new Rectangle(0, aRect.y, aRect.width, aRect.height));
@@ -142 +143 @@
         });
         activeSourcesModel.setActiveSources(getInitialSourcesList());
-        
+
         final EditActiveSourceAction editActiveSourceAction = new EditActiveSourceAction();
         tblActiveSources.getSelectionModel().addListSelectionListener(editActiveSourceAction);
@@ -368 +369 @@
      */
     protected enum I18nString { AVAILABLE_SOURCES, ACTIVE_SOURCES, NEW_SOURCE_ENTRY_TOOLTIP, NEW_SOURCE_ENTRY,
-            REMOVE_SOURCE_TOOLTIP, EDIT_SOURCE_TOOLTIP, ACTIVATE_TOOLTIP, RELOAD_ALL_AVAILABLE,
-            LOADING_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM_HELP_TOPIC,
-            ILLEGAL_FORMAT_OF_ENTRY }
+        REMOVE_SOURCE_TOOLTIP, EDIT_SOURCE_TOOLTIP, ACTIVATE_TOOLTIP, RELOAD_ALL_AVAILABLE,
+        LOADING_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM_HELP_TOPIC,
+        ILLEGAL_FORMAT_OF_ENTRY }
 
     /**
@@ -378 +379 @@
     private static void adjustColumnWidth(JTable tbl, int col) {
         int maxwidth = 0;
-                for (int row=0; row<tbl.getRowCount(); row++) {
+        for (int row=0; row<tbl.getRowCount(); row++) {
             TableCellRenderer tcr = tbl.getCellRenderer(row, col);
-                Object val = tbl.getValueAt(row, col);
-                Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, row, col);
-                maxwidth = Math.max(comp.getPreferredSize().width, maxwidth);
-                }
-                tbl.getColumnModel().getColumn(col).setPreferredWidth(maxwidth);
+            Object val = tbl.getValueAt(row, col);
+            Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, row, col);
+            maxwidth = Math.max(comp.getPreferredSize().width, maxwidth);
+        }
+        tbl.getColumnModel().getColumn(col).setPreferredWidth(maxwidth);
     }
 
@@ -587 +588 @@
             if (sel.length == 0)
                 return false;
-            if (i < 0) { // Up
+            if (i < 0)
                 return sel[0] >= -i;
-            } else if (i > 0) { // Down
-                return sel[sel.length-1] <= getRowCount()-1 - i;
-            } else
-                return true;
+                else if (i > 0)
+                    return sel[sel.length-1] <= getRowCount()-1 - i;
+                else
+                    return true;
         }
 
@@ -735 +736 @@
         }
 
+        @Override
         public String getTitle() {
             return tfTitle.getText();
@@ -1211 +1213 @@
         }
     }
-    
+
     class SourceEntryTableCellRenderer extends DefaultTableCellRenderer {
         @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+            if (value == null)
+                return this;
             SourceEntry se = (SourceEntry) value;
             JLabel label = (JLabel)super.getTableCellRendererComponent(table,
@@ -1490 +1494 @@
         public Collection<? extends SourceEntry> readNewFormat() {
             List<SourceEntry> entries = readNewFormatImpl();
-            if (entries == null) {
+            if (entries == null)
                 return getDefault();
-            }
             return entries;
         }
@@ -1500 +1503 @@
             Collection<Collection<String>> mappaintSrc = Main.pref.getArray(pref, null);
             if (mappaintSrc == null || mappaintSrc.isEmpty()) {
-                if (Main.pref.getBoolean(pref + "._empty_", false)) {
+                if (Main.pref.getBoolean(pref + "._empty_", false))
                     return Collections.<SourceEntry>emptyList();
-                }
                 return null;
             }