Changeset 36065 in osm for applications/editors/josm/plugins/MicrosoftStreetside/src

Timestamp:

2023-03-22T15:57:34+01:00 (22 months ago)

Author:

taylor.smock

Message:

Streetside: Fix or disable various tests

Location:

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside

Files:

• StreetsidePlugin.java (modified) (2 diffs)
• cubemap/CubemapBuilder.java (modified) (2 diffs)
• gui/imageinfo/StreetsideViewerPanel.java (modified) (2 diffs)

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsidePlugin.java

@@ -36 +36 @@
   private static final StreetsideWalkAction WALK_ACTION = new StreetsideWalkAction();
 
-  static {
-      MainMenu.add(MainApplication.getMenu().fileMenu, new StreetsideExportAction(), false, 14);
-      MainMenu.add(MainApplication.getMenu().imagerySubMenu, new StreetsideDownloadAction(), false);
-      MainMenu.add(MainApplication.getMenu().viewMenu, ZOOM_ACTION, false, 15);
-      MainMenu.add(MainApplication.getMenu().fileMenu, new StreetsideDownloadViewAction(), false, 14);
-      MainMenu.add(MainApplication.getMenu().moreToolsMenu, WALK_ACTION, false);
-  }
-
   /**
    * Main constructor.
@@ -56 +48 @@
       StreetsideUser.setTokenValid(false);
     }
+    MainMenu.add(MainApplication.getMenu().fileMenu, new StreetsideExportAction(), false, 14);
+    MainMenu.add(MainApplication.getMenu().imagerySubMenu, new StreetsideDownloadAction(), false);
+    MainMenu.add(MainApplication.getMenu().viewMenu, ZOOM_ACTION, false, 15);
+    MainMenu.add(MainApplication.getMenu().fileMenu, new StreetsideDownloadViewAction(), false, 14);
+    MainMenu.add(MainApplication.getMenu().moreToolsMenu, WALK_ACTION, false);
   }
 

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBuilder.java

@@ -24 +24 @@
 import org.openstreetmap.josm.plugins.streetside.gui.StreetsideViewerDialog;
 import org.openstreetmap.josm.plugins.streetside.gui.imageinfo.StreetsideViewerPanel;
+import org.openstreetmap.josm.plugins.streetside.gui.imageinfo.ThreeSixtyDegreeViewerPanel;
 import org.openstreetmap.josm.plugins.streetside.utils.GraphicsUtils;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
@@ -115 +116 @@
 
         public void downloadCubemapImages(String imageId) {
-    if(StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().getScene() != StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().getLoadingScene()) {
-      StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().setScene(
-              StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().getLoadingScene()
-          );
+      ThreeSixtyDegreeViewerPanel panel360 = StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel();
+      if (panel360 != null && panel360.getScene() != panel360.getLoadingScene()) {
+        panel360.setScene(panel360.getLoadingScene());
           }
 

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/StreetsideViewerPanel.java

@@ -3 +3 @@
 
 import java.awt.BorderLayout;
+import java.awt.GraphicsEnvironment;
 import java.text.MessageFormat;
 
@@ -55 +56 @@
                 threeSixtyDegreeViewerPanel = new ThreeSixtyDegreeViewerPanel();
 
-                GraphicsUtils.PlatformHelper.run(() -> {
-                threeSixtyDegreeViewerPanel.initialize();
-                });
+    if (!GraphicsEnvironment.isHeadless()) {
+      GraphicsUtils.PlatformHelper.run(threeSixtyDegreeViewerPanel::initialize);
+    }
 
                 add(threeSixtyDegreeViewerPanel, BorderLayout.CENTER);