Changeset 2969 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

Timestamp:

12.02.2010 20:01:55 (2 years ago)

Author:

bastiK

Message:

fixed #4502 - Photomapping pannel open just one time;
make tiger highlight color a little transparent (see #2381)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -236 +236 @@
                 Main.main.addLayer(layer);
                 layer.hook_up_mouse_events(); // Main.map.mapView should exist
-                // now. Can add mouse listener
+                                              // now. Can add mouse listener
                 Main.map.mapView.addPropertyChangeListener(layer);
-                if (!addedToggleDialog) {
-                    // TODO Workaround for bug in DialogsPanel
-                    // When GeoImageLayer is added as a first layer, division by zero exception is thrown
-                    // This is caused by DialogsPanel.reconstruct method which use height of other dialogs
-                    // to calculate height of newly added ImageViewerDialog. But height of other dialogs is
-                    // zero because it's calculated by layout manager later
-                    SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            Main.map.addToggleDialog(ImageViewerDialog.getInstance());
-                        }
-                    });
-                    addedToggleDialog = true;
+                if (Main.map.getToggleDialog(ImageViewerDialog.class) == null) {
+                    System.err.println("JO");
+                    ImageViewerDialog.newInstance();// = new ImageViewerDialog();
+                    Main.map.addToggleDialog(ImageViewerDialog.getInstance());
                 }
 
@@ -271 +263 @@
     }
 
-    private static boolean addedToggleDialog = false;
-
     public static void create(Collection<File> files, GpxLayer gpxLayer) {
         Loader loader = new Loader(files, gpxLayer);
@@ -291 +281 @@
         return ImageProvider.get("dialogs/geoimage");
     }
-    
+
     public static interface LayerMenuAddition {
         public Component getComponent(Layer layer);
@@ -306 +296 @@
         JMenuItem correlateItem = new JMenuItem(tr("Correlate to GPX"), ImageProvider.get("dialogs/geoimage/gpx2img"));
         correlateItem.addActionListener(new CorrelateGpxWithImages(this));
-        
+
         List<Component> entries = new ArrayList<Component>();
         entries.add(new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)));
@@ -323 +313 @@
 
         return entries.toArray(new Component[0]);
-        
+
     }
 
@@ -335 +325 @@
         + " " + trn("{0} was found to be GPS tagged.", "{0} were found to be GPS tagged.", i, i);
     }
-    
+
     @Override public Object getInfoComponent() {
         return infoText();
@@ -752 +742 @@
         Main.map.mapView.repaint();
     }
-    
+
     public List<ImageEntry> getImages() {
         List<ImageEntry> copy = new ArrayList<ImageEntry>();