Changeset 31204 in osm for applications/editors/josm/plugins/photo_geotagging

Timestamp:

2015-06-03T17:43:57+02:00 (9 years ago)

Author:

donvip

Message:

[josm_photo_geotagging] use commons-imaging plugin

Location:

applications/editors/josm/plugins/photo_geotagging

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/apache (deleted)
• src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java (modified) (2 diffs)

applications/editors/josm/plugins/photo_geotagging/.classpath

@@ -4 +4 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-commons-imaging"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

applications/editors/josm/plugins/photo_geotagging/build.xml

@@ -13 +13 @@
     <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Photo_Geotagging"/>
     <property name="plugin.canloadatruntime" value="true"/>
+    <property name="plugin.requires" value="commons-imaging"/>
 
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
 
-    <!--
-    **********************************************************
-    ** compile - complies the source tree
-    ** Overrides the target from build-common.xml
-    **********************************************************
-    -->
-    <target name="compile" depends="init">
-        <echo message="compiling sanselan sources ... "/>
-        <javac srcdir="${plugin.src.dir}" excludes="org/openstreetmap/**" debug="true" destdir="${plugin.build.dir}" encoding="iso-8859-1" includeantruntime="false">
-            <compilerarg value="-Xlint:deprecation"/>
-        </javac>
-        <echo message="compiling sources for ${plugin.jar} ..."/>
-        <javac srcdir="${plugin.src.dir}" excludes="org/apache/sanselan/**" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
-            <compilerarg value="-Xlint:deprecation"/>
-            <compilerarg value="-Xlint:unchecked"/>
-        </javac>
-    </target>
+    <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+        <include name="commons-imaging.jar"/>
+    </fileset>
 
 </project>

applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java

@@ -17 +17 @@
 import org.apache.commons.imaging.ImageWriteException;
 import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
 import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
@@ -54 +54 @@
         TiffOutputSet outputSet = null;
 
-        IImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
+        ImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
         JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
         if (null != jpegMetadata) {