Changeset 9926 in josm for trunk

Timestamp:

2016-03-05T14:37:53+01:00 (9 years ago)

Author:

Don-vip

Message:

LayerListDialog: add first unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (17 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/LayerListDialogTest.java (added)

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

@@ -115 +115 @@
     private final LayerList layerList;
 
-    private final SideButton opacityButton;
-    private final SideButton gammaButton;
-
     private final ActivateLayerAction activateLayerAction;
     private final ShowHideLayerAction showHideLayerAction;
@@ -268 +265 @@
 
         // -- layer opacity action
-        LayerOpacityAction layerOpacityAction = new LayerOpacityAction();
+        LayerOpacityAction layerOpacityAction = new LayerOpacityAction(model);
         adaptTo(layerOpacityAction, selectionModel);
-        opacityButton = new SideButton(layerOpacityAction, false);
+        SideButton opacityButton = new SideButton(layerOpacityAction, false);
+        layerOpacityAction.setCorrespondingSideButton(opacityButton);
 
         // -- layer gamma action
-        LayerGammaAction layerGammaAction = new LayerGammaAction();
+        LayerGammaAction layerGammaAction = new LayerGammaAction(model);
         adaptTo(layerGammaAction, selectionModel);
-        gammaButton = new SideButton(layerGammaAction, false);
+        SideButton gammaButton = new SideButton(layerGammaAction, false);
+        layerGammaAction.setCorrespondingSideButton(gammaButton);
 
         // -- delete layer action
@@ -533 +532 @@
      */
     public abstract static class AbstractLayerPropertySliderAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
+        protected final LayerListModel model;
         protected final JPopupMenu popup;
         protected final JSlider slider;
         private final double factor;
-
-        public AbstractLayerPropertySliderAction(String name, final double factor) {
+        private SideButton sideButton;
+
+        protected AbstractLayerPropertySliderAction(LayerListModel model, String name, final double factor) {
             super(name);
+            this.model = model;
             this.factor = factor;
             updateEnabledState();
@@ -551 +553 @@
             });
             popup.add(slider);
-
         }
 
@@ -558 +559 @@
         protected abstract double getValue();
 
-        protected abstract SideButton getCorrespondingSideButton();
+        /**
+         * Sets the corresponding side button.
+         * @param sideButton the corresponding side button
+         */
+        final void setCorrespondingSideButton(SideButton sideButton) {
+            this.sideButton = sideButton;
+        }
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            final SideButton sideButton = getCorrespondingSideButton();
             slider.setValue((int) (getValue() * factor));
             if (e.getSource() == sideButton) {
@@ -577 +583 @@
             return new JMenuItem(this);
         }
-
     }
 
@@ -583 +588 @@
      * Action which allows to change the opacity of one or more layers.
      */
-    public final class LayerOpacityAction extends AbstractLayerPropertySliderAction {
+    public static final class LayerOpacityAction extends AbstractLayerPropertySliderAction {
         private transient Layer layer;
 
         /**
-         * Creates a {@link LayerOpacityAction} which allows to change the
-         * opacity of one or more layers.
-         *
+         * Creates a {@link LayerOpacityAction} which allows to change the opacity of one or more layers.
+         *
+         * @param model layer list model
          * @param layer  the layer. Must not be null.
          * @throws IllegalArgumentException if layer is null
          */
-        public LayerOpacityAction(Layer layer) {
-            this();
+        public LayerOpacityAction(LayerListModel model, Layer layer) {
+            this(model);
             CheckParameterUtil.ensureParameterNotNull(layer, "layer");
             this.layer = layer;
@@ -601 +606 @@
 
         /**
-         * Creates a {@link ShowHideLayerAction} which will toggle the visibility of
-         * the currently selected layers
-         *
-         */
-        public LayerOpacityAction() {
-            super(tr("Opacity"), 100);
+         * Creates a {@link ShowHideLayerAction} which will toggle the visibility of the currently selected layers
+         * @param model layer list model
+         */
+        public LayerOpacityAction(LayerListModel model) {
+            super(model, tr("Opacity"), 100);
             putValue(SHORT_DESCRIPTION, tr("Adjust opacity of the layer."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/layerlist", "transparency"));
@@ -617 +621 @@
                 layer.setOpacity(value);
             } else {
-                for (Layer layer: model.getSelectedLayers()) {
-                    layer.setOpacity(value);
+                for (Layer l : model.getSelectedLayers()) {
+                    l.setOpacity(value);
                 }
             }
@@ -630 +634 @@
                 double opacity = 0;
                 List<Layer> layers = model.getSelectedLayers();
-                for (Layer layer: layers) {
-                    opacity += layer.getOpacity();
+                for (Layer l : layers) {
+                    opacity += l.getOpacity();
                 }
                 return opacity / layers.size();
             }
-        }
-
-        @Override
-        protected SideButton getCorrespondingSideButton() {
-            return opacityButton;
         }
 
@@ -645 +644 @@
         public void updateEnabledState() {
             if (layer == null) {
-                setEnabled(!getModel().getSelectedLayers().isEmpty());
+                setEnabled(!model.getSelectedLayers().isEmpty());
             } else {
                 setEnabled(true);
@@ -660 +659 @@
      * Action which allows to change the gamma of one imagery layer.
      */
-    public final class LayerGammaAction extends AbstractLayerPropertySliderAction {
-
-        public LayerGammaAction() {
-            super(tr("Gamma"), 50);
+    public static final class LayerGammaAction extends AbstractLayerPropertySliderAction {
+
+        /**
+         * Constructs a new {@code LayerGammaAction}.
+         * @param model layer list model
+         */
+        public LayerGammaAction(LayerListModel model) {
+            super(model, tr("Gamma"), 50);
             putValue(SHORT_DESCRIPTION, tr("Adjust gamma value of the layer."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/layerlist", "gamma"));
@@ -678 +681 @@
         protected double getValue() {
             return Utils.filteredCollection(model.getSelectedLayers(), ImageryLayer.class).iterator().next().getGamma();
-        }
-
-        @Override
-        protected SideButton getCorrespondingSideButton() {
-            return gammaButton;
         }
 
@@ -1112 +1110 @@
             Layer layer = (Layer) value;
             if (layer instanceof NativeScaleLayer) {
-                boolean active = layer != null && layer == Main.map.mapView.getNativeScaleLayer();
+                boolean active = ((NativeScaleLayer) layer) == Main.map.mapView.getNativeScaleLayer();
                 cb.setSelected(active);
                 cb.setToolTipText(active
@@ -1271 +1269 @@
      * the properties {@link Layer#VISIBLE_PROP} and {@link Layer#NAME_PROP}.
      */
-    public final class LayerListModel extends AbstractTableModel implements MapView.LayerChangeListener, PropertyChangeListener {
+    public static final class LayerListModel extends AbstractTableModel implements MapView.LayerChangeListener, PropertyChangeListener {
         /** manages list selection state*/
         private final DefaultListSelectionModel selectionModel;
         private final CopyOnWriteArrayList<LayerListModelListener> listeners;
+        private LayerList layerList;
 
         /**
@@ -1281 +1280 @@
          * @param selectionModel the list selection model
          */
-        private LayerListModel(DefaultListSelectionModel selectionModel) {
+        LayerListModel(DefaultListSelectionModel selectionModel) {
             this.selectionModel = selectionModel;
             listeners = new CopyOnWriteArrayList<>();
+        }
+
+        void setlayerList(LayerList layerList) {
+            this.layerList = layerList;
         }
 
@@ -1732 +1735 @@
 
     static class LayerList extends JTable {
-        LayerList(TableModel dataModel) {
+        LayerList(LayerListModel dataModel) {
             super(dataModel);
+            dataModel.setlayerList(this);
         }