Changeset 2969 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-02-12T20:01:55+01:00 (15 years ago)

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/DialogsPanel.java (modified) (2 diffs)
• dialogs/ToggleDialog.java (modified) (3 diffs)
• layer/geoimage/GeoImageLayer.java (modified) (7 diffs)
• layer/geoimage/ImageViewerDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

@@ -122 +122 @@
          * in the last panel anyway.
          */
-        int k = N-1;                // index of the current Panel (start with last one)
-        JPanel p = panels.get(k);   // current Panel
-        k = -1;                     // indicates that the current Panel index is N-1, but no default-view-Dialog was added to this Panel yet.
+        JPanel p = panels.get(N-1); // current Panel (start with last one)
+        int k = -1;                 // indicates that the current Panel index is N-1, but no default-view-Dialog has been added to this Panel yet.
         for (int i=N-1; i >= 0 ; --i) {
             final ToggleDialog dlg = allDialogs.get(i);
@@ -171 +170 @@
                 if (dlg.isDialogInDefaultView()) {
                     if (dlg != triggeredBy) {
-                        final int ph = dlg.getPreferredHeight();
-                        final int ah = dlg.getHeight();
-                        sumP += ph;
-                        sumA += ah;
+                        sumP += dlg.getPreferredHeight();
+                        sumA += dlg.getHeight();
                     }
                 } else if (dlg.isDialogInCollapsedView()) {
                     sumC += dlg.getHeight();
                 }
+            }
+            
+            /**
+             * If we add additional dialogs on startup (e.g. geoimage), they may 
+             * not have an actual height yet.
+             * In this case we simply reset everything to it's preferred size.
+             */
+            if (sumA == 0) {
+                reconstruct(Action.ELEMENT_SHRINKS, null);
+                return;
             }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -50 +50 @@
     protected ToggleDialogAction toggleAction;
     protected String preferencePrefix;
+    final protected String name;
 
     /** DialogsPanel that manages all ToggleDialogs */
@@ -100 +101 @@
         super(new BorderLayout());
         this.preferencePrefix = iconName;
+        this.name = name;
 
         /** Use the full width of the parent element */
@@ -516 +518 @@
         return "Dialog/"+help;
     }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
     /**
      * Replies true if this dialog is showing either as docked or as detached dialog

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>();

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

@@ -44 +44 @@
     private boolean centerView = false;
 
-    // Only one instance of that class
-    static private ImageViewerDialog INSTANCE = null;
+    // Only one instance of that class is present at one time
+    private static ImageViewerDialog dialog;
 
     private boolean collapseButtonClicked = false;
 
+    static void newInstance() {
+        dialog = new ImageViewerDialog();
+    }
+
     public static ImageViewerDialog getInstance() {
-        if (INSTANCE == null) {
-            INSTANCE = new ImageViewerDialog();
-        }
-        return INSTANCE;
+        if (dialog == null) {
+            throw new AssertionError(); // a new instance needs to be created first
+        }
+        return dialog;
     }
 
@@ -63 +67 @@
         super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged", tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.GROUP_EDIT), 200);
 
-        if (INSTANCE != null) {
-            throw new IllegalStateException("Image viewer dialog should not be instanciated twice !");
-        }
-
         /* Don't show a detached dialog right from the start. */
         if (isShowing && !isDocked) {
             setIsShowing(false);
         }
-
-        INSTANCE = this;
 
         JPanel content = new JPanel();
@@ -254 +252 @@
             //    osd.append(tr("\nImage gps time: {0}", Long.toString(entry.getGpsTime().getTime())));
             //}
-            
+
             imgDisplay.setOsdText(osd.toString());
         } else {