Changeset 30713 in osm for applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack

Timestamp:

2014-10-12T12:13:45+02:00 (10 years ago)

Author:

donvip

Message:

[josm_merge_overlap] fix Java7 warnings

Location:

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack

Files:

• MyRelationMemberConflictResolverModel.java (modified) (3 diffs)
• MyRelationMemberConflictResolverTable.java (modified) (1 diff)

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyRelationMemberConflictResolverModel.java

@@ -80 +80 @@
 
         public MyRelationMemberConflictResolverModel() {
-            decisions = new ArrayList<RelationMemberConflictDecision>();
+            decisions = new ArrayList<>();
             support = new PropertyChangeSupport(this);
         }
@@ -165 +165 @@
             references = references == null ? new LinkedList<RelationToChildReference>() : references;
             decisions.clear();
-            this.relations = new HashSet<Relation>(references.size());
+            this.relations = new HashSet<>(references.size());
             for (RelationToChildReference reference: references) {
                 decisions.add(new RelationMemberConflictDecision(reference.getParent(), reference.getPosition()));
@@ -308 +308 @@
          */
         public Set<Relation> getModifiedRelations(OsmPrimitive newPrimitive) {
-            HashSet<Relation> ret = new HashSet<Relation>();
+            HashSet<Relation> ret = new HashSet<>();
             for (Relation relation: relations) {
                 if (isChanged(relation, newPrimitive)) {

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyRelationMemberConflictResolverTable.java

@@ -42 +42 @@
         getActionMap().put("selectPreviousColumnCell", selectPreviousColumnCellAction);
 
-        setRowHeight((int)new JComboBox<Object>().getPreferredSize().getHeight());
+        setRowHeight((int)new JComboBox<>().getPreferredSize().getHeight());
     }