Changeset 32905 in osm for applications/editors/josm/plugins/reverter

Timestamp:

2016-09-03T16:16:04+02:00 (8 years ago)

Author:

donvip

Message:

checkstyle

Location:

applications/editors/josm/plugins/reverter

Files:

• .checkstyle (added)
• .project (modified) (1 diff)
• .settings/org.eclipse.jdt.ui.prefs (added)
• src/reverter/ChangesetIdQuery.java (modified) (11 diffs)
• src/reverter/ChangesetIdsTextField.java (modified) (2 diffs)
• src/reverter/ChangesetReverter.java (modified) (20 diffs)
• src/reverter/DataSetCommandMerger.java (modified) (9 diffs)
• src/reverter/MultiOsmReader.java (modified) (2 diffs)
• src/reverter/ObjectsHistoryAction.java (modified) (3 diffs)
• src/reverter/ObjectsHistoryDialog.java (modified) (2 diffs)
• src/reverter/OsmServerMultiObjectReader.java (modified) (3 diffs)
• src/reverter/RevertChangesetAction.java (modified) (3 diffs)
• src/reverter/RevertChangesetCommand.java (modified) (1 diff)
• src/reverter/RevertChangesetHandler.java (modified) (4 diffs)
• src/reverter/RevertChangesetTask.java (modified) (4 diffs)
• src/reverter/RevertRedactedChangesetException.java (modified) (1 diff)
• src/reverter/ReverterPlugin.java (modified) (1 diff)
• src/reverter/ReverterUploadHook.java (modified) (2 diffs)
• src/reverter/corehacks/ChangesetDataSet.java (modified) (13 diffs)
• src/reverter/corehacks/OsmChangesetContentParser.java (modified) (15 diffs)
• src/reverter/corehacks/OsmServerChangesetReader.java (modified) (9 diffs)

applications/editors/josm/plugins/reverter/.project

@@ -17 +17 @@
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>
                 <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
         </natures>
 </projectDescription>

applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -42 +43 @@
     private final JRadioButton rbSelectionUndelete = new JRadioButton(tr("Revert selection and restore deleted objects"));
     private final JCheckBox cbNewLayer = new JCheckBox(tr("Download as new layer"));
-    
+
     public Collection<Integer> getIdsInReverseOrder() {
         return tcid.getIdsInReverseOrder();
     }
-    
+
     /**
      * Replies true if the user requires to download into a new layer
@@ -64 +65 @@
 
     public ChangesetIdQuery() {
-        super(Main.parent, tr("Revert changeset"), new String[] {tr("Revert"),tr("Cancel")}, true);
-        contentInsets = new Insets(10,10,10,5);
-        
+        super(Main.parent, tr("Revert changeset"), new String[] {tr("Revert"), tr("Cancel")}, true);
+        contentInsets = new Insets(10, 10, 10, 5);
+
         panel.add(new JLabel(tr("Changeset id:")));
 
@@ -80 +81 @@
         // forward the enter key stroke to the revert button
         tcid.getKeymap().removeKeyStrokeBinding(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false));
-        
+
         panel.add(cbId, GBC.eol().fill(GBC.HORIZONTAL));
 
@@ -88 +89 @@
 
         rbFull.setSelected(true);
-        panel.add(rbFull, GBC.eol().insets(0,10,0,0).fill(GBC.HORIZONTAL));
+        panel.add(rbFull, GBC.eol().insets(0, 10, 0, 0).fill(GBC.HORIZONTAL));
         panel.add(rbSelection, GBC.eol().fill(GBC.HORIZONTAL));
         panel.add(rbSelectionUndelete, GBC.eol().fill(GBC.HORIZONTAL));
@@ -102 +103 @@
         setButtonIcons(new String[] {"ok.png", "cancel.png" });
         setDefaultButton(1);
-        
+
         addWindowListener(new InternalWindowListener());
         super.setupDialog();
-        
+
         final DataSet ds = Main.getLayerManager().getEditDataSet();
-        
+
         // Disables "Download in new layer" choice if there is no current data set (i.e no data layer)
         if (ds == null) {
@@ -118 +119 @@
             rbSelectionUndelete.setEnabled(false);
         }
-        
+
         // Enables/disables the Revert button when a changeset id is correctly set or not
         tcid.getDocument().addDocumentListener(new DocumentListener() {
-            @Override public void removeUpdate(DocumentEvent e) { idChanged(); }
-            @Override public void insertUpdate(DocumentEvent e) { idChanged(); }
-            @Override public void changedUpdate(DocumentEvent e) { idChanged(); }
+            @Override public void removeUpdate(DocumentEvent e) {
+                idChanged();
+            }
+
+            @Override public void insertUpdate(DocumentEvent e) {
+                idChanged();
+            }
+
+            @Override public void changedUpdate(DocumentEvent e) {
+                idChanged();
+            }
+
             private void idChanged() {
                 if (tcid.hasFocus()) {
@@ -130 +140 @@
             }
         });
-        
-        if (Main.pref.getBoolean("downloadchangeset.autopaste", true)) { 
+
+        if (Main.pref.getBoolean("downloadchangeset.autopaste", true)) {
             tcid.tryToPasteFromClipboard();
         }
-        
+
         // Initially sets the revert button consistent with text id field contents
         buttons.get(0).setEnabled(tcid.readIds());
@@ -142 +152 @@
      * Restore the current history from the preferences
      *
-     * @param cbHistory
+     * @param cbHistory history combobox
      */
     protected void restoreChangesetsHistory(HistoryComboBox cbHistory) {
-        List<String> cmtHistory = new LinkedList<>(Main.pref.getCollection(getClass().getName() + ".changesetsHistory", new LinkedList<String>()));
+        List<String> cmtHistory = new LinkedList<>(
+                Main.pref.getCollection(getClass().getName() + ".changesetsHistory", new LinkedList<String>()));
         // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
         Collections.reverse(cmtHistory);
         cbHistory.setPossibleItems(cmtHistory);
     }
-    
+
     /**
      * Remind the current history in the preferences
-     * @param cbHistory
+     * @param cbHistory history combobox
      */
     protected void remindChangesetsHistory(HistoryComboBox cbHistory) {
@@ -159 +170 @@
         Main.pref.putCollection(getClass().getName() + ".changesetsHistory", cbHistory.getHistory());
     }
-    
+
     private class InternalWindowListener implements WindowListener {
         @Override public void windowClosed(WindowEvent e) {
@@ -169 +180 @@
             }
         }
-    
+
         @Override public void windowOpened(WindowEvent e) {}
+
         @Override public void windowClosing(WindowEvent e) {}
+
         @Override public void windowIconified(WindowEvent e) {}
+
         @Override public void windowDeiconified(WindowEvent e) {}
+
         @Override public void windowActivated(WindowEvent e) {}
+
         @Override public void windowDeactivated(WindowEvent e) {}
     }

applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdsTextField.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -40 +41 @@
             try {
                 final StringTokenizer tokenizer = new StringTokenizer(value, ",.+/ \t\n");
-                while(tokenizer.hasMoreTokens()) {
+                while (tokenizer.hasMoreTokens()) {
                     ids.add(Integer.parseInt(tokenizer.nextToken().trim()));
                 }

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -50 +51 @@
 public class ChangesetReverter {
 
-    public static enum RevertType {
+    public enum RevertType {
         FULL,
         SELECTION,
         SELECTION_WITH_UNDELETE
     }
-    
+
     public static final Collection<Long> MODERATOR_REDACTION_ACCOUNTS = Collections.unmodifiableCollection(Arrays.asList(
             722137L, // OSMF Redaction Account
@@ -64 +65 @@
     public final Changeset changeset;
     public final RevertType revertType;
-    
+
     private final OsmDataLayer layer; // data layer associated with reverter
     private final DataSet ds; // DataSet associated with reverter
@@ -84 +85 @@
         }
     }
+
     private void addMissingHistoryIds(Iterable<HistoryOsmPrimitive> primitives) {
         for (HistoryOsmPrimitive p : primitives) {
             addIfMissing(p.getPrimitiveId());
             if (p.getType() == OsmPrimitiveType.WAY) {
-                for (long nd : ((HistoryWay)p).getNodes()) {
-                    addIfMissing(new SimplePrimitiveId(nd,OsmPrimitiveType.NODE));
+                for (long nd : ((HistoryWay) p).getNodes()) {
+                    addIfMissing(new SimplePrimitiveId(nd, OsmPrimitiveType.NODE));
                 }
             }
@@ -99 +101 @@
             addIfMissing(p);
             if (p.getType() == OsmPrimitiveType.WAY) {
-                for (Node nd : ((Way)p).getNodes()) {
+                for (Node nd : ((Way) p).getNodes()) {
                     addIfMissing(nd);
                 }
@@ -124 +126 @@
     /**
      * creates a reverter for specific changeset and fetches initial data
-     * @param changesetId
-     * @param monitor
-     * @throws OsmTransferException
-     * @throws RevertRedactedChangesetException 
+     * @param changesetId changeset id
+     * @param monitor progress monitor
+     * @throws OsmTransferException if data transfer errors occur
+     * @throws RevertRedactedChangesetException if a redacted changeset is requested
      */
     public ChangesetReverter(int changesetId, RevertType revertType, boolean newLayer, ProgressMonitor monitor)
@@ -162 +164 @@
 
         // Build our own lists of created/updated/modified objects for better performance
-        for (Iterator<ChangesetDataSetEntry> it = cds.iterator();it.hasNext();) {
+        for (Iterator<ChangesetDataSetEntry> it = cds.iterator(); it.hasNext();) {
             ChangesetDataSetEntry entry = it.next();
             if (!checkOsmChangeEntry(entry)) continue;
@@ -174 +176 @@
         }
     }
+
     public void checkMissingCreated() {
         addMissingHistoryIds(created);
     }
+
     public void checkMissingUpdated() {
         addMissingHistoryIds(updated);
     }
+
     public void checkMissingDeleted() {
         addMissingHistoryIds(deleted);
     }
-    
-    private void readObjectVersion(OsmServerMultiObjectReader rdr, PrimitiveId id, int version, ProgressMonitor progressMonitor) throws OsmTransferException {
+
+    private void readObjectVersion(OsmServerMultiObjectReader rdr, PrimitiveId id, int version, ProgressMonitor progressMonitor)
+            throws OsmTransferException {
         boolean readOK = false;
         while (!readOK && version >= 1) {
@@ -209 +215 @@
     /**
      * fetch objects that were updated or deleted by changeset
-     * @param progressMonitor
-     * @throws OsmTransferException
+     * @param progressMonitor progress monitor
+     * @throws OsmTransferException if data transfer errors occur
      */
     @SuppressWarnings("unchecked")
@@ -216 +222 @@
         final OsmServerMultiObjectReader rdr = new OsmServerMultiObjectReader();
 
-        progressMonitor.beginTask(tr("Downloading objects history"),updated.size()+deleted.size()+1);
+        progressMonitor.beginTask(tr("Downloading objects history"), updated.size()+deleted.size()+1);
         try {
             for (HashSet<HistoryOsmPrimitive> collection : Arrays.asList(new HashSet[]{updated, deleted})) {
@@ -280 +286 @@
         switch (p.getType()) {
         case NODE:
-            return new Conflict<>((Node)p,new Node((Node)p), isMyDeleted);
+            return new Conflict<>((Node) p, new Node((Node) p), isMyDeleted);
         case CLOSEDWAY:
         case WAY:
-            return new Conflict<>((Way)p,new Way((Way)p), isMyDeleted);
+            return new Conflict<>((Way) p, new Way((Way) p), isMyDeleted);
         case MULTIPOLYGON:
         case RELATION:
-            return new Conflict<>((Relation)p,new Relation((Relation)p), isMyDeleted);
+            return new Conflict<>((Relation) p, new Relation((Relation) p), isMyDeleted);
         default: throw new AssertionError();
         }
     }
 
-    private boolean hasEqualSemanticAttributes(OsmPrimitive current,HistoryOsmPrimitive history) {
+    private boolean hasEqualSemanticAttributes(OsmPrimitive current, HistoryOsmPrimitive history) {
         if (!current.getKeys().equals(history.getTags())) return false;
         switch (current.getType()) {
         case NODE:
-            LatLon currentCoor = ((Node)current).getCoor();
-            LatLon historyCoor = ((HistoryNode)history).getCoords();
+            LatLon currentCoor = ((Node) current).getCoor();
+            LatLon historyCoor = ((HistoryNode) history).getCoords();
             if (currentCoor == historyCoor || (currentCoor != null && historyCoor != null && currentCoor.equals(historyCoor)))
                 return true;
             // Handle case where a deleted note has been restored to avoid false conflicts (fix #josm8660)
             if (currentCoor != null && historyCoor == null) {
-                LatLon previousCoor = ((Node)nds.getPrimitiveById(history.getPrimitiveId())).getCoor();
+                LatLon previousCoor = ((Node) nds.getPrimitiveById(history.getPrimitiveId())).getCoor();
                 return previousCoor != null && previousCoor.equals(currentCoor);
             }
-            return false; 
+            return false;
         case CLOSEDWAY:
         case WAY:
-            List<Node> currentNodes = ((Way)current).getNodes();
-            List<Long> historyNodes = ((HistoryWay)history).getNodes();
+            List<Node> currentNodes = ((Way) current).getNodes();
+            List<Long> historyNodes = ((HistoryWay) history).getNodes();
             if (currentNodes.size() != historyNodes.size()) return false;
             for (int i = 0; i < currentNodes.size(); i++) {
@@ -317 +323 @@
         case RELATION:
             List<org.openstreetmap.josm.data.osm.RelationMember> currentMembers =
-                ((Relation)current).getMembers();
-            List<RelationMemberData> historyMembers = ((HistoryRelation)history).getMembers();
+                ((Relation) current).getMembers();
+            List<RelationMemberData> historyMembers = ((HistoryRelation) history).getMembers();
             if (currentMembers.size() != historyMembers.size()) return false;
             for (int i = 0; i < currentMembers.size(); i++) {
@@ -326 +332 @@
                 if (!currentMember.getRole().equals(historyMember.getRole())) return false;
                 if (!currentMember.getMember().getPrimitiveId().equals(new SimplePrimitiveId(
-                        historyMember.getMemberId(),historyMember.getMemberType()))) return false;
+                        historyMember.getMemberId(), historyMember.getMemberType()))) return false;
             }
             return true;
@@ -342 +348 @@
         //////////////////////////////////////////////////////////////////////////
         // Create commands to restore/update all affected objects
-        DataSetCommandMerger merger = new DataSetCommandMerger(nds,ds);
+        DataSetCommandMerger merger = new DataSetCommandMerger(nds, ds);
         List<Command> cmds = merger.getCommandList();
 
@@ -368 +374 @@
 
         for (Conflict<? extends OsmPrimitive> conflict : merger.getConflicts()) {
-            cmds.add(new ConflictAddCommand(layer,conflict));
+            cmds.add(new ConflictAddCommand(layer, conflict));
         }
 
         // Check objects versions
-        for (Iterator<ChangesetDataSetEntry> it = cds.iterator();it.hasNext();) {
+        for (Iterator<ChangesetDataSetEntry> it = cds.iterator(); it.hasNext();) {
             ChangesetDataSetEntry entry = it.next();
             if (!checkOsmChangeEntry(entry)) continue;
@@ -385 +391 @@
                     /* Don't create conflict if changeset object and dataset object
                      * has same semantic attributes (but different versions) */
-                    !hasEqualSemanticAttributes(dp,hp)
+                    !hasEqualSemanticAttributes(dp, hp)
                     /* Don't create conflict if the object has to be deleted but has already been deleted */
                     && !(toDelete.contains(dp) && dp.isDeleted())) {
-                cmds.add(new ConflictAddCommand(layer,CreateConflict(dp,
+                cmds.add(new ConflictAddCommand(layer, CreateConflict(dp,
                         entry.getModificationType() == ChangesetModificationType.CREATED)));
                 conflicted.add(dp);
@@ -410 +416 @@
                                */
                 if (!conflicted.contains(p)) {
-                    cmds.add(new ConflictAddCommand(layer,CreateConflict(p, true)));
+                    cmds.add(new ConflictAddCommand(layer, CreateConflict(p, true)));
                     conflicted.add(p);
                 }
@@ -428 +434 @@
         return cmds;
     }
-    
+
     public boolean hasMissingObjects() {
         return !missing.isEmpty();
     }
-    
+
     public void fixNodesWithoutCoordinates(ProgressMonitor progressMonitor) throws OsmTransferException {
         for (Node n : nds.getNodes()) {
@@ -439 +445 @@
                 OsmPrimitive p = ds.getPrimitiveById(id);
                 if (p instanceof Node && p.getVersion() > 1) {
-                    LatLon coor = ((Node)p).getCoor();
+                    LatLon coor = ((Node) p).getCoor();
                     if (coor == null) {
                         final OsmServerMultiObjectReader rdr = new OsmServerMultiObjectReader();
@@ -445 +451 @@
                         Collection<OsmPrimitive> result = rdr.parseOsm(progressMonitor.createSubTaskMonitor(1, true)).allPrimitives();
                         if (!result.isEmpty()) {
-                            coor = ((Node)result.iterator().next()).getCoor();
+                            coor = ((Node) result.iterator().next()).getCoor();
                         }
                     }

applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -40 +41 @@
      * constructor
      */
-    public DataSetCommandMerger(DataSet sourceDataSet, DataSet targetDataSet) {
+    DataSetCommandMerger(DataSet sourceDataSet, DataSet targetDataSet) {
         this.sourceDataSet = sourceDataSet;
         this.targetDataSet = targetDataSet;
         merge();
     }
-    
+
     private void addChangeCommandIfNotEquals(OsmPrimitive target, OsmPrimitive newTarget, boolean nominal) {
         if (!target.hasEqualSemanticAttributes(newTarget)) {
-            cmds.add(new ChangeCommand(target,newTarget));
+            cmds.add(new ChangeCommand(target, newTarget));
             if (nominal) {
                 nominalRevertedPrimitives.add(target);
@@ -66 +67 @@
     private void mergePrimitive(OsmPrimitive source, OsmPrimitive target, OsmPrimitive newTarget) {
         newTarget.mergeFrom(source);
-        newTarget.setOsmId(target.getId(), (int)target.getVersion());
+        newTarget.setOsmId(target.getId(), target.getVersion());
         newTarget.setVisible(target.isVisible());
         newTarget.setDeleted(false);
@@ -79 +80 @@
         if (source.isIncomplete()) return;
         if (!source.isVisible()) return;
-        Node target = (Node)getMergeTarget(source);
+        Node target = (Node) getMergeTarget(source);
 
         Node newTarget = new Node(target);
         mergePrimitive(source, target, newTarget);
-        addChangeCommandIfNotEquals(target,newTarget,true);
+        addChangeCommandIfNotEquals(target, newTarget, true);
     }
 
@@ -97 +98 @@
         if (source.isIncomplete()) return;
         if (!source.isVisible()) return;
-        Way target = (Way)getMergeTarget(source);
+        Way target = (Way) getMergeTarget(source);
 
         // use a set to avoid conflicts being added twice for closed ways, fixes #11811
@@ -104 +105 @@
         List<Node> newNodes = new ArrayList<>(source.getNodesCount());
         for (Node sourceNode : source.getNodes()) {
-            Node targetNode = (Node)getMergeTarget(sourceNode);
+            Node targetNode = (Node) getMergeTarget(sourceNode);
             // Target node is not deleted or it will be undeleted when running existing commands
             if (!targetNode.isDeleted() || nominalRevertedPrimitives.contains(targetNode)) {
@@ -124 +125 @@
                 Main.warn("New conflict: "+c);
                 conflicts.add(c);
-                Node targetNode = (Node)c.getTheir();
+                Node targetNode = (Node) c.getTheir();
                 Node undeletedTargetNode = new Node(targetNode);
                 undeletedTargetNode.setDeleted(false);
-                addChangeCommandIfNotEquals(targetNode,undeletedTargetNode,false);
+                addChangeCommandIfNotEquals(targetNode, undeletedTargetNode, false);
             }
-            addChangeCommandIfNotEquals(target,newTarget,true);
+            addChangeCommandIfNotEquals(target, newTarget, true);
         }
     }
@@ -152 +153 @@
                 OsmPrimitive undeletedTargetMember;
                 switch(targetMember.getType()) {
-                case NODE: undeletedTargetMember = new Node((Node)targetMember); break;
-                case WAY: undeletedTargetMember = new Way((Way)targetMember); break;
-                case RELATION: undeletedTargetMember = new Relation((Relation)targetMember); break;
+                case NODE: undeletedTargetMember = new Node((Node) targetMember); break;
+                case WAY: undeletedTargetMember = new Way((Way) targetMember); break;
+                case RELATION: undeletedTargetMember = new Relation((Relation) targetMember); break;
                 default: throw new AssertionError();
                 }
                 undeletedTargetMember.setDeleted(false);
-                addChangeCommandIfNotEquals(targetMember,undeletedTargetMember,false);
+                addChangeCommandIfNotEquals(targetMember, undeletedTargetMember, false);
             }
             newMembers.add(new RelationMember(sourceMember.getRole(), targetMember));
@@ -165 +166 @@
         mergePrimitive(source, target, newRelation);
         newRelation.setMembers(newMembers);
-        addChangeCommandIfNotEquals(target,newRelation,true);
+        addChangeCommandIfNotEquals(target, newRelation, true);
     }
-    
+
     private void merge() {
         for (Node node: sourceDataSet.getNodes()) {

applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -24 +25 @@
             setParser(parser);
             parse();
-        } catch(XMLStreamException e) {
+        } catch (XMLStreamException e) {
            throw new IllegalDataException(e);
-        } catch(Exception e) {
+        } catch (Exception e) {
             throw new IllegalDataException(e);
         }
     }
-    
+
     public void processData() throws IllegalDataException {
         prepareDataSet();

applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -13 +14 @@
 
     public ObjectsHistoryAction() {
-        super(tr("Objects history"),null,tr("History reverter"),
+        super(tr("Objects history"), null, tr("History reverter"),
             Shortcut.registerShortcut("tool:history",
                 tr("Tool: Display objects history dialog"),
@@ -20 +21 @@
         setEnabled(false);
     }
+
     @Override
     public void actionPerformed(ActionEvent arg0) {

applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryDialog.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -14 +15 @@
 public class ObjectsHistoryDialog extends ExtendedDialog {
     public ObjectsHistoryDialog() {
-        super(Main.parent, tr("Objects history"), new String[] {"Revert","Cancel"}, false);
-        contentInsets = new Insets(10,10,10,5);
+        super(Main.parent, tr("Objects history"), new String[] {"Revert", "Cancel"}, false);
+        contentInsets = new Insets(10, 10, 10, 5);
         setButtonIcons(new String[] {"ok.png", "cancel.png" });
         setContent(new JPanel(new GridBagLayout()));

applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -22 +23 @@
     }
 
-    public void readObject(long id,int version,OsmPrimitiveType type,ProgressMonitor progressMonitor) throws OsmTransferException {
+    public void readObject(long id, int version, OsmPrimitiveType type, ProgressMonitor progressMonitor) throws OsmTransferException {
         StringBuffer sb = new StringBuffer();
         sb.append(type.getAPIName());
@@ -38 +39 @@
         }
     }
+
     /**
      * Method to parse downloaded objects
      * @return the data requested
-     * @throws SAXException
-     * @throws IOException
+     * @throws SAXException in case of SAX error
+     * @throws IOException in case of I/O error
      */
     @Override

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -17 +18 @@
 
     public RevertChangesetAction() {
-        super(tr("Revert changeset"),"revert-changeset",tr("Revert changeset"),
+        super(tr("Revert changeset"), "revert-changeset", tr("Revert changeset"),
             Shortcut.registerShortcut("tool:revert",
                 tr("Tool: {0}", tr("Revert changeset")),
@@ -25 +26 @@
 
     @Override
-    public void actionPerformed(ActionEvent arg0)  {
+    public void actionPerformed(ActionEvent arg0) {
         final ChangesetIdQuery dlg = new ChangesetIdQuery();
         if (dlg.showDialog().getValue() != 1) return;

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetCommand.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
 import java.util.Collection;
+
 import javax.swing.Icon;
 

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetHandler.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -11 +12 @@
     public static final String permissionKey = "remotecontrol.permission.revert_changeset";
     public static final boolean permissionDefault = true;
-    
+
     private int changesetId;
 
@@ -17 +18 @@
     protected void handleRequest() throws RequestHandlerErrorException,
             RequestHandlerBadRequestException {
-        try
-        {
+        try {
             Main.worker.submit(new RevertChangesetTask(changesetId, ChangesetReverter.RevertType.FULL, true));
         } catch (Exception ex) {
@@ -25 +25 @@
             throw new RequestHandlerErrorException(ex);
         }
-
     }
 

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -17 +18 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.OsmTransferException;
+
 import reverter.ChangesetReverter.RevertType;
 
@@ -30 +32 @@
         this(changesetId, revertType, false);
     }
-    
+
     public RevertChangesetTask(int changesetId, RevertType revertType, boolean autoConfirmDownload) {
         this(changesetId, revertType, autoConfirmDownload, false);
     }
-    
+
     public RevertChangesetTask(int changesetId, RevertType revertType, boolean autoConfirmDownload, boolean newLayer) {
         super(tr("Reverting..."));
@@ -110 +112 @@
         List<Command> cmds = rev.getCommands();
         final Command cmd = new RevertChangesetCommand(tr(revertType == RevertType.FULL ? "Revert changeset #{0}" :
-                "Partially revert changeset #{0}",changesetId),cmds);
+                "Partially revert changeset #{0}", changesetId), cmds);
         int n = 0;
         for (Command c : cmds) {

applications/editors/josm/plugins/reverter/src/reverter/RevertRedactedChangesetException.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
 /**
- * Exception thrown if a changeset created by a modeartor redaction account is being reverted. 
+ * Exception thrown if a changeset created by a modeartor redaction account is being reverted.
  */
 @SuppressWarnings("serial")

applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 

applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package reverter;
 
@@ -11 +12 @@
         pluginString = "reverter_plugin/" + plugin.getPluginInformation().version;
     }
+
     @Override
     public boolean checkUpload(APIDataSet apiDataSet) {

applications/editors/josm/plugins/reverter/src/reverter/corehacks/ChangesetDataSet.java

@@ -6 +6 @@
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
-import java.util.Map.Entry;
 
 import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -18 +18 @@
 public class ChangesetDataSet {
 
-    public static enum ChangesetModificationType {
+    public enum ChangesetModificationType {
         CREATED,
         UPDATED,
@@ -24 +24 @@
     }
 
-    public static interface ChangesetDataSetEntry {
-        public ChangesetModificationType getModificationType();
-        public HistoryOsmPrimitive getPrimitive();
-        public int getEarliestVersion();
-    }
-
-    final private Map<PrimitiveId, Integer> earliestVersions = new HashMap<>();
-    final private Map<PrimitiveId, HistoryOsmPrimitive> primitives = new HashMap<>();
-    final private Map<PrimitiveId, ChangesetModificationType> modificationTypes = new HashMap<>();
+    public interface ChangesetDataSetEntry {
+        ChangesetModificationType getModificationType();
+
+        HistoryOsmPrimitive getPrimitive();
+
+        int getEarliestVersion();
+    }
+
+    private final Map<PrimitiveId, Integer> earliestVersions = new HashMap<>();
+    private final Map<PrimitiveId, HistoryOsmPrimitive> primitives = new HashMap<>();
+    private final Map<PrimitiveId, ChangesetModificationType> modificationTypes = new HashMap<>();
 
     /**
@@ -42 +44 @@
      * @throws IllegalArgumentException thrown if cmt is null
      */
-    public void put(HistoryOsmPrimitive primitive, ChangesetModificationType cmt) throws IllegalArgumentException{
-        CheckParameterUtil.ensureParameterNotNull(primitive,"primitive");
-        CheckParameterUtil.ensureParameterNotNull(cmt,"cmt");
+    public void put(HistoryOsmPrimitive primitive, ChangesetModificationType cmt) throws IllegalArgumentException {
+        CheckParameterUtil.ensureParameterNotNull(primitive, "primitive");
+        CheckParameterUtil.ensureParameterNotNull(cmt, "cmt");
         PrimitiveId pid = primitive.getPrimitiveId();
         if (primitives.containsKey(pid)) {
@@ -51 +53 @@
                 Integer earliest = earliestVersions.get(pid);
                 if (earliest == null || primitive.getVersion() < earliest) {
-                    earliestVersions.put(pid, (int)primitive.getVersion());
+                    earliestVersions.put(pid, (int) primitive.getVersion());
                     if (cmt == ChangesetModificationType.CREATED)
                         modificationTypes.put(pid, cmt);
@@ -61 +63 @@
                 }
                 if (earliestVersions.get(pid) == null) {
-                    earliestVersions.put(pid, (int)primitives.get(pid).getVersion());
+                    earliestVersions.put(pid, (int) primitives.get(pid).getVersion());
                 }
             }
@@ -93 +95 @@
     public int getEarliestVersion(PrimitiveId id) {
         Integer earliestVersion = earliestVersions.get(id);
-        if (earliestVersion == null) earliestVersion = (int)primitives.get(id).getVersion();
+        if (earliestVersion == null) earliestVersion = (int) primitives.get(id).getVersion();
         return earliestVersion;
     }
@@ -144 +146 @@
      */
     public Set<HistoryOsmPrimitive> getPrimitivesByModificationType(ChangesetModificationType cmt) throws IllegalArgumentException {
-        CheckParameterUtil.ensureParameterNotNull(cmt,"cmt");
+        CheckParameterUtil.ensureParameterNotNull(cmt, "cmt");
         HashSet<HistoryOsmPrimitive> ret = new HashSet<>();
         for (Entry<PrimitiveId, ChangesetModificationType> entry: modificationTypes.entrySet()) {
@@ -172 +174 @@
      */
     public HistoryOsmPrimitive getPrimitive(PrimitiveId id) {
-        if (id == null)  return null;
+        if (id == null) return null;
         return primitives.get(id);
     }
@@ -185 +187 @@
         private final int earliestVersion;
 
-        public DefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive, int earliestVersion) {
+        DefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive, int earliestVersion) {
             this.modificationType = modificationType;
             this.primitive = primitive;
@@ -191 +193 @@
         }
 
+        @Override
         public ChangesetModificationType getModificationType() {
             return modificationType;
         }
 
+        @Override
         public HistoryOsmPrimitive getPrimitive() {
             return primitive;
         }
 
+        @Override
         public int getEarliestVersion() {
             return earliestVersion;
@@ -207 +212 @@
         private final Iterator<Entry<PrimitiveId, ChangesetModificationType>> typeIterator;
 
-        public DefaultIterator() {
+        DefaultIterator() {
             typeIterator = modificationTypes.entrySet().iterator();
         }
 
+        @Override
         public boolean hasNext() {
             return typeIterator.hasNext();
         }
 
+        @Override
         public ChangesetDataSetEntry next() {
             Entry<PrimitiveId, ChangesetModificationType> next = typeIterator.next();
@@ -220 +227 @@
             HistoryOsmPrimitive primitive = primitives.get(next.getKey());
             Integer earliestVersion = earliestVersions.get(next.getKey());
-            if (earliestVersion == null) earliestVersion = (int)primitive.getVersion();
+            if (earliestVersion == null) earliestVersion = (int) primitive.getVersion();
             return new DefaultChangesetDataSetEntry(type, primitive, earliestVersion);
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();

applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
 package reverter.corehacks;
 
@@ -25 +25 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.XmlParsingException;
 import org.openstreetmap.josm.tools.date.DateUtils;
-import org.openstreetmap.josm.tools.XmlParsingException;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -79 +79 @@
             try {
                 l = Long.parseLong(v);
-            } catch(NumberFormatException e) {
+            } catch (NumberFormatException e) {
                 throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
             }
@@ -104 +104 @@
         }
 */
-        protected Double getAttributeDouble(Attributes attr, String name) throws SAXException{
+
+        protected Double getAttributeDouble(Attributes attr, String name) throws SAXException {
             String v = attr.getValue(name);
             if (v == null) {
@@ -112 +113 @@
             try {
                 d = Double.parseDouble(v);
-            } catch(NumberFormatException e) {
+            } catch (NumberFormatException e) {
                 throwException(tr("Illegal value for attribute ''{0}'' of type double. Got ''{1}''.", name, v));
             }
@@ -118 +119 @@
         }
 
-        protected String getMandatoryAttributeString(Attributes attr, String name) throws SAXException{
+        protected String getMandatoryAttributeString(Attributes attr, String name) throws SAXException {
             String v = attr.getValue(name);
             if (v == null) {
@@ -133 +134 @@
         }
 */
-        protected boolean getMandatoryAttributeBoolean(Attributes attr, String name) throws SAXException{
+
+        protected boolean getMandatoryAttributeBoolean(Attributes attr, String name) throws SAXException {
             String v = attr.getValue(name);
             if (v == null) {
@@ -145 +147 @@
         }
 
-        protected  HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
-            long id = getMandatoryAttributeLong(atts,"id");
-            long version = getMandatoryAttributeLong(atts,"version");
-            long changesetId = getMandatoryAttributeLong(atts,"changeset");
-            boolean visible= getMandatoryAttributeBoolean(atts, "visible");
+        protected HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
+            long id = getMandatoryAttributeLong(atts, "id");
+            long version = getMandatoryAttributeLong(atts, "version");
+            long changesetId = getMandatoryAttributeLong(atts, "changeset");
+            boolean visible = getMandatoryAttributeBoolean(atts, "visible");
             String v = getMandatoryAttributeString(atts, "timestamp");
             Date timestamp = DateUtils.fromString(v);
@@ -158 +160 @@
                 Double lat = getAttributeDouble(atts, "lat");
                 Double lon = getAttributeDouble(atts, "lon");
-                LatLon coor = (lat != null && lon != null) ? new LatLon(lat,lon) : null;
+                LatLon coor = (lat != null && lon != null) ? new LatLon(lat, lon) : null;
                 primitive = new HistoryNode(
-                        id,version,visible,User.getAnonymous(),changesetId,timestamp, coor
+                        id, version, visible, User.getAnonymous(), changesetId, timestamp, coor
                 );
 
             } else if (type.equals(OsmPrimitiveType.WAY)) {
                 primitive = new HistoryWay(
-                        id,version,visible,User.getAnonymous(),changesetId,timestamp
+                        id, version, visible, User.getAnonymous(), changesetId, timestamp
                 );
-            }if (type.equals(OsmPrimitiveType.RELATION)) {
+            } else if (type.equals(OsmPrimitiveType.RELATION)) {
                 primitive = new HistoryRelation(
-                        id,version,visible,User.getAnonymous(),changesetId,timestamp
+                        id, version, visible, User.getAnonymous(), changesetId, timestamp
                 );
             }
@@ -176 +178 @@
 
         protected void startNode(Attributes atts) throws SAXException {
-            currentPrimitive= createPrimitive(atts, OsmPrimitiveType.NODE);
+            currentPrimitive = createPrimitive(atts, OsmPrimitiveType.NODE);
         }
 
         protected void startWay(Attributes atts) throws SAXException {
-            currentPrimitive= createPrimitive(atts, OsmPrimitiveType.WAY);
-        }
+            currentPrimitive = createPrimitive(atts, OsmPrimitiveType.WAY);
+        }
+
         protected void startRelation(Attributes atts) throws SAXException {
-            currentPrimitive= createPrimitive(atts, OsmPrimitiveType.RELATION);
+            currentPrimitive = createPrimitive(atts, OsmPrimitiveType.RELATION);
         }
 
         protected void handleTag(Attributes atts) throws SAXException {
-            String key= getMandatoryAttributeString(atts, "k");
-            String value= getMandatoryAttributeString(atts, "v");
-            currentPrimitive.put(key,value);
+            String key = getMandatoryAttributeString(atts, "k");
+            String value = getMandatoryAttributeString(atts, "v");
+            currentPrimitive.put(key, value);
         }
 
         protected void handleNodeReference(Attributes atts) throws SAXException {
             long ref = getMandatoryAttributeLong(atts, "ref");
-            ((HistoryWay)currentPrimitive).addNode(ref);
+            ((HistoryWay) currentPrimitive).addNode(ref);
         }
 
@@ -203 +206 @@
             try {
                 type = OsmPrimitiveType.fromApiTypeName(v);
-            } catch(IllegalArgumentException e) {
+            } catch (IllegalArgumentException e) {
                 throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''.", "type", v));
             }
             String role = getMandatoryAttributeString(atts, "role");
-            RelationMemberData member = new RelationMemberData(role, type,ref);
-            ((HistoryRelation)currentPrimitive).addMember(member);
+            RelationMemberData member = new RelationMemberData(role, type, ref);
+            ((HistoryRelation) currentPrimitive).addMember(member);
         }
 
@@ -233 +236 @@
                 currentModificationType = ChangesetModificationType.DELETED;
             } else {
-                System.err.println(tr("Warning: unsupported start element ''{0}'' in changeset content at position ({1},{2}). Skipping.", qName, locator.getLineNumber(), locator.getColumnNumber()));
+                System.err.println(tr("Warning: unsupported start element ''{0}'' in changeset content at position ({1},{2}). Skipping.",
+                        qName, locator.getLineNumber(), locator.getColumnNumber()));
             }
         }
@@ -243 +247 @@
                     || qName.equals("relation")) {
                 if (currentModificationType == null) {
-                    throwException(tr("Illegal document structure. Found node, way, or relation outside of ''create'', ''modify'', or ''delete''."));
+                    throwException(
+                            tr("Illegal document structure. Found node, way, or relation outside of ''create'', ''modify'', or ''delete''."));
                 }
                 data.put(currentPrimitive, currentModificationType);
@@ -261 +266 @@
                 // do nothing
             } else {
-                System.err.println(tr("Warning: unsupported end element ''{0}'' in changeset content at position ({1},{2}). Skipping.", qName, locator.getLineNumber(), locator.getColumnNumber()));
+                System.err.println(tr("Warning: unsupported end element ''{0}'' in changeset content at position ({1},{2}). Skipping.",
+                        qName, locator.getLineNumber(), locator.getColumnNumber()));
             }
         }
@@ -310 +316 @@
             progressMonitor.indeterminateSubTask(tr("Parsing changeset content ..."));
             SAXParserFactory.newInstance().newSAXParser().parse(source, new Parser());
-        } catch(XmlParsingException e){
+        } catch (XmlParsingException e) {
             throw e;
         } catch (ParserConfigurationException e) {
             throw new XmlParsingException(e);
-        } catch(SAXException e) {
+        } catch (SAXException e) {
             throw new XmlParsingException(e);
-        } catch(IOException e) {
+        } catch (IOException e) {
             throw new XmlParsingException(e);
         } finally {

applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java

@@ -36 +36 @@
      *
      */
-    public OsmServerChangesetReader(){
+    public OsmServerChangesetReader() {
         setDoAuthenticate(false);
     }
@@ -71 +71 @@
             monitor.indeterminateSubTask(tr("Downloading changesets ..."));
             return OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
-        } catch(OsmTransferException e) {
+        } catch (OsmTransferException e) {
             throw e;
-        } catch(IllegalDataException e) {
+        } catch (IllegalDataException e) {
             throw new OsmTransferException(e);
         } finally {
@@ -96 +96 @@
         }
         try {
-            monitor.beginTask(tr("Reading changeset {0} ...",id));
+            monitor.beginTask(tr("Reading changeset {0} ...", id));
             StringBuffer sb = new StringBuffer();
             sb.append("changeset/").append(id);
@@ -107 +107 @@
                 return null;
             return changesets.get(0);
-        } catch(OsmTransferException e) {
+        } catch (OsmTransferException e) {
             throw e;
-        } catch(IllegalDataException e) {
+        } catch (IllegalDataException e) {
             throw new OsmTransferException(e);
         } finally {
@@ -132 +132 @@
         }
         try {
-            monitor.beginTask(trn("Downloading {0} changeset ...", "Downloading {0} changesets ...",ids.size(),ids.size()));
+            monitor.beginTask(trn("Downloading {0} changeset ...", "Downloading {0} changesets ...", ids.size(), ids.size()));
             monitor.setTicksCount(ids.size());
             List<Changeset> ret = new ArrayList<>();
-            int i=0;
-            for (Iterator<Integer> it = ids.iterator(); it.hasNext(); ) {
+            int i = 0;
+            for (Iterator<Integer> it = ids.iterator(); it.hasNext();) {
                 int id = it.next();
                 if (id <= 0) {
@@ -147 +147 @@
                 if (in == null)
                     return null;
-                monitor.indeterminateSubTask(tr("({0}/{1}) Downloading changeset {2} ...", i,ids.size(), id));
+                monitor.indeterminateSubTask(tr("({0}/{1}) Downloading changeset {2} ...", i, ids.size(), id));
                 List<Changeset> changesets = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
                 if (changesets == null || changesets.isEmpty()) {
@@ -156 +156 @@
             }
             return ret;
-        } catch(OsmTransferException e) {
+        } catch (OsmTransferException e) {
             throw e;
-        } catch(IllegalDataException e) {
+        } catch (IllegalDataException e) {
             throw new OsmTransferException(e);
         } finally {
@@ -176 +176 @@
     public ChangesetDataSet downloadChangeset(int id, ProgressMonitor monitor) throws IllegalArgumentException, OsmTransferException {
         if (id <= 0)
-            throw new IllegalArgumentException(MessageFormat.format("Expected value of type integer > 0 for parameter ''{0}'', got {1}", "id", id));
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Expected value of type integer > 0 for parameter ''{0}'', got {1}", "id", id));
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -191 +192 @@
             ChangesetDataSet ds = parser.parse(monitor.createSubTaskMonitor(1, true));
             return ds;
-        } catch(UnsupportedEncodingException e) {
-            throw new OsmTransferException(e);
-        } catch(XmlParsingException e) {
+        } catch (UnsupportedEncodingException e) {
+            throw new OsmTransferException(e);
+        } catch (XmlParsingException e) {
             throw new OsmTransferException(e);
         } finally {