Changeset 12050 in josm


Ignore:
Timestamp:
2017-05-03T17:27:50+02:00 (23 months ago)
Author:
michael2402
Message:

Fix sonar warnings (modifiers, parameters)

Location:
trunk/src/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java

    r12040 r12050  
    130130    }
    131131
    132     private boolean isUsableNode(OsmPrimitive p) {
     132    private static boolean isUsableNode(OsmPrimitive p) {
    133133        // test changed nodes - ways referred by them may not be checked automatically.
    134134        return p instanceof Node && p.isDrawable();
    135135    }
    136136
    137     private boolean isUsableWay(OsmPrimitive p) {
     137    private static boolean isUsableWay(OsmPrimitive p) {
    138138        // test only Ways with at least 2 nodes
    139139        return p instanceof Way && ((Way) p).getNodesCount() > 1;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java

    r12047 r12050  
    180180     * The current row counter. Used when adding new rows.
    181181     */
    182     protected int currentRow = 0;
     182    protected int currentRow;
    183183
    184184    /**
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

    r12047 r12050  
    4646     * the table for my tag set
    4747     */
    48     private final JTable mineTable = generateTable(model, new MineTableCellRenderer());
     48    private final JTable mineTable = generateTable(new MineTableCellRenderer());
    4949    /**
    5050     * the table for the merged tag set
    5151     */
    52     private final JTable mergedTable = generateTable(model, new MergedTableCellRenderer());
     52    private final JTable mergedTable = generateTable(new MergedTableCellRenderer());
    5353    /**
    5454     * the table for their tag set
    5555     */
    56     private final JTable theirTable = generateTable(model, new TheirTableCellRenderer());
     56    private final JTable theirTable = generateTable(new TheirTableCellRenderer());
    5757
    5858    /**
     
    7171    }
    7272
    73     private JTable generateTable(TagMergeModel model2, TagMergeTableCellRenderer renderer) {
     73    private JTable generateTable(TagMergeTableCellRenderer renderer) {
    7474        return new JTable(model, new TagTableColumnModelBuilder(renderer, KEY_VALUE).build());
    7575    }
     
    105105
    106106    private final class TagTableRow extends MergeRow {
    107         private transient AdjustmentSynchronizer adjustmentSynchronizer = new AdjustmentSynchronizer();
     107        private final AdjustmentSynchronizer adjustmentSynchronizer = new AdjustmentSynchronizer();
    108108
    109109        /**
     
    113113         * @return the scroll pane embedding the table
    114114         */
    115         protected JScrollPane embeddInScrollPane(JTable table) {
     115        JScrollPane embeddInScrollPane(JTable table) {
    116116            JScrollPane pane = new JScrollPane(table);
    117117            adjustmentSynchronizer.synchronizeAdjustment(pane.getVerticalScrollBar());
Note: See TracChangeset for help on using the changeset viewer.