Index: applications/editors/josm/plugins/reverter/.checkstyle =================================================================== --- applications/editors/josm/plugins/reverter/.checkstyle (revision 32905) +++ applications/editors/josm/plugins/reverter/.checkstyle (revision 32905) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/reverter/.project =================================================================== --- applications/editors/josm/plugins/reverter/.project (revision 32904) +++ applications/editors/josm/plugins/reverter/.project (revision 32905) @@ -17,7 +17,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: applications/editors/josm/plugins/reverter/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- applications/editors/josm/plugins/reverter/.settings/org.eclipse.jdt.ui.prefs (revision 32905) +++ applications/editors/josm/plugins/reverter/.settings/org.eclipse.jdt.ui.prefs (revision 32905) @@ -0,0 +1,59 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true Index: applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -42,9 +43,9 @@ 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 getIdsInReverseOrder() { return tcid.getIdsInReverseOrder(); } - + /** * Replies true if the user requires to download into a new layer @@ -64,7 +65,7 @@ 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,5 +81,5 @@ // 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,5 +89,5 @@ 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,10 +103,10 @@ 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,10 +119,19 @@ 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,9 +140,9 @@ } }); - - 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,16 +152,17 @@ * Restore the current history from the preferences * - * @param cbHistory + * @param cbHistory history combobox */ protected void restoreChangesetsHistory(HistoryComboBox cbHistory) { - List cmtHistory = new LinkedList<>(Main.pref.getCollection(getClass().getName() + ".changesetsHistory", new LinkedList())); + List cmtHistory = new LinkedList<>( + Main.pref.getCollection(getClass().getName() + ".changesetsHistory", new LinkedList())); // 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,5 +170,5 @@ Main.pref.putCollection(getClass().getName() + ".changesetsHistory", cbHistory.getHistory()); } - + private class InternalWindowListener implements WindowListener { @Override public void windowClosed(WindowEvent e) { @@ -169,10 +180,15 @@ } } - + @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) {} } Index: applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdsTextField.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdsTextField.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdsTextField.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -40,5 +41,5 @@ try { final StringTokenizer tokenizer = new StringTokenizer(value, ",.+/ \t\n"); - while(tokenizer.hasMoreTokens()) { + while (tokenizer.hasMoreTokens()) { ids.add(Integer.parseInt(tokenizer.nextToken().trim())); } Index: applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -50,10 +51,10 @@ public class ChangesetReverter { - public static enum RevertType { + public enum RevertType { FULL, SELECTION, SELECTION_WITH_UNDELETE } - + public static final Collection MODERATOR_REDACTION_ACCOUNTS = Collections.unmodifiableCollection(Arrays.asList( 722137L, // OSMF Redaction Account @@ -64,5 +65,5 @@ 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,10 +85,11 @@ } } + private void addMissingHistoryIds(Iterable 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,5 +101,5 @@ addIfMissing(p); if (p.getType() == OsmPrimitiveType.WAY) { - for (Node nd : ((Way)p).getNodes()) { + for (Node nd : ((Way) p).getNodes()) { addIfMissing(nd); } @@ -124,8 +126,8 @@ /** * 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,5 +164,5 @@ // Build our own lists of created/updated/modified objects for better performance - for (Iterator it = cds.iterator();it.hasNext();) { + for (Iterator it = cds.iterator(); it.hasNext();) { ChangesetDataSetEntry entry = it.next(); if (!checkOsmChangeEntry(entry)) continue; @@ -174,15 +176,19 @@ } } + 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,6 +215,6 @@ /** * 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,5 +222,5 @@ 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 collection : Arrays.asList(new HashSet[]{updated, deleted})) { @@ -280,33 +286,33 @@ 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 currentNodes = ((Way)current).getNodes(); - List historyNodes = ((HistoryWay)history).getNodes(); + List currentNodes = ((Way) current).getNodes(); + List historyNodes = ((HistoryWay) history).getNodes(); if (currentNodes.size() != historyNodes.size()) return false; for (int i = 0; i < currentNodes.size(); i++) { @@ -317,6 +323,6 @@ case RELATION: List currentMembers = - ((Relation)current).getMembers(); - List historyMembers = ((HistoryRelation)history).getMembers(); + ((Relation) current).getMembers(); + List historyMembers = ((HistoryRelation) history).getMembers(); if (currentMembers.size() != historyMembers.size()) return false; for (int i = 0; i < currentMembers.size(); i++) { @@ -326,5 +332,5 @@ 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,5 +348,5 @@ ////////////////////////////////////////////////////////////////////////// // Create commands to restore/update all affected objects - DataSetCommandMerger merger = new DataSetCommandMerger(nds,ds); + DataSetCommandMerger merger = new DataSetCommandMerger(nds, ds); List cmds = merger.getCommandList(); @@ -368,9 +374,9 @@ for (Conflict conflict : merger.getConflicts()) { - cmds.add(new ConflictAddCommand(layer,conflict)); + cmds.add(new ConflictAddCommand(layer, conflict)); } // Check objects versions - for (Iterator it = cds.iterator();it.hasNext();) { + for (Iterator it = cds.iterator(); it.hasNext();) { ChangesetDataSetEntry entry = it.next(); if (!checkOsmChangeEntry(entry)) continue; @@ -385,8 +391,8 @@ /* 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,5 +416,5 @@ */ if (!conflicted.contains(p)) { - cmds.add(new ConflictAddCommand(layer,CreateConflict(p, true))); + cmds.add(new ConflictAddCommand(layer, CreateConflict(p, true))); conflicted.add(p); } @@ -428,9 +434,9 @@ return cmds; } - + public boolean hasMissingObjects() { return !missing.isEmpty(); } - + public void fixNodesWithoutCoordinates(ProgressMonitor progressMonitor) throws OsmTransferException { for (Node n : nds.getNodes()) { @@ -439,5 +445,5 @@ 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,5 +451,5 @@ Collection result = rdr.parseOsm(progressMonitor.createSubTaskMonitor(1, true)).allPrimitives(); if (!result.isEmpty()) { - coor = ((Node)result.iterator().next()).getCoor(); + coor = ((Node) result.iterator().next()).getCoor(); } } Index: applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -40,13 +41,13 @@ * 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,5 +67,5 @@ 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,9 +80,9 @@ 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,5 +98,5 @@ 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,5 +105,5 @@ List 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,10 +125,10 @@ 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,11 +153,11 @@ 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,7 +166,7 @@ mergePrimitive(source, target, newRelation); newRelation.setMembers(newMembers); - addChangeCommandIfNotEquals(target,newRelation,true); + addChangeCommandIfNotEquals(target, newRelation, true); } - + private void merge() { for (Node node: sourceDataSet.getNodes()) { Index: applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -24,11 +25,11 @@ 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(); Index: applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -13,5 +14,5 @@ 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,4 +21,5 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { Index: applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryDialog.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryDialog.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryDialog.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -14,6 +15,6 @@ 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())); Index: applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -22,5 +23,5 @@ } - 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,9 +39,10 @@ } } + /** * 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 Index: applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -17,5 +18,5 @@ 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,5 +26,5 @@ @Override - public void actionPerformed(ActionEvent arg0) { + public void actionPerformed(ActionEvent arg0) { final ChangesetIdQuery dlg = new ChangesetIdQuery(); if (dlg.showDialog().getValue() != 1) return; Index: applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetCommand.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetCommand.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetCommand.java (revision 32905) @@ -1,5 +1,7 @@ +// License: GPL. For details, see LICENSE file. package reverter; import java.util.Collection; + import javax.swing.Icon; Index: applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetHandler.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetHandler.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetHandler.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -11,5 +12,5 @@ public static final String permissionKey = "remotecontrol.permission.revert_changeset"; public static final boolean permissionDefault = true; - + private int changesetId; @@ -17,6 +18,5 @@ protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException { - try - { + try { Main.worker.submit(new RevertChangesetTask(changesetId, ChangesetReverter.RevertType.FULL, true)); } catch (Exception ex) { @@ -25,5 +25,4 @@ throw new RequestHandlerErrorException(ex); } - } Index: applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -17,4 +18,5 @@ import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.io.OsmTransferException; + import reverter.ChangesetReverter.RevertType; @@ -30,9 +32,9 @@ 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,5 +112,5 @@ List 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) { Index: applications/editors/josm/plugins/reverter/src/reverter/RevertRedactedChangesetException.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/RevertRedactedChangesetException.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/RevertRedactedChangesetException.java (revision 32905) @@ -1,6 +1,7 @@ +// 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") Index: applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; Index: applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java (revision 32905) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package reverter; @@ -11,4 +12,5 @@ pluginString = "reverter_plugin/" + plugin.getPluginInformation().version; } + @Override public boolean checkUpload(APIDataSet apiDataSet) { Index: applications/editors/josm/plugins/reverter/src/reverter/corehacks/ChangesetDataSet.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/corehacks/ChangesetDataSet.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/corehacks/ChangesetDataSet.java (revision 32905) @@ -6,6 +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,5 +18,5 @@ public class ChangesetDataSet { - public static enum ChangesetModificationType { + public enum ChangesetModificationType { CREATED, UPDATED, @@ -24,13 +24,15 @@ } - public static interface ChangesetDataSetEntry { - public ChangesetModificationType getModificationType(); - public HistoryOsmPrimitive getPrimitive(); - public int getEarliestVersion(); - } - - final private Map earliestVersions = new HashMap<>(); - final private Map primitives = new HashMap<>(); - final private Map modificationTypes = new HashMap<>(); + public interface ChangesetDataSetEntry { + ChangesetModificationType getModificationType(); + + HistoryOsmPrimitive getPrimitive(); + + int getEarliestVersion(); + } + + private final Map earliestVersions = new HashMap<>(); + private final Map primitives = new HashMap<>(); + private final Map modificationTypes = new HashMap<>(); /** @@ -42,7 +44,7 @@ * @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,5 +53,5 @@ 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,5 +63,5 @@ } if (earliestVersions.get(pid) == null) { - earliestVersions.put(pid, (int)primitives.get(pid).getVersion()); + earliestVersions.put(pid, (int) primitives.get(pid).getVersion()); } } @@ -93,5 +95,5 @@ 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,5 +146,5 @@ */ public Set getPrimitivesByModificationType(ChangesetModificationType cmt) throws IllegalArgumentException { - CheckParameterUtil.ensureParameterNotNull(cmt,"cmt"); + CheckParameterUtil.ensureParameterNotNull(cmt, "cmt"); HashSet ret = new HashSet<>(); for (Entry entry: modificationTypes.entrySet()) { @@ -172,5 +174,5 @@ */ public HistoryOsmPrimitive getPrimitive(PrimitiveId id) { - if (id == null) return null; + if (id == null) return null; return primitives.get(id); } @@ -185,5 +187,5 @@ 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,12 +193,15 @@ } + @Override public ChangesetModificationType getModificationType() { return modificationType; } + @Override public HistoryOsmPrimitive getPrimitive() { return primitive; } + @Override public int getEarliestVersion() { return earliestVersion; @@ -207,12 +212,14 @@ private final Iterator> typeIterator; - public DefaultIterator() { + DefaultIterator() { typeIterator = modificationTypes.entrySet().iterator(); } + @Override public boolean hasNext() { return typeIterator.hasNext(); } + @Override public ChangesetDataSetEntry next() { Entry next = typeIterator.next(); @@ -220,8 +227,9 @@ 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(); Index: applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java (revision 32905) @@ -1,3 +1,3 @@ -// License: GPL. Copyright 2007 by Immanuel Scholz and others +// License: GPL. For details, see LICENSE file. package reverter.corehacks; @@ -25,6 +25,6 @@ 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,5 +79,5 @@ 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,5 +104,6 @@ } */ - 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,5 +113,5 @@ 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,5 +119,5 @@ } - 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,5 +134,6 @@ } */ - 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,9 +147,9 @@ } - 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,16 +160,16 @@ 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,23 +178,24 @@ 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,10 +206,10 @@ 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,5 +236,6 @@ 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,5 +247,6 @@ || 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,5 +266,6 @@ // 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,11 +316,11 @@ 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 { Index: applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java =================================================================== --- applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java (revision 32904) +++ applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java (revision 32905) @@ -36,5 +36,5 @@ * */ - public OsmServerChangesetReader(){ + public OsmServerChangesetReader() { setDoAuthenticate(false); } @@ -71,7 +71,7 @@ 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,5 +96,5 @@ } 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,7 +107,7 @@ 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,9 +132,9 @@ } 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 ret = new ArrayList<>(); - int i=0; - for (Iterator it = ids.iterator(); it.hasNext(); ) { + int i = 0; + for (Iterator it = ids.iterator(); it.hasNext();) { int id = it.next(); if (id <= 0) { @@ -147,5 +147,5 @@ 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 changesets = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true)); if (changesets == null || changesets.isEmpty()) { @@ -156,7 +156,7 @@ } return ret; - } catch(OsmTransferException e) { + } catch (OsmTransferException e) { throw e; - } catch(IllegalDataException e) { + } catch (IllegalDataException e) { throw new OsmTransferException(e); } finally { @@ -176,5 +176,6 @@ 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,7 +192,7 @@ 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 {