Ignore:
Timestamp:
2013-06-28T03:23:46+02:00 (11 years ago)
Author:
donvip
Message:

[josm_directupload] update eclipse project, build.xml, fix EDT violations

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

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/DirectUpload/.classpath

    r16582 r29718  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     4        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    66        <classpathentry kind="output" path="bin"/>

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

    r29435 r29718  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is the build file for the DirectUpload plugin
    4 **
    5 ** Maintaining versions
    6 ** ====================
    7 ** see README.template
    8 **
    9 ** Usage
    10 ** =====
    11 ** To build it run
    12 **
    13 **    > ant  dist
    14 **
    15 ** To install the generated plugin locally (in your default plugin directory) run
    16 **
    17 **    > ant  install
    18 **
    19 ** To build against the core in ../../core, create a correct manifest and deploy to
    20 ** SVN,
    21 **    set the properties commit.message and plugin.main.version
    22 ** and run
    23 **    > ant  publish
    24 **
    25 **
    26 -->
    272<project name="DirectUpload" default="dist" basedir=".">
     3
     4    <!-- enter the SVN commit message -->
    285    <property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])"/>
     6    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    297    <property name="plugin.main.version" value="5053"/>
    30     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    31     <property name="plugin.dist.dir" value="../../dist"/>
    32     <property name="plugin.build.dir" value="build"/>
    33     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    34     <property name="ant.build.javac.target" value="1.5"/>
    35     <target name="init">
    36         <mkdir dir="${plugin.build.dir}"/>
    37     </target>
    38     <target name="compile" depends="init">
    39         <echo message="creating ${plugin.jar}"/>
    40         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
    41             <compilerarg value="-Xlint:deprecation"/>
    42             <compilerarg value="-Xlint:unchecked"/>
    43         </javac>
    44     </target>
    45     <target name="dist" depends="compile,revision">
    46         <copy todir="${plugin.build.dir}/images">
    47             <fileset dir="images"/>
    48         </copy>
    49         <copy todir="${plugin.build.dir}/data">
    50             <fileset dir="data"/>
    51         </copy>
    52         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    53             <manifest>
    54                 <attribute name="Author" value="Subhodip Biswas"/>
    55                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.DirectUpload.UploadDataGuiPlugin"/>
    56                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    57                 <attribute name="Plugin-Description" value="This plugin directly upload GPS Traces from current active layer in JOSM to openstreetmap.org."/>
    58                 <attribute name="Plugin-Icon" value="images/UploadAction.png"/>
    59                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/User:Subhodip/GSoC_Doc#DirectUpload_Plugin_in_JOSM_:"/>
    60                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    61                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    62             </manifest>
    63         </jar>
    64     </target>
    65     <target name="revision">
    66         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    67             <env key="LANG" value="C"/>
    68             <arg value="info"/>
    69             <arg value="--xml"/>
    70             <arg value="."/>
    71         </exec>
    72         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    73         <delete file="REVISION"/>
    74     </target>
    75     <target name="clean">
    76         <delete dir="${plugin.build.dir}"/>
    77         <delete file="${plugin.jar}"/>
    78     </target>
    79     <target name="install" depends="dist">
    80         <property environment="env"/>
    81         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    82             <and>
    83                 <os family="windows"/>
    84             </and>
    85         </condition>
    86         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    87     </target>
    88     <!--
    89      ************************** Publishing the plugin ***********************************
     8
     9    <!-- Configure these properties (replace "..." accordingly).
     10         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    9011    -->
    91     <!--
    92     ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    93     ** property ${coreversion.info.entry.revision}
    94     **
    95     -->
    96     <target name="core-info">
    97         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    98             <env key="LANG" value="C"/>
    99             <arg value="info"/>
    100             <arg value="--xml"/>
    101             <arg value="../../core"/>
    102         </exec>
    103         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    104         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    105         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    106         <delete file="core.info.xml"/>
    107     </target>
    108     <!--
    109     ** commits the source tree for this plugin
    110     -->
    111     <target name="commit-current">
    112         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    113         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    114             <env key="LANG" value="C"/>
    115             <arg value="commit"/>
    116             <arg value="-m '${commit.message}'"/>
    117             <arg value="."/>
    118         </exec>
    119     </target>
    120     <!--
    121     ** updates (svn up) the source tree for this plugin
    122     -->
    123     <target name="update-current">
    124         <echo>Updating plugin source ...</echo>
    125         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    126             <env key="LANG" value="C"/>
    127             <arg value="up"/>
    128             <arg value="."/>
    129         </exec>
    130         <echo>Updating ${plugin.jar} ...</echo>
    131         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    132             <env key="LANG" value="C"/>
    133             <arg value="up"/>
    134             <arg value="../dist/${plugin.jar}"/>
    135         </exec>
    136     </target>
    137     <!--
    138     ** commits the plugin.jar
    139     -->
    140     <target name="commit-dist">
    141         <echo>
    142 ***** Properties of published ${plugin.jar} *****
    143 Commit message    : '${commit.message}'
    144 Plugin-Mainversion: ${plugin.main.version}
    145 JOSM build version: ${coreversion.info.entry.revision}
    146 Plugin-Version    : ${version.entry.commit.revision}
    147 ***** / Properties of published ${plugin.jar} *****
     12    <property name="plugin.author" value="Subhodip Biswas"/>
     13    <property name="plugin.class" value="org.openstreetmap.josm.plugins.DirectUpload.UploadDataGuiPlugin"/>
     14    <property name="plugin.description" value="This plugin directly upload GPS Traces from current active layer in JOSM to openstreetmap.org."/>
     15    <property name="plugin.icon" value="images/UploadAction.png"/>
     16    <property name="plugin.link" value="http://wiki.openstreetmap.org/index.php/User:Subhodip/GSoC_Doc#DirectUpload_Plugin_in_JOSM_:"/>
     17    <!--<property name="plugin.early" value="..."/>-->
     18    <!--<property name="plugin.requires" value="..."/>-->
     19    <!--<property name="plugin.stage" value="..."/>-->
    14820
    149 Now commiting ${plugin.jar} ...
    150 </echo>
    151         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    152             <env key="LANG" value="C"/>
    153             <arg value="-m '${commit.message}'"/>
    154             <arg value="commit"/>
    155             <arg value="${plugin.jar}"/>
    156         </exec>
    157     </target>
    158     <!-- ** make sure svn is present as a command line tool ** -->
    159     <target name="ensure-svn-present">
    160         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    161             <env key="LANG" value="C"/>
    162             <arg value="--version"/>
    163         </exec>
    164         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    165             <!-- return code not set at all? Most likely svn isn't installed -->
    166             <condition>
    167                 <not>
    168                     <isset property="svn.exit.code"/>
    169                 </not>
    170             </condition>
    171         </fail>
    172         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    173             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    174             <condition>
    175                 <isfailure code="${svn.exit.code}"/>
    176             </condition>
    177         </fail>
    178     </target>
    179     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    180     </target>
     21    <!-- ** include targets that all plugins have in common ** -->
     22    <import file="../build-common.xml"/>
    18123</project>

  • applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java

    r29631 r29718  
    3939import org.openstreetmap.josm.gui.PleaseWaitRunnable;
    4040import org.openstreetmap.josm.gui.progress.ProgressMonitor;
     41import org.openstreetmap.josm.gui.util.GuiHelper;
    4142import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
    4243import org.openstreetmap.josm.io.GpxWriter;
    … …  
    242243            if (canceled) {
    243244                conn.disconnect();
    244                 OutputDisplay.setText(tr("Upload canceled"));
    245                 buttons.get(0).setEnabled(true);
     245                GuiHelper.runInEDT(new Runnable() {
     246                    @Override public void run() {
     247                        OutputDisplay.setText(tr("Upload canceled"));
     248                        buttons.get(0).setEnabled(true);
     249                    }
     250                });
    246251                canceled = false;
    247252            }
    248253            else {
    249                 boolean success = finishUpConnection(conn);
    250                 buttons.get(0).setEnabled(!success);
    251                 if (success) {
    252                     buttons.get(1).setText(tr("Close"));
     254                final boolean success = finishUpConnection(conn);
     255                GuiHelper.runInEDT(new Runnable() {
     256                    @Override public void run() {
     257                        buttons.get(0).setEnabled(!success);
     258                        if (success) {
     259                            buttons.get(1).setText(tr("Close"));
     260                        }
     261                    }
     262                });
     263            }
     264        }
     265        catch (Exception e) {
     266            GuiHelper.runInEDT(new Runnable() {
     267                @Override public void run() {
     268                    OutputDisplay.setText(tr("Error while uploading"));
    253269                }
    254             }
    255         }
    256         catch (Exception e) {
    257             OutputDisplay.setText(tr("Error while uploading"));
     270            });
    258271            e.printStackTrace();
    259272        }
    … …  
    300313    private boolean finishUpConnection(HttpURLConnection c) throws Exception {
    301314        String returnMsg = c.getResponseMessage();
    302         boolean success = returnMsg.equals("OK");
     315        final boolean success = returnMsg.equals("OK");
    303316
    304317        if (c.getResponseCode() != 200) {
    … …  
    306319                returnMsg += "\n" + c.getHeaderField("Error");
    307320        }
    308 
    309         OutputDisplay.setText(success
    310             ? tr("GPX upload was successful")
    311             : tr("Upload failed. Server returned the following message: ") + returnMsg);
     321       
     322        final String returnMsgEDT = returnMsg;
     323
     324        GuiHelper.runInEDT(new Runnable() {
     325            @Override public void run() {
     326                OutputDisplay.setText(success
     327                        ? tr("GPX upload was successful")
     328                        : tr("Upload failed. Server returned the following message: ") + returnMsgEDT);
     329            }
     330        });
    312331
    313332        c.disconnect();
    … …  
    385404            errors += tr("No GPX layer selected. Cannot upload a trace.");
    386405
    387         OutputDisplay.setText(errors);
     406        final String errorsEDT = errors;
     407       
     408        GuiHelper.runInEDT(new Runnable() {
     409            @Override public void run() {
     410                OutputDisplay.setText(errorsEDT);
     411            }
     412        });
     413       
    388414        return errors.length() > 0;
    389415    }
Note: See TracChangeset for help on using the changeset viewer.