Changeset 33997 in osm for applications


Ignore:
Timestamp:
2018-01-12T16:06:40+01:00 (7 years ago)
Author:
rebeccas95
Message:

Clean up: Fixing unnecessary translation-method and author field

Location:
applications/editors/josm/plugins/indoorhelper
Files:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/indoorhelper/README

    r33974 r33997  
    55
    66Indoorhelper is a JOSM plugin to support users when creating their own indoor maps.
    7     Copyright (C) 2016  Erik Gruschka
     7    Copyright (C) 2016  Erik Gruschka, Rebecca Schmidt
    88
    99    This program is free software: you can redistribute it and/or modify

  • applications/editors/josm/plugins/indoorhelper/build.xml

    r33974 r33997  
    1010         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    1111    -->
    12     <property name="plugin.author" value="Erik Gruschka"/>
    13     <property name="plugin.author" value="Rebecca Schmidt"/>
     12    <property name="plugin.author" value="Erik Gruschka, Rebecca Schmidt"/>
    1413    <property name="plugin.class" value="org.openstreetmap.josm.plugins.indoorhelper.IndoorHelperPlugin"/>
    1514    <property name="plugin.description" value="Gives assistance for the mapping process of indoor OSM building data. Includes a validator and a mappaint style for indoor-data."/>

  • applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

    r33976 r33997  
    22 * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps.
    33 *  Copyright (C) 2016  Erik Gruschka
     4 *  Copyright (C) 2018  Rebecca Schmidt
    45 *
    56 *  This program is free software: you can redistribute it and/or modify
    … …  
    112113       // Shortcuts
    113114       SpaceShortcut = Shortcut.registerShortcut("mapmode:space",
    114                tr("IndoorHelper <SPACE> Shortcut"), KeyEvent.VK_SPACE, Shortcut.DIRECT);
     115               "", KeyEvent.VK_SPACE, Shortcut.DIRECT);
    115116       this.SpaceAction = new SpaceAction();
    116117       MainApplication.registerActionShortcut(SpaceAction,SpaceShortcut);
    117118
    118119       EnterShortcut = Shortcut.registerShortcut("mapmode:ALT",
    119                tr("IndoorHelper <ENTER> Shortcut"), KeyEvent.VK_ENTER, Shortcut.DIRECT);
     120               "", KeyEvent.VK_ENTER, Shortcut.DIRECT);
    120121       this.EnterAction = new EnterAction();
    121122       MainApplication.registerActionShortcut(EnterAction,EnterShortcut);
    … …  
    188189               List<Tag> tags = new ArrayList<>();
    189190               if (toolboxView.getLevelCheckBoxStatus() == false && !levelValue.equals("")) {
    190                    tags.add(new Tag(tr("level"),levelValue));
     191                   tags.add(new Tag("level",levelValue));
    191192               }
    192193                   if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
    193                            tags.add(new Tag(tr("level_name"),toolboxView.getLevelNameText()));
     194                           tags.add(new Tag("level_name",toolboxView.getLevelNameText()));
    194195                   }
    195196               if (!toolboxView.getNameText().isEmpty()) {
    196                    tags.add(new Tag(tr("name"), toolboxView.getNameText()));
     197                   tags.add(new Tag("name", toolboxView.getNameText()));
    197198               }
    198199               if (!toolboxView.getRefText().isEmpty()) {
    199                    tags.add(new Tag(tr("ref"), toolboxView.getRefText()));
     200                   tags.add(new Tag("ref", toolboxView.getRefText()));
    200201               }
    201202               if (!toolboxView.getRepeatOnText().isEmpty()){
    202                                 tags.add(new Tag(tr("repeat_on"),toolboxView.getRepeatOnText()));
     203                                tags.add(new Tag("repeat_on",toolboxView.getRepeatOnText()));
    203204                   }
    204205                   if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
    205                            tags.add(new Tag(tr("level_name"),toolboxView.getLevelNameText()));
     206                           tags.add(new Tag("level_name",toolboxView.getLevelNameText()));
    206207                   }
    207208
    … …  
    273274           @Override
    274275           public void actionPerformed(ActionEvent e) {
    275                    String topic = tr("ToolB");
    276                    HelpBrowser.setUrlForHelpTopic(Optional.ofNullable(topic).orElse(tr("/")));
     276                   String topic = "indoorHelper";
     277                   //Open HelpBrowser for short description about the plugin
     278                   HelpBrowser.setUrlForHelpTopic(Optional.ofNullable(topic).orElse("/"));
    277279           }
    278280   }
    … …  
    545547
    546548               List<Tag> tags = new ArrayList<>();
    547                    tags.add(new Tag(tr("level"),levelNum));
     549                   tags.add(new Tag("level",levelNum));
    548550
    549551                   //Add level tag

  • applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java

    r33974 r33997  
    22 * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps.
    33 *  Copyright (C) 2016  Erik Gruschka
     4 *  Copyright (C) 2018  Rebecca Schmidt
    45 *
    56 *  This program is free software: you can redistribute it and/or modify

  • applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java

    r33974 r33997  
    22 * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps.
    33 *  Copyright (C) 2016  Erik Gruschka
     4 *  Copyright (C) 2018  Rebecca Schmidt
    45 *
    56 *  This program is free software: you can redistribute it and/or modify

  • applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java

    r33974 r33997  
    22 * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps.
    33 *  Copyright (C) 2016  Erik Gruschka
     4 *  Copyright (C) 2018  Rebecca Schmidt
    45 *
    56 *  This program is free software: you can redistribute it and/or modify
    … …  
    1819
    1920package model;
    20 
    21 /**
    22  * Class to provide the indoor tagging catalog.
    23  *
    24  * @author egru
    25  * @author rebsc
    26  *
    27  */
    2821
    2922/**
    … …  
    5548        switch(o) {
    5649        case CONCRETE_WALL:
    57             tagList.add(new Tag(tr("indoor"), tr("wall")));
    58             tagList.add(new Tag(tr("material"), tr("concrete")));
     50            tagList.add(new Tag("indoor", "wall"));
     51            tagList.add(new Tag("material", "concrete"));
    5952            return tagList;
    6053        case DOOR_PRIVATE:
    61             tagList.add(new Tag(tr("door"), tr("yes")));
     54            tagList.add(new Tag("door", "yes"));
    6255            tagList.add(new Tag ("access","private"));
    6356            return tagList;
    6457        case DOOR_PUBLIC:
    65             tagList.add(new Tag(tr("door"), tr("yes")));
    66             tagList.add(new Tag (tr("access"),tr("public")));
     58            tagList.add(new Tag("door", "yes"));
     59            tagList.add(new Tag ("access","public"));
    6760            return tagList;
    6861        case ELEVATOR:
    69             tagList.add(new Tag(tr("highway"), tr("elevator")));
     62            tagList.add(new Tag("highway", "elevator"));
    7063            return tagList;
    7164        case ENTRANCE:
    72             tagList.add(new Tag(tr("entrance"), tr("yes")));
     65            tagList.add(new Tag("entrance", "yes"));
    7366            return tagList;
    7467        case ENTRANCE_EXIT_ONLY:
    75             tagList.add(new Tag(tr("entrance"), tr("exit")));
     68            tagList.add(new Tag("entrance", "exit"));
    7669            return tagList;
    7770        case ACCESS_PRIVATE:
    78                 tagList.add(new Tag(tr("access"),tr("private")));
     71                tagList.add(new Tag("access","private"));
    7972                return tagList;
    8073        case ACCESS_PUBLIC:
    81                 tagList.add(new Tag(tr("access"),tr("public")));
     74                tagList.add(new Tag("access","public"));
    8275                return tagList;
    8376        case TOILET_FEMALE:
    84             tagList.add(new Tag(tr("indoor"), tr("room")));
    85             tagList.add(new Tag(tr("amenity"), tr("toilets")));
    86             tagList.add(new Tag(tr("female"), tr("yes")));
     77            tagList.add(new Tag("indoor", "room"));
     78            tagList.add(new Tag("amenity", "toilets"));
     79            tagList.add(new Tag("female", "yes"));
    8780            return tagList;
    8881        case GLASS_WALL:
    89             tagList.add(new Tag(tr("indoor"), tr("wall")));
    90             tagList.add(new Tag(tr("material"), tr("glass")));
     82            tagList.add(new Tag("indoor", "wall"));
     83            tagList.add(new Tag("material", "glass"));
    9184            return tagList;
    9285        case TOILET_MALE:
    93             tagList.add(new Tag(tr("indoor"), tr("room")));
    94             tagList.add(new Tag(tr("amenity"), tr("toilets")));
    95             tagList.add(new Tag(tr("male"), tr("yes")));
     86            tagList.add(new Tag("indoor", "room"));
     87            tagList.add(new Tag("amenity", "toilets"));
     88            tagList.add(new Tag("male", "yes"));
    9689            return tagList;
    9790        case ROOM:
    98             tagList.add(new Tag(tr("indoor"), tr("room")));
     91            tagList.add(new Tag("indoor", "room"));
    9992            return tagList;
    10093        case STEPS:
    101             tagList.add(new Tag(tr("highway"), tr("steps")));
     94            tagList.add(new Tag("highway", "steps"));
    10295            return tagList;
    10396        case CORRIDOR:
    104                 tagList.add(new Tag(tr("indoor"), tr("corridor")));
     97                tagList.add(new Tag("indoor", "corridor"));
    10598                return tagList;
    10699        case BENCH:
    107                 tagList.add(new Tag(tr("amenity"),tr("bench")));
     100                tagList.add(new Tag("amenity","bench"));
    108101                return tagList;
    109102        case ZONE:
    110                 tagList.add(new Tag(tr("area"),tr("zone")));
     103                tagList.add(new Tag("area","zone"));
    111104                return tagList;
    112105        case NONE:

  • applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java

    r33974 r33997  
    22 * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps.
    33 *  Copyright (C) 2016  Erik Gruschka
     4 *  Copyright (C) 2018  Rebecca Schmidt
    45 *
    56 *  This program is free software: you can redistribute it and/or modify

  • applications/editors/josm/plugins/indoorhelper/src/views/LevelSelectorView.java

    r33974 r33997  
     1/*
     2 * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps.
     3 *  Copyright (C) 2016  Erik Gruschka
     4 *  Copyright (C) 2018  Rebecca Schmidt
     5 *
     6 *  This program is free software: you can redistribute it and/or modify
     7 *  it under the terms of the GNU General Public License as published by
     8 *  the Free Software Foundation, either version 3 of the License, or
     9 *  (at your option) any later version.
     10 *
     11 *  This program is distributed in the hope that it will be useful,
     12 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     14 *  GNU General Public License for more details.
     15 *
     16 *  You should have received a copy of the GNU General Public License
     17 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
     18 */
    119package views;
    220

  • applications/editors/josm/plugins/indoorhelper/src/views/PresetButton.java

    r33974 r33997  
    22 * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps.
    33 *  Copyright (C) 2016  Erik Gruschka
     4 *  Copyright (C) 2018  Rebecca Schmidt
    45 *
    56 *  This program is free software: you can redistribute it and/or modify

  • applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java

    r33974 r33997  
    22 * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps.
    33 *  Copyright (C) 2016  Erik Gruschka
     4 *  Copyright (C) 2018  Rebecca Schmidt
    45 *
    56 *  This program is free software: you can redistribute it and/or modify
    … …  
    1617 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1718 */
    18 
    1919package views;
    2020
Note: See TracChangeset for help on using the changeset viewer.