Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.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/SourceEditor.java (modified) (17 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -211 +211 @@
         RemoveActiveSourcesAction removeActiveSourcesAction = new RemoveActiveSourcesAction();
         tblActiveSources.getSelectionModel().addListSelectionListener(removeActiveSourcesAction);
-        tblActiveSources.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "delete");
+        tblActiveSources.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
         tblActiveSources.getActionMap().put("delete", removeActiveSourcesAction);
 
@@ -327 +327 @@
         add(bottomRightTB, gbc);
 
-        /***
-         * Icon configuration
-         **/
-
+        // Icon configuration
         if (handleIcons) {
             buildIcons(gbc);
@@ -353 +350 @@
         RemoveIconPathAction removeIconPathAction = new RemoveIconPathAction();
         tblIconPaths.getSelectionModel().addListSelectionListener(removeIconPathAction);
-        tblIconPaths.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "delete");
+        tblIconPaths.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
         tblIconPaths.getActionMap().put("delete", removeIconPathAction);
 
@@ -494 +491 @@
         public void deleteSelected() {
             Iterator<ExtendedSourceEntry> it = data.iterator();
-            int i=0;
-            while(it.hasNext()) {
+            int i = 0;
+            while (it.hasNext()) {
                 it.next();
                 if (selectionModel.isSelectedIndex(i)) {
@@ -507 +504 @@
         public List<ExtendedSourceEntry> getSelected() {
             List<ExtendedSourceEntry> ret = new ArrayList<>();
-            for(int i=0; i<data.size();i++) {
+            for (int i = 0; i < data.size(); i++) {
                 if (selectionModel.isSelectedIndex(i)) {
                     ret.add(data.get(i));
@@ -586 +583 @@
         public void removeSelected() {
             Iterator<SourceEntry> it = data.iterator();
-            int i=0;
-            while(it.hasNext()) {
+            int i = 0;
+            while (it.hasNext()) {
                 it.next();
                 if (selectionModel.isSelectedIndex(i)) {
@@ -599 +596 @@
         public void removeIdxs(Collection<Integer> idxs) {
             List<SourceEntry> newData = new ArrayList<>();
-            for (int i=0; i<data.size(); ++i) {
+            for (int i = 0; i < data.size(); ++i) {
                 if (!idxs.contains(i)) {
                     newData.add(data.get(i));
@@ -617 +614 @@
             for (ExtendedSourceEntry info: sources) {
                 int pos = data.indexOf(info);
-                if (pos >=0) {
+                if (pos >= 0) {
                     selectionModel.addSelectionInterval(pos, pos);
                 }
@@ -725 +722 @@
         try {
             sourceUrl = new URL(url);
-        } catch(MalformedURLException e) {
+        } catch (MalformedURLException e) {
             File f = new File(url);
             if (f.isFile()) {
@@ -788 +785 @@
                     updateOkButtonState();
                 }
+
                 @Override
                 public void removeUpdate(DocumentEvent e) {
                     updateOkButtonState();
                 }
+
                 @Override
                 public void changedUpdate(DocumentEvent e) {
@@ -958 +957 @@
     class MoveUpDownAction extends AbstractAction implements ListSelectionListener, TableModelListener {
         private final int increment;
+
         public MoveUpDownAction(boolean isDown) {
             increment = isDown ? 1 : -1;
@@ -1054 +1054 @@
         private final String url;
         private final transient List<SourceProvider> sourceProviders;
+
         public ReloadSourcesAction(String url, List<SourceProvider> sourceProviders) {
             putValue(NAME, tr("Reload"));
@@ -1101 +1102 @@
         @Override
         public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-            updatePath(rowIndex, (String)aValue);
+            updatePath(rowIndex, (String) aValue);
         }
 
         public void setIconPaths(Collection<String> paths) {
             data.clear();
-            if (paths !=null) {
+            if (paths != null) {
                 data.addAll(paths);
             }
@@ -1138 +1139 @@
         public void removeSelected() {
             Iterator<String> it = data.iterator();
-            int i=0;
-            while(it.hasNext()) {
+            int i = 0;
+            while (it.hasNext()) {
                 it.next();
                 if (selectionModel.isSelectedIndex(i)) {
@@ -1181 +1182 @@
         public void actionPerformed(ActionEvent e) {
             iconPathsModel.addPath("");
-            tblIconPaths.editCellAt(iconPathsModel.getRowCount() -1,0);
+            tblIconPaths.editCellAt(iconPathsModel.getRowCount() -1, 0);
         }
     }
@@ -1500 +1501 @@
         public boolean isCellEditable(EventObject anEvent) {
             if (anEvent instanceof MouseEvent)
-                return ((MouseEvent)anEvent).getClickCount() >= 2;
+                return ((MouseEvent) anEvent).getClickCount() >= 2;
                 return true;
         }
@@ -1532 +1533 @@
         @Override
         public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
-            setInitialValue((String)value);
+            setInitialValue((String) value);
             tfFileName.selectAll();
             return this;