Index: /applications/editors/josm/plugins/indoorhelper/README
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/README (revision 33996)
+++ /applications/editors/josm/plugins/indoorhelper/README (revision 33997)
@@ -5,5 +5,5 @@
Indoorhelper is a JOSM plugin to support users when creating their own indoor maps.
- Copyright (C) 2016 Erik Gruschka
+ Copyright (C) 2016 Erik Gruschka, Rebecca Schmidt
This program is free software: you can redistribute it and/or modify
Index: /applications/editors/josm/plugins/indoorhelper/build.xml
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/build.xml (revision 33996)
+++ /applications/editors/josm/plugins/indoorhelper/build.xml (revision 33997)
@@ -10,6 +10,5 @@
See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
-->
-
-
+
Index: /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (revision 33996)
+++ /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (revision 33997)
@@ -2,4 +2,5 @@
* 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
@@ -112,10 +113,10 @@
// Shortcuts
SpaceShortcut = Shortcut.registerShortcut("mapmode:space",
- tr("IndoorHelper Shortcut"), KeyEvent.VK_SPACE, Shortcut.DIRECT);
+ "", KeyEvent.VK_SPACE, Shortcut.DIRECT);
this.SpaceAction = new SpaceAction();
MainApplication.registerActionShortcut(SpaceAction,SpaceShortcut);
EnterShortcut = Shortcut.registerShortcut("mapmode:ALT",
- tr("IndoorHelper Shortcut"), KeyEvent.VK_ENTER, Shortcut.DIRECT);
+ "", KeyEvent.VK_ENTER, Shortcut.DIRECT);
this.EnterAction = new EnterAction();
MainApplication.registerActionShortcut(EnterAction,EnterShortcut);
@@ -188,20 +189,20 @@
List tags = new ArrayList<>();
if (toolboxView.getLevelCheckBoxStatus() == false && !levelValue.equals("")) {
- tags.add(new Tag(tr("level"),levelValue));
+ tags.add(new Tag("level",levelValue));
}
if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
- tags.add(new Tag(tr("level_name"),toolboxView.getLevelNameText()));
+ tags.add(new Tag("level_name",toolboxView.getLevelNameText()));
}
if (!toolboxView.getNameText().isEmpty()) {
- tags.add(new Tag(tr("name"), toolboxView.getNameText()));
+ tags.add(new Tag("name", toolboxView.getNameText()));
}
if (!toolboxView.getRefText().isEmpty()) {
- tags.add(new Tag(tr("ref"), toolboxView.getRefText()));
+ tags.add(new Tag("ref", toolboxView.getRefText()));
}
if (!toolboxView.getRepeatOnText().isEmpty()){
- tags.add(new Tag(tr("repeat_on"),toolboxView.getRepeatOnText()));
+ tags.add(new Tag("repeat_on",toolboxView.getRepeatOnText()));
}
if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
- tags.add(new Tag(tr("level_name"),toolboxView.getLevelNameText()));
+ tags.add(new Tag("level_name",toolboxView.getLevelNameText()));
}
@@ -273,6 +274,7 @@
@Override
public void actionPerformed(ActionEvent e) {
- String topic = tr("ToolB");
- HelpBrowser.setUrlForHelpTopic(Optional.ofNullable(topic).orElse(tr("/")));
+ String topic = "indoorHelper";
+ //Open HelpBrowser for short description about the plugin
+ HelpBrowser.setUrlForHelpTopic(Optional.ofNullable(topic).orElse("/"));
}
}
@@ -545,5 +547,5 @@
List tags = new ArrayList<>();
- tags.add(new Tag(tr("level"),levelNum));
+ tags.add(new Tag("level",levelNum));
//Add level tag
Index: /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java (revision 33996)
+++ /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java (revision 33997)
@@ -2,4 +2,5 @@
* 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
Index: /applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java (revision 33996)
+++ /applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java (revision 33997)
@@ -2,4 +2,5 @@
* 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
Index: /applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java (revision 33996)
+++ /applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java (revision 33997)
@@ -2,4 +2,5 @@
* 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
@@ -18,12 +19,4 @@
package model;
-
-/**
- * Class to provide the indoor tagging catalog.
- *
- * @author egru
- * @author rebsc
- *
- */
/**
@@ -55,58 +48,58 @@
switch(o) {
case CONCRETE_WALL:
- tagList.add(new Tag(tr("indoor"), tr("wall")));
- tagList.add(new Tag(tr("material"), tr("concrete")));
+ tagList.add(new Tag("indoor", "wall"));
+ tagList.add(new Tag("material", "concrete"));
return tagList;
case DOOR_PRIVATE:
- tagList.add(new Tag(tr("door"), tr("yes")));
+ tagList.add(new Tag("door", "yes"));
tagList.add(new Tag ("access","private"));
return tagList;
case DOOR_PUBLIC:
- tagList.add(new Tag(tr("door"), tr("yes")));
- tagList.add(new Tag (tr("access"),tr("public")));
+ tagList.add(new Tag("door", "yes"));
+ tagList.add(new Tag ("access","public"));
return tagList;
case ELEVATOR:
- tagList.add(new Tag(tr("highway"), tr("elevator")));
+ tagList.add(new Tag("highway", "elevator"));
return tagList;
case ENTRANCE:
- tagList.add(new Tag(tr("entrance"), tr("yes")));
+ tagList.add(new Tag("entrance", "yes"));
return tagList;
case ENTRANCE_EXIT_ONLY:
- tagList.add(new Tag(tr("entrance"), tr("exit")));
+ tagList.add(new Tag("entrance", "exit"));
return tagList;
case ACCESS_PRIVATE:
- tagList.add(new Tag(tr("access"),tr("private")));
+ tagList.add(new Tag("access","private"));
return tagList;
case ACCESS_PUBLIC:
- tagList.add(new Tag(tr("access"),tr("public")));
+ tagList.add(new Tag("access","public"));
return tagList;
case TOILET_FEMALE:
- tagList.add(new Tag(tr("indoor"), tr("room")));
- tagList.add(new Tag(tr("amenity"), tr("toilets")));
- tagList.add(new Tag(tr("female"), tr("yes")));
+ tagList.add(new Tag("indoor", "room"));
+ tagList.add(new Tag("amenity", "toilets"));
+ tagList.add(new Tag("female", "yes"));
return tagList;
case GLASS_WALL:
- tagList.add(new Tag(tr("indoor"), tr("wall")));
- tagList.add(new Tag(tr("material"), tr("glass")));
+ tagList.add(new Tag("indoor", "wall"));
+ tagList.add(new Tag("material", "glass"));
return tagList;
case TOILET_MALE:
- tagList.add(new Tag(tr("indoor"), tr("room")));
- tagList.add(new Tag(tr("amenity"), tr("toilets")));
- tagList.add(new Tag(tr("male"), tr("yes")));
+ tagList.add(new Tag("indoor", "room"));
+ tagList.add(new Tag("amenity", "toilets"));
+ tagList.add(new Tag("male", "yes"));
return tagList;
case ROOM:
- tagList.add(new Tag(tr("indoor"), tr("room")));
+ tagList.add(new Tag("indoor", "room"));
return tagList;
case STEPS:
- tagList.add(new Tag(tr("highway"), tr("steps")));
+ tagList.add(new Tag("highway", "steps"));
return tagList;
case CORRIDOR:
- tagList.add(new Tag(tr("indoor"), tr("corridor")));
+ tagList.add(new Tag("indoor", "corridor"));
return tagList;
case BENCH:
- tagList.add(new Tag(tr("amenity"),tr("bench")));
+ tagList.add(new Tag("amenity","bench"));
return tagList;
case ZONE:
- tagList.add(new Tag(tr("area"),tr("zone")));
+ tagList.add(new Tag("area","zone"));
return tagList;
case 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 33996)
+++ /applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java (revision 33997)
@@ -2,4 +2,5 @@
* 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
Index: /applications/editors/josm/plugins/indoorhelper/src/views/LevelSelectorView.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/views/LevelSelectorView.java (revision 33996)
+++ /applications/editors/josm/plugins/indoorhelper/src/views/LevelSelectorView.java (revision 33997)
@@ -1,2 +1,20 @@
+/*
+ * 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 .
+ */
package views;
Index: /applications/editors/josm/plugins/indoorhelper/src/views/PresetButton.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/views/PresetButton.java (revision 33996)
+++ /applications/editors/josm/plugins/indoorhelper/src/views/PresetButton.java (revision 33997)
@@ -2,4 +2,5 @@
* 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
Index: /applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java (revision 33996)
+++ /applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java (revision 33997)
@@ -2,4 +2,5 @@
* 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
@@ -16,5 +17,4 @@
* along with this program. If not, see .
*/
-
package views;