Changeset 9543 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2016-01-20T00:05:07+01:00 (8 years ago)

Author:

Don-vip

Message:

refactoring - global simplification of use of setLayout method - simply pass layout to JPanel constructor

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• map/BackupPreference.java (modified) (1 diff)
• projection/ProjectionPreference.java (modified) (1 diff)
• projection/UTMProjectionChoice.java (modified) (1 diff)
• remotecontrol/RemoteControlPreference.java (modified) (1 diff)
• server/AuthenticationPreferencesPanel.java (modified) (1 diff)
• server/OAuthAuthenticationPreferencesPanel.java (modified) (1 diff)
• shortcut/PrefJPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java

@@ -52 +52 @@
     @Override
     public void addGui(PreferenceTabbedPane gui) {
-        JPanel panel = new VerticallyScrollablePanel();
-        panel.setLayout(new GridBagLayout());
+        JPanel panel = new VerticallyScrollablePanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -320 +320 @@
 
         projPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        projPanel.setLayout(new GridBagLayout());
         projPanel.add(new JLabel(tr("Projection method")), GBC.std().insets(5, 5, 0, 5));
         projPanel.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

@@ -63 +63 @@
             group.add(south);
 
-            JPanel bPanel = new JPanel();
-            bPanel.setLayout(new GridBagLayout());
+            JPanel bPanel = new JPanel(new GridBagLayout());
 
             bPanel.add(new JLabel(tr("North")), GBC.std().insets(5, 5, 0, 5));

trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java

@@ -100 +100 @@
         remote.add(enableRemoteControl, GBC.eol());
 
-        final JPanel wrapper = new JPanel();
-        wrapper.setLayout(new GridBagLayout());
+        final JPanel wrapper = new JPanel(new GridBagLayout());
         wrapper.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.gray)));
 

trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java

@@ -86 +86 @@
         gc.weightx = 1.0;
         gc.weighty = 1.0;
-        pnlAuthenticationParameteters = new JPanel();
+        pnlAuthenticationParameteters = new JPanel(new BorderLayout());
         add(pnlAuthenticationParameteters, gc);
-        pnlAuthenticationParameteters.setLayout(new BorderLayout());
 
         //-- the two panels for authentication parameters

trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

@@ -118 +118 @@
         gc.weightx = 1.0;
         gc.insets = new Insets(10, 0, 0, 0);
-        add(pnlAuthorisationMessage = new JPanel(), gc);
-        pnlAuthorisationMessage.setLayout(new BorderLayout());
+        add(pnlAuthorisationMessage = new JPanel(new BorderLayout()), gc);
 
         // create these two panels, they are going to be used later in refreshView

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -10 +10 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.GridLayout;
 import java.awt.Insets;
 import java.awt.Toolkit;
@@ -186 +187 @@
 
     private void initComponents() {
-        JPanel listPane = new JPanel();
+        JPanel listPane = new JPanel(new GridLayout());
         JScrollPane listScrollPane = new JScrollPane();
-        JPanel shortcutEditPane = new JPanel();
+        JPanel shortcutEditPane = new JPanel(new GridLayout(5, 2));
 
         CbAction action = new CbAction(this);
         setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
         add(buildFilterPanel());
-        listPane.setLayout(new java.awt.GridLayout());
 
         // This is the list of shortcuts:
@@ -211 +211 @@
 
         // and here follows the edit area. I won't object to someone re-designing it, it looks, um, "minimalistic" ;)
-        shortcutEditPane.setLayout(new java.awt.GridLayout(5, 2));
 
         cbDefault.setAction(action);