Changeset 22017 in osm for applications/editors/josm


Ignore:
Timestamp:
2010-06-25T21:30:27+02:00 (14 years ago)
Author:
jttt
Message:

Adapt to latest josm

Location:
applications/editors/josm/plugins/DirectUpload
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/DirectUpload/build.xml

    r21706 r22017  
    1818**
    1919** To build against the core in ../../core, create a correct manifest and deploy to
    20 ** SVN, 
     20** SVN,
    2121**    set the properties commit.message and plugin.main.version
    2222** and run
     
    2828
    2929        <property name="commit.message" value="Changed constructor signature of plugin main class" />
    30         <property name="plugin.main.version" value="2830" />
     30        <property name="plugin.main.version" value="3338" />
    3131
    3232        <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     
    8686        </target>
    8787        <!--
    88          ************************** Publishing the plugin *********************************** 
     88         ************************** Publishing the plugin ***********************************
    8989        -->
    9090        <!--
    91         ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
     91        ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    9292        ** property ${coreversion.info.entry.revision}
    9393        **
     
    138138
    139139        <!--
    140         ** commits the plugin.jar 
     140        ** commits the plugin.jar
    141141        -->
    142142        <target name="commit-dist">
    143143                <echo>
    144144***** Properties of published ${plugin.jar} *****
    145 Commit message    : '${commit.message}'                                 
     145Commit message    : '${commit.message}'
    146146Plugin-Mainversion: ${plugin.main.version}
    147147JOSM build version: ${coreversion.info.entry.revision}
    148148Plugin-Version    : ${version.entry.commit.revision}
    149 ***** / Properties of published ${plugin.jar} *****                                     
    150                                        
     149***** / Properties of published ${plugin.jar} *****
     150
    151151Now commiting ${plugin.jar} ...
    152152</echo>
  • applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java

    r17532 r22017  
    6161        TRACKABLE    (tr("Trackable (only shared as anonymous, ordered points with timestamps)")),
    6262        IDENTIFIABLE (tr("Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"));
    63        
     63
    6464        public final String description;
    6565        visibility(String description) {
    6666            this.description = description;
    6767        }
    68        
     68
    6969        /**
    7070         * "Converts" a given description into the actual enum. Returns null if no matching description
     
    7575        public static visibility desc2visi(Object desc) {
    7676            for (visibility v : visibility.values()) {
    77                 if(desc.equals((String)v.description))
     77                if(desc.equals(v.description))
    7878                    return v;
    7979            }
    8080            return null;
    8181        }
    82        
    83         public String toString() {
     82
     83        @Override
     84                public String toString() {
    8485            return this.name().toLowerCase();
    8586        }
    8687    }
    8788
    88        
     89
    8990    // User for log in when uploading trace
    9091    private String username = Main.pref.get("osm-server.username");
     
    136137        visibilityLabel.setToolTipText(tr("Defines the visibility of your trace for other OSM users."));
    137138        for(visibility v : visibility.values()) {
    138                 visibilityCombo.addItem((String)v.description);
     139                visibilityCombo.addItem(v.description);
    139140        }
    140141        UrlLabel visiUrl = new UrlLabel(tr("http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"), tr("(What does that mean?)"));
     
    508509     * Overrides the default actions. Will not close the window when upload trace is clicked
    509510     */
    510     @Override protected void buttonAction(ActionEvent evt) {
     511    @Override protected void buttonAction(int buttonIndex, ActionEvent evt) {
    511512        String a = evt.getActionCommand();
    512513        if(uploadTraceText.equals(a))
Note: See TracChangeset for help on using the changeset viewer.