Changeset 12050 in josm for trunk/src

Timestamp:

2017-05-03T17:27:50+02:00 (7 years ago)

Author:

michael2402

Message:

Fix sonar warnings (modifiers, parameters)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/LongSegment.java (modified) (1 diff)
• gui/conflict/pair/AbstractMergePanel.java (modified) (1 diff)
• gui/conflict/pair/tags/TagMerger.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java

@@ -130 +130 @@
     }
 
-    private boolean isUsableNode(OsmPrimitive p) {
+    private static boolean isUsableNode(OsmPrimitive p) {
         // test changed nodes - ways referred by them may not be checked automatically.
         return p instanceof Node && p.isDrawable();
     }
 
-    private boolean isUsableWay(OsmPrimitive p) {
+    private static boolean isUsableWay(OsmPrimitive p) {
         // test only Ways with at least 2 nodes
         return p instanceof Way && ((Way) p).getNodesCount() > 1;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java

@@ -180 +180 @@
      * The current row counter. Used when adding new rows.
      */
-    protected int currentRow = 0;
+    protected int currentRow;
 
     /**

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -46 +46 @@
      * the table for my tag set
      */
-    private final JTable mineTable = generateTable(model, new MineTableCellRenderer());
+    private final JTable mineTable = generateTable(new MineTableCellRenderer());
     /**
      * the table for the merged tag set
      */
-    private final JTable mergedTable = generateTable(model, new MergedTableCellRenderer());
+    private final JTable mergedTable = generateTable(new MergedTableCellRenderer());
     /**
      * the table for their tag set
      */
-    private final JTable theirTable = generateTable(model, new TheirTableCellRenderer());
+    private final JTable theirTable = generateTable(new TheirTableCellRenderer());
 
     /**
@@ -71 +71 @@
     }
 
-    private JTable generateTable(TagMergeModel model2, TagMergeTableCellRenderer renderer) {
+    private JTable generateTable(TagMergeTableCellRenderer renderer) {
         return new JTable(model, new TagTableColumnModelBuilder(renderer, KEY_VALUE).build());
     }
@@ -105 +105 @@
 
     private final class TagTableRow extends MergeRow {
-        private transient AdjustmentSynchronizer adjustmentSynchronizer = new AdjustmentSynchronizer();
+        private final AdjustmentSynchronizer adjustmentSynchronizer = new AdjustmentSynchronizer();
 
         /**
@@ -113 +113 @@
          * @return the scroll pane embedding the table
          */
-        protected JScrollPane embeddInScrollPane(JTable table) {
+        JScrollPane embeddInScrollPane(JTable table) {
             JScrollPane pane = new JScrollPane(table);
             adjustmentSynchronizer.synchronizeAdjustment(pane.getVerticalScrollBar());