Changeset 31615 in osm for applications/editors/josm


Ignore:
Timestamp:
2015-10-12T23:48:43+02:00 (9 years ago)
Author:
donvip
Message:

[josm_plugins] update to JOSM 8863

Location:
applications/editors/josm/plugins
Files:
20 edited

Legend:

Unmodified
Added
Removed

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

    r31402 r31615  
    11<?xml version="1.0" encoding="utf-8"?>
    2 
    32<project name="OSMRecPlugin" default="dist" basedir=".">
    43
    5     <!-- enter the SVN commit message -->
    6     <property name="commit.message" value="Commit message"/>
    74    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    8     <property name="plugin.main.version" value="7001"/>
     5    <property name="plugin.main.version" value="8863"/>
    96    <property name="plugin.version" value="2.0"/>
    107
    118    <!-- Configure these properties (replace "..." accordingly).
    12 
    13 
    14 
    159         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    1610    -->
    … …  
    2014    <property name="plugin.icon" value="images/dialogs/logo-osmrec.png"/>
    2115    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OSMRec"/>
    22     <!-- <property name="plugin.link" value="..."/>-->
    23     <!--<property name="plugin.early" value="..."/>-->
    24     <!--<property name="plugin.requires" value="..."/>-->
    25     <!--<property name="plugin.stage" value="..."/>-->
    26    
    27    
    28     <!-- temporary out
    29         <property name="josm" location="../../core/dist/josm-custom.jar"/>
    30         <property name="plugin.dist.dir" value="../../dist"/>
    31     -->
    3216   
    3317    <!-- ** include targets that all plugins have in common ** -->
    34    <!-- <import file="build-common.xml"/>-->
    3518    <import file="../build-common.xml"/>
    36    
    37    
    3819</project>

  • applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecPluginHelper.java

    r31564 r31615  
    119119import org.openstreetmap.josm.gui.ExtendedDialog;
    120120import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
    121 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
    122121import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
    123122import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
    124123import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
     124import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    125125import org.openstreetmap.josm.gui.util.GuiHelper;
    126126import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;

  • applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecToggleDialog.java

    r31584 r31615  
    9090import org.openstreetmap.josm.gui.help.HelpUtil;
    9191import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    92 import org.openstreetmap.josm.gui.tagging.PresetHandler;
    93 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
    94 import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
     92import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
     93import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
     94import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
    9595import org.openstreetmap.josm.gui.util.GuiHelper;
    9696import org.openstreetmap.josm.gui.util.HighlightHelper;
    … …  
    221221            + tr("Select objects or create new objects and get recommendation.") + "</p></html>");
    222222
    223     private final PresetHandler presetHandler = new PresetHandler() {
     223    private final TaggingPresetHandler presetHandler = new TaggingPresetHandler() {
    224224        @Override public void updateTags(List<Tag> tags) {
    225225            Command command = TaggingPreset.createCommand(getSelection(), tags);

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

    r30440 r31615  
    77    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    88    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    9     <property name="plugin.main.version" value="7100"/>
     9    <property name="plugin.main.version" value="8863"/>
    1010    <property name="livegpsplugin.jar" value="${plugin.dist.dir}/livegps.jar"/>
    1111

  • applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/TaggingPresetAction.java

    r30440 r31615  
    1010
    1111import org.openstreetmap.josm.data.coor.LatLon;
    12 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
    13 import org.openstreetmap.josm.gui.tagging.TaggingPresets;
     12import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
     13import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
    1414
    1515import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;

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

    r31576 r31615  
    22<project name="tageditor" default="dist" basedir=".">
    33    <property name="commit.message" value="Tageditor:  help shortcut parser, rebuild"/>
    4     <property name="plugin.main.version" value="8760"/>
     4    <property name="plugin.main.version" value="8863"/>
    55   
    66        <property name="plugin.author" value="Karl Guggisberg"/>

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java

    r30488 r31615  
    3030import org.openstreetmap.josm.data.osm.DataSet;
    3131import org.openstreetmap.josm.data.osm.OsmPrimitive;
    32 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
    3332import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
    3433import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
     34import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    3535import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionListViewer;
    3636import org.openstreetmap.josm.plugins.tageditor.editor.TagEditor;

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java

    r30488 r31615  
    1111import javax.swing.UIManager;
    1212
    13 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
     13import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    1414
    1515public class PresetItemListCellRenderer extends JLabel implements ListCellRenderer<TaggingPreset> {

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java

    r30488 r31615  
    1515import javax.swing.JPanel;
    1616
    17 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
     17import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    1818
    1919public class PresetManager extends JPanel {

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java

    r30737 r31615  
    1515import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1616import org.openstreetmap.josm.gui.tagging.TagModel;
    17 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
     17import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    1818import org.openstreetmap.josm.plugins.tageditor.preset.AdvancedTag;
    1919import org.openstreetmap.josm.plugins.tageditor.tagspec.KeyValuePair;

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTableCellRenderer.java

    r30488 r31615  
    1515
    1616import org.openstreetmap.josm.gui.tagging.TagModel;
    17 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
     17import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    1818import org.openstreetmap.josm.plugins.tageditor.preset.AdvancedTag;
    1919

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AdvancedTag.java

    r30488 r31615  
    99
    1010import org.openstreetmap.josm.data.osm.Tag;
    11 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
    12 import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
    13 import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.KeyedItem;
    14 import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Optional;
     11import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
     12import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
     13import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
     14import org.openstreetmap.josm.gui.tagging.presets.items.Optional;
    1515
    1616public class AdvancedTag extends Tag {

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/IPresetSelectorListener.java

    r30488 r31615  
    22package org.openstreetmap.josm.plugins.tageditor.preset.ui;
    33
    4 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
     4import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    55
    66public interface IPresetSelectorListener {

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/NameIconCellRenderer.java

    r30488 r31615  
    1010import javax.swing.table.TableCellRenderer;
    1111
    12 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
     12import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    1313
    1414public class NameIconCellRenderer extends JLabel implements TableCellRenderer {

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableModel.java

    r30737 r31615  
    88import javax.swing.table.AbstractTableModel;
    99
    10 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
     10import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    1111
    1212public class PresetsTableModel extends AbstractTableModel  {

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java

    r30737 r31615  
    3333import javax.swing.event.ListSelectionListener;
    3434
    35 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
    36 import org.openstreetmap.josm.gui.tagging.TaggingPresets;
     35import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
     36import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
    3737
    3838public class TabularPresetSelector extends JPanel {

  • applications/editors/josm/plugins/tagging-preset-tester/build.xml

    r31120 r31615  
    22<project name="tagging-preset-tester" default="dist" basedir=".">
    33    <property name="commit.message" value="[josm_tagging_preset_tester] #josm10288: fix NPE when starting without map"/>
    4     <property name="plugin.main.version" value="8338"/>
     4    <property name="plugin.main.version" value="8863"/>
    55    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    66    <property name="plugin.dist.dir" value="../../dist"/>

  • applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingCellRenderer.java

    r30532 r31615  
    1212import javax.swing.JList;
    1313
    14 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
     14import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    1515import org.openstreetmap.josm.tools.ImageProvider;
    1616

  • applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java

    r30592 r31615  
    2727import org.openstreetmap.josm.data.osm.Relation;
    2828import org.openstreetmap.josm.data.osm.Way;
    29 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
    30 import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
    31 import org.openstreetmap.josm.gui.tagging.TaggingPresetSelector;
    32 import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
     29import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
     30import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
     31import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSelector;
     32import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
    3333import org.openstreetmap.josm.tools.GBC;
    3434

  • applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java

    r29864 r31615  
    1212import org.openstreetmap.josm.actions.JosmAction;
    1313import org.openstreetmap.josm.gui.MainMenu;
    14 import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
     14import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
    1515import org.openstreetmap.josm.plugins.PluginInformation;
    1616import org.openstreetmap.josm.tools.Shortcut;
Note: See TracChangeset for help on using the changeset viewer.