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

Timestamp:

2016-01-17T02:54:22+01:00 (9 years ago)

Author:

Don-vip

Message:

massive refactoring of GenericRelationEditor. As JDialog cannot be instantiated in headless mode, extract all actions to separate classes in new package gui.dialogs.relation.actions in order to test them with JUnit

File:

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

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

@@ -703 +703 @@
      * Sort the selected relation members by the way they are linked.
      */
-    void sort() {
+    public void sort() {
         List<RelationMember> selectedMembers = new ArrayList<>(getSelectedMembers());
-        List<RelationMember> sortedMembers = null;
+        List<RelationMember> sortedMembers;
         List<RelationMember> newMembers;
         if (selectedMembers.size() <= 1) {
@@ -727 +727 @@
         }
 
-        if (members.size() != newMembers.size()) throw new AssertionError();
+        if (members.size() != newMembers.size())
+            throw new AssertionError();
 
         members.clear();
@@ -738 +739 @@
      * Sort the selected relation members and all members below by the way they are linked.
      */
-    void sortBelow() {
-        final List<RelationMember> subList = members.subList(getSelectionModel().getMinSelectionIndex(), members.size());
+    public void sortBelow() {
+        final List<RelationMember> subList = members.subList(Math.max(0, getSelectionModel().getMinSelectionIndex()), members.size());
         final List<RelationMember> sorted = relationSorter.sortMembers(subList);
         subList.clear();
@@ -766 +767 @@
      * Reverse the relation members.
      */
-    void reverse() {
+    public void reverse() {
         List<Integer> selectedIndices = getSelectedIndices();
         List<Integer> selectedIndicesReversed = getSelectedIndices();