Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

Timestamp:

2014-04-26T17:39:23+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (13 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -64 +64 @@
      */
     public MemberTableModel(OsmDataLayer layer, PresetListPanel.PresetHandler presetHandler) {
-        members = new ArrayList<RelationMember>();
-        listeners = new CopyOnWriteArrayList<IMemberModelListener>();
+        members = new ArrayList<>();
+        listeners = new CopyOnWriteArrayList<>();
         this.layer = layer;
         this.presetHandler = presetHandler;
@@ -337 +337 @@
      */
     public Set<OsmPrimitive> getIncompleteMemberPrimitives() {
-        Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        Set<OsmPrimitive> ret = new HashSet<>();
         for (RelationMember member : members) {
             if (member.getMember().isIncomplete()) {
@@ -352 +352 @@
      */
     public Set<OsmPrimitive> getSelectedIncompleteMemberPrimitives() {
-        Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        Set<OsmPrimitive> ret = new HashSet<>();
         for (RelationMember member : getSelectedMembers()) {
             if (member.getMember().isIncomplete()) {
@@ -388 +388 @@
 
     protected List<Integer> getSelectedIndices() {
-        List<Integer> selectedIndices = new ArrayList<Integer>();
+        List<Integer> selectedIndices = new ArrayList<>();
         for (int i = 0; i < members.size(); i++) {
             if (getSelectionModel().isSelectedIndex(i)) {
@@ -403 +403 @@
         int idx = index;
         for (OsmPrimitive primitive : primitives) {
-            Set<String> potentialRoles = new TreeSet<String>();
+            Set<String> potentialRoles = new TreeSet<>();
             for (TaggingPreset tp : presets) {
                 String suggestedRole = tp.suggestRoleForOsmPrimitive(primitive);
@@ -480 +480 @@
      */
     public Collection<RelationMember> getSelectedMembers() {
-        List<RelationMember> selectedMembers = new ArrayList<RelationMember>();
+        List<RelationMember> selectedMembers = new ArrayList<>();
         for (int i : getSelectedIndices()) {
             selectedMembers.add(members.get(i));
@@ -493 +493 @@
      */
     public Collection<OsmPrimitive> getSelectedChildPrimitives() {
-        Collection<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
+        Collection<OsmPrimitive> ret = new ArrayList<>();
         for (RelationMember m: getSelectedMembers()) {
             ret.add(m.getMember());
@@ -506 +506 @@
      */
     public Set<OsmPrimitive> getChildPrimitives(Collection<? extends OsmPrimitive> referenceSet) {
-        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        HashSet<OsmPrimitive> ret = new HashSet<>();
         if (referenceSet == null) return null;
         for (RelationMember m: members) {
@@ -529 +529 @@
         // lookup the indices for the respective members
         //
-        Set<Integer> selectedIndices = new HashSet<Integer>();
+        Set<Integer> selectedIndices = new HashSet<>();
         for (RelationMember member : selectedMembers) {
             for (int idx = 0; idx < members.size(); ++idx) {
@@ -598 +598 @@
         if (primitives == null || primitives.isEmpty())
             return false;
-        HashSet<OsmPrimitive> referrers = new HashSet<OsmPrimitive>();
+        HashSet<OsmPrimitive> referrers = new HashSet<>();
         for (RelationMember member : members) {
             referrers.add(member.getMember());
@@ -672 +672 @@
      */
     void sort() {
-        List<RelationMember> selectedMembers = new ArrayList<RelationMember>(getSelectedMembers());
+        List<RelationMember> selectedMembers = new ArrayList<>(getSelectedMembers());
         List<RelationMember> sortedMembers = null;
         List<RelationMember> newMembers;
@@ -681 +681 @@
             sortedMembers = relationSorter.sortMembers(selectedMembers);
             List<Integer> selectedIndices = getSelectedIndices();
-            newMembers = new ArrayList<RelationMember>();
+            newMembers = new ArrayList<>();
             boolean inserted = false;
             for (int i=0; i < members.size(); i++) {
@@ -730 +730 @@
             Collections.reverse(selectedIndicesReversed);
 
-            List<RelationMember> newMembers = new ArrayList<RelationMember>(members);
+            List<RelationMember> newMembers = new ArrayList<>(members);
 
             for (int i=0; i < selectedIndices.size(); i++) {