Changeset 31476 in osm for applications/editors

Timestamp:

2015-08-10T18:18:32+02:00 (9 years ago)

Author:

nokutu

Message:

New test form MapillaryRecord class. Tests every type of command.

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/commands/CommandMoveImage.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/oauth/MapillaryUser.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/mapillary/commands (added)
• test/unit/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecordTest.java (added)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandMoveImage.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.ArrayList;
 import java.util.List;
 
@@ -31 +30 @@
   public CommandMoveImage(List<MapillaryAbstractImage> images, double x,
       double y) {
-    this.images = new ArrayList<>(images);
+    this.images = images;
     this.x = x;
     this.y = y;
@@ -43 +42 @@
     }
     checkModified();
-    Main.map.repaint();
+    if (Main.main != null)
+      Main.map.repaint();
   }
 
@@ -53 +53 @@
     }
     checkModified();
-    Main.map.repaint();
+    if (Main.main != null)
+      Main.map.repaint();
   }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.ArrayList;
 import java.util.List;
 
@@ -27 +26 @@
    */
   public CommandTurnImage(List<MapillaryAbstractImage> images, double ca) {
-    this.images = new ArrayList<>(images);
+    this.images = images;
     this.ca = ca;
   }
@@ -38 +37 @@
     }
     checkModified();
-    Main.map.repaint();
+    if (Main.main != null)
+      Main.map.repaint();
   }
 
@@ -48 +48 @@
     }
     checkModified();
-    Main.map.repaint();
+    if (Main.main != null)
+      Main.map.repaint();
   }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java

@@ -6 +6 @@
 
 /**
- * History record system in order to let the user undo and redo commands
+ * History record system in order to let the user undo and redo commands.
  *
  * @author nokutu
@@ -97 +97 @@
   public void undo() {
     if (this.position == -1)
-      return;
+      throw new IllegalStateException();
     this.commandList.get(this.position).undo();
     this.position--;
@@ -104 +104 @@
 
   /**
-   * Redo latest undoed action.
+   * Redoes latest undone action.
    */
   public void redo() {
     if (this.position + 1 >= this.commandList.size())
-      return;
+      throw new IllegalStateException();
     this.position++;
     this.commandList.get(this.position).redo();

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/MapillaryUser.java

@@ -87 +87 @@
     isTokenValid = true;
   }
-
 }