Changeset 6708 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-01-17T01:49:03+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #8417 - info GPX layer window not resizeable

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/LayerListPopup.java (modified) (4 diffs)
• layer/GpxLayer.java (modified) (2 diffs)
• layer/Layer.java (modified) (1 diff)

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
@@ -17 +19 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
@@ -30 +33 @@
     public final static class InfoAction extends AbstractAction {
         private final Layer layer;
+        
+        /**
+         * Constructs a new {@code InfoAction} for the given layer.
+         * @param layer The layer
+         */
         public InfoAction(Layer layer) {
             super(tr("Info"), ImageProvider.get("info"));
@@ -35 +43 @@
             this.layer = layer;
         }
+        
         @Override
         public void actionPerformed(ActionEvent e) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    layer.getInfoComponent(),
-                    tr("Information about layer"),
-                    JOptionPane.INFORMATION_MESSAGE
-            );
+            Object object = layer.getInfoComponent();
+            if (object instanceof Component) {
+                ExtendedDialog ed = new ExtendedDialog(
+                        Main.parent, tr("Information about layer"),
+                        new String[] {tr("OK")});
+                ed.setButtonIcons(new String[] {"ok"});
+                ed.setIcon(JOptionPane.INFORMATION_MESSAGE);
+                ed.setContent((Component) object);
+                ed.setResizable(layer.isInfoResizable());
+                ed.setMinimumSize(new Dimension(270, 170));
+                ed.showDialog();
+            } else {
+                JOptionPane.showMessageDialog(
+                        Main.parent, object,
+                        tr("Information about layer"),
+                        JOptionPane.INFORMATION_MESSAGE
+                        );
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -221 +221 @@
 
         final JScrollPane sp = new JScrollPane(new HtmlPanel(info.toString()));
-        sp.setPreferredSize(new Dimension(sp.getPreferredSize().width, 350));
+        sp.setPreferredSize(new Dimension(sp.getPreferredSize().width+20, 370));
         SwingUtilities.invokeLater(new Runnable() {
             @Override
@@ -229 +229 @@
         });
         return sp;
+    }
+    
+    @Override
+    public boolean isInfoResizable() {
+        return true;
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -184 +184 @@
 
     /**
+     * Determines if info dialog can be resized (false by default).
+     * @return {@code true} if the info dialog can be resized, {@code false} otherwise
+     * @since 6708
+     */
+    public boolean isInfoResizable() {
+        return false;
+    }
+
+    /**
      * Returns list of actions. Action can implement LayerAction interface when it needs to be represented by other
      * menu component than JMenuItem or when it supports multiple layers. Actions that support multiple layers should also