Changeset 1790 in josm for trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

Timestamp:

2009-07-15T17:22:56+02:00 (15 years ago)

Author:

Gubaer

Message:

Relation Editor: complete rework
Relation Editor: had to temporarily remove code for "link information" and "sorting"
IO Subsystem: clean up in exception handling
some cosmetics

File:

• trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -95 +95 @@
 
             button = new JButton(action);
-            if(buttonIcons != null && buttonIcons[i] != null)
+            if(buttonIcons != null && buttonIcons[i] != null) {
                 button.setIcon(ImageProvider.get(buttonIcons[i]));
+            }
 
-            if(i == 0) rootPane.setDefaultButton(button);
+            if(i == 0) {
+                rootPane.setDefaultButton(button);
+            }
             buttonsPanel.add(button, GBC.std().insets(2,2,2,2));
             buttons.add(button);
@@ -120 +123 @@
         boolean limitedInHeight = d.height > x.height;
 
-        if(x.width  > 0 && d.width  > x.width)  d.width  = x.width;
-        if(x.height > 0 && d.height > x.height) d.height = x.height;
+        if(x.width  > 0 && d.width  > x.width) {
+            d.width  = x.width;
+        }
+        if(x.height > 0 && d.height > x.height) {
+            d.height = x.height;
+        }
 
         // We have a vertical scrollbar and enough space to prevent a horizontal one
-        if(!limitedInWidth && limitedInHeight)
+        if(!limitedInWidth && limitedInHeight) {
             d.width += new JScrollBar().getPreferredSize().width;
+        }
 
         setSize(d);
@@ -161 +169 @@
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         Dimension x = new Dimension(Math.round(screenSize.width*2/3),
-                                    Math.round(screenSize.height*2/3));
+                Math.round(screenSize.height*2/3));
         try {
-            if(parent != null)
+            if(parent != null) {
                 x = JOptionPane.getFrameForComponent(parent).getSize();
+            }
         } catch(NullPointerException e) { }
         return x;
@@ -184 +193 @@
 
         rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-            .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE");
+        .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE");
         rootPane.getActionMap().put("ESCAPE", actionListener);
     }