Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (modified) (17 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -90 +90 @@
         p.add(lbFilter);
         p.add(txtFilter, GBC.eol().fill(GBC.HORIZONTAL));
-        txtFilter.getDocument().addDocumentListener(new DocumentListener(){
-            @Override public void changedUpdate(DocumentEvent e) {
+        txtFilter.getDocument().addDocumentListener(new DocumentListener() {
+            @Override
+            public void changedUpdate(DocumentEvent e) {
                 action();
             }
-            @Override public void insertUpdate(DocumentEvent e) {
+
+            @Override
+            public void insertUpdate(DocumentEvent e) {
                 action();
             }
-            @Override public void removeUpdate(DocumentEvent e) {
+
+            @Override
+            public void removeUpdate(DocumentEvent e) {
                 action();
             }
+
             private void action() {
                 applyFilter();
@@ -110 +116 @@
         JScrollPane scroll = new JScrollPane(table);
         p.add(scroll, GBC.eol().fill(GBC.BOTH));
-        scroll.setPreferredSize(new Dimension(400,200));
+        scroll.setPreferredSize(new Dimension(400, 200));
 
         JButton add = new JButton(tr("Add"));
         p.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
-        p.add(add, GBC.std().insets(0,5,0,0));
-        add.addActionListener(new ActionListener(){
+        p.add(add, GBC.std().insets(0, 5, 0, 0));
+        add.addActionListener(new ActionListener() {
             @Override public void actionPerformed(ActionEvent e) {
                 PrefEntry pe = table.addPreference(gui);
-                if (pe!=null) {
+                if (pe != null) {
                     allData.add(pe);
                     Collections.sort(allData);
@@ -127 +133 @@
 
         JButton edit = new JButton(tr("Edit"));
-        p.add(edit, GBC.std().insets(5,5,5,0));
-        edit.addActionListener(new ActionListener(){
+        p.add(edit, GBC.std().insets(5, 5, 5, 0));
+        edit.addActionListener(new ActionListener() {
             @Override public void actionPerformed(ActionEvent e) {
                 boolean ok = table.editPreference(gui);
@@ -136 +142 @@
 
         JButton reset = new JButton(tr("Reset"));
-        p.add(reset, GBC.std().insets(0,5,0,0));
-        reset.addActionListener(new ActionListener(){
+        p.add(reset, GBC.std().insets(0, 5, 0, 0));
+        reset.addActionListener(new ActionListener() {
             @Override public void actionPerformed(ActionEvent e) {
                 table.resetPreferences(gui);
@@ -144 +150 @@
 
         JButton read = new JButton(tr("Read from file"));
-        p.add(read, GBC.std().insets(5,5,0,0));
-        read.addActionListener(new ActionListener(){
+        p.add(read, GBC.std().insets(5, 5, 0, 0));
+        read.addActionListener(new ActionListener() {
             @Override public void actionPerformed(ActionEvent e) {
                 readPreferencesFromXML();
@@ -152 +158 @@
 
         JButton export = new JButton(tr("Export selected items"));
-        p.add(export, GBC.std().insets(5,5,0,0));
-        export.addActionListener(new ActionListener(){
+        p.add(export, GBC.std().insets(5, 5, 0, 0));
+        export.addActionListener(new ActionListener() {
             @Override public void actionPerformed(ActionEvent e) {
                 exportSelectedToXML();
@@ -160 +166 @@
 
         final JButton more = new JButton(tr("More..."));
-        p.add(more, GBC.std().insets(5,5,0,0));
+        p.add(more, GBC.std().insets(5, 5, 0, 0));
         more.addActionListener(new ActionListener() {
             private JPopupMenu menu = buildPopupMenu();
@@ -180 +186 @@
             // so we do not want to show it in the table as "changed" now
             Setting<?> pluginSetting = orig.get("plugins");
-            if (pluginSetting!=null) {
+            if (pluginSetting != null) {
                 loaded.put("plugins", pluginSetting);
             }
@@ -195 +201 @@
                 return f.isDirectory() || Utils.hasExtension(f, "xml");
             }
+
             @Override
             public String getDescription() {
@@ -204 +211 @@
         if (fc != null) {
             File[] sel = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : (new File[]{fc.getSelectedFile()});
-            if (sel.length==1 && !sel[0].getName().contains(".")) sel[0]=new File(sel[0].getAbsolutePath()+".xml");
+            if (sel.length == 1 && !sel[0].getName().contains(".")) sel[0] = new File(sel[0].getAbsolutePath()+".xml");
             return sel;
         }
@@ -314 +321 @@
     }
 
-    private Map<String,String> profileTypes = new LinkedHashMap<>();
+    private Map<String, String> profileTypes = new LinkedHashMap<>();
 
     private JPopupMenu buildPopupMenu() {
@@ -323 +330 @@
         profileTypes.put(marktr("imagery"), "imagery.*");
 
-        for (Entry<String,String> e: profileTypes.entrySet()) {
+        for (Entry<String, String> e: profileTypes.entrySet()) {
             menu.add(new ExportProfileAction(Main.pref, e.getKey(), e.getValue()));
         }
@@ -354 +361 @@
 
     private JMenu getProfileMenu() {
-        final JMenu p =new JMenu(tr("Load profile"));
+        final JMenu p = new JMenu(tr("Load profile"));
         p.addMenuListener(new MenuListener() {
             @Override
@@ -364 +371 @@
                        String s = f.getName();
                        int idx = s.indexOf('_');
-                       if (idx>=0) {
-                            String t=s.substring(0,idx);
+                       if (idx >= 0) {
+                            String t = s.substring(0, idx);
                             if (profileTypes.containsKey(t)) {
                                 p.add(new ImportProfileAction(s, f, t));
@@ -377 +384 @@
                        String s = f.getName();
                        int idx = s.indexOf('_');
-                       if (idx>=0) {
-                            String t=s.substring(0,idx);
+                       if (idx >= 0) {
+                            String t = s.substring(0, idx);
                             if (profileTypes.containsKey(t)) {
                                 p.add(new ImportProfileAction(s, f, t));
@@ -386 +393 @@
                 }
             }
+
             @Override
             public void menuDeselected(MenuEvent me) {
                 // Not implemented
             }
+
             @Override
             public void menuCanceled(MenuEvent me) {
@@ -450 +459 @@
             }
         }
-        if (table!=null) table.fireDataChanged();
+        if (table != null) table.fireDataChanged();
     }