Index: /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (revision 35312) @@ -1,21 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * Copyright (C) 2018 Rebecca Schmidt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - +// License: GPL. For details, see LICENSE file. package controller; @@ -27,6 +9,6 @@ import java.awt.event.ItemListener; import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; import java.util.ArrayList; import java.util.Collection; @@ -34,5 +16,4 @@ import java.util.List; import java.util.Map; -import java.util.Optional; import javax.swing.AbstractAction; @@ -40,6 +21,4 @@ import org.openstreetmap.josm.actions.ValidateAction; -import org.openstreetmap.josm.actions.mapmode.DrawAction; -import org.openstreetmap.josm.actions.mapmode.SelectAction; import org.openstreetmap.josm.data.Preferences; import org.openstreetmap.josm.data.osm.DataSet; @@ -48,5 +27,4 @@ import org.openstreetmap.josm.data.osm.Tag; import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.gui.help.HelpBrowser; import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; @@ -63,74 +41,275 @@ /** -* -* Class for the Controller which provides the communication between -* the IndoorHelperModel and the different views. -* -* @author egru -* @author rebsc -* -*/ + * + * Class for the Controller which provides the communication between the + * IndoorHelperModel and the different views. + * + * @author egru + * @author rebsc + */ public class IndoorHelperController { - private IndoorHelperModel model; - private ToolBoxView toolboxView; - private String sep; - private String levelValue, levelNum; - private MapFrame map; - private DrawAction drawAction; - private SelectAction selectAction; - private SpaceAction spaceAction; - private transient Shortcut spaceShortcut; - private EnterAction enterAction; - private transient Shortcut enterShortcut; - private boolean outerHelp, innerHelp, levelHelp; - private Collection innerRelation; - private LevelSelectorView selectorView; - - /** - * Constructor for the {@link IndoorHelperController} which initiates model and views. - * - */ - public IndoorHelperController() { - - this.model = new IndoorHelperModel(); - this.toolboxView = new ToolBoxView(); - - this.sep = System.getProperty("file.separator"); - setPluginPreferences(true); - - // Multipolygon actions - this.drawAction = new DrawAction(); - this.map = MainApplication.getMap(); - this.selectAction = new SelectAction(map); - - // Ui elements - toolboxView.setAllUiElementsEnabled(true); - toolboxView.setROUiElementsEnabled(false); - - addToolboxListeners(); - MainApplication.getMap().addToggleDialog(toolboxView); - - // Shortcuts - spaceShortcut = Shortcut.registerShortcut("mapmode:space", - "ConfirmObjectDrawing", KeyEvent.VK_SPACE, Shortcut.DIRECT); - this.spaceAction = new SpaceAction(); - MainApplication.registerActionShortcut(spaceAction, spaceShortcut); - - enterShortcut = Shortcut.registerShortcut("mapmode:enter", - "ConfirmMultipolygonSelection", KeyEvent.VK_ENTER, Shortcut.DIRECT); - this.enterAction = new EnterAction(); - MainApplication.registerActionShortcut(enterAction, enterShortcut); - - // Helper - outerHelp = false; - innerHelp = false; - levelHelp = false; - innerRelation = null; - levelValue = new String(); - levelNum = new String(); - - } - + private final IndoorHelperModel model = new IndoorHelperModel(); + private ToolBoxView toolboxView; + private String levelValue, levelNum; + private final SpaceAction spaceAction = new SpaceAction(); + private Shortcut spaceShortcut; + private final EnterAction enterAction = new EnterAction(); + private Shortcut enterShortcut; + private boolean outerHelp, innerHelp, levelHelp; + private Collection innerRelation; + private LevelSelectorView selectorView; + + /** + * The listener which provides the handling of the applyButton. + * Gets the texts which were written by the user and writes them to the OSM-data. + * After that it checks the tagged data. + * + * @author egru + * @author rebsc + */ + private final ActionListener toolApplyButtonListener = e -> { + + IndoorObject indoorObject = toolboxView.getSelectedObject(); + + // collecting all tags + List tags = new ArrayList<>(); + if (!toolboxView.getLevelCheckBoxStatus() && !levelValue.equals("")) { + tags.add(new Tag("level", levelValue)); + } + if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) { + tags.add(new Tag("level_name", toolboxView.getLevelNameText())); + } + if (!toolboxView.getNameText().isEmpty()) { + tags.add(new Tag("name", toolboxView.getNameText())); + } + if (!toolboxView.getRefText().isEmpty()) { + tags.add(new Tag("ref", toolboxView.getRefText())); + } + if (!toolboxView.getRepeatOnText().isEmpty()) { + tags.add(new Tag("repeat_on", toolboxView.getRepeatOnText())); + } + if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) { + tags.add(new Tag("level_name", toolboxView.getLevelNameText())); + } + + // Tagging to OSM Data + model.addTagsToOSM(indoorObject, tags); + + // Reset UI elements + toolboxView.resetUiElements(); + + // Do the validation process + new ValidateAction().doValidate(true); + + refreshPresets(); + }; + + /** + * The listener which is called when a new item in the object list is selected. + * + * @author egru + * @author rebsc + */ + private final ItemListener toolObjectItemListener = e -> { + if (toolboxView.getSelectedObject().equals(IndoorObject.ROOM)) { + toolboxView.setNRUiElementsEnabled(true); + toolboxView.setROUiElementsEnabled(false); + } else if (toolboxView.getSelectedObject().equals(IndoorObject.STEPS) + || toolboxView.getSelectedObject().equals(IndoorObject.ELEVATOR)) { + toolboxView.setROUiElementsEnabled(true); + toolboxView.setNRUiElementsEnabled(true); + } else { + toolboxView.setROUiElementsEnabled(false); + } + }; + + /** + * The listener which is called when the LevelCheckBox is selected. + * + * @author rebsc + */ + private final ItemListener toolLevelCheckBoxListener = e -> toolboxView + .setLVLUiElementsEnabled(e.getStateChange() != ItemEvent.SELECTED); + + /** + * The listener which is called when the helpButton got pushed. + * + * @author rebsc + */ + private final ActionListener toolHelpButtonListener = e -> HelpBrowser.setUrlForHelpTopic("Plugin/IndoorHelper"); + + /** + * The listener which is called when the addLevelButton got pushed. + * + * @author rebsc + */ + private final ActionListener toolAddLevelButtonListener = e -> { + if (selectorView == null) { + selectorView = new LevelSelectorView(); + addLevelSelectorListeners(); + + // Show LevelSelectorView + selectorView.setVisible(true); + } else { + // Put focus back on LevelSelectorView + selectorView.toFront(); + } + }; + + /** + * The listener which is called when the MultiCheckBox is selected. + * + * @author rebsc + */ + private final ItemListener toolMultiCheckBoxListener = e -> toolboxView + .setMultiUiElementsEnabled(e.getStateChange() != ItemEvent.SELECTED); + + /** + * The listener which is called when the OUTER Button got pushed. + * + * @author rebsc + */ + private final ActionListener toolOuterButtonListener = e -> { + // Select drawing action + MainApplication.getMap().selectDrawTool(false); + + // For space shortcut to add the relation after spacebar got pushed {@link SpaceAction} + outerHelp = true; + innerHelp = false; + }; + + /** + * The listener which is called when the INNER Button got pushed. + * + * @author rebsc + */ + private final ActionListener toolInnerButtonListener = e -> { + // Select drawing action + MainApplication.getMap().selectDrawTool(false); + + // For space shortcut to edit the relation after enter got pushed {@link SpaceAction}{@link EnterAction} + innerHelp = true; + outerHelp = false; + }; + + /** + * Listener for preset button 1. + * + * @author egru + */ + private final ActionListener preset1Listener = e -> model.addTagsToOSM(toolboxView.getPreset1()); + + /** + * Listener for preset button 2. + * + * @author egru + */ + private final ActionListener preset2Listener = e -> model.addTagsToOSM(toolboxView.getPreset2()); + + /** + * Listener for preset button 3. + * + * @author egru + */ + private final ActionListener preset3Listener = e -> model.addTagsToOSM(toolboxView.getPreset3()); + + /** + * Listener for preset button 4. + * + * @author egru + */ + private final ActionListener preset4Listener = e -> model.addTagsToOSM(toolboxView.getPreset4()); + + /** + * Updates the preset button from the current ranking. + */ + private void refreshPresets() { + toolboxView.setPresetButtons(model.getPresetRanking()); + } + + /** + * Specific listener for the applyButton + * + * @author rebsc + */ + private final ActionListener toolLevelOkButtonListener = e -> { + levelHelp = true; + + // Get insert level number out of SelectorView + if (!selectorView.getLevelNumber().equals("")) { + levelNum = selectorView.getLevelNumber(); + + // Unset visibility + selectorView.dispose(); + // Select draw-action + MainApplication.getMap().selectDrawTool(false); + + } else { + JOptionPane.showMessageDialog(null, tr("Please insert a value."), tr("Error"), JOptionPane.ERROR_MESSAGE); + } + + selectorView = null; + }; + + /** + * Specific listener for the cancelButton + * + * @author rebsc + */ + private final ActionListener toolLevelCancelButtonListener = e -> { + selectorView.dispose(); + selectorView = null; + }; + + /** + * General listener for LevelSelectorView window + * + * @author rebsc + */ + class ToolSelectorWindowSListener extends WindowAdapter { + + @Override + public void windowClosed(WindowEvent e) { + selectorView = null; + } + + @Override + public void windowClosing(WindowEvent e) { + selectorView = null; + } + } + + /** + * Constructor for the {@link IndoorHelperController} which initiates model and views. + */ + public IndoorHelperController() { + + toolboxView = new ToolBoxView(); + + setPluginPreferences(true); + + // Ui elements + toolboxView.setAllUiElementsEnabled(true); + toolboxView.setROUiElementsEnabled(false); + + addToolboxListeners(); + MainApplication.getMap().addToggleDialog(toolboxView); + + // Shortcuts + spaceShortcut = Shortcut.registerShortcut("mapmode:space", "ConfirmObjectDrawing", KeyEvent.VK_SPACE, Shortcut.DIRECT); + MainApplication.registerActionShortcut(spaceAction, spaceShortcut); + + enterShortcut = Shortcut.registerShortcut("mapmode:enter", "ConfirmMultipolygonSelection", KeyEvent.VK_ENTER, Shortcut.DIRECT); + MainApplication.registerActionShortcut(enterAction, enterShortcut); + + // Helper + outerHelp = false; + innerHelp = false; + levelHelp = false; + innerRelation = null; + levelValue = ""; + levelNum = ""; + } /** @@ -138,18 +317,17 @@ */ private void addToolboxListeners() { - - if (this.toolboxView != null) { - this.toolboxView.setApplyButtonListener(new ToolApplyButtonListener()); - this.toolboxView.setLevelCheckBoxListener(new ToolLevelCheckBoxListener()); - this.toolboxView.setHelpButtonListener(new ToolHelpButtonListener()); - this.toolboxView.setAddLevelButtonListener(new ToolAddLevelButtonListener()); - this.toolboxView.setObjectItemListener(new ToolObjectItemListener()); - this.toolboxView.setOuterButtonListener(new ToolOuterButtonListener()); - this.toolboxView.setInnerButtonListener(new ToolInnerButtonListener()); - this.toolboxView.setMultiCheckBoxListener(new ToolMultiCheckBoxListener()); - this.toolboxView.setPreset1Listener(new Preset1Listener()); - this.toolboxView.setPreset2Listener(new Preset2Listener()); - this.toolboxView.setPreset3Listener(new Preset3Listener()); - this.toolboxView.setPreset4Listener(new Preset4Listener()); + if (toolboxView != null) { + toolboxView.setApplyButtonListener(toolApplyButtonListener); + toolboxView.setLevelCheckBoxListener(toolLevelCheckBoxListener); + toolboxView.setHelpButtonListener(toolHelpButtonListener); + toolboxView.setAddLevelButtonListener(toolAddLevelButtonListener); + toolboxView.setObjectItemListener(toolObjectItemListener); + toolboxView.setOuterButtonListener(toolOuterButtonListener); + toolboxView.setInnerButtonListener(toolInnerButtonListener); + toolboxView.setMultiCheckBoxListener(toolMultiCheckBoxListener); + toolboxView.setPreset1Listener(preset1Listener); + toolboxView.setPreset2Listener(preset2Listener); + toolboxView.setPreset3Listener(preset3Listener); + toolboxView.setPreset4Listener(preset4Listener); } } @@ -159,440 +337,112 @@ */ private void addLevelSelectorListeners() { - if (this.selectorView != null) { - this.selectorView.setOkButtonListener(new ToolLevelOkButtonListener()); - this.selectorView.setCancelButtonListener(new ToolLevelCancelButtonListener()); - this.selectorView.setSelectorWindowListener(new ToolSelectorWindowSListener()); - } - - } - - /** - * The listener which provides the handling of the applyButton. - * Gets the texts which were written by the user and writes them to the OSM-data. - * After that it checks the tagged data. - * - * @author egru - * @author rebsc - */ - class ToolApplyButtonListener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - - IndoorObject indoorObject = toolboxView.getSelectedObject(); - - // collecting all tags - List tags = new ArrayList<>(); - if (!toolboxView.getLevelCheckBoxStatus() && !levelValue.equals("")) { - tags.add(new Tag("level", levelValue)); - } - if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) { - tags.add(new Tag("level_name", toolboxView.getLevelNameText())); - } - if (!toolboxView.getNameText().isEmpty()) { - tags.add(new Tag("name", toolboxView.getNameText())); - } - if (!toolboxView.getRefText().isEmpty()) { - tags.add(new Tag("ref", toolboxView.getRefText())); - } - if (!toolboxView.getRepeatOnText().isEmpty()) { - tags.add(new Tag("repeat_on", toolboxView.getRepeatOnText())); - } - if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) { - tags.add(new Tag("level_name", toolboxView.getLevelNameText())); - } - - // Tagging to OSM Data - model.addTagsToOSM(indoorObject, tags); - - // Reset UI elements - toolboxView.resetUiElements(); - - //Do the validation process - ValidateAction validateAction = new ValidateAction(); - validateAction.doValidate(true); - - refreshPresets(); - - } - } - - /** - * The listener which is called when a new item in the object list is selected. - * - * @author egru - * @author rebsc - * - */ - class ToolObjectItemListener implements ItemListener { - - @Override - public void itemStateChanged(ItemEvent e) { - if (toolboxView.getSelectedObject().equals(IndoorObject.ROOM)) { - toolboxView.setNRUiElementsEnabled(true); - toolboxView.setROUiElementsEnabled(false); - } else if (toolboxView.getSelectedObject().equals(IndoorObject.STEPS) || - toolboxView.getSelectedObject().equals(IndoorObject.ELEVATOR)) { - toolboxView.setROUiElementsEnabled(true); - toolboxView.setNRUiElementsEnabled(true); - } else { - toolboxView.setROUiElementsEnabled(false); - } - } - } - - /** - * The listener which is called when the LevelCheckBox is selected. - * - * @author rebsc - */ - class ToolLevelCheckBoxListener implements ItemListener { - @Override - public void itemStateChanged(ItemEvent e) { - if (e.getStateChange() == ItemEvent.SELECTED) { - toolboxView.setLVLUiElementsEnabled(false); - } else { - toolboxView.setLVLUiElementsEnabled(true); - } - } - } - - /** - * The listener which is called when the helpButton got pushed. - * - * @author rebsc - */ - static class ToolHelpButtonListener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - String topic = "Plugin/IndoorHelper"; - //Open HelpBrowser for short description about the plugin - HelpBrowser.setUrlForHelpTopic(Optional.ofNullable(topic).orElse("/")); - } - } - - /** - * The listener which is called when the addLevelButton got pushed. - * - * @author rebsc - */ - class ToolAddLevelButtonListener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - - if (selectorView == null) { - selectorView = new LevelSelectorView(); - addLevelSelectorListeners(); - - //Show LevelSelectorView - selectorView.setVisible(true); - } else { - //Put focus back on LevelSelectorView - selectorView.toFront(); - } - - } - } - - /** - * The listener which is called when the MultiCheckBox is selected. - * - * @author rebsc - */ - class ToolMultiCheckBoxListener implements ItemListener { - @Override - public void itemStateChanged(ItemEvent e) { - if (e.getStateChange() == ItemEvent.SELECTED) { - toolboxView.setMultiUiElementsEnabled(false); - } else { - toolboxView.setMultiUiElementsEnabled(true); - } - } - } - - /** - * The listener which is called when the OUTER Button got pushed. - * - * @author rebsc - */ - class ToolOuterButtonListener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - // Select drawing action - map.selectMapMode(drawAction); - - // For space shortcut to add the relation after spacebar got pushed {@link SpaceAction} - outerHelp = true; - innerHelp = false; - } - } - - /** - * The listener which is called when the INNER Button got pushed. - * - * @author rebsc - */ - class ToolInnerButtonListener implements ActionListener { - @Override - public void actionPerformed(ActionEvent e) { - // Select drawing action - map.selectMapMode(drawAction); - - // For space shortcut to edit the relation after enter got pushed {@link SpaceAction}{@link EnterAction} - innerHelp = true; - outerHelp = false; - - } - } - - /** - * Listener for preset button 1. - * @author egru - * - */ - class Preset1Listener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - model.addTagsToOSM(toolboxView.getPreset1()); - } - } - - /** - * Listener for preset button 2. - * @author egru - * - */ - class Preset2Listener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - model.addTagsToOSM(toolboxView.getPreset2()); - } - } - - /** - * Listener for preset button 3. - * @author egru - * - */ - class Preset3Listener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - model.addTagsToOSM(toolboxView.getPreset3()); - } - } - - /** - * Listener for preset button 4. - * @author egru - * - */ - class Preset4Listener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - model.addTagsToOSM(toolboxView.getPreset4()); - } - } - - /** - * Updates the preset button from the current ranking. - */ - private void refreshPresets() { - toolboxView.setPresetButtons(model.getPresetRanking()); - } - - /** - * Specific listener for the applyButton - * @author rebsc - * - */ - class ToolLevelOkButtonListener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - levelHelp = true; - - // Get insert level number out of SelectorView - if (!selectorView.getLevelNumber().equals("")) { - levelNum = selectorView.getLevelNumber(); - - //Unset visibility - selectorView.dispose(); - //Select draw-action - map.selectMapMode(drawAction); - - } else { - JOptionPane.showMessageDialog(null, tr("Please insert a value."), tr("Error"), JOptionPane.ERROR_MESSAGE); - } - - selectorView = null; - } - } - - /** - * Specific listener for the cancelButton - * @author rebsc - * - */ - class ToolLevelCancelButtonListener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - selectorView.dispose(); - selectorView = null; - } - } - - /** - * General listener for LevelSelectorView window - * @author rebsc - * - */ - class ToolSelectorWindowSListener implements WindowListener { - - @Override - public void windowClosed(WindowEvent e) { - selectorView = null; - } - - @Override - public void windowClosing(WindowEvent e) { - selectorView = null; - } - - @Override - public void windowActivated(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void windowDeactivated(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void windowDeiconified(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void windowIconified(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void windowOpened(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - } - - /** - * Shortcut for spacebar - * @author rebsc - */ - private class SpaceAction extends AbstractAction { - - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - if (outerHelp) { - - //Create new relation and add the currently drawn object to it - model.addRelation("outer"); - map.selectMapMode(selectAction); - outerHelp = false; - - //Clear currently selection - MainApplication.getLayerManager().getEditDataSet().clearSelection(); - } else if (innerHelp) { - - //Save new drawn relation for adding - innerRelation = MainApplication.getLayerManager().getEditDataSet().getAllSelected(); - map.selectMapMode(selectAction); - - //Clear currently selection - MainApplication.getLayerManager().getEditDataSet().clearSelection(); - } else if (levelHelp) { - - List tags = new ArrayList<>(); - tags.add(new Tag("level", levelNum)); - - //Add level tag - model.addTagsToOSM(tags); - - //Change action - map.selectMapMode(selectAction); - levelHelp = false; - } - } - } - - /** - * Shortcut for enter - * @author rebsc - */ - private class EnterAction extends AbstractAction { - - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - if (innerHelp && !outerHelp) { - // Edit the new drawn relation member to selected relation - model.editRelation("inner", innerRelation); - innerHelp = false; - } else if ((innerHelp && outerHelp) || (outerHelp && !innerHelp)) { - JOptionPane.showMessageDialog(null, - tr("Please press spacebar first to add \"outer\" object to relation."), tr("Relation-Error"), JOptionPane.ERROR_MESSAGE); - resetHelper(); - } - } - } - - /** - * Function which unsets the disabled state of currently hidden and/or disabled objects which have a - * specific tag (key). Just unsets the disabled state if object has a tag-value which is part of the - * current working level. - * - * @author rebsc - * @param key sepcific key to unset hidden objects which contains it - */ - public void unsetSpecificKeyFilter(String key) { - - DataSet editDataSet = OsmDataManager.getInstance().getEditDataSet(); - if (editDataSet != null) { - Collection p = editDataSet.allPrimitives(); - int level = Integer.parseInt(levelValue); - - //Find all primitives with the specific tag and check if value is part of the current - //workinglevel. After that unset the disabled status. - for (OsmPrimitive osm: p) { - if ((osm.isDisabledAndHidden() || osm.isDisabled()) && osm.hasKey(key)) { - for (Map.Entry e: osm.getInterestingTags().entrySet()) { - if (e.getKey().equals(key)) { - //Compare values to current working level - if (IndoorLevel.isPartOfWorkingLevel(e.getValue(), level)) { - osm.unsetDisabledState(); - } else { - osm.setDisabledState(true); + if (selectorView != null) { + selectorView.setOkButtonListener(toolLevelOkButtonListener); + selectorView.setCancelButtonListener(toolLevelCancelButtonListener); + selectorView.setSelectorWindowListener(new ToolSelectorWindowSListener()); + } + } + + /** + * Shortcut for spacebar + * + * @author rebsc + */ + private class SpaceAction extends AbstractAction { + + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + if (outerHelp) { + + // Create new relation and add the currently drawn object to it + model.addRelation("outer"); + MainApplication.getMap().selectSelectTool(false); + outerHelp = false; + + // Clear currently selection + MainApplication.getLayerManager().getEditDataSet().clearSelection(); + } else if (innerHelp) { + + // Save new drawn relation for adding + innerRelation = MainApplication.getLayerManager().getEditDataSet().getAllSelected(); + MainApplication.getMap().selectSelectTool(false); + + // Clear currently selection + MainApplication.getLayerManager().getEditDataSet().clearSelection(); + } else if (levelHelp) { + + List tags = new ArrayList<>(); + tags.add(new Tag("level", levelNum)); + + // Add level tag + model.addTagsToOSM(tags); + + // Change action + MainApplication.getMap().selectSelectTool(false); + levelHelp = false; + } + } + } + + /** + * Shortcut for enter + * + * @author rebsc + */ + private class EnterAction extends AbstractAction { + + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + if (innerHelp && !outerHelp) { + // Edit the new drawn relation member to selected relation + model.editRelation("inner", innerRelation); + innerHelp = false; + } else if ((innerHelp && outerHelp) || (outerHelp && !innerHelp)) { + JOptionPane.showMessageDialog(null, + tr("Please press spacebar first to add \"outer\" object to relation."), tr("Relation-Error"), + JOptionPane.ERROR_MESSAGE); + innerHelp = false; + outerHelp = false; + } + } + } + + /** + * Function which unsets the disabled state of currently hidden and/or disabled objects which have a + * specific tag (key). Just unsets the disabled state if object has a tag-value which is part of the + * current working level. + * + * @author rebsc + * @param key specific key to unset hidden objects which contains it + */ + public void unsetSpecificKeyFilter(String key) { + + DataSet editDataSet = OsmDataManager.getInstance().getEditDataSet(); + if (editDataSet != null) { + Collection p = editDataSet.allPrimitives(); + int level = Integer.parseInt(levelValue); + + // Find all primitives with the specific tag and check if value is part of the current + // workinglevel. After that unset the disabled status. + for (OsmPrimitive osm : p) { + if ((osm.isDisabledAndHidden() || osm.isDisabled()) && osm.hasKey(key)) { + for (Map.Entry e : osm.getInterestingTags().entrySet()) { + if (e.getKey().equals(key)) { + // Compare values to current working level + if (IndoorLevel.isPartOfWorkingLevel(e.getValue(), level)) { + osm.unsetDisabledState(); + } else { + osm.setDisabledState(true); + } } } - } - } - } - } - } + } + } + } + } /** @@ -602,5 +452,5 @@ */ public void setIndoorLevel(String indoorLevel) { - this.toolboxView.setLevelLabel(indoorLevel); + this.toolboxView.setLevelLabel(indoorLevel); } @@ -615,15 +465,7 @@ /** - * Function which resets the helper for relation adding - */ - private void resetHelper() { - innerHelp = false; - outerHelp = false; - } - - /** * Forces JOSM to load the mappaint settings. */ - private void updateSettings() { + private static void updateSettings() { Preferences.main().init(false); MapPaintStyles.readFromPreferences(); @@ -635,60 +477,31 @@ * @param enabled Activates or disables the settings. */ - private void setPluginPreferences(boolean enabled) { - Map> settings = Preferences.main().getAllSettings(); - - MapListSetting styleMapListSetting = (MapListSetting) settings. - get("mappaint.style.entries"); - List> styleMaps = new ArrayList<>(); - if (styleMapListSetting != null) { - styleMaps = styleMapListSetting.getValue(); - } - - if (enabled) { - //set mappaint active - - List> styleMapsNew = new ArrayList<>(); - if (!styleMaps.isEmpty()) { - styleMapsNew.addAll(styleMaps); - } - - for (Map map : styleMapsNew) { - if (map.containsValue(tr("Indoor"))) { - styleMapsNew.remove(map); - break; - } - } - Map indoorMapPaint = new HashMap<>(); - indoorMapPaint.put("title", tr("Indoor")); - indoorMapPaint.put("active", "true"); - indoorMapPaint.put("url", Config.getDirs().getUserDataDirectory(true) + sep + "styles" - + sep + "sit.mapcss"); - styleMapsNew.add(indoorMapPaint); - Config.getPref().putListOfMaps("mappaint.style.entries", styleMapsNew); - - updateSettings(); - } else { - //set mappaint inactive - - List> styleMapsNew = new ArrayList<>(); - if (!styleMaps.isEmpty()) { - styleMapsNew.addAll(styleMaps); - } - for (Map map : styleMapsNew) { - if (map.containsValue(tr("Indoor"))) { - styleMapsNew.remove(map); - break; - } - } - Map indoorMapPaint = new HashMap<>(); - indoorMapPaint.put("title", tr("Indoor")); - indoorMapPaint.put("active", "false"); - indoorMapPaint.put("url", Config.getDirs().getUserDataDirectory(true) + sep + "styles" - + sep + "sit.mapcss"); - styleMapsNew.add(indoorMapPaint); - Config.getPref().putListOfMaps("mappaint.style.entries", styleMapsNew); - - updateSettings(); - } - } + private static void setPluginPreferences(boolean enabled) { + Map> settings = Preferences.main().getAllSettings(); + String sep = System.getProperty("file.separator"); + + MapListSetting styleMapListSetting = (MapListSetting) settings.get("mappaint.style.entries"); + List> styleMaps = new ArrayList<>(); + if (styleMapListSetting != null) { + styleMaps = styleMapListSetting.getValue(); + } + + List> styleMapsNew = new ArrayList<>(); + if (!styleMaps.isEmpty()) { + styleMapsNew.addAll(styleMaps); + } + for (Map map : styleMapsNew) { + if (map.containsValue(tr("Indoor"))) { + styleMapsNew.remove(map); + break; + } + } + Map indoorMapPaint = new HashMap<>(); + indoorMapPaint.put("title", tr("Indoor")); + indoorMapPaint.put("active", Boolean.toString(enabled)); + indoorMapPaint.put("url", Config.getDirs().getUserDataDirectory(true) + sep + "styles" + sep + "sit.mapcss"); + styleMapsNew.add(indoorMapPaint); + Config.getPref().putListOfMaps("mappaint.style.entries", styleMapsNew); + updateSettings(); + } } Index: /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java (revision 35312) @@ -1,21 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * Copyright (C) 2018 Rebecca Schmidt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - +// License: GPL. For details, see LICENSE file. package model; @@ -206,5 +188,5 @@ newMember = new RelationMember(role == null ? "" : role, osm); relation.addMember(newMember); - }; + } //Check if dataset is not empty or if {@link innerRelation} has no value Index: /applications/editors/josm/plugins/indoorhelper/src/model/IndoorLevel.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/model/IndoorLevel.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/model/IndoorLevel.java (revision 35312) @@ -1,20 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - +// License: GPL. For details, see LICENSE file. package model; Index: /applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java (revision 35312) @@ -1,21 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * Copyright (C) 2018 Rebecca Schmidt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - +// License: GPL. For details, see LICENSE file. package model; @@ -36,5 +18,5 @@ private List rankingList; - private List counterList; + private final List counterList = new ArrayList<>(); /** @@ -43,10 +25,4 @@ public PresetCounter() { - this.init(); - } - - private void init() { - counterList = new ArrayList<>(); - counterList.add(new ObjectCounter(IndoorObject.CONCRETE_WALL, 0)); counterList.add(new ObjectCounter(IndoorObject.DOOR_PRIVATE, 0)); @@ -138,5 +114,3 @@ } } - - } Index: /applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java (revision 35312) @@ -1,21 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * Copyright (C) 2018 Rebecca Schmidt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - +// License: GPL. For details, see LICENSE file. package model; @@ -100,5 +82,4 @@ return tagList; } - } @@ -110,6 +91,6 @@ */ public enum IndoorObject { - CONCRETE_WALL, GLASS_WALL, ROOM, TOILET_MALE, TOILET_FEMALE, ELEVATOR, DOOR_PRIVATE, DOOR_PUBLIC, ENTRANCE, - ENTRANCE_EXIT_ONLY, ACCESS_PRIVATE, ACCESS_PUBLIC, STEPS, CORRIDOR, BENCH, AREA, NONE; + CONCRETE_WALL, GLASS_WALL, ROOM, TOILET_MALE, TOILET_FEMALE, ELEVATOR, DOOR_PRIVATE, DOOR_PUBLIC, ENTRANCE, + ENTRANCE_EXIT_ONLY, ACCESS_PRIVATE, ACCESS_PUBLIC, STEPS, CORRIDOR, BENCH, AREA, NONE; } } Index: /applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java (revision 35312) @@ -1,21 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * Copyright (C) 2018 Rebecca Schmidt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.indoorhelper; @@ -87,5 +69,4 @@ try (InputStream stream = IndoorHelperPlugin.class.getResourceAsStream("/data/" + resourceName)) { if (stream == null) { - System.out.println("MapPaint: stream is null"); throw new IOException("Cannot get resource \"" + resourceName + "\" from Jar file."); } @@ -133,46 +114,3 @@ } } - - /** - * Writes the indoor validator file in the user preferences if it isn't there - * and activates it. - */ -// private void setIndoorValidator() { -// //get the current validator settings -// Map> settings = Config.getPref().getAllSettings(); -// MapListSetting mapListSetting = (MapListSetting) settings. -// get("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries"); -// List> validatorMaps; -// if (mapListSetting != null) { -// validatorMaps = mapListSetting.getValue(); -// } else { -// validatorMaps = new ArrayList<>(); -// } -// boolean validatorExists = false; -// -// //check if indoor validator is already set -// for (Map map : validatorMaps) { -// if (map.containsValue("Indoor")) { -// validatorExists = true; -// } -// } -// -// //put it in the settings if not -// if (!validatorExists) { -// List> validatorMapsNew = new ArrayList<>(); -// if (!validatorMaps.isEmpty()) { -// validatorMapsNew.addAll(validatorMaps); -// } -// Map indoorValidator = new HashMap<>(); -// indoorValidator.put("title", "Indoor"); -// indoorValidator.put("active", "true"); -// indoorValidator.put("url", Config.getPref().getUserDataDirectory()+ sep +"validator" + -// sep + "indoorhelper.validator.mapcss"); -// -// validatorMapsNew.add(indoorValidator); -// Config.getPref().putListOfStructs -// ("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries", -// validatorMapsNew); -// } -// } } Index: /applications/editors/josm/plugins/indoorhelper/src/views/DialogPanel.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/views/DialogPanel.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/views/DialogPanel.java (revision 35312) @@ -1,20 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - +// License: GPL. For details, see LICENSE file. package views; Index: /applications/editors/josm/plugins/indoorhelper/src/views/LevelSelectorView.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/views/LevelSelectorView.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/views/LevelSelectorView.java (revision 35312) @@ -1,20 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * Copyright (C) 2018 Rebecca Schmidt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// License: GPL. For details, see LICENSE file. package views; Index: /applications/editors/josm/plugins/indoorhelper/src/views/PresetButton.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/views/PresetButton.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/views/PresetButton.java (revision 35312) @@ -1,21 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * Copyright (C) 2018 Rebecca Schmidt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - +// License: GPL. For details, see LICENSE file. package views; Index: /applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java (revision 35311) +++ /applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java (revision 35312) @@ -1,20 +1,3 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * Copyright (C) 2018 Rebecca Schmidt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// License: GPL. For details, see LICENSE file. package views;