Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair

Files:

• ConflictResolver.java (modified) (5 diffs)
• IConflictResolver.java (modified) (1 diff)
• ListMergeModel.java (modified) (11 diffs)
• ListMerger.java (modified) (7 diffs)
• nodes/NodeListMerger.java (modified) (1 diff)
• nodes/NodeListTableCellRenderer.java (modified) (4 diffs)
• properties/PropertiesMergeModel.java (modified) (2 diffs)
• properties/PropertiesMerger.java (modified) (4 diffs)
• relation/RelationMemberListMergeModel.java (modified) (1 diff)
• relation/RelationMemberMerger.java (modified) (1 diff)
• relation/RelationMemberTableCellEditor.java (modified) (1 diff)
• relation/RelationMemberTableCellRenderer.java (modified) (3 diffs)
• tags/MergedTableCellRenderer.java (modified) (2 diffs)
• tags/MineTableCellRenderer.java (modified) (1 diff)
• tags/TagMergeModel.java (modified) (6 diffs)
• tags/TagMergeTableCellRenderer.java (modified) (2 diffs)
• tags/TagMerger.java (modified) (3 diffs)
• tags/TheirTableCellRenderer.java (modified) (1 diff)

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

@@ -171 +171 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(TagMergeModel.PROP_NUM_UNDECIDED_TAGS)) {
-            int newValue = (Integer)evt.getNewValue();
+            int newValue = (Integer) evt.getNewValue();
             if (newValue == 0) {
                 tabbedPane.setTitleAt(1, tr("Tags"));
@@ -184 +184 @@
             updateResolvedCompletely();
         } else if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) {
-            boolean frozen = (Boolean)evt.getNewValue();
+            boolean frozen = (Boolean) evt.getNewValue();
             if (evt.getSource() == nodeListMerger.getModel() && my instanceof Way) {
                 if (frozen) {
@@ -192 +192 @@
                 } else {
                     tabbedPane.setTitleAt(2, tr("Nodes(with conflicts)"));
-                    tabbedPane.setToolTipTextAt(2,tr("Pending conflicts in the node list of this way"));
+                    tabbedPane.setToolTipTextAt(2, tr("Pending conflicts in the node list of this way"));
                     tabbedPane.setIconAt(2, mergeIncomplete);
                 }
@@ -208 +208 @@
             updateResolvedCompletely();
         } else if (evt.getPropertyName().equals(PropertiesMergeModel.RESOLVED_COMPLETELY_PROP)) {
-            boolean resolved = (Boolean)evt.getNewValue();
+            boolean resolved = (Boolean) evt.getNewValue();
             if (resolved) {
                 tabbedPane.setTitleAt(0, tr("Properties"));
@@ -242 +242 @@
 
         if (my instanceof Node) {
-            tabbedPane.setEnabledAt(2,false);
-            tabbedPane.setEnabledAt(3,false);
+            tabbedPane.setEnabledAt(2, false);
+            tabbedPane.setEnabledAt(3, false);
         } else if (my instanceof Way) {
             nodeListMerger.populate(conflict);
             tabbedPane.setEnabledAt(2, true);
             tabbedPane.setEnabledAt(3, false);
-            tabbedPane.setTitleAt(3,tr("Members"));
+            tabbedPane.setTitleAt(3, tr("Members"));
             tabbedPane.setIconAt(3, null);
         } else if (my instanceof Relation) {
             relationMemberMerger.populate(conflict);
             tabbedPane.setEnabledAt(2, false);
-            tabbedPane.setTitleAt(2,tr("Nodes"));
+            tabbedPane.setTitleAt(2, tr("Nodes"));
             tabbedPane.setIconAt(2, null);
             tabbedPane.setEnabledAt(3, true);

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

@@ -8 +8 @@
 
     void deletePrimitive(boolean deleted);
+
     void populate(Conflict<? extends OsmPrimitive> conflict);
-
 }

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

@@ -139 +139 @@
             PrimitiveId id = mergedMap.get(entry);
             if (id == null && entry instanceof OsmPrimitive) {
-                id = mergedMap.get(((OsmPrimitive)entry).getPrimitiveId());
+                id = mergedMap.get(((OsmPrimitive) entry).getPrimitiveId());
             }
             if (id != null) {
@@ -208 +208 @@
 
     public void addPropertyChangeListener(PropertyChangeListener listener) {
-        synchronized(listeners) {
+        synchronized (listeners) {
             if (listener != null && !listeners.contains(listener)) {
                 listeners.add(listener);
@@ -216 +216 @@
 
     public void removePropertyChangeListener(PropertyChangeListener listener) {
-        synchronized(listeners) {
+        synchronized (listeners) {
             if (listener != null && listeners.contains(listener)) {
                 listeners.remove(listener);
@@ -224 +224 @@
 
     protected void fireFrozenChanged(boolean oldValue, boolean newValue) {
-        synchronized(listeners) {
+        synchronized (listeners) {
             PropertyChangeEvent evt = new PropertyChangeEvent(this, FROZEN_PROP, oldValue, newValue);
             for (PropertyChangeListener listener: listeners) {
@@ -355 +355 @@
     protected void alertCopyFailedForDeletedPrimitives(List<PrimitiveId> deletedIds) {
         List<String> items = new ArrayList<>();
-        for (int i=0; i<Math.min(MAX_DELETED_PRIMITIVE_IN_DIALOG, deletedIds.size()); i++) {
+        for (int i = 0; i < Math.min(MAX_DELETED_PRIMITIVE_IN_DIALOG, deletedIds.size()); i++) {
             items.add(deletedIds.get(i).toString());
         }
@@ -402 +402 @@
 
         int[] rows = new int[entries.get(source).size()];
-        for (int i=0; i<rows.length; i++) {
+        for (int i = 0; i < rows.length; i++) {
             rows[i] = i;
         }
@@ -525 +525 @@
             // can't move down
             return;
-        for (int i = rows.length-1; i>=0;i--) {
+        for (int i = rows.length-1; i >= 0; i--) {
             int row = rows[i];
             T n = mergedEntries.get(row);
@@ -551 +551 @@
         List<T> mergedEntries = getMergedEntries();
 
-        for (int i = rows.length-1; i>=0;i--) {
+        for (int i = rows.length-1; i >= 0; i--) {
             mergedEntries.remove(rows[i]);
         }
@@ -569 +569 @@
         if (getMyEntriesSize() != getTheirEntriesSize())
             return false;
-        for (int i=0; i < getMyEntriesSize(); i++) {
+        for (int i = 0; i < getMyEntriesSize(); i++) {
             if (!isEqualEntry(getMyEntries().get(i), getTheirEntries().get(i)))
                 return false;
@@ -617 +617 @@
         @Override
         public void setValueAt(Object value, int row, int col) {
-            ListMergeModel.this.setValueAt(this, value,row,col);
+            ListMergeModel.this.setValueAt(this, value, row, col);
         }
 
@@ -712 +712 @@
                 return (OsmPrimitive) value;
             } else if (value instanceof RelationMember) {
-                return ((RelationMember)value).getMember();
+                return ((RelationMember) value).getMember();
             } else {
                 Main.error("Unknown object type: "+value);

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

@@ -82 +82 @@
 
     protected abstract JScrollPane buildMyElementsTable();
+
     protected abstract JScrollPane buildMergedElementsTable();
+
     protected abstract JScrollPane buildTheirElementsTable();
 
@@ -268 +270 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(10,0,0,0);
+        gc.insets = new Insets(10, 0, 0, 0);
         lblMyVersion = new JLabel(tr("My version"));
         lblMyVersion.setToolTipText(tr("List of elements in my dataset, i.e. the local dataset"));
@@ -295 +297 @@
         gc.weightx = 0.33;
         gc.weighty = 0.0;
-        gc.insets = new Insets(0,0,0,0);
+        gc.insets = new Insets(0, 0, 0, 0);
         JCheckBox cbLockMyScrolling = new JCheckBox();
         cbLockMyScrolling.setName("checkbox.lockmyscrolling");
@@ -321 +323 @@
         gc.weightx = 0.33;
         gc.weighty = 1.0;
-        gc.insets = new Insets(0,0,0,0);
+        gc.insets = new Insets(0, 0, 0, 0);
         JScrollPane pane = buildMyElementsTable();
         lblMyVersion.setLabelFor(pane);
@@ -809 +811 @@
                         public void propertyChange(PropertyChangeEvent evt) {
                             if (evt.getPropertyName().equals(PROP_SELECTED)) {
-                                btn.setSelected((Boolean)evt.getNewValue());
+                                btn.setSelected((Boolean) evt.getNewValue());
                             }
                         }
@@ -828 +830 @@
                 model.setFrozen(false);
             }
-            boolean isSelected = (Boolean)getValue(PROP_SELECTED);
+            boolean isSelected = (Boolean) getValue(PROP_SELECTED);
             if (isSelected != (e.getStateChange() == ItemEvent.SELECTED)) {
                 putValue(PROP_SELECTED, e.getStateChange() == ItemEvent.SELECTED);
@@ -860 +862 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) {
-            handlePropertyChangeFrozen((Boolean)evt.getOldValue(), (Boolean)evt.getNewValue());
+            handlePropertyChangeFrozen((Boolean) evt.getOldValue(), (Boolean) evt.getNewValue());
         }
     }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

@@ -59 +59 @@
     @Override
     public void populate(Conflict<? extends OsmPrimitive> conflict) {
-        Way myWay = (Way)conflict.getMy();
-        Way theirWay = (Way)conflict.getTheir();
-        ((NodeListMergeModel)model).populate(myWay, theirWay, conflict.getMergedMap());
+        Way myWay = (Way) conflict.getMy();
+        Way theirWay = (Way) conflict.getTheir();
+        ((NodeListMergeModel) model).populate(myWay, theirWay, conflict.getMergedMap());
         myEntriesTable.setLayer(findLayerFor(myWay));
         theirEntriesTable.setLayer(findLayerFor(theirWay));

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

@@ -32 +32 @@
     public NodeListTableCellRenderer() {
         icon = ImageProvider.get("data", "node");
-        rowNumberBorder = BorderFactory.createEmptyBorder(0,4,0,0);
+        rowNumberBorder = BorderFactory.createEmptyBorder(0, 4, 0, 0);
         setOpaque(true);
     }
@@ -104 +104 @@
             int row, int column) {
 
-        Node node = (Node)value;
+        Node node = (Node) value;
         reset();
         if (node == null) {
@@ -111 +111 @@
             switch(column) {
             case 0:
-                renderRowId(getModel(table),row, isSelected);
+                renderRowId(getModel(table), row, isSelected);
                 break;
             case 1:
@@ -126 +126 @@
     /**
      * replies the model
-     * @param table  the table
+     * @param table the table
      * @return the table model
      */
     @SuppressWarnings("unchecked")
     protected ListMergeModel<Node>.EntriesTableModel getModel(JTable table) {
-        return (ListMergeModel<Node>.EntriesTableModel)table.getModel();
+        return (ListMergeModel<Node>.EntriesTableModel) table.getModel();
     }
 }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -128 +128 @@
         OsmPrimitive their = conflict.getTheir();
         if (my instanceof Node) {
-            myCoords = ((Node)my).getCoor();
-            theirCoords = ((Node)their).getCoor();
+            myCoords = ((Node) my).getCoor();
+            theirCoords = ((Node) their).getCoor();
         } else {
             myCoords = null;
@@ -138 +138 @@
         theirDeletedState = their.isDeleted();
 
-        myReferrers = my.getDataSet() == null?Collections.<OsmPrimitive>emptyList():my.getReferrers();
-        theirReferrers = their.getDataSet() == null?Collections.<OsmPrimitive>emptyList():their.getReferrers();
+        myReferrers = my.getDataSet() == null ? Collections.<OsmPrimitive>emptyList() : my.getReferrers();
+        theirReferrers = their.getDataSet() == null ? Collections.<OsmPrimitive>emptyList() : their.getReferrers();
 
         coordMergeDecision = UNDECIDED;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -78 +78 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(10,0,10,0);
+        gc.insets = new Insets(10, 0, 10, 0);
         JLabel lblMyVersion = new JLabel(tr("My version"));
         lblMyVersion.setToolTipText(tr("Properties in my dataset, i.e. the local dataset"));
@@ -108 +108 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(0,5,0,5);
+        gc.insets = new Insets(0, 5, 0, 5);
         add(new JLabel(tr("Coordinates:")), gc);
 
@@ -182 +182 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(0,5,0,5);
+        gc.insets = new Insets(0, 5, 0, 5);
         add(new JLabel(tr("Deleted State:")), gc);
 
@@ -258 +258 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(0,5,0,5);
+        gc.insets = new Insets(0, 5, 0, 5);
         add(new JLabel(tr("Referenced by:")), gc);
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -48 +48 @@
         if (model == getMergedTableModel() && col == 1) {
             RelationMember memberOld = getMergedEntries().get(row);
-            RelationMember memberNew = new RelationMember((String)value,memberOld.getMember());
+            RelationMember memberNew = new RelationMember((String) value, memberOld.getMember());
             getMergedEntries().remove(row);
-            getMergedEntries().add(row,memberNew);
+            getMergedEntries().add(row, memberNew);
             fireModelDataChanged();
         }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

@@ -60 +60 @@
     @Override
     public void populate(Conflict<? extends OsmPrimitive> conflict) {
-        Relation myRel = (Relation)conflict.getMy();
-        Relation theirRel = (Relation)conflict.getTheir();
-        ((RelationMemberListMergeModel)model).populate(myRel, theirRel, conflict.getMergedMap());
+        Relation myRel = (Relation) conflict.getMy();
+        Relation theirRel = (Relation) conflict.getTheir();
+        ((RelationMemberListMergeModel) model).populate(myRel, theirRel, conflict.getMergedMap());
         myEntriesTable.setLayer(findLayerFor(myRel));
         theirEntriesTable.setLayer(findLayerFor(theirRel));

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java

@@ -42 +42 @@
             return null;
 
-        RelationMember member = (RelationMember)value;
+        RelationMember member = (RelationMember) value;
 
         editor.setText(member.getRole());

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java

@@ -31 +31 @@
         setIcon(null);
         setOpaque(true);
-        rowNumberBorder = BorderFactory.createEmptyBorder(0,4,0,0);
+        rowNumberBorder = BorderFactory.createEmptyBorder(0, 4, 0, 0);
     }
 
@@ -116 +116 @@
             int row, int column) {
 
-        RelationMember member = (RelationMember)value;
+        RelationMember member = (RelationMember) value;
         reset();
         if (member == null) {
@@ -147 +147 @@
     @SuppressWarnings("unchecked")
     protected ListMergeModel<Node>.EntriesTableModel getModel(JTable table) {
-        return (ListMergeModel<Node>.EntriesTableModel)table.getModel();
+        return (ListMergeModel<Node>.EntriesTableModel) table.getModel();
     }
 }

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

@@ -24 +24 @@
     @Override
     protected void renderKey(TagMergeItem item, boolean isSelected) {
-        setBackgroundColor(item,isSelected);
+        setBackgroundColor(item, isSelected);
         if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision()) && item.getMyTagValue() == null) {
             setText(tr("<undefined>"));
@@ -41 +41 @@
     @Override
     protected void renderValue(TagMergeItem item, boolean isSelected) {
-        setBackgroundColor(item,isSelected);
+        setBackgroundColor(item, isSelected);
         if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision()) && item.getMyTagValue() == null) {
             setText(tr("<undefined>"));

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

@@ -48 +48 @@
     @Override
     protected void renderValue(TagMergeItem item, boolean isSelected) {
-        setBackgroundColor(item,isSelected);
+        setBackgroundColor(item, isSelected);
         setTextColor(item);
         if (item.getMyTagValue() == null) {

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

@@ -49 +49 @@
 
     public void addPropertyChangeListener(PropertyChangeListener listener) {
-        synchronized(listeners) {
+        synchronized (listeners) {
             if (listener == null) return;
             if (listeners.contains(listener)) return;
@@ -57 +57 @@
 
     public void removePropertyChangeListener(PropertyChangeListener listener) {
-        synchronized(listeners) {
+        synchronized (listeners) {
             if (listener == null) return;
             if (!listeners.contains(listener)) return;
@@ -71 +71 @@
      */
     protected void fireNumUndecidedTagsChanged(int oldValue, int newValue) {
-        PropertyChangeEvent evt = new PropertyChangeEvent(this,PROP_NUM_UNDECIDED_TAGS,oldValue, newValue);
-        synchronized(listeners) {
-            for(PropertyChangeListener l : listeners) {
+        PropertyChangeEvent evt = new PropertyChangeEvent(this, PROP_NUM_UNDECIDED_TAGS, oldValue, newValue);
+        synchronized (listeners) {
+            for (PropertyChangeListener l : listeners) {
                 l.propertyChange(evt);
             }
@@ -85 +85 @@
      */
     protected void refreshNumUndecidedTags() {
-        int newValue=0;
-        for(TagMergeItem item: tagMergeItems) {
+        int newValue = 0;
+        for (TagMergeItem item: tagMergeItems) {
             if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
                 newValue++;
@@ -110 +110 @@
         keys.addAll(my.keySet());
         keys.addAll(their.keySet());
-        for(String key : keys) {
+        for (String key : keys) {
             String myValue = my.get(key);
             String theirValue = their.get(key);
@@ -214 +214 @@
 
     public int getFirstUndecided(int startIndex) {
-        for (int i=startIndex; i<tagMergeItems.size(); i++) {
+        for (int i = startIndex; i < tagMergeItems.size(); i++) {
             if (tagMergeItems.get(i).getMergeDecision() == MergeDecisionType.UNDECIDED)
                 return i;

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

@@ -31 +31 @@
             return this;
 
-        TagMergeItem item = (TagMergeItem)value;
+        TagMergeItem item = (TagMergeItem) value;
         switch(col) {
         case 0:
@@ -45 +45 @@
         return this;
     }
-
 }

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

@@ -131 +131 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(10,0,10,0);
+        gc.insets = new Insets(10, 0, 10, 0);
         JLabel lblMy = new JLabel(tr("My version (local dataset)"));
         add(lblMy, gc);
@@ -154 +154 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(0,0,0,0);
+        gc.insets = new Insets(0, 0, 0, 0);
         JLabel lblTheir = new JLabel(tr("Their version (server dataset)"));
         add(lblTheir, gc);
@@ -429 +429 @@
     public void deletePrimitive(boolean deleted) {
         // Use my entries, as it doesn't really matter
-        MergeDecisionType decision = deleted?MergeDecisionType.KEEP_MINE:MergeDecisionType.UNDECIDED;
-        for (int i=0; i<model.getRowCount(); i++) {
+        MergeDecisionType decision = deleted ? MergeDecisionType.KEEP_MINE : MergeDecisionType.UNDECIDED;
+        for (int i = 0; i < model.getRowCount(); i++) {
             model.decide(i, decision);
         }

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

@@ -48 +48 @@
     @Override
     protected void renderValue(TagMergeItem item, boolean isSelected) {
-        setBackgroundColor(item,isSelected);
+        setBackgroundColor(item, isSelected);
         setTextColor(item);
         if (item.getTheirTagValue() == null) {