Changeset 6623 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java

Timestamp:

2014-01-04T06:39:00+01:00 (10 years ago)

Author:

Don-vip

Message:

fix Sonar issues

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java

@@ -18 +18 @@
 public class RelationMemberConflictResolverColumnModel extends DefaultTableColumnModel {
 
+    private final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer();
+    
+    private final OsmPrimitivRenderer primitiveRenderer = new OsmPrimitivRenderer() {
+        @Override
+        public Component getTableCellRendererComponent(JTable table,
+                Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+            return setColors(super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column),
+                    table, isSelected, row);
+        }
+    };
+    
+    private final TableCellRenderer tableRenderer = new TableCellRenderer() {
+        @Override
+        public Component getTableCellRendererComponent(JTable table, Object value,
+                boolean isSelected, boolean hasFocus, int row, int column) {
+            return setColors(defaultTableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column),
+                    table, isSelected, row);
+        }
+    };
+    
     private static Component setColors(Component comp, JTable table, boolean isSelected, int row) {
         RelationMemberConflictResolverModel model = (RelationMemberConflictResolverModel) table.getModel();
@@ -40 +60 @@
     }
     
-    protected void createColumns() {
-        final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer();
-        
-        OsmPrimitivRenderer primitiveRenderer = new OsmPrimitivRenderer() {
-            @Override
-            public Component getTableCellRendererComponent(JTable table,
-                    Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-                return setColors(super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column),
-                        table, isSelected, row);
-            }
-        };
-        
-        TableCellRenderer tableRenderer = new TableCellRenderer() {
-            @Override
-            public Component getTableCellRendererComponent(JTable table, Object value,
-                    boolean isSelected, boolean hasFocus, int row, int column) {
-                return setColors(defaultTableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column),
-                        table, isSelected, row);
-            }
-        };
+    protected final void createColumns() {
         
         AutoCompletingTextField roleEditor = new AutoCompletingTextField();