Changeset 35012 in osm

Timestamp:

2019-05-28T01:20:32+02:00 (5 years ago)

Author:

donvip

Message:

fix #josm17152 - fix JAXB initialization

Location:

applications/editors/josm/plugins/dataimport

Files:

• .classpath (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java (modified) (5 diffs)

applications/editors/josm/plugins/dataimport/.classpath

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

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java

@@ -3 +3 @@
 
 import java.io.IOException;
+
+import javax.xml.bind.JAXBException;
 
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -19 +21 @@
      * @param info plugin information
      * @throws IOException in case of I/O error
+     * @throws JAXBException if JAXB cannot be initialized
      */
-    public DataImportPlugin(PluginInformation info) throws IOException {
+    public DataImportPlugin(PluginInformation info) throws IOException, JAXBException {
         super(info);
 

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java

@@ -13 +13 @@
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.datatype.XMLGregorianCalendar;
 
@@ -35 +34 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 
-
 /**
- * TCX Reader. This class is based on code genarated by the Java Architecture
+ * TCX Reader. This class is based on code generated by the Java Architecture
  * for XML Binding (JAXB). For this class to work you will need the API und IMPL
  * Jars from the RI. JAXB can be downloaded at <a
@@ -51 +49 @@
  * {@code xjc.bat -p org.openstreetmap.josm.io.tcx TrainingCenterDatabasev2.xsd -d <path to the src folder of JOSM>}
  * <p>
- * Note: if you get an exception that JAXB 2.1 is not supported on your system, you will have to add the jaxb-api.jar
- * to the endorsed directory (create it if necessary) of your JRE. Usually it is something like this:
- * {@code \<program files>\Java\jre<java version>\lib\endorsed}
  *
  * @author adrian &lt;as@nitegate.de&gt;
@@ -63 +58 @@
 
     private GpxData gpxData;
+    private final JAXBContext jc;
 
-    public Tcx() {
+    public Tcx() throws JAXBException {
         super(new ExtensionFileFilter("tcx", "tcx", tr("TCX Files (*.tcx)")));
+        // JAXB must be initialized at plugin construction to get access to JAXB plugin from JOSM plugin classloader
+        jc = JAXBContext.newInstance(TrainingCenterDatabaseT.class);
     }
 
@@ -84 +82 @@
     }
 
-    /**
-     *
-     */
-    @SuppressWarnings("unchecked") private void parseFile(File tcxFile) {
+    @SuppressWarnings("unchecked")
+    private void parseFile(File tcxFile) {
         try {
-            JAXBContext jc = JAXBContext
-                    .newInstance(TrainingCenterDatabaseT.class);
-            Unmarshaller unmarshaller = jc.createUnmarshaller();
-            JAXBElement<TrainingCenterDatabaseT> element = (JAXBElement<TrainingCenterDatabaseT>) unmarshaller
-                    .unmarshal(tcxFile);
-
-            TrainingCenterDatabaseT tcd = element.getValue();
+            TrainingCenterDatabaseT tcd = ((JAXBElement<TrainingCenterDatabaseT>)
+                    jc.createUnmarshaller().unmarshal(tcxFile)).getValue();
 
             gpxData = new GpxData();