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

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/reverter/src/reverter

Files:

• ChangesetIdQuery.java (modified) (1 diff)
• ChangesetReverter.java (modified) (4 diffs)
• DataSetCommandMerger.java (modified) (3 diffs)
• corehacks/ChangesetDataSet.java (modified) (2 diffs)
• corehacks/OsmServerChangesetReader.java (modified) (1 diff)

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

@@ -145 +145 @@
      */
     protected void restoreChangesetsHistory(HistoryComboBox cbHistory) {
-        List<String> cmtHistory = new LinkedList<String>(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);

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

@@ -70 +70 @@
     private DataSet nds; // Dataset that contains new objects downloaded by reverter
 
-    private final HashSet<PrimitiveId> missing = new HashSet<PrimitiveId>();
-
-    private final HashSet<HistoryOsmPrimitive> created = new HashSet<HistoryOsmPrimitive>();
-    private final HashSet<HistoryOsmPrimitive> updated = new HashSet<HistoryOsmPrimitive>();
-    private final HashSet<HistoryOsmPrimitive> deleted = new HashSet<HistoryOsmPrimitive>();
+    private final HashSet<PrimitiveId> missing = new HashSet<>();
+
+    private final HashSet<HistoryOsmPrimitive> created = new HashSet<>();
+    private final HashSet<HistoryOsmPrimitive> updated = new HashSet<>();
+    private final HashSet<HistoryOsmPrimitive> deleted = new HashSet<>();
 
     //// Handling missing objects
@@ -280 +280 @@
         switch (p.getType()) {
         case NODE:
-            return new Conflict<Node>((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>((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>((Relation)p,new Relation((Relation)p), isMyDeleted);
+            return new Conflict<>((Relation)p,new Relation((Relation)p), isMyDeleted);
         default: throw new AssertionError();
         }
@@ -348 +348 @@
         // Create a set of objects to be deleted
 
-        HashSet<OsmPrimitive> toDelete = new HashSet<OsmPrimitive>();
+        HashSet<OsmPrimitive> toDelete = new HashSet<>();
         // Mark objects that has visible=false to be deleted
         for (OsmPrimitive p : nds.allPrimitives()) {
@@ -365 +365 @@
         // Check reversion against current dataset and create necessary conflicts
 
-        HashSet<OsmPrimitive> conflicted = new HashSet<OsmPrimitive>();
+        HashSet<OsmPrimitive> conflicted = new HashSet<>();
 
         for (Conflict<? extends OsmPrimitive> conflict : merger.getConflicts()) {

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

@@ -33 +33 @@
     private final DataSet targetDataSet;
 
-    private final List<Command> cmds = new LinkedList<Command>();
-    private final List<OsmPrimitive> nominalRevertedPrimitives = new LinkedList<OsmPrimitive>();
+    private final List<Command> cmds = new LinkedList<>();
+    private final List<OsmPrimitive> nominalRevertedPrimitives = new LinkedList<>();
 
     /**
@@ -98 +98 @@
         Way target = (Way)getMergeTarget(source);
         
-        Collection<Conflict<OsmPrimitive>> localConflicts = new ArrayList<Conflict<OsmPrimitive>>();
+        Collection<Conflict<OsmPrimitive>> localConflicts = new ArrayList<>();
 
-        List<Node> newNodes = new ArrayList<Node>(source.getNodesCount());
+        List<Node> newNodes = new ArrayList<>(source.getNodesCount());
         for (Node sourceNode : source.getNodes()) {
             Node targetNode = (Node)getMergeTarget(sourceNode);
@@ -142 +142 @@
         if (!source.isVisible()) return;
         Relation target = (Relation) getMergeTarget(source);
-        LinkedList<RelationMember> newMembers = new LinkedList<RelationMember>();
+        LinkedList<RelationMember> newMembers = new LinkedList<>();
         for (RelationMember sourceMember : source.getMembers()) {
             OsmPrimitive targetMember = getMergeTarget(sourceMember.getMember());
             if (targetMember.isDeleted() && sourceMember.getMember().isIncomplete()
                     && !conflicts.hasConflictForMy(targetMember)) {
-                conflicts.add(new Conflict<OsmPrimitive>(targetMember, sourceMember.getMember(), true));
+                conflicts.add(new Conflict<>(targetMember, sourceMember.getMember(), true));
                 OsmPrimitive undeletedTargetMember;
                 switch(targetMember.getType()) {

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

@@ -30 +30 @@
     }
 
-    final private Map<PrimitiveId, Integer> earliestVersions = new HashMap<PrimitiveId, Integer>();
-    final private Map<PrimitiveId, HistoryOsmPrimitive> primitives = new HashMap<PrimitiveId, HistoryOsmPrimitive>();
-    final private Map<PrimitiveId, ChangesetModificationType> modificationTypes = new HashMap<PrimitiveId, ChangesetModificationType>();
+    final private Map<PrimitiveId, Integer> earliestVersions = new HashMap<>();
+    final private Map<PrimitiveId, HistoryOsmPrimitive> primitives = new HashMap<>();
+    final private Map<PrimitiveId, ChangesetModificationType> modificationTypes = new HashMap<>();
 
     /**
@@ -145 +145 @@
     public Set<HistoryOsmPrimitive> getPrimitivesByModificationType(ChangesetModificationType cmt) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(cmt,"cmt");
-        HashSet<HistoryOsmPrimitive> ret = new HashSet<HistoryOsmPrimitive>();
+        HashSet<HistoryOsmPrimitive> ret = new HashSet<>();
         for (Entry<PrimitiveId, ChangesetModificationType> entry: modificationTypes.entrySet()) {
             if (entry.getValue().equals(cmt)) {

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

@@ -134 +134 @@
             monitor.beginTask(trn("Downloading {0} changeset ...", "Downloading {0} changesets ...",ids.size(),ids.size()));
             monitor.setTicksCount(ids.size());
-            List<Changeset> ret = new ArrayList<Changeset>();
+            List<Changeset> ret = new ArrayList<>();
             int i=0;
             for (Iterator<Integer> it = ids.iterator(); it.hasNext(); ) {