Changeset 23393 in osm for applications/editors/josm/plugins/smed/plugs/oseam

Timestamp:

2010-09-29T00:12:24+02:00 (14 years ago)

Author:

postfix

Message:

some corrections in ant-files
Listener for osm changes now correctly dequeue if program exit
josm-menuItem handled now correctly

Location:

applications/editors/josm/plugins/smed/plugs/oseam

Files:

• build.xml (modified) (3 diffs)
• src/oseam/OSeaM.java (modified) (2 diffs)
• src/oseam/dialogs/OSeaMAction.java (modified) (4 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/build.xml

@@ -46 +46 @@
         <property name="plugin.build.dir"       value="build"/>
         <property name="plugin.src.dir"         value="src"/>
+        <property name="smed.build.dir"         value="../../../smed/build"/>
+        <property name="smed.src.dir"           value="../../../smed/src"/>
         <!-- this is the directory where the plugin jar is copied to -->
         <property name="plugin.dist.dir"        value="../../../../dist"/>
         <property name="ant.build.javac.target" value="1.5"/>
-        <property name="plugin.dist.dir"        value="../../../../dist"/>
         <property name="plugin.jar"             value="${plugin.dist.dir}/00_${DSTAMP}_${TSTAMP}_${ant.project.name}.jar"/>
 
@@ -63 +64 @@
         <!--
     **********************************************************
+    ** init_smed - initializes the build of smed
+    **********************************************************
+    -->
+        <target name="init_smed">
+                <mkdir dir="${smed.build.dir}"/>
+        </target>
+
+        <!--
+    **********************************************************
+    ** compile_smed - compiles the source tree of smed
+    **********************************************************
+    -->
+        <target name="compile_smed" depends="init_smed">
+                <echo message="compiling sources for smed.jar ... "/>
+                <javac srcdir="${smed.src.dir}" classpath="${josm}" debug="true" destdir="${smed.build.dir}">
+                        <compilerarg value="-Xlint:deprecation"/>
+                        <compilerarg value="-Xlint:unchecked"/>
+                </javac>
+        </target>
+        
+        <!--
+    **********************************************************
+    ** dist_smed - creates smed.jar
+    **********************************************************
+    -->
+        <target name="dist_smed" depends="compile_smed">
+                <echo message="creating smed.jar ... "/>
+
+                <copy todir="${smed.build.dir}/images">
+                        <fileset dir="${smed.src.dir}/images"/>
+                </copy>
+                
+                <copy todir="${smed.build.dir}/images">
+                        <fileset dir="../../../smed/images"/>
+                </copy>
+
+                <copy todir="${smed.build.dir}/smed/msg">
+                        <fileset dir="${smed.src.dir}/smed/msg"/>
+                </copy>
+
+                <copy todir="${smed.build.dir}">
+                        <fileset dir="../../../smed">
+                <include name="*.txt" />
+                        </fileset>
+                </copy>
+
+                <jar destfile="${smed}" basedir="${smed.build.dir}">
+                        <!--
+        ************************************************
+        ** configure these properties. Most of them will be copied to the plugins
+        ** manifest file. Property values will also show up in the list available
+        ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
+        **
+        ************************************************
+    -->
+                        <manifest>
+                                <attribute name="Author" value="Werner"/>
+                                <attribute name="Plugin-Class" value="smed.Smed"/>
+                                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                                <attribute name="Plugin-Description" value="Create and edit seamaps for OpenSeaMap"/>
+                                <attribute name="Plugin-Icon" value="images/Smed.png"/>
+                                <attribute name="Plugin-Link" value="http://openseamap.org/"/>
+                                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+                                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                        </manifest>
+                </jar>
+        </target>
+
+        <!--
+    **********************************************************
     ** compile - complies the source tree
     **********************************************************
     -->
-        <target name="compile" depends="init">
+        <target name="compile" depends="init,dist_smed">
                 <echo message="compiling sources for  ${plugin.jar} ... "/>
                 <javac srcdir="src" classpath="${josm}:${smed}" debug="true" destdir="${plugin.build.dir}">
@@ -73 +144 @@
                 </javac>
         </target>
+
 
         <!--

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java

@@ -10 +10 @@
 public class OSeaM implements SmedPluggable {
 
-        private OSeaMAction os = null;
+        private OSeaMAction osm = null;
         
         @Override
         public JComponent getComponent() {
-                os = new OSeaMAction();
-                os.init();
-                return os.getPM01SeaMap();
+                osm = new OSeaMAction();
+                osm.init();
+                return osm.getPM01SeaMap();
         }
 
@@ -39 +39 @@
         @Override
         public boolean stop() {
-                // TODO Auto-generated method stub
-                return false;
+                osm.closePanel();
+                return true;
         }
 

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java

@@ -55 +55 @@
                                                                                                                                                                 // SmpDialogAction
         private Buoy buoy = null; // Variable f�r Objekte des Typs "Tonne" //
-        private boolean isOpen = false; // zeigt den Status des Dialogs an
         private Node onode = null; // gemerkter Knoten
         private Buoy obuoy = null; // gemerkte Tonne // @jve:decl-index=0:
@@ -187 +186 @@
         }
 
-        public boolean isOpen() {
-                return isOpen;
-        }
-
-        public void setOpen(boolean isOpen) {
-                this.isOpen = isOpen;
-        }
-
         public String getOs() {
                 return Os;
@@ -211 +202 @@
         }
 
-        public void CloseDialog() {
+        public void closePanel() {
                 onode = null;
                 DataSet.removeSelectionListener(SmpListener);
                 Selection = null;
-
-                /*
-                if (isOpen)
-                        dM01SeaMap.dispose();
-                */
-                isOpen = false;
         }
 
@@ -226 +211 @@
                 onode = null;
                 obuoy = null;
-                setOpen(true);
 
                 /*