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

Timestamp:

2014-09-12T01:04:39+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10462 - Include object type and id in history for undecorated windows

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserDialog.java (modified) (8 diffs)
• HistoryBrowserDialogManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

@@ -16 +16 @@
 import javax.swing.JComponent;
 import javax.swing.JDialog;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -40 +41 @@
     private HistoryBrowser browser;
     private CloseAction closeAction;
+    private JLabel titleLabel;
 
     /**
@@ -59 +61 @@
     }
 
+    @Override
+    public void setTitle(String title) {
+        super.setTitle(title);
+        if (titleLabel != null) {
+            titleLabel.setText(title);
+        }
+    }
+
     /**
      * builds the GUI
-     *
      */
     protected void build() {
         setLayout(new BorderLayout());
+
+        titleLabel = new JLabel();
+        titleLabel.setHorizontalAlignment(JLabel.CENTER);
+        add(titleLabel, BorderLayout.NORTH);
+
         browser = new HistoryBrowser();
         add(browser, BorderLayout.CENTER);
@@ -92 +106 @@
 
     /**
-     * constructor
+     * Constructs a new {@code HistoryBrowserDialog}.
      *
-     * @param history  the history to be displayed
+     * @param history the history to be displayed
      */
     public HistoryBrowserDialog(History history) {
@@ -101 +115 @@
         setHistory(history);
         renderTitle(history);
+        pack();
+        if (getInsets().top > 0) {
+            titleLabel.setVisible(false);
+        }
         HistoryDataSet.getInstance().addHistoryDataSetListener(this);
         addWindowListener(new WindowClosingAdapter());
@@ -106 +124 @@
 
     /**
-     * sets the current history
+     * Sets the current history.
      * @param history
      */
@@ -113 +131 @@
     }
 
+    /**
+     * Removes this history browser model as listener for data change and layer change events.
+     */
     public void unlinkAsListener() {
         getHistoryBrowser().getModel().unlinkAsListener();
@@ -174 +195 @@
     }
 
+    /**
+     * Replies the history browser.
+     * @return the history browser
+     */
     public HistoryBrowser getHistoryBrowser() {
         return browser;

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -12 +12 @@
 import java.util.Map;
 
-import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 
 import org.openstreetmap.josm.Main;
@@ -70 +67 @@
             placeOnScreen(dialog);
             dialog.setVisible(true);
-            // Debug stuff for #10462
-            if (Main.isDebugEnabled()) {
-                Main.debug("#10462 - JDialog.isDefaultLookAndFeelDecorated: "+JDialog.isDefaultLookAndFeelDecorated());
-                Main.debug("#10462 - JFrame.isDefaultLookAndFeelDecorated: "+JFrame.isDefaultLookAndFeelDecorated());
-                Main.debug("#10462 - dialog.isUndecorated: "+dialog.isUndecorated());
-                Main.debug("#10462 - UIManager.getLookAndFeel: "+UIManager.getLookAndFeel());
-                Main.debug("#10462 - LookAndFeel.getSupportsWindowDecorations: "+UIManager.getLookAndFeel().getSupportsWindowDecorations());
-                Main.debug("#10462 - JRootPane.getWindowDecorationStyle: "+dialog.getRootPane().getWindowDecorationStyle());
-                Main.debug("#10462 - Window.getIconImages: "+dialog.getIconImages());
-                Main.debug("#10462 - Dialog.getTitle: "+dialog.getTitle());
-                Main.debug("#10462 - Dialog.getInsets: "+dialog.getInsets());
-            }
             dialogs.put(id, dialog);
         }