Changeset 32078 in osm

Timestamp:

2016-02-19T23:36:27+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Highlight the sequence that the selected image is contained in

• this also fixes one unit test that failed since the last commit
• and the JOSM-preferences are no longer overwritten everytime you run ./gradlew runJosm, only when you ./gradlew clean

Location:

applications/editors/josm/plugins/mapillary

Files:

• .settings/org.eclipse.jdt.core.prefs (modified) (1 diff)
• build.gradle (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSettingTest.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.core.prefs

@@ -73 +73 @@
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning

applications/editors/josm/plugins/mapillary/build.gradle

@@ -141 +141 @@
 
 task activatePlugin(type: Copy) {
-  from "gradle/josm-preferences.xml"
-  into "$buildDir/.josm"
-  rename 'josm-preferences.xml', 'preferences.xml'
+  if (!new File("$buildDir/.josm/preferences.xml").exists()) {
+    from "gradle/josm-preferences.xml"
+    into "$buildDir/.josm"
+    rename 'josm-preferences.xml', 'preferences.xml'
+  }
 }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java

@@ -17 +17 @@
  *
  */
-public class MapillaryAbstractImage implements Comparable<MapillaryAbstractImage>{
+public class MapillaryAbstractImage implements Comparable<MapillaryAbstractImage> {
   /**
    * If two values for field ca differ by less than EPSILON both values are considered equal.

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -318 +318 @@
     }
     // Draw sequence line
-    g.setColor(Color.WHITE);
-    g.setStroke(new BasicStroke(this == Main.map.mapView.getActiveLayer() ? 3 : 1));
+    final MapillaryAbstractImage selectedImage = MapillaryLayer.getInstance().getData().getSelectedImage();
+    String selectedImageKey = null; // Intentionally not null to avoid null-check before .equals()
+    if (selectedImage != null && selectedImage.getSequence() != null) {
+      selectedImageKey = selectedImage.getSequence().getKey();
+    }
+    g.setStroke(new BasicStroke(this == Main.map.mapView.getActiveLayer() ? 3 : 2));
     for (MapillarySequence seq : getData().getSequences()) {
+      if (selectedImageKey != null && selectedImageKey.equals(seq.getKey())) {
+        g.setColor(Color.MAGENTA.brighter());
+      } else {
+        g.setColor(Color.WHITE);
+      }
       g.draw(MapViewGeometryUtil.getSequencePath(mv, seq));
     }

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSettingTest.java

@@ -47 +47 @@
     assertEquals(I18n.tr("You are currently not logged in."), ((JLabel) getPrivateField(setting, "loginLabel")).getText());
     assertFalse(((JPanel) getPrivateField(setting, "loginPanel")).isAncestorOf(((JButton) getPrivateField(setting, "logoutButton"))));
+    assertTrue(((JPanel) getPrivateField(setting, "loginPanel")).isAncestorOf(((JButton) getPrivateField(setting, "loginButton"))));
 
     String username = "TheMapillaryUsername";
     setting.onLogin(username);
 
-    assertEquals(I18n.tr("Re-Login"), ((JButton) getPrivateField(setting, "loginButton")).getText());
+    assertEquals(I18n.tr("Login"), ((JButton) getPrivateField(setting, "loginButton")).getText());
     assertEquals(I18n.tr("You are logged in as ''{0}''.", username), ((JLabel) getPrivateField(setting, "loginLabel")).getText());
     assertTrue(((JPanel) getPrivateField(setting, "loginPanel")).isAncestorOf(((JButton) getPrivateField(setting, "logoutButton"))));
+    assertFalse(((JPanel) getPrivateField(setting, "loginPanel")).isAncestorOf(((JButton) getPrivateField(setting, "loginButton"))));
   }