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

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

@@ -121 +121 @@
     private final class ToggleLayerIndexVisibility extends AbstractAction {
         private int layerIndex = -1;
+
         public ToggleLayerIndexVisibility(int layerIndex) {
             this.layerIndex = layerIndex;
         }
+
         @Override
         public void actionPerformed(ActionEvent e) {
@@ -145 +147 @@
                 KeyEvent.VK_6, KeyEvent.VK_7, KeyEvent.VK_8, KeyEvent.VK_9, KeyEvent.VK_0};
 
-        for(int i=0; i < 10; i++) {
+        for (int i = 0; i < 10; i++) {
             visibilityToggleShortcuts[i] = Shortcut.registerShortcut("subwindow:layers:toggleLayer" + (i+1),
                     tr("Toggle visibility of layer: {0}", i+1), k[i], Shortcut.ALT);
@@ -223 +225 @@
                         layerList.repaint();
                     }
+
                     @Override
                     public void refresh() {
@@ -233 +236 @@
         MoveUpAction moveUpAction = new MoveUpAction();
         adaptTo(moveUpAction, model);
-        adaptTo(moveUpAction,selectionModel);
+        adaptTo(moveUpAction, selectionModel);
 
         // -- move down action
         MoveDownAction moveDownAction = new MoveDownAction();
         adaptTo(moveDownAction, model);
-        adaptTo(moveDownAction,selectionModel);
+        adaptTo(moveDownAction, selectionModel);
 
         // -- activate action
@@ -261 +264 @@
         MergeAction mergeLayerAction = new MergeAction();
         adaptTo(mergeLayerAction, model);
-        adaptTo(mergeLayerAction,selectionModel);
+        adaptTo(mergeLayerAction, selectionModel);
 
         // -- duplicate layer action
@@ -273 +276 @@
         adaptTo(deleteLayerAction, selectionModel);
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),"delete"
+                KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete"
                 );
         getActionMap().put("delete", deleteLayerAction);
@@ -369 +372 @@
     @Override
     public void destroy() {
-        for(int i=0; i < 10; i++) {
+        for (int i = 0; i < 10; i++) {
             Main.unregisterActionShortcut(visibilityToggleActions[i], visibilityToggleShortcuts[i]);
         }
@@ -389 +392 @@
          */
         public DeleteLayerAction() {
-            putValue(SMALL_ICON,ImageProvider.get("dialogs", "delete"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
             putValue(SHORT_DESCRIPTION, tr("Delete the selected layers."));
             putValue(NAME, tr("Delete"));
@@ -464 +467 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            for(Layer l : model.getSelectedLayers()) {
+            for (Layer l : model.getSelectedLayers()) {
                 l.toggleVisible();
             }
@@ -559 +562 @@
                 @Override
                 public void stateChanged(ChangeEvent e) {
-                    setOpacity((double)slider.getValue()/100);
+                    setOpacity((double) slider.getValue()/100);
                 }
             });
@@ -570 +573 @@
                 layer.setOpacity(value);
             } else {
-                for(Layer layer: model.getSelectedLayers()) {
+                for (Layer layer: model.getSelectedLayers()) {
                     layer.setOpacity(value);
                 }
@@ -582 +585 @@
                 double opacity = 0;
                 List<Layer> layers = model.getSelectedLayers();
-                for(Layer layer: layers) {
+                for (Layer layer: layers) {
                     opacity += layer.getOpacity();
                 }
@@ -591 +594 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            slider.setValue((int)Math.round(getOpacity()*100));
+            slider.setValue((int) Math.round(getOpacity()*100));
             if (e.getSource() == opacityButton) {
                 popup.show(opacityButton, 0, opacityButton.getHeight());
@@ -858 +861 @@
             }
             if (layer instanceof OsmDataLayer) {
-                OsmDataLayer oldLayer = (OsmDataLayer)layer;
+                OsmDataLayer oldLayer = (OsmDataLayer) layer;
                 // Translators: "Copy of {layer name}"
                 String newName = tr("Copy of {0}", oldLayer.getName());
@@ -917 +920 @@
         private final ImageIcon iconEyeTranslucent;
         private boolean isTranslucent;
+
+        /**
+         * Constructs a new {@code LayerVisibleCheckBox}.
+         */
         public LayerVisibleCheckBox() {
             setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
@@ -940 +947 @@
             boolean visible = layer.isVisible();
             setSelected(visible);
-            setTranslucent(layer.getOpacity()<1.0);
+            setTranslucent(layer.getOpacity() < 1.0);
             setToolTipText(visible ? tr("layer is currently visible (click to hide layer)") : tr("layer is currently hidden (click to show layer)"));
         }
@@ -947 +954 @@
     private static class ActiveLayerCellRenderer implements TableCellRenderer {
         private final JCheckBox cb;
+
+        /**
+         * Constructs a new {@code ActiveLayerCellRenderer}.
+         */
         public ActiveLayerCellRenderer() {
             cb = new ActiveLayerCheckBox();
@@ -962 +973 @@
     private static class LayerVisibleCellRenderer implements TableCellRenderer {
         private final LayerVisibleCheckBox cb;
+
+        /**
+         * Constructs a new {@code LayerVisibleCellRenderer}.
+         */
         public LayerVisibleCellRenderer() {
             this.cb = new LayerVisibleCheckBox();
@@ -969 +984 @@
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
             if (value != null) {
-                cb.updateStatus((Layer)value);
+                cb.updateStatus((Layer) value);
             }
             return cb;
@@ -977 +992 @@
     private static class LayerVisibleCellEditor extends DefaultCellEditor {
         private final LayerVisibleCheckBox cb;
+
         public LayerVisibleCellEditor(LayerVisibleCheckBox cb) {
             super(cb);
@@ -984 +1000 @@
         @Override
         public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
-            cb.updateStatus((Layer)value);
+            cb.updateStatus((Layer) value);
             return cb;
         }
@@ -1000 +1016 @@
             if (value == null)
                 return this;
-            Layer layer = (Layer)value;
-            JLabel label = (JLabel)super.getTableCellRendererComponent(table,
+            Layer layer = (Layer) value;
+            JLabel label = (JLabel) super.getTableCellRendererComponent(table,
                     layer.getName(), isSelected, hasFocus, row, column);
             if (isActiveLayer(layer)) {
                 label.setFont(label.getFont().deriveFont(Font.BOLD));
             }
-            if(Main.pref.getBoolean("dialog.layer.colorname", true)) {
+            if (Main.pref.getBoolean("dialog.layer.colorname", true)) {
                 Color c = layer.getColor(false);
-                if(c != null) {
+                if (c != null) {
                     Color oc = null;
-                    for(Layer l : model.getLayers()) {
+                    for (Layer l : model.getLayers()) {
                         oc = l.getColor(false);
-                        if(oc != null) {
-                            if(oc.equals(c)) {
+                        if (oc != null) {
+                            if (oc.equals(c)) {
                                 oc = null;
                             } else {
@@ -1021 +1037 @@
                     }
                     /* not more than one color, don't use coloring */
-                    if(oc == null) {
+                    if (oc == null) {
                         c = null;
                     }
                 }
-                if(c == null) {
+                if (c == null) {
                     c = Main.pref.getUIColor(isSelected ? "Table.selectionForeground" : "Table.foreground");
                 }
@@ -1229 +1245 @@
             List<Layer> selected = new ArrayList<>();
             List<Layer> layers = getLayers();
-            for (int i=0; i<layers.size(); i++) {
+            for (int i = 0; i < layers.size(); i++) {
                 if (selectionModel.isSelectedIndex(i)) {
                     selected.add(layers.get(i));
@@ -1238 +1254 @@
 
         /**
-         * Replies a the list of indices of the selected rows. Never null,
-         * but may be empty.
-         *
-         * @return  the list of indices of the selected rows. Never null,
-         * but may be empty.
+         * Replies a the list of indices of the selected rows. Never null, but may be empty.
+         *
+         * @return  the list of indices of the selected rows. Never null, but may be empty.
          */
         public List<Integer> getSelectedRows() {
             List<Integer> selected = new ArrayList<>();
-            for (int i=0; i<getLayers().size();i++) {
+            for (int i = 0; i < getLayers().size(); i++) {
                 if (selectionModel.isSelectedIndex(i)) {
                     selected.add(i);
@@ -1532 +1546 @@
                         int idx = getLayers().indexOf(oldLayer);
                         if (idx >= 0) {
-                            fireTableRowsUpdated(idx,idx);
+                            fireTableRowsUpdated(idx, idx);
                         }
                     }
@@ -1539 +1553 @@
                         int idx = getLayers().indexOf(newLayer);
                         if (idx >= 0) {
-                            fireTableRowsUpdated(idx,idx);
+                            fireTableRowsUpdated(idx, idx);
                         }
                     }
@@ -1563 +1577 @@
         public void propertyChange(PropertyChangeEvent evt) {
             if (evt.getSource() instanceof Layer) {
-                Layer layer = (Layer)evt.getSource();
+                Layer layer = (Layer) evt.getSource();
                 final int idx = getLayers().indexOf(layer);
                 if (idx < 0) return;