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

Timestamp:

2014-04-05T14:51:42+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9898 - fix NPE for toggle dialogs not calling createLayout()

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) (8 diffs)

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

@@ -159 +159 @@
     protected JCheckBoxMenuItem windowMenuItem;
 
+    private final JRadioButtonMenuItem alwaysShown  = new JRadioButtonMenuItem(new AbstractAction(tr("Always shown")) {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            setIsButtonHiding(ButtonHidingType.ALWAYS_SHOWN);
+        }
+    });
+
+    private final JRadioButtonMenuItem dynamic      = new JRadioButtonMenuItem(new AbstractAction(tr("Dynamic")) {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            setIsButtonHiding(ButtonHidingType.DYNAMIC);
+        }
+    });
+
+    private final JRadioButtonMenuItem alwaysHidden = new JRadioButtonMenuItem(new AbstractAction(tr("Always hidden")) {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            setIsButtonHiding(ButtonHidingType.ALWAYS_HIDDEN);
+        }
+    });
+    
     /**
      * The linked preferences class (optional). If set, accessible from the title bar with a dedicated button
@@ -508 +529 @@
                         @Override
                         public void actionPerformed(ActionEvent e) {
-                            JRadioButtonMenuItem item = (buttonHiding == ButtonHidingType.DYNAMIC) ? popupMenu.alwaysShown : popupMenu.dynamic;
+                            JRadioButtonMenuItem item = (buttonHiding == ButtonHidingType.DYNAMIC) ? alwaysShown : dynamic;
                             item.setSelected(true);
                             item.getAction().actionPerformed(null);
@@ -586 +607 @@
             private final JMenu buttonHidingMenu = new JMenu(tr("Side buttons"));
 
-            public final JRadioButtonMenuItem alwaysShown  = new JRadioButtonMenuItem(new AbstractAction(tr("Always shown")) {
-                @Override public void actionPerformed(ActionEvent e) {
-                    setIsButtonHiding(ButtonHidingType.ALWAYS_SHOWN);
-                }
-            });
-
-            public final JRadioButtonMenuItem dynamic      = new JRadioButtonMenuItem(new AbstractAction(tr("Dynamic")) {
-                @Override public void actionPerformed(ActionEvent e) {
-                    setIsButtonHiding(ButtonHidingType.DYNAMIC);
-                }
-            });
-
-            public final JRadioButtonMenuItem alwaysHidden = new JRadioButtonMenuItem(new AbstractAction(tr("Always hidden")) {
-                @Override public void actionPerformed(ActionEvent e) {
-                    setIsButtonHiding(ButtonHidingType.ALWAYS_HIDDEN);
-                }
-            });
-
             public DialogPopupMenu() {
                 alwaysShown.setSelected(buttonHiding == ButtonHidingType.ALWAYS_SHOWN);
@@ -714 +717 @@
 
     /**
-     * Sets the dialogsPanel managing all toggle dialogs
+     * Sets the dialogsPanel managing all toggle dialogs.
+     * @param dialogsPanel The panel managing all toggle dialogs
      */
     public void setDialogsPanel(DialogsPanel dialogsPanel) {
@@ -766 +770 @@
     }
 
+    /**
+     * Returns the preferred height of this dialog.
+     * @return The preferred height if the toggle dialog is expanded
+     */
     public int getPreferredHeight() {
         return preferredHeight;
@@ -783 +791 @@
 
     /**
-     * Replies true if this dialog is showing either as docked or as detached dialog
+     * Determines if this dialog is showing either as docked or as detached dialog.
+     * @return {@code true} if this dialog is showing either as docked or as detached dialog
      */
     public boolean isDialogShowing() {
@@ -790 +799 @@
 
     /**
-     * Replies true if this dialog is docked and expanded
+     * Determines if this dialog is docked and expanded.
+     * @return {@code true} if this dialog is docked and expanded
      */
     public boolean isDialogInDefaultView() {
@@ -797 +807 @@
 
     /**
-     * Replies true if this dialog is docked and collapsed
+     * Determines if this dialog is docked and collapsed.
+     * @return {@code true} if this dialog is docked and collapsed
      */
     public boolean isDialogInCollapsedView() {