Changeset 31981 in osm for applications/editors

Timestamp:

2016-01-13T01:18:14+01:00 (9 years ago)

Author:

donvip

Message:

[josm_nanolog] update to JOSM 9383 + fix Eclipse warnings + fix NPE if nanolog layer is created first

Location:

applications/editors/josm/plugins/NanoLog

Files:

• .settings/org.eclipse.jdt.core.prefs (modified) (3 diffs)
• build.xml (modified) (1 diff)
• src/nanolog/Correlator.java (modified) (10 diffs)
• src/nanolog/NanoLogEntry.java (modified) (1 diff)
• src/nanolog/NanoLogLayer.java (modified) (1 diff)
• src/nanolog/NanoLogPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/NanoLog/.settings/org.eclipse.jdt.core.prefs

@@ -7 +7 @@
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -40 +45 @@
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
@@ -81 +86 @@
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

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

@@ -5 +5 @@
     <property name="commit.message" value="NanoLog"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7299"/>
+    <property name="plugin.main.version" value="9383"/>
     <property name="plugin.author" value="Ilya Zverev"/>
     <property name="plugin.class" value="nanolog.NanoLogPlugin"/>

applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17 +16 @@
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.tools.Geometry;
-import org.openstreetmap.josm.tools.date.PrimaryDateParser;
+import org.openstreetmap.josm.tools.UncheckedParseException;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -33 +32 @@
     public static long crudeMatch( List<NanoLogEntry> entries, GpxData data ) {
         List<NanoLogEntry> sortedEntries = new ArrayList<>(entries);
-        PrimaryDateParser dateParser = new PrimaryDateParser();
         Collections.sort(sortedEntries);
         long firstExifDate = sortedEntries.get(0).getTime().getTime();
@@ -47 +45 @@
 
                     try {
-                        firstGPXDate = dateParser.parse(curDateWpStr).getTime();
+                        firstGPXDate = DateUtils.fromString(curDateWpStr).getTime();
                         break outer;
                     } catch( Exception e ) {
@@ -82 +80 @@
         List<NanoLogEntry> sortedEntries = new ArrayList<>(entries);
         //int ret = 0;
-        PrimaryDateParser dateParser = new PrimaryDateParser();
         Collections.sort(sortedEntries);
         for( GpxTrack track : data.tracks ) {
@@ -94 +91 @@
                     if( curWpTimeStr != null ) {
                         try {
-                            long curWpTime = dateParser.parse(curWpTimeStr).getTime() + offset;
+                            long curWpTime = DateUtils.fromString(curWpTimeStr).getTime() + offset;
                             /*ret +=*/ matchPoints(sortedEntries, prevWp, prevWpTime, curWp, curWpTime, offset);
 
@@ -100 +97 @@
                             prevWpTime = curWpTime;
 
-                        } catch( ParseException e ) {
+                        } catch( UncheckedParseException e ) {
                             Main.error("Error while parsing date \"" + curWpTimeStr + '"');
                             Main.error(e);
@@ -220 +217 @@
     public static long getGpxDate( GpxData data, LatLon pos ) {
         EastNorth en = Main.getProjection().latlon2eastNorth(pos);
-        PrimaryDateParser dateParser = new PrimaryDateParser();
         for( GpxTrack track : data.tracks ) {
             for( GpxTrackSegment segment : track.getSegments() ) {
@@ -229 +225 @@
                     if( curWpTimeStr != null ) {
                         try {
-                            long curWpTime = dateParser.parse(curWpTimeStr).getTime();
+                            long curWpTime = DateUtils.fromString(curWpTimeStr).getTime();
                             if( prevWp != null ) {
                                 EastNorth c1 = Main.getProjection().latlon2eastNorth(prevWp.getCoor());
@@ -249 +245 @@
                             prevWp = curWp;
                             prevWpTime = curWpTime;
-                        } catch( ParseException e ) {
+                        } catch( UncheckedParseException e ) {
                             Main.error("Error while parsing date \"" + curWpTimeStr + '"');
                             Main.error(e);

applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java

@@ -25 +25 @@
         this.time = time;
         this.message = message;
-        this.direction = direction;
     }
 

applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java

@@ -62 +62 @@
         selectedEntry = -1;
         mouseListener = new NLLMouseAdapter();
+    }
+
+    public void setupListeners() {
         Main.map.mapView.addMouseListener(mouseListener);
         Main.map.mapView.addMouseMotionListener(mouseListener);

applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java

@@ -48 +48 @@
                         NanoLogLayer layer = new NanoLogLayer(entries);
                         Main.main.addLayer(layer);
+                        layer.setupListeners();
                     }
                 } catch( IOException ex ) {