Index: trunk/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java (revision 10143) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java (revision 10144) @@ -76,8 +76,8 @@ && OsmPrimitiveType.NODE.equals(member.getType()) && !routeNodes.contains(member.getNode())) { - errors.add(new TestError(this, Severity.WARNING, tr("Stop position not part of route"), 3603, Arrays.asList(member.getMember(), r))); + errors.add(new TestError(this, Severity.WARNING, + tr("Stop position not part of route"), 3603, Arrays.asList(member.getMember(), r))); } } - } } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 10143) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 10144) @@ -8,5 +8,4 @@ import java.awt.Dimension; import java.awt.Font; -import java.awt.GridBagLayout; import java.awt.Point; import java.awt.Rectangle; @@ -17,8 +16,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.List; @@ -26,5 +23,4 @@ import javax.swing.AbstractAction; -import javax.swing.BorderFactory; import javax.swing.DefaultCellEditor; import javax.swing.DefaultListSelectionModel; @@ -33,8 +29,4 @@ import javax.swing.JComponent; import javax.swing.JLabel; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JSlider; import javax.swing.JTable; import javax.swing.JViewport; @@ -42,6 +34,4 @@ import javax.swing.ListSelectionModel; import javax.swing.UIManager; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.event.ListDataEvent; import javax.swing.event.ListSelectionEvent; @@ -59,24 +49,25 @@ import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.SideButton; -import org.openstreetmap.josm.gui.help.HelpUtil; -import org.openstreetmap.josm.gui.layer.ImageryLayer; +import org.openstreetmap.josm.gui.dialogs.layer.ActivateLayerAction; +import org.openstreetmap.josm.gui.dialogs.layer.DeleteLayerAction; +import org.openstreetmap.josm.gui.dialogs.layer.DuplicateAction; +import org.openstreetmap.josm.gui.dialogs.layer.IEnabledStateUpdating; +import org.openstreetmap.josm.gui.dialogs.layer.LayerVisibilityAction; +import org.openstreetmap.josm.gui.dialogs.layer.MergeAction; +import org.openstreetmap.josm.gui.dialogs.layer.MoveDownAction; +import org.openstreetmap.josm.gui.dialogs.layer.MoveUpAction; +import org.openstreetmap.josm.gui.dialogs.layer.ShowHideLayerAction; import org.openstreetmap.josm.gui.layer.JumpToMarkerActions; import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.gui.layer.Layer.LayerAction; import org.openstreetmap.josm.gui.layer.NativeScaleLayer; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField; import org.openstreetmap.josm.gui.widgets.JosmTextField; import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; -import org.openstreetmap.josm.tools.CheckParameterUtil; -import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.InputMapUtils; import org.openstreetmap.josm.tools.MultikeyActionsHandler; -import org.openstreetmap.josm.tools.MultikeyShortcutAction; import org.openstreetmap.josm.tools.MultikeyShortcutAction.MultikeyInfo; import org.openstreetmap.josm.tools.Shortcut; -import org.openstreetmap.josm.tools.Utils; /** @@ -247,15 +238,15 @@ // -- move up action - MoveUpAction moveUpAction = new MoveUpAction(); + MoveUpAction moveUpAction = new MoveUpAction(model); adaptTo(moveUpAction, model); adaptTo(moveUpAction, selectionModel); // -- move down action - MoveDownAction moveDownAction = new MoveDownAction(); + MoveDownAction moveDownAction = new MoveDownAction(model); adaptTo(moveDownAction, model); adaptTo(moveDownAction, selectionModel); // -- activate action - activateLayerAction = new ActivateLayerAction(); + activateLayerAction = new ActivateLayerAction(model); activateLayerAction.updateEnabledState(); MultikeyActionsHandler.getInstance().addAction(activateLayerAction); @@ -265,5 +256,5 @@ // -- show hide action - showHideLayerAction = new ShowHideLayerAction(); + showHideLayerAction = new ShowHideLayerAction(model); MultikeyActionsHandler.getInstance().addAction(showHideLayerAction); adaptTo(showHideLayerAction, selectionModel); @@ -275,5 +266,5 @@ // -- delete layer action - DeleteLayerAction deleteLayerAction = new DeleteLayerAction(); + DeleteLayerAction deleteLayerAction = new DeleteLayerAction(model); layerList.getActionMap().put("deleteLayer", deleteLayerAction); adaptTo(deleteLayerAction, selectionModel); @@ -325,8 +316,4 @@ public LayerListModel getModel() { return model; - } - - protected interface IEnabledStateUpdating { - void updateEnabledState(); } @@ -361,5 +348,4 @@ listModel.addTableModelListener( new TableModelListener() { - @Override public void tableChanged(TableModelEvent e) { @@ -380,819 +366,4 @@ super.destroy(); instance = null; - } - - /** - * The action to delete the currently selected layer - */ - public final class DeleteLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction { - - /** - * Creates a {@link DeleteLayerAction} which will delete the currently - * selected layers in the layer dialog. - */ - public DeleteLayerAction() { - putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); - putValue(SHORT_DESCRIPTION, tr("Delete the selected layers.")); - putValue(NAME, tr("Delete")); - putValue("help", HelpUtil.ht("/Dialog/LayerList#DeleteLayer")); - updateEnabledState(); - } - - @Override - public void actionPerformed(ActionEvent e) { - List selectedLayers = getModel().getSelectedLayers(); - if (selectedLayers.isEmpty()) - return; - if (!Main.saveUnsavedModifications(selectedLayers, false)) - return; - for (Layer l: selectedLayers) { - Main.main.removeLayer(l); - } - } - - @Override - public void updateEnabledState() { - setEnabled(!getModel().getSelectedLayers().isEmpty()); - } - - @Override - public Component createMenuComponent() { - return new JMenuItem(this); - } - - @Override - public boolean supportLayers(List layers) { - return true; - } - - @Override - public boolean equals(Object obj) { - return obj instanceof DeleteLayerAction; - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } - } - - /** - * Action which will toggle the visibility of the currently selected layers. - */ - public final class ShowHideLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, MultikeyShortcutAction { - - private transient WeakReference lastLayer; - private final transient Shortcut multikeyShortcut; - - /** - * Creates a {@link ShowHideLayerAction} which will toggle the visibility of - * the currently selected layers - */ - public ShowHideLayerAction() { - putValue(NAME, tr("Show/hide")); - putValue(SMALL_ICON, ImageProvider.get("dialogs", "showhide")); - putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer.")); - putValue("help", HelpUtil.ht("/Dialog/LayerList#ShowHideLayer")); - multikeyShortcut = Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}", - tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT); - multikeyShortcut.setAccelerator(this); - updateEnabledState(); - } - - @Override - public Shortcut getMultikeyShortcut() { - return multikeyShortcut; - } - - @Override - public void actionPerformed(ActionEvent e) { - for (Layer l : model.getSelectedLayers()) { - l.toggleVisible(); - } - } - - @Override - public void executeMultikeyAction(int index, boolean repeat) { - Layer l = LayerListDialog.getLayerForIndex(index); - if (l != null) { - l.toggleVisible(); - lastLayer = new WeakReference<>(l); - } else if (repeat && lastLayer != null) { - l = lastLayer.get(); - if (LayerListDialog.isLayerValid(l)) { - l.toggleVisible(); - } - } - } - - @Override - public void updateEnabledState() { - setEnabled(!model.getSelectedLayers().isEmpty()); - } - - @Override - public Component createMenuComponent() { - return new JMenuItem(this); - } - - @Override - public boolean supportLayers(List layers) { - return true; - } - - @Override - public boolean equals(Object obj) { - return obj instanceof ShowHideLayerAction; - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } - - @Override - public List getMultikeyCombinations() { - return LayerListDialog.getLayerInfoByClass(Layer.class); - } - - @Override - public MultikeyInfo getLastMultikeyAction() { - if (lastLayer != null) - return LayerListDialog.getLayerInfo(lastLayer.get()); - return null; - } - } - - /** - * This is a menu that includes all settings for the layer visibility. It combines gamma/opacity sliders and the visible-checkbox. - * - * @author Michael Zangl - */ - public static final class LayerVisibilityAction extends AbstractAction implements IEnabledStateUpdating, LayerAction { - protected static final int SLIDER_STEPS = 100; - private static final double MAX_GAMMA_FACTOR = 2; - private static final double MAX_SHARPNESS_FACTOR = 2; - private static final double MAX_COLORFUL_FACTOR = 2; - private final LayerListModel model; - private final JPopupMenu popup; - private SideButton sideButton; - private JCheckBox visibilityCheckbox; - final OpacitySlider opacitySlider = new OpacitySlider(); - private final ArrayList> sliders = new ArrayList<>(); - - /** - * Creates a new {@link LayerVisibilityAction} - * @param model The list to get the selection from. - */ - public LayerVisibilityAction(LayerListModel model) { - this.model = model; - popup = new JPopupMenu(); - - // just to add a border - JPanel content = new JPanel(); - popup.add(content); - content.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - content.setLayout(new GridBagLayout()); - - putValue(SMALL_ICON, ImageProvider.get("dialogs/layerlist", "visibility")); - putValue(SHORT_DESCRIPTION, tr("Change visibility of the selected layer.")); - - visibilityCheckbox = new JCheckBox(tr("Show layer")); - visibilityCheckbox.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - setVisibleFlag(visibilityCheckbox.isSelected()); - } - }); - content.add(visibilityCheckbox, GBC.eop()); - - addSlider(content, opacitySlider); - addSlider(content, new ColorfulnessSlider()); - addSlider(content, new GammaFilterSlider()); - addSlider(content, new SharpnessSlider()); - } - - private void addSlider(JPanel content, FilterSlider slider) { - content.add(new JLabel(slider.getIcon()), GBC.std().span(1, 2).insets(0, 0, 5, 0)); - content.add(new JLabel(slider.getLabel()), GBC.eol()); - content.add(slider, GBC.eop()); - sliders.add(slider); - } - - protected void setVisibleFlag(boolean visible) { - for (Layer l : model.getSelectedLayers()) { - l.setVisible(visible); - } - updateValues(); - } - - @Override - public void actionPerformed(ActionEvent e) { - updateValues(); - if (e.getSource() == sideButton) { - popup.show(sideButton, 0, sideButton.getHeight()); - } else { - // Action can be trigger either by opacity button or by popup menu (in case toggle buttons are hidden). - // In that case, show it in the middle of screen (because opacityButton is not visible) - popup.show(Main.parent, Main.parent.getWidth() / 2, (Main.parent.getHeight() - popup.getHeight()) / 2); - } - } - - protected void updateValues() { - List layers = model.getSelectedLayers(); - - visibilityCheckbox.setEnabled(!layers.isEmpty()); - boolean allVisible = true; - boolean allHidden = true; - for (Layer l : layers) { - allVisible &= l.isVisible(); - allHidden &= !l.isVisible(); - } - // TODO: Indicate tristate. - visibilityCheckbox.setSelected(allVisible && !allHidden); - - for (FilterSlider slider : sliders) { - slider.updateSlider(layers, allHidden); - } - } - - @Override - public boolean supportLayers(List layers) { - return !layers.isEmpty(); - } - - @Override - public Component createMenuComponent() { - return new JMenuItem(this); - } - - @Override - public void updateEnabledState() { - setEnabled(!model.getSelectedLayers().isEmpty()); - } - - /** - * Sets the corresponding side button. - * @param sideButton the corresponding side button - */ - void setCorrespondingSideButton(SideButton sideButton) { - this.sideButton = sideButton; - } - - /** - * This is a slider for a filter value. - * @author Michael Zangl - * - * @param The layer type. - */ - private abstract class FilterSlider extends JSlider { - private final double minValue; - private final double maxValue; - private final Class layerClassFilter; - - /** - * Create a new filter slider. - * @param minValue The minimum value to map to the left side. - * @param maxValue The maximum value to map to the right side. - * @param layerClassFilter The type of layer influenced by this filter. - */ - FilterSlider(double minValue, double maxValue, Class layerClassFilter) { - super(JSlider.HORIZONTAL); - this.minValue = minValue; - this.maxValue = maxValue; - this.layerClassFilter = layerClassFilter; - setMaximum(SLIDER_STEPS); - int tick = convertFromRealValue(1); - setMinorTickSpacing(tick); - setMajorTickSpacing(tick); - setPaintTicks(true); - - addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - onStateChanged(); - } - }); - } - - /** - * Called whenever the state of the slider was changed. - * @see #getValueIsAdjusting() - * @see #getRealValue() - */ - protected void onStateChanged() { - Collection layers = filterLayers(model.getSelectedLayers()); - for (T layer : layers) { - applyValueToLayer(layer); - } - } - - protected void applyValueToLayer(T layer) { - } - - protected double getRealValue() { - return convertToRealValue(getValue()); - } - - protected double convertToRealValue(int value) { - double s = (double) value / SLIDER_STEPS; - return s * maxValue + (1-s) * minValue; - } - - protected void setRealValue(double value) { - setValue(convertFromRealValue(value)); - } - - protected int convertFromRealValue(double value) { - int i = (int) ((value - minValue) / (maxValue - minValue) * SLIDER_STEPS + .5); - if (i < getMinimum()) { - return getMinimum(); - } else if (i > getMaximum()) { - return getMaximum(); - } else { - return i; - } - } - - public abstract ImageIcon getIcon(); - - public abstract String getLabel(); - - public void updateSlider(List layers, boolean allHidden) { - Collection usedLayers = filterLayers(layers); - if (usedLayers.isEmpty() || allHidden) { - setEnabled(false); - } else { - setEnabled(true); - updateSliderWhileEnabled(usedLayers, allHidden); - } - } - - protected Collection filterLayers(List layers) { - return Utils.filteredCollection(layers, layerClassFilter); - } - - protected abstract void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden); - } - - /** - * This slider allows you to change the opacity of a layer. - * - * @author Michael Zangl - * @see Layer#setOpacity(double) - */ - class OpacitySlider extends FilterSlider { - /** - * Creaate a new {@link OpacitySlider}. - */ - OpacitySlider() { - super(0, 1, Layer.class); - setToolTipText(tr("Adjust opacity of the layer.")); - - } - - @Override - protected void onStateChanged() { - if (getRealValue() <= 0.001 && !getValueIsAdjusting()) { - setVisibleFlag(false); - } else { - super.onStateChanged(); - } - } - - @Override - protected void applyValueToLayer(Layer layer) { - layer.setOpacity(getRealValue()); - } - - @Override - protected void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden) { - double opacity = 0; - for (Layer l : usedLayers) { - opacity += l.getOpacity(); - } - opacity /= usedLayers.size(); - if (opacity == 0) { - opacity = 1; - setVisibleFlag(true); - } - setRealValue(opacity); - } - - @Override - public String getLabel() { - return tr("Opacity"); - } - - @Override - public ImageIcon getIcon() { - return ImageProvider.get("dialogs/layerlist", "transparency"); - } - - @Override - public String toString() { - return "OpacitySlider [getRealValue()=" + getRealValue() + "]"; - } - } - - /** - * This slider allows you to change the gamma value of a layer. - * - * @author Michael Zangl - * @see ImageryLayer#setGamma(double) - */ - private class GammaFilterSlider extends FilterSlider { - - /** - * Create a new {@link GammaFilterSlider} - */ - GammaFilterSlider() { - super(0, MAX_GAMMA_FACTOR, ImageryLayer.class); - setToolTipText(tr("Adjust gamma value of the layer.")); - } - - @Override - protected void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden) { - double gamma = ((ImageryLayer) usedLayers.iterator().next()).getGamma(); - setRealValue(gamma); - } - - @Override - protected void applyValueToLayer(ImageryLayer layer) { - layer.setGamma(getRealValue()); - } - - @Override - public ImageIcon getIcon() { - return ImageProvider.get("dialogs/layerlist", "gamma"); - } - - @Override - public String getLabel() { - return tr("Gamma"); - } - } - - /** - * This slider allows you to change the sharpness of a layer. - * - * @author Michael Zangl - * @see ImageryLayer#setSharpenLevel(double) - */ - private class SharpnessSlider extends FilterSlider { - - /** - * Creates a new {@link SharpnessSlider} - */ - SharpnessSlider() { - super(0, MAX_SHARPNESS_FACTOR, ImageryLayer.class); - setToolTipText(tr("Adjust sharpness/blur value of the layer.")); - } - - @Override - protected void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden) { - setRealValue(((ImageryLayer) usedLayers.iterator().next()).getSharpenLevel()); - } - - @Override - protected void applyValueToLayer(ImageryLayer layer) { - layer.setSharpenLevel(getRealValue()); - } - - @Override - public ImageIcon getIcon() { - return ImageProvider.get("dialogs/layerlist", "sharpness"); - } - - @Override - public String getLabel() { - return tr("Sharpness"); - } - } - - /** - * This slider allows you to change the colorfulness of a layer. - * - * @author Michael Zangl - * @see ImageryLayer#setColorfulness(double) - */ - private class ColorfulnessSlider extends FilterSlider { - - /** - * Create a new {@link ColorfulnessSlider} - */ - ColorfulnessSlider() { - super(0, MAX_COLORFUL_FACTOR, ImageryLayer.class); - setToolTipText(tr("Adjust colorfulness of the layer.")); - } - - @Override - protected void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden) { - setRealValue(((ImageryLayer) usedLayers.iterator().next()).getColorfulness()); - } - - @Override - protected void applyValueToLayer(ImageryLayer layer) { - layer.setColorfulness(getRealValue()); - } - - @Override - public ImageIcon getIcon() { - return ImageProvider.get("dialogs/layerlist", "colorfulness"); - } - - @Override - public String getLabel() { - return tr("Colorfulness"); - } - } - } - - /** - * The action to activate the currently selected layer - */ - - public final class ActivateLayerAction extends AbstractAction - implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction { - private transient Layer layer; - private transient Shortcut multikeyShortcut; - - /** - * Constructs a new {@code ActivateLayerAction}. - * @param layer the layer - */ - public ActivateLayerAction(Layer layer) { - this(); - CheckParameterUtil.ensureParameterNotNull(layer, "layer"); - this.layer = layer; - putValue(NAME, tr("Activate")); - updateEnabledState(); - } - - /** - * Constructs a new {@code ActivateLayerAction}. - */ - public ActivateLayerAction() { - putValue(NAME, tr("Activate")); - putValue(SMALL_ICON, ImageProvider.get("dialogs", "activate")); - putValue(SHORT_DESCRIPTION, tr("Activate the selected layer")); - multikeyShortcut = Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}", - tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT); - multikeyShortcut.setAccelerator(this); - putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer")); - } - - @Override - public Shortcut getMultikeyShortcut() { - return multikeyShortcut; - } - - @Override - public void actionPerformed(ActionEvent e) { - Layer toActivate; - if (layer != null) { - toActivate = layer; - } else { - toActivate = model.getSelectedLayers().get(0); - } - execute(toActivate); - } - - private void execute(Layer layer) { - // model is going to be updated via LayerChangeListener and PropertyChangeEvents - Main.map.mapView.setActiveLayer(layer); - layer.setVisible(true); - } - - protected boolean isActiveLayer(Layer layer) { - if (!Main.isDisplayingMapView()) return false; - return Main.map.mapView.getActiveLayer() == layer; - } - - @Override - public void updateEnabledState() { - GuiHelper.runInEDTAndWait(new Runnable() { - @Override - public void run() { - if (layer == null) { - if (getModel().getSelectedLayers().size() != 1) { - setEnabled(false); - return; - } - Layer selectedLayer = getModel().getSelectedLayers().get(0); - setEnabled(!isActiveLayer(selectedLayer)); - } else { - setEnabled(!isActiveLayer(layer)); - } - } - }); - } - - @Override - public void activeLayerChange(Layer oldLayer, Layer newLayer) { - updateEnabledState(); - } - - @Override - public void layerAdded(Layer newLayer) { - updateEnabledState(); - } - - @Override - public void layerRemoved(Layer oldLayer) { - updateEnabledState(); - } - - @Override - public void executeMultikeyAction(int index, boolean repeat) { - Layer l = LayerListDialog.getLayerForIndex(index); - if (l != null) { - execute(l); - } - } - - @Override - public List getMultikeyCombinations() { - return LayerListDialog.getLayerInfoByClass(Layer.class); - } - - @Override - public MultikeyInfo getLastMultikeyAction() { - return null; // Repeating action doesn't make much sense for activating - } - } - - /** - * The action to merge the currently selected layer into another layer. - */ - public final class MergeAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, Layer.MultiLayerAction { - private transient Layer layer; - private transient List layers; - - /** - * Constructs a new {@code MergeAction}. - * @param layer the layer - * @throws IllegalArgumentException if {@code layer} is null - */ - public MergeAction(Layer layer) { - this(layer, null); - CheckParameterUtil.ensureParameterNotNull(layer, "layer"); - } - - /** - * Constructs a new {@code MergeAction}. - * @param layers the layer list - * @throws IllegalArgumentException if {@code layers} is null - */ - public MergeAction(List layers) { - this(null, layers); - CheckParameterUtil.ensureParameterNotNull(layers, "layers"); - } - - /** - * Constructs a new {@code MergeAction}. - * @param layer the layer (null if layer list if specified) - * @param layers the layer list (null if a single layer is specified) - */ - private MergeAction(Layer layer, List layers) { - this.layer = layer; - this.layers = layers; - putValue(NAME, tr("Merge")); - putValue(SMALL_ICON, ImageProvider.get("dialogs", "mergedown")); - putValue(SHORT_DESCRIPTION, tr("Merge this layer into another layer")); - putValue("help", HelpUtil.ht("/Dialog/LayerList#MergeLayer")); - updateEnabledState(); - } - - @Override - public void actionPerformed(ActionEvent e) { - if (layer != null) { - Main.main.menu.merge.merge(layer); - } else if (layers != null) { - Main.main.menu.merge.merge(layers); - } else { - if (getModel().getSelectedLayers().size() == 1) { - Layer selectedLayer = getModel().getSelectedLayers().get(0); - Main.main.menu.merge.merge(selectedLayer); - } else { - Main.main.menu.merge.merge(getModel().getSelectedLayers()); - } - } - } - - @Override - public void updateEnabledState() { - if (layer == null && layers == null) { - if (getModel().getSelectedLayers().isEmpty()) { - setEnabled(false); - } else if (getModel().getSelectedLayers().size() > 1) { - setEnabled(supportLayers(getModel().getSelectedLayers())); - } else { - Layer selectedLayer = getModel().getSelectedLayers().get(0); - List targets = getModel().getPossibleMergeTargets(selectedLayer); - setEnabled(!targets.isEmpty()); - } - } else if (layer != null) { - List targets = getModel().getPossibleMergeTargets(layer); - setEnabled(!targets.isEmpty()); - } else { - setEnabled(supportLayers(layers)); - } - } - - @Override - public boolean supportLayers(List layers) { - if (layers.isEmpty()) { - return false; - } else { - final Layer firstLayer = layers.get(0); - final List remainingLayers = layers.subList(1, layers.size()); - return getModel().getPossibleMergeTargets(firstLayer).containsAll(remainingLayers); - } - } - - @Override - public Component createMenuComponent() { - return new JMenuItem(this); - } - - @Override - public MergeAction getMultiLayerAction(List layers) { - return new MergeAction(layers); - } - } - - /** - * The action to merge the currently selected layer into another layer. - */ - public final class DuplicateAction extends AbstractAction implements IEnabledStateUpdating { - private transient Layer layer; - - /** - * Constructs a new {@code DuplicateAction}. - * @param layer the layer - * @throws IllegalArgumentException if {@code layer} is null - */ - public DuplicateAction(Layer layer) { - this(); - CheckParameterUtil.ensureParameterNotNull(layer, "layer"); - this.layer = layer; - updateEnabledState(); - } - - /** - * Constructs a new {@code DuplicateAction}. - */ - public DuplicateAction() { - putValue(NAME, tr("Duplicate")); - putValue(SMALL_ICON, ImageProvider.get("dialogs", "duplicatelayer")); - putValue(SHORT_DESCRIPTION, tr("Duplicate this layer")); - putValue("help", HelpUtil.ht("/Dialog/LayerList#DuplicateLayer")); - updateEnabledState(); - } - - private void duplicate(Layer layer) { - if (!Main.isDisplayingMapView()) - return; - - List layerNames = new ArrayList<>(); - for (Layer l: Main.map.mapView.getAllLayers()) { - layerNames.add(l.getName()); - } - if (layer instanceof OsmDataLayer) { - OsmDataLayer oldLayer = (OsmDataLayer) layer; - // Translators: "Copy of {layer name}" - String newName = tr("Copy of {0}", oldLayer.getName()); - int i = 2; - while (layerNames.contains(newName)) { - // Translators: "Copy {number} of {layer name}" - newName = tr("Copy {1} of {0}", oldLayer.getName(), i); - i++; - } - Main.main.addLayer(new OsmDataLayer(oldLayer.data.clone(), newName, null)); - } - } - - @Override - public void actionPerformed(ActionEvent e) { - if (layer != null) { - duplicate(layer); - } else { - duplicate(getModel().getSelectedLayers().get(0)); - } - } - - @Override - public void updateEnabledState() { - if (layer == null) { - if (getModel().getSelectedLayers().size() == 1) { - setEnabled(getModel().getSelectedLayers().get(0) instanceof OsmDataLayer); - } else { - setEnabled(false); - } - } else { - setEnabled(layer instanceof OsmDataLayer); - } - } } @@ -1342,5 +513,6 @@ protected boolean isActiveLayer(Layer layer) { - if (!Main.isDisplayingMapView()) return false; + if (!Main.isDisplayingMapView()) + return false; return Main.map.mapView.getActiveLayer() == layer; } @@ -1408,48 +580,4 @@ /** - * The action to move up the currently selected entries in the list. - */ - class MoveUpAction extends AbstractAction implements IEnabledStateUpdating { - MoveUpAction() { - putValue(NAME, tr("Move up")); - putValue(SMALL_ICON, ImageProvider.get("dialogs", "up")); - putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row up.")); - updateEnabledState(); - } - - @Override - public void updateEnabledState() { - setEnabled(model.canMoveUp()); - } - - @Override - public void actionPerformed(ActionEvent e) { - model.moveUp(); - } - } - - /** - * The action to move down the currently selected entries in the list. - */ - class MoveDownAction extends AbstractAction implements IEnabledStateUpdating { - MoveDownAction() { - putValue(NAME, tr("Move down")); - putValue(SMALL_ICON, ImageProvider.get("dialogs", "down")); - putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row down.")); - updateEnabledState(); - } - - @Override - public void updateEnabledState() { - setEnabled(model.canMoveDown()); - } - - @Override - public void actionPerformed(ActionEvent e) { - model.moveDown(); - } - } - - /** * Observer interface to be implemented by views using {@link LayerListModel}. */ @@ -1518,5 +646,4 @@ * removes a listener from this model * @param listener the listener - * */ public void removeLayerListModelListener(LayerListModelListener listener) { @@ -1636,5 +763,6 @@ */ protected void onAddLayer(Layer layer) { - if (layer == null) return; + if (layer == null) + return; layer.addPropertyChangeListener(this); fireTableDataChanged(); @@ -1651,5 +779,6 @@ */ public Layer getFirstLayer() { - if (getRowCount() == 0) return null; + if (getRowCount() == 0) + return null; return getLayers().get(0); } @@ -1683,5 +812,6 @@ */ public void moveUp() { - if (!canMoveUp()) return; + if (!canMoveUp()) + return; List sel = getSelectedRows(); List layers = getLayers(); @@ -1712,8 +842,8 @@ /** * Move down the currently selected layers by one position - * */ public void moveDown() { - if (!canMoveDown()) return; + if (!canMoveDown()) + return; List sel = getSelectedRows(); Collections.reverse(sel); @@ -1734,13 +864,13 @@ /** - * Make sure the first of the selected layers is visible in the - * views of this model. - * + * Make sure the first of the selected layers is visible in the views of this model. */ protected void ensureSelectedIsVisible() { int index = selectionModel.getMinSelectionIndex(); - if (index < 0) return; + if (index < 0) + return; List layers = getLayers(); - if (index >= layers.size()) return; + if (index >= layers.size()) + return; Layer layer = layers.get(index); fireMakeVisible(index, layer); @@ -1748,6 +878,5 @@ /** - * Replies a list of layers which are possible merge targets - * for source + * Replies a list of layers which are possible merge targets for source * * @param source the source layer @@ -1811,6 +940,5 @@ */ protected Layer getActiveLayer() { - if (!Main.isDisplayingMapView()) return null; - return Main.map.mapView.getActiveLayer(); + return Main.isDisplayingMapView() ? Main.map.mapView.getActiveLayer() : null; } @@ -1821,6 +949,5 @@ */ protected NativeScaleLayer getNativeScaleLayer() { - if (!Main.isDisplayingMapView()) return null; - return Main.map.mapView.getNativeScaleLayer(); + return Main.isDisplayingMapView() ? Main.map.mapView.getNativeScaleLayer() : null; } @@ -1832,6 +959,5 @@ public int getRowCount() { List layers = getLayers(); - if (layers == null) return 0; - return layers.size(); + return layers == null ? 0 : layers.size(); } @@ -1943,5 +1069,6 @@ Layer layer = (Layer) evt.getSource(); final int idx = getLayers().indexOf(layer); - if (idx < 0) return; + if (idx < 0) + return; fireRefresh(); } @@ -1967,26 +1094,23 @@ /** - * Creates a {@link ShowHideLayerAction} in the - * context of this {@link LayerListDialog}. + * Creates a {@link ShowHideLayerAction} in the context of this {@link LayerListDialog}. * * @return the action */ public ShowHideLayerAction createShowHideLayerAction() { - return new ShowHideLayerAction(); - } - - /** - * Creates a {@link DeleteLayerAction} in the - * context of this {@link LayerListDialog}. + return new ShowHideLayerAction(model); + } + + /** + * Creates a {@link DeleteLayerAction} in the context of this {@link LayerListDialog}. * * @return the action */ public DeleteLayerAction createDeleteLayerAction() { - return new DeleteLayerAction(); - } - - /** - * Creates a {@link ActivateLayerAction} for layer in the - * context of this {@link LayerListDialog}. + return new DeleteLayerAction(model); + } + + /** + * Creates a {@link ActivateLayerAction} for layer in the context of this {@link LayerListDialog}. * * @param layer the layer @@ -1994,10 +1118,9 @@ */ public ActivateLayerAction createActivateLayerAction(Layer layer) { - return new ActivateLayerAction(layer); - } - - /** - * Creates a {@link MergeLayerAction} for layer in the - * context of this {@link LayerListDialog}. + return new ActivateLayerAction(layer, model); + } + + /** + * Creates a {@link MergeLayerAction} for layer in the context of this {@link LayerListDialog}. * * @param layer the layer @@ -2005,10 +1128,9 @@ */ public MergeAction createMergeLayerAction(Layer layer) { - return new MergeAction(layer); - } - - /** - * Creates a {@link DuplicateAction} for layer in the - * context of this {@link LayerListDialog}. + return new MergeAction(layer, model); + } + + /** + * Creates a {@link DuplicateAction} for layer in the context of this {@link LayerListDialog}. * * @param layer the layer @@ -2016,5 +1138,5 @@ */ public DuplicateAction createDuplicateLayerAction(Layer layer) { - return new DuplicateAction(layer); + return new DuplicateAction(layer, model); } @@ -2025,5 +1147,4 @@ */ public static Layer getLayerForIndex(int index) { - if (!Main.isDisplayingMapView()) return null; @@ -2044,5 +1165,4 @@ */ public static List getLayerInfoByClass(Class layerClass) { - List result = new ArrayList<>(); @@ -2069,5 +1189,4 @@ */ public static boolean isLayerValid(Layer l) { - if (l == null || !Main.isDisplayingMapView()) return false; @@ -2082,5 +1201,4 @@ */ public static MultikeyInfo getLayerInfo(Layer l) { - if (l == null || !Main.isDisplayingMapView()) return null; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java (revision 10144) @@ -0,0 +1,139 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.layer; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.List; + +import javax.swing.AbstractAction; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel; +import org.openstreetmap.josm.gui.help.HelpUtil; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.tools.CheckParameterUtil; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.MultikeyShortcutAction; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * The action to activate the currently selected layer + */ +public final class ActivateLayerAction extends AbstractAction +implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction { + private transient Layer layer; + private transient Shortcut multikeyShortcut; + private final LayerListModel model; + + /** + * Constructs a new {@code ActivateLayerAction}. + * @param layer the layer + * @param model layer list model + */ + public ActivateLayerAction(Layer layer, LayerListModel model) { + this(model); + CheckParameterUtil.ensureParameterNotNull(layer, "layer"); + this.layer = layer; + putValue(NAME, tr("Activate")); + updateEnabledState(); + } + + /** + * Constructs a new {@code ActivateLayerAction}. + * @param model layer list model + */ + public ActivateLayerAction(LayerListModel model) { + this.model = model; + putValue(NAME, tr("Activate")); + putValue(SMALL_ICON, ImageProvider.get("dialogs", "activate")); + putValue(SHORT_DESCRIPTION, tr("Activate the selected layer")); + multikeyShortcut = Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}", + tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT); + multikeyShortcut.setAccelerator(this); + putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer")); + } + + @Override + public Shortcut getMultikeyShortcut() { + return multikeyShortcut; + } + + @Override + public void actionPerformed(ActionEvent e) { + Layer toActivate; + if (layer != null) { + toActivate = layer; + } else { + toActivate = model.getSelectedLayers().get(0); + } + execute(toActivate); + } + + private void execute(Layer layer) { + // model is going to be updated via LayerChangeListener and PropertyChangeEvents + Main.map.mapView.setActiveLayer(layer); + layer.setVisible(true); + } + + protected boolean isActiveLayer(Layer layer) { + if (!Main.isDisplayingMapView()) + return false; + return Main.map.mapView.getActiveLayer() == layer; + } + + @Override + public void updateEnabledState() { + GuiHelper.runInEDTAndWait(new Runnable() { + @Override + public void run() { + if (layer == null) { + if (model.getSelectedLayers().size() != 1) { + setEnabled(false); + return; + } + setEnabled(!isActiveLayer(model.getSelectedLayers().get(0))); + } else { + setEnabled(!isActiveLayer(layer)); + } + } + }); + } + + @Override + public void activeLayerChange(Layer oldLayer, Layer newLayer) { + updateEnabledState(); + } + + @Override + public void layerAdded(Layer newLayer) { + updateEnabledState(); + } + + @Override + public void layerRemoved(Layer oldLayer) { + updateEnabledState(); + } + + @Override + public void executeMultikeyAction(int index, boolean repeat) { + Layer l = LayerListDialog.getLayerForIndex(index); + if (l != null) { + execute(l); + } + } + + @Override + public List getMultikeyCombinations() { + return LayerListDialog.getLayerInfoByClass(Layer.class); + } + + @Override + public MultikeyInfo getLastMultikeyAction() { + return null; // Repeating action doesn't make much sense for activating + } +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java (revision 10144) @@ -0,0 +1,76 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.layer; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.util.List; + +import javax.swing.AbstractAction; +import javax.swing.JMenuItem; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel; +import org.openstreetmap.josm.gui.help.HelpUtil; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.Layer.LayerAction; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * The action to delete the currently selected layer + */ +public final class DeleteLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction { + + private final LayerListModel model; + + /** + * Creates a {@link DeleteLayerAction} which will delete the currently selected layers in the layer dialog. + * @param model layer list model + */ + public DeleteLayerAction(LayerListModel model) { + this.model = model; + putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); + putValue(SHORT_DESCRIPTION, tr("Delete the selected layers.")); + putValue(NAME, tr("Delete")); + putValue("help", HelpUtil.ht("/Dialog/LayerList#DeleteLayer")); + updateEnabledState(); + } + + @Override + public void actionPerformed(ActionEvent e) { + List selectedLayers = model.getSelectedLayers(); + if (selectedLayers.isEmpty()) + return; + if (!Main.saveUnsavedModifications(selectedLayers, false)) + return; + for (Layer l: selectedLayers) { + Main.main.removeLayer(l); + } + } + + @Override + public void updateEnabledState() { + setEnabled(!model.getSelectedLayers().isEmpty()); + } + + @Override + public Component createMenuComponent() { + return new JMenuItem(this); + } + + @Override + public boolean supportLayers(List layers) { + return true; + } + + @Override + public boolean equals(Object obj) { + return obj instanceof DeleteLayerAction; + } + + @Override + public int hashCode() { + return getClass().hashCode(); + } +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java (revision 10144) @@ -0,0 +1,96 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.layer; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.AbstractAction; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel; +import org.openstreetmap.josm.gui.help.HelpUtil; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.tools.CheckParameterUtil; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * The action to merge the currently selected layer into another layer. + */ +public final class DuplicateAction extends AbstractAction implements IEnabledStateUpdating { + private transient Layer layer; + private final LayerListModel model; + + /** + * Constructs a new {@code DuplicateAction}. + * @param layer the layer + * @param model layer list model + * @throws IllegalArgumentException if {@code layer} is null + */ + public DuplicateAction(Layer layer, LayerListModel model) { + this(model); + CheckParameterUtil.ensureParameterNotNull(layer, "layer"); + this.layer = layer; + updateEnabledState(); + } + + /** + * Constructs a new {@code DuplicateAction}. + * @param model layer list model + */ + public DuplicateAction(LayerListModel model) { + this.model = model; + putValue(NAME, tr("Duplicate")); + putValue(SMALL_ICON, ImageProvider.get("dialogs", "duplicatelayer")); + putValue(SHORT_DESCRIPTION, tr("Duplicate this layer")); + putValue("help", HelpUtil.ht("/Dialog/LayerList#DuplicateLayer")); + updateEnabledState(); + } + + private void duplicate(Layer layer) { + if (!Main.isDisplayingMapView()) + return; + + List layerNames = new ArrayList<>(); + for (Layer l: Main.map.mapView.getAllLayers()) { + layerNames.add(l.getName()); + } + if (layer instanceof OsmDataLayer) { + OsmDataLayer oldLayer = (OsmDataLayer) layer; + // Translators: "Copy of {layer name}" + String newName = tr("Copy of {0}", oldLayer.getName()); + int i = 2; + while (layerNames.contains(newName)) { + // Translators: "Copy {number} of {layer name}" + newName = tr("Copy {1} of {0}", oldLayer.getName(), i); + i++; + } + Main.main.addLayer(new OsmDataLayer(oldLayer.data.clone(), newName, null)); + } + } + + @Override + public void actionPerformed(ActionEvent e) { + if (layer != null) { + duplicate(layer); + } else { + duplicate(model.getSelectedLayers().get(0)); + } + } + + @Override + public void updateEnabledState() { + if (layer == null) { + if (model.getSelectedLayers().size() == 1) { + setEnabled(model.getSelectedLayers().get(0) instanceof OsmDataLayer); + } else { + setEnabled(false); + } + } else { + setEnabled(layer instanceof OsmDataLayer); + } + } +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/IEnabledStateUpdating.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/IEnabledStateUpdating.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/IEnabledStateUpdating.java (revision 10144) @@ -0,0 +1,13 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.layer; + +/** + * To be implemented by actions for which their enabled state depends on another model. + */ +public interface IEnabledStateUpdating { + + /** + * Called after the layer model has changed. + */ + void updateEnabledState(); +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java (revision 10144) @@ -0,0 +1,417 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.layer; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import javax.swing.AbstractAction; +import javax.swing.BorderFactory; +import javax.swing.ImageIcon; +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JSlider; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.SideButton; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel; +import org.openstreetmap.josm.gui.layer.ImageryLayer; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.Layer.LayerAction; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.Utils; + +/** + * This is a menu that includes all settings for the layer visibility. It combines gamma/opacity sliders and the visible-checkbox. + * + * @author Michael Zangl + */ +public final class LayerVisibilityAction extends AbstractAction implements IEnabledStateUpdating, LayerAction { + protected static final int SLIDER_STEPS = 100; + private static final double MAX_GAMMA_FACTOR = 2; + private static final double MAX_SHARPNESS_FACTOR = 2; + private static final double MAX_COLORFUL_FACTOR = 2; + private final LayerListModel model; + private final JPopupMenu popup; + private SideButton sideButton; + private JCheckBox visibilityCheckbox; + final OpacitySlider opacitySlider = new OpacitySlider(); + private final ArrayList> sliders = new ArrayList<>(); + + /** + * Creates a new {@link LayerVisibilityAction} + * @param model The list to get the selection from. + */ + public LayerVisibilityAction(LayerListModel model) { + this.model = model; + popup = new JPopupMenu(); + + // just to add a border + JPanel content = new JPanel(); + popup.add(content); + content.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + content.setLayout(new GridBagLayout()); + + putValue(SMALL_ICON, ImageProvider.get("dialogs/layerlist", "visibility")); + putValue(SHORT_DESCRIPTION, tr("Change visibility of the selected layer.")); + + visibilityCheckbox = new JCheckBox(tr("Show layer")); + visibilityCheckbox.addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + setVisibleFlag(visibilityCheckbox.isSelected()); + } + }); + content.add(visibilityCheckbox, GBC.eop()); + + addSlider(content, opacitySlider); + addSlider(content, new ColorfulnessSlider()); + addSlider(content, new GammaFilterSlider()); + addSlider(content, new SharpnessSlider()); + } + + private void addSlider(JPanel content, FilterSlider slider) { + content.add(new JLabel(slider.getIcon()), GBC.std().span(1, 2).insets(0, 0, 5, 0)); + content.add(new JLabel(slider.getLabel()), GBC.eol()); + content.add(slider, GBC.eop()); + sliders.add(slider); + } + + protected void setVisibleFlag(boolean visible) { + for (Layer l : model.getSelectedLayers()) { + l.setVisible(visible); + } + updateValues(); + } + + @Override + public void actionPerformed(ActionEvent e) { + updateValues(); + if (e.getSource() == sideButton) { + popup.show(sideButton, 0, sideButton.getHeight()); + } else { + // Action can be trigger either by opacity button or by popup menu (in case toggle buttons are hidden). + // In that case, show it in the middle of screen (because opacityButton is not visible) + popup.show(Main.parent, Main.parent.getWidth() / 2, (Main.parent.getHeight() - popup.getHeight()) / 2); + } + } + + protected void updateValues() { + List layers = model.getSelectedLayers(); + + visibilityCheckbox.setEnabled(!layers.isEmpty()); + boolean allVisible = true; + boolean allHidden = true; + for (Layer l : layers) { + allVisible &= l.isVisible(); + allHidden &= !l.isVisible(); + } + // TODO: Indicate tristate. + visibilityCheckbox.setSelected(allVisible && !allHidden); + + for (FilterSlider slider : sliders) { + slider.updateSlider(layers, allHidden); + } + } + + @Override + public boolean supportLayers(List layers) { + return !layers.isEmpty(); + } + + @Override + public Component createMenuComponent() { + return new JMenuItem(this); + } + + @Override + public void updateEnabledState() { + setEnabled(!model.getSelectedLayers().isEmpty()); + } + + /** + * Sets the corresponding side button. + * @param sideButton the corresponding side button + */ + public void setCorrespondingSideButton(SideButton sideButton) { + this.sideButton = sideButton; + } + + /** + * This is a slider for a filter value. + * @author Michael Zangl + * + * @param The layer type. + */ + private abstract class FilterSlider extends JSlider { + private final double minValue; + private final double maxValue; + private final Class layerClassFilter; + + /** + * Create a new filter slider. + * @param minValue The minimum value to map to the left side. + * @param maxValue The maximum value to map to the right side. + * @param layerClassFilter The type of layer influenced by this filter. + */ + FilterSlider(double minValue, double maxValue, Class layerClassFilter) { + super(JSlider.HORIZONTAL); + this.minValue = minValue; + this.maxValue = maxValue; + this.layerClassFilter = layerClassFilter; + setMaximum(SLIDER_STEPS); + int tick = convertFromRealValue(1); + setMinorTickSpacing(tick); + setMajorTickSpacing(tick); + setPaintTicks(true); + + addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + onStateChanged(); + } + }); + } + + /** + * Called whenever the state of the slider was changed. + * @see #getValueIsAdjusting() + * @see #getRealValue() + */ + protected void onStateChanged() { + Collection layers = filterLayers(model.getSelectedLayers()); + for (T layer : layers) { + applyValueToLayer(layer); + } + } + + protected void applyValueToLayer(T layer) { + } + + protected double getRealValue() { + return convertToRealValue(getValue()); + } + + protected double convertToRealValue(int value) { + double s = (double) value / SLIDER_STEPS; + return s * maxValue + (1-s) * minValue; + } + + protected void setRealValue(double value) { + setValue(convertFromRealValue(value)); + } + + protected int convertFromRealValue(double value) { + int i = (int) ((value - minValue) / (maxValue - minValue) * SLIDER_STEPS + .5); + if (i < getMinimum()) { + return getMinimum(); + } else if (i > getMaximum()) { + return getMaximum(); + } else { + return i; + } + } + + public abstract ImageIcon getIcon(); + + public abstract String getLabel(); + + public void updateSlider(List layers, boolean allHidden) { + Collection usedLayers = filterLayers(layers); + if (usedLayers.isEmpty() || allHidden) { + setEnabled(false); + } else { + setEnabled(true); + updateSliderWhileEnabled(usedLayers, allHidden); + } + } + + protected Collection filterLayers(List layers) { + return Utils.filteredCollection(layers, layerClassFilter); + } + + protected abstract void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden); + } + + /** + * This slider allows you to change the opacity of a layer. + * + * @author Michael Zangl + * @see Layer#setOpacity(double) + */ + class OpacitySlider extends FilterSlider { + /** + * Creaate a new {@link OpacitySlider}. + */ + OpacitySlider() { + super(0, 1, Layer.class); + setToolTipText(tr("Adjust opacity of the layer.")); + } + + @Override + protected void onStateChanged() { + if (getRealValue() <= 0.001 && !getValueIsAdjusting()) { + setVisibleFlag(false); + } else { + super.onStateChanged(); + } + } + + @Override + protected void applyValueToLayer(Layer layer) { + layer.setOpacity(getRealValue()); + } + + @Override + protected void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden) { + double opacity = 0; + for (Layer l : usedLayers) { + opacity += l.getOpacity(); + } + opacity /= usedLayers.size(); + if (opacity == 0) { + opacity = 1; + setVisibleFlag(true); + } + setRealValue(opacity); + } + + @Override + public String getLabel() { + return tr("Opacity"); + } + + @Override + public ImageIcon getIcon() { + return ImageProvider.get("dialogs/layerlist", "transparency"); + } + + @Override + public String toString() { + return "OpacitySlider [getRealValue()=" + getRealValue() + "]"; + } + } + + /** + * This slider allows you to change the gamma value of a layer. + * + * @author Michael Zangl + * @see ImageryLayer#setGamma(double) + */ + private class GammaFilterSlider extends FilterSlider { + + /** + * Create a new {@link GammaFilterSlider} + */ + GammaFilterSlider() { + super(0, MAX_GAMMA_FACTOR, ImageryLayer.class); + setToolTipText(tr("Adjust gamma value of the layer.")); + } + + @Override + protected void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden) { + double gamma = ((ImageryLayer) usedLayers.iterator().next()).getGamma(); + setRealValue(gamma); + } + + @Override + protected void applyValueToLayer(ImageryLayer layer) { + layer.setGamma(getRealValue()); + } + + @Override + public ImageIcon getIcon() { + return ImageProvider.get("dialogs/layerlist", "gamma"); + } + + @Override + public String getLabel() { + return tr("Gamma"); + } + } + + /** + * This slider allows you to change the sharpness of a layer. + * + * @author Michael Zangl + * @see ImageryLayer#setSharpenLevel(double) + */ + private class SharpnessSlider extends FilterSlider { + + /** + * Creates a new {@link SharpnessSlider} + */ + SharpnessSlider() { + super(0, MAX_SHARPNESS_FACTOR, ImageryLayer.class); + setToolTipText(tr("Adjust sharpness/blur value of the layer.")); + } + + @Override + protected void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden) { + setRealValue(((ImageryLayer) usedLayers.iterator().next()).getSharpenLevel()); + } + + @Override + protected void applyValueToLayer(ImageryLayer layer) { + layer.setSharpenLevel(getRealValue()); + } + + @Override + public ImageIcon getIcon() { + return ImageProvider.get("dialogs/layerlist", "sharpness"); + } + + @Override + public String getLabel() { + return tr("Sharpness"); + } + } + + /** + * This slider allows you to change the colorfulness of a layer. + * + * @author Michael Zangl + * @see ImageryLayer#setColorfulness(double) + */ + private class ColorfulnessSlider extends FilterSlider { + + /** + * Create a new {@link ColorfulnessSlider} + */ + ColorfulnessSlider() { + super(0, MAX_COLORFUL_FACTOR, ImageryLayer.class); + setToolTipText(tr("Adjust colorfulness of the layer.")); + } + + @Override + protected void updateSliderWhileEnabled(Collection usedLayers, boolean allHidden) { + setRealValue(((ImageryLayer) usedLayers.iterator().next()).getColorfulness()); + } + + @Override + protected void applyValueToLayer(ImageryLayer layer) { + layer.setColorfulness(getRealValue()); + } + + @Override + public ImageIcon getIcon() { + return ImageProvider.get("dialogs/layerlist", "colorfulness"); + } + + @Override + public String getLabel() { + return tr("Colorfulness"); + } + } +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java (revision 10144) @@ -0,0 +1,124 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.layer; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.util.List; + +import javax.swing.AbstractAction; +import javax.swing.JMenuItem; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel; +import org.openstreetmap.josm.gui.help.HelpUtil; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.Layer.LayerAction; +import org.openstreetmap.josm.tools.CheckParameterUtil; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * The action to merge the currently selected layer into another layer. + */ +public final class MergeAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, Layer.MultiLayerAction { + private transient Layer layer; + private transient List layers; + private final LayerListModel model; + + /** + * Constructs a new {@code MergeAction}. + * @param layer the layer + * @param model layer list model + * @throws IllegalArgumentException if {@code layer} is null + */ + public MergeAction(Layer layer, LayerListModel model) { + this(layer, null, model); + CheckParameterUtil.ensureParameterNotNull(layer, "layer"); + } + + /** + * Constructs a new {@code MergeAction}. + * @param layers the layer list + * @param model layer list model + * @throws IllegalArgumentException if {@code layers} is null + */ + public MergeAction(List layers, LayerListModel model) { + this(null, layers, model); + CheckParameterUtil.ensureParameterNotNull(layers, "layers"); + } + + /** + * Constructs a new {@code MergeAction}. + * @param layer the layer (null if layer list if specified) + * @param layers the layer list (null if a single layer is specified) + * @param model layer list model + */ + private MergeAction(Layer layer, List layers, LayerListModel model) { + this.layer = layer; + this.layers = layers; + this.model = model; + putValue(NAME, tr("Merge")); + putValue(SMALL_ICON, ImageProvider.get("dialogs", "mergedown")); + putValue(SHORT_DESCRIPTION, tr("Merge this layer into another layer")); + putValue("help", HelpUtil.ht("/Dialog/LayerList#MergeLayer")); + updateEnabledState(); + } + + @Override + public void actionPerformed(ActionEvent e) { + if (layer != null) { + Main.main.menu.merge.merge(layer); + } else if (layers != null) { + Main.main.menu.merge.merge(layers); + } else { + if (model.getSelectedLayers().size() == 1) { + Layer selectedLayer = model.getSelectedLayers().get(0); + Main.main.menu.merge.merge(selectedLayer); + } else { + Main.main.menu.merge.merge(model.getSelectedLayers()); + } + } + } + + @Override + public void updateEnabledState() { + if (layer == null && layers == null) { + if (model.getSelectedLayers().isEmpty()) { + setEnabled(false); + } else if (model.getSelectedLayers().size() > 1) { + setEnabled(supportLayers(model.getSelectedLayers())); + } else { + Layer selectedLayer = model.getSelectedLayers().get(0); + List targets = model.getPossibleMergeTargets(selectedLayer); + setEnabled(!targets.isEmpty()); + } + } else if (layer != null) { + List targets = model.getPossibleMergeTargets(layer); + setEnabled(!targets.isEmpty()); + } else { + setEnabled(supportLayers(layers)); + } + } + + @Override + public boolean supportLayers(List layers) { + if (layers.isEmpty()) { + return false; + } else { + final Layer firstLayer = layers.get(0); + final List remainingLayers = layers.subList(1, layers.size()); + return model.getPossibleMergeTargets(firstLayer).containsAll(remainingLayers); + } + } + + @Override + public Component createMenuComponent() { + return new JMenuItem(this); + } + + @Override + public MergeAction getMultiLayerAction(List layers) { + return new MergeAction(layers, model); + } +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveDownAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveDownAction.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveDownAction.java (revision 10144) @@ -0,0 +1,40 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.layer; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; + +import javax.swing.AbstractAction; + +import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * The action to move down the currently selected entries in the list. + */ +public class MoveDownAction extends AbstractAction implements IEnabledStateUpdating { + private final LayerListModel model; + + /** + * Constructs a new {@code MoveDownAction}. + * @param model layer list model + */ + public MoveDownAction(LayerListModel model) { + this.model = model; + putValue(NAME, tr("Move down")); + putValue(SMALL_ICON, ImageProvider.get("dialogs", "down")); + putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row down.")); + updateEnabledState(); + } + + @Override + public void updateEnabledState() { + setEnabled(model.canMoveDown()); + } + + @Override + public void actionPerformed(ActionEvent e) { + model.moveDown(); + } +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java (revision 10144) @@ -0,0 +1,40 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.layer; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; + +import javax.swing.AbstractAction; + +import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * The action to move up the currently selected entries in the list. + */ +public class MoveUpAction extends AbstractAction implements IEnabledStateUpdating { + private final LayerListModel model; + + /** + * Constructs a new {@code MoveUpAction}. + * @param model layer list model + */ + public MoveUpAction(LayerListModel model) { + this.model = model; + putValue(NAME, tr("Move up")); + putValue(SMALL_ICON, ImageProvider.get("dialogs", "up")); + putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row up.")); + updateEnabledState(); + } + + @Override + public void updateEnabledState() { + setEnabled(model.canMoveUp()); + } + + @Override + public void actionPerformed(ActionEvent e) { + model.moveUp(); + } +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ShowHideLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ShowHideLayerAction.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ShowHideLayerAction.java (revision 10144) @@ -0,0 +1,111 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.layer; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.lang.ref.WeakReference; +import java.util.List; + +import javax.swing.AbstractAction; +import javax.swing.JMenuItem; + +import org.openstreetmap.josm.gui.dialogs.LayerListDialog; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel; +import org.openstreetmap.josm.gui.help.HelpUtil; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.Layer.LayerAction; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.MultikeyShortcutAction; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * Action which will toggle the visibility of the currently selected layers. + */ +public final class ShowHideLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, MultikeyShortcutAction { + + private transient WeakReference lastLayer; + private final transient Shortcut multikeyShortcut; + private final LayerListModel model; + + /** + * Creates a {@link ShowHideLayerAction} which will toggle the visibility of the currently selected layers + * @param model layer list model + */ + public ShowHideLayerAction(LayerListModel model) { + this.model = model; + putValue(NAME, tr("Show/hide")); + putValue(SMALL_ICON, ImageProvider.get("dialogs", "showhide")); + putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer.")); + putValue("help", HelpUtil.ht("/Dialog/LayerList#ShowHideLayer")); + multikeyShortcut = Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}", + tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT); + multikeyShortcut.setAccelerator(this); + updateEnabledState(); + } + + @Override + public Shortcut getMultikeyShortcut() { + return multikeyShortcut; + } + + @Override + public void actionPerformed(ActionEvent e) { + for (Layer l : model.getSelectedLayers()) { + l.toggleVisible(); + } + } + + @Override + public void executeMultikeyAction(int index, boolean repeat) { + Layer l = LayerListDialog.getLayerForIndex(index); + if (l != null) { + l.toggleVisible(); + lastLayer = new WeakReference<>(l); + } else if (repeat && lastLayer != null) { + l = lastLayer.get(); + if (LayerListDialog.isLayerValid(l)) { + l.toggleVisible(); + } + } + } + + @Override + public void updateEnabledState() { + setEnabled(!model.getSelectedLayers().isEmpty()); + } + + @Override + public Component createMenuComponent() { + return new JMenuItem(this); + } + + @Override + public boolean supportLayers(List layers) { + return true; + } + + @Override + public boolean equals(Object obj) { + return obj instanceof ShowHideLayerAction; + } + + @Override + public int hashCode() { + return getClass().hashCode(); + } + + @Override + public List getMultikeyCombinations() { + return LayerListDialog.getLayerInfoByClass(Layer.class); + } + + @Override + public MultikeyInfo getLastMultikeyAction() { + if (lastLayer != null) + return LayerListDialog.getLayerInfo(lastLayer.get()); + return null; + } +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/layer/package-info.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/layer/package-info.java (revision 10144) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/layer/package-info.java (revision 10144) @@ -0,0 +1,6 @@ +// License: GPL. For details, see LICENSE file. + +/** + * Toggle dialog allowing to display the list of layers. + */ +package org.openstreetmap.josm.gui.dialogs.layer;