This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins.
commit f49c5abe502d6e33ac1c911f81c854165820774b Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Oct 22 22:17:41 2014 +0200 Imported Upstream version 0.0.svn30763+ds1 --- DirectUpload/.settings/org.eclipse.jdt.core.prefs | 4 +- .../josm/plugins/DirectUpload/UploadDataGui.java | 30 ++++---- build-common.xml | 55 +++----------- colorscheme/.settings/org.eclipse.jdt.core.prefs | 88 ++++++++++++++++++++++ .../plugin/colorscheme/ColorSchemePreference.java | 4 +- editgpx/.settings/org.eclipse.jdt.core.prefs | 8 +- .../josm/plugins/editgpx/data/EditGpxData.java | 6 +- .../josm/plugins/editgpx/data/EditGpxTrack.java | 6 +- .../plugins/editgpx/data/EditGpxTrackSegment.java | 4 +- .../josm/plugins/editgpx/data/EditGpxWayPoint.java | 2 +- lakewalker/.settings/org.eclipse.jdt.core.prefs | 4 +- .../josm/plugins/lakewalker/Lakewalker.java | 8 +- .../josm/plugins/lakewalker/LakewalkerAction.java | 10 +-- .../josm/plugins/lakewalker/LakewalkerWMS.java | 4 +- measurement/.settings/org.eclipse.jdt.core.prefs | 8 +- .../plugins/measurement/MeasurementDialog.java | 22 +++--- .../josm/plugins/measurement/MeasurementLayer.java | 26 +++---- openvisible/.settings/org.eclipse.jdt.core.prefs | 4 +- routing/.settings/org.eclipse.jdt.core.prefs | 8 +- .../com/innovant/josm/jrt/core/RoutingGraph.java | 6 +- .../com/innovant/josm/jrt/core/RoutingProfile.java | 2 +- .../innovant/josm/plugin/routing/RoutingLayer.java | 2 +- .../innovant/josm/plugin/routing/RoutingModel.java | 4 +- .../josm/plugin/routing/RoutingPlugin.java | 2 +- svn-info.xml | 6 +- 25 files changed, 195 insertions(+), 128 deletions(-) diff --git a/DirectUpload/.settings/org.eclipse.jdt.core.prefs b/DirectUpload/.settings/org.eclipse.jdt.core.prefs index 92ec4cc..f4e5715 100644 --- a/DirectUpload/.settings/org.eclipse.jdt.core.prefs +++ b/DirectUpload/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -57,7 +57,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore diff --git a/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java b/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java index df6a2ed..30a9ca3 100644 --- a/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java +++ b/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java @@ -51,7 +51,7 @@ import org.openstreetmap.josm.tools.Utils; * @author subhodip, xeen, ax */ public class UploadDataGui extends ExtendedDialog { - + /** * This enum contains the possible values for the visibility field and their * explanation. Provides some methods for easier handling. @@ -102,7 +102,7 @@ public class UploadDataGui extends ExtendedDialog { private static final String uploadTraceText = tr("Upload Trace"); private boolean canceled = false; - + public UploadDataGui() { // Initalizes ExtendedDialog super(Main.parent, @@ -112,7 +112,7 @@ public class UploadDataGui extends ExtendedDialog { ); JPanel content = initComponents(); GpxData gpxData = UploadOsmConnection.getInstance().autoSelectTrace(); - initTitleAndDescriptionFromGpxData(gpxData); // this is changing some dialog elements, so it (probably) must be before the following + initTitleAndDescriptionFromGpxData(gpxData); // this is changing some dialog elements, so it (probably) must be before the following setContent(content); setButtonIcons(new String[] { "uploadtrace.png", "cancel.png" }); setupDialog(); @@ -128,7 +128,7 @@ public class UploadDataGui extends ExtendedDialog { // visibilty JLabel visibilityLabel = new JLabel(tr("Visibility")); visibilityLabel.setToolTipText(tr("Defines the visibility of your trace for other OSM users.")); - + visibilityCombo = new JComboBox<>(); visibilityCombo.setEditable(false); for(visibility v : visibility.values()) { @@ -141,8 +141,8 @@ public class UploadDataGui extends ExtendedDialog { JLabel descriptionLabel = new JLabel(tr("Description")); descriptionField = new HistoryComboBox(); descriptionField.setToolTipText(tr("Please enter Description about your trace.")); - - List<String> descHistory = new LinkedList<String>(Main.pref.getCollection("directupload.description.history", new LinkedList<String>())); + + List<String> descHistory = new LinkedList<>(Main.pref.getCollection("directupload.description.history", new LinkedList<String>())); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement() // XXX this should be handled in HistoryComboBox Collections.reverse(descHistory); @@ -153,7 +153,7 @@ public class UploadDataGui extends ExtendedDialog { tagsField = new HistoryComboBox(); tagsField.setToolTipText(tr("Please enter tags about your trace.")); - List<String> tagsHistory = new LinkedList<String>(Main.pref.getCollection("directupload.tags.history", new LinkedList<String>())); + List<String> tagsHistory = new LinkedList<>(Main.pref.getCollection("directupload.tags.history", new LinkedList<String>())); // we have to reverse the history, because ComboBoxHistory will reverse it againin addElement() // XXX this should be handled in HistoryComboBox Collections.reverse(tagsHistory); @@ -198,7 +198,7 @@ public class UploadDataGui extends ExtendedDialog { } } else { - description = new SimpleDateFormat("yyMMddHHmmss").format(new Date()); + description = new SimpleDateFormat("yyMMddHHmmss").format(new Date()); title = tr("No GPX layer selected. Cannot upload a trace."); } outputDisplay.setText(title); @@ -295,8 +295,8 @@ public class UploadDataGui extends ExtendedDialog { c.setConnectTimeout(15000); c.setRequestMethod("POST"); c.setDoOutput(true); - // unfortunately, addAuth() is protected, so we need to subclass OsmConnection - // XXX make addAuth public. + // unfortunately, addAuth() is protected, so we need to subclass OsmConnection + // XXX make addAuth public. UploadOsmConnection.getInstance().addAuthHack(c); c.addRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY); @@ -321,7 +321,7 @@ public class UploadDataGui extends ExtendedDialog { if (c.getHeaderField("Error") != null) returnMsg += "\n" + c.getHeaderField("Error"); } - + final String returnMsgEDT = returnMsg; GuiHelper.runInEDT(new Runnable() { @@ -407,13 +407,13 @@ public class UploadDataGui extends ExtendedDialog { errors += tr("No GPX layer selected. Cannot upload a trace."); final String errorsEDT = errors; - + GuiHelper.runInEDT(new Runnable() { @Override public void run() { outputDisplay.setText(errorsEDT); } }); - + return errors.length() > 0; } @@ -428,10 +428,10 @@ public class UploadDataGui extends ExtendedDialog { // Disable Upload button so users can't just upload that track again buttons.get(0).setEnabled(false); - + // save history Main.pref.put("directupload.visibility.last-used", visibility.desc2visi(visibilityCombo.getSelectedItem().toString()).name()); - + descriptionField.addCurrentItemToHistory(); Main.pref.putCollection("directupload.description.history", descriptionField.getHistory()); diff --git a/build-common.xml b/build-common.xml index ae15c25..c1d6904 100644 --- a/build-common.xml +++ b/build-common.xml @@ -36,6 +36,9 @@ <property name="xjc" value="${java.home}/../bin/xjc" /> </target> + <!-- To be overriden in plugin build file before inclusion if other plugins are required --> + <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}" includes="nothing"/> + <!-- ********************************************************** ** init - initializes the build @@ -59,6 +62,7 @@ <fileset dir="${plugin.lib.dir}" erroronmissingdir="no"> <include name="**/*.jar"/> </fileset> + <fileset refid="plugin.requires.jars"/> </classpath> </javac> </target> @@ -379,9 +383,6 @@ <pathelement path="${plugin.jar}"/> <pathelement path="${groovy.jar}"/> </path> - <condition property="plugin.requires.jars.set"> - <isreference refid="plugin.requires.jars"/> - </condition> <macrodef name="init-test-preferences"> <sequential> <copy file="${plugin.test.dir}/config/preferences.template.xml" tofile="${plugin.test.dir}/config/unit-josm.home/preferences.xml"/> @@ -402,12 +403,12 @@ <delete file="${plugin.test.dir}/config/unit-josm.home/preferences.xml" /> <delete dir="${plugin.test.dir}/config/unit-josm.home/cache" failonerror="false"/> </target> - <macrodef name="call-groovyc"> - <element name="cp-elements"/> + <target name="test-compile" depends="test-init,dist"> + <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${groovy.jar}"/> <sequential> <groovyc srcdir="${plugin.test.dir}/unit" destdir="${plugin.test.dir}/build/unit" encoding="UTF-8"> <classpath> - <cp-elements/> + <fileset refid="plugin.requires.jars"/> <path refid="test.classpath"/> </classpath> <javac target="1.7" source="1.7" debug="on" encoding="UTF-8"> @@ -416,26 +417,10 @@ </javac> </groovyc> </sequential> - </macrodef> - <target name="call-groovyc-extended" if="plugin.requires.jars.set"> - <call-groovyc> - <cp-elements> - <fileset refid="plugin.requires.jars"/> - </cp-elements> - </call-groovyc> - </target> - <target name="call-groovyc-base" unless="plugin.requires.jars.set"> - <call-groovyc> - <cp-elements/> - </call-groovyc> - </target> - <target name="test-compile" depends="test-init,dist"> - <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${groovy.jar}"/> - <antcall target="call-groovyc-base"/> - <antcall target="call-groovyc-extended"/> </target> - <macrodef name="call-junit"> - <element name="cp-elements"/> + <target name="test" depends="dist, test-compile" + description="Run unit tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password"> + <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="../00_core_tools/jacocoant.jar" /> <sequential> <echo message="Running unit tests with JUnit"/> <jacoco:coverage destfile="${plugin.test.dir}/jacoco.exec"> @@ -446,7 +431,7 @@ <sysproperty key="java.awt.headless" value="true"/> <sysproperty key="suppressPermanentFailure" value="${suppressPermanentFailure}"/> <classpath> - <cp-elements/> + <fileset refid="plugin.requires.jars"/> <path refid="test.classpath"/> <pathelement path="${plugin.test.dir}/build/unit"/> </classpath> @@ -458,24 +443,6 @@ </junit> </jacoco:coverage> </sequential> - </macrodef> - <target name="call-junit-extended" if="plugin.requires.jars.set"> - <call-junit> - <cp-elements> - <fileset refid="plugin.requires.jars"/> - </cp-elements> - </call-junit> - </target> - <target name="call-junit-base" unless="plugin.requires.jars.set"> - <call-junit> - <cp-elements/> - </call-junit> - </target> - <target name="test" depends="dist, test-compile" - description="Run unit tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password"> - <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="../00_core_tools/jacocoant.jar" /> - <antcall target="call-junit-base"/> - <antcall target="call-junit-extended"/> </target> <target name="runjosm" depends="install"> diff --git a/colorscheme/.settings/org.eclipse.jdt.core.prefs b/colorscheme/.settings/org.eclipse.jdt.core.prefs index 11f6e46..cd2388b 100644 --- a/colorscheme/.settings/org.eclipse.jdt.core.prefs +++ b/colorscheme/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,95 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +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.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7 diff --git a/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java b/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java index 7f5ccda..b629ffd 100644 --- a/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java +++ b/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java @@ -55,7 +55,7 @@ public class ColorSchemePreference implements SubPreferenceSetting { panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); Map<String, String> colorMap = Main.pref.getAllPrefix(PREF_KEY_COLOR_PREFIX); - colorKeys = new ArrayList<String>(colorMap.keySet()); + colorKeys = new ArrayList<>(colorMap.keySet()); Collections.sort(colorKeys); listModel = new DefaultListModel<>(); schemesList = new JList<>(listModel); @@ -186,7 +186,7 @@ public class ColorSchemePreference implements SubPreferenceSetting { public Map<String, String> getColorMap(String schemeName) { String colorKey; String prefix = PREF_KEY_SCHEMES_PREFIX + schemeName + "." + PREF_KEY_COLOR_PREFIX; - Map<String, String>colorMap = new HashMap<String, String>(); + Map<String, String>colorMap = new HashMap<>(); for(String schemeColorKey : Main.pref.getAllPrefix(prefix).keySet()) { colorKey = schemeColorKey.substring(prefix.length()); colorMap.put(colorKey, Main.pref.get(schemeColorKey)); diff --git a/editgpx/.settings/org.eclipse.jdt.core.prefs b/editgpx/.settings/org.eclipse.jdt.core.prefs index 424f4bb..63f25f1 100644 --- a/editgpx/.settings/org.eclipse.jdt.core.prefs +++ b/editgpx/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault @@ -18,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -43,6 +44,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error @@ -55,7 +57,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore @@ -63,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -86,6 +89,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7 diff --git a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java index 9c2d267..4126bd0 100644 --- a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java +++ b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java @@ -11,10 +11,10 @@ import org.openstreetmap.josm.data.gpx.WayPoint; public class EditGpxData { - private final List<EditGpxTrack> tracks = new ArrayList<EditGpxTrack>(); + private final List<EditGpxTrack> tracks = new ArrayList<>(); // Only copy of routes and waypoints to preserve all info when converting back to gpx track - private final List<GpxRoute> routes = new ArrayList<GpxRoute>(); - private final List<WayPoint> waypoints = new ArrayList<WayPoint>(); + private final List<GpxRoute> routes = new ArrayList<>(); + private final List<WayPoint> waypoints = new ArrayList<>(); public void load(GpxData data) { for (GpxTrack track: data.tracks) { diff --git a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java index 39d9a2b..5f346d0 100644 --- a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java +++ b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java @@ -18,8 +18,8 @@ import org.openstreetmap.josm.data.gpx.WayPoint; public class EditGpxTrack { - private final List<EditGpxTrackSegment> segments = new ArrayList<EditGpxTrackSegment>(); - private final Map<String, Object> attributes = new HashMap<String, Object>(); + private final List<EditGpxTrackSegment> segments = new ArrayList<>(); + private final Map<String, Object> attributes = new HashMap<>(); private boolean isDeleted; public EditGpxTrack(GpxTrack track) { @@ -38,7 +38,7 @@ public class EditGpxTrack { public GpxTrack createGpxTrack(boolean anonTime, double minTime) { - Collection<Collection<WayPoint>> wayPoints = new ArrayList<Collection<WayPoint>>(); + Collection<Collection<WayPoint>> wayPoints = new ArrayList<>(); final DateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); diff --git a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java index c612298..95a54ad 100644 --- a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java +++ b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java @@ -9,7 +9,7 @@ import org.openstreetmap.josm.data.gpx.WayPoint; public class EditGpxTrackSegment { - private final List<EditGpxWayPoint> wayPoints = new ArrayList<EditGpxWayPoint>(); + private final List<EditGpxWayPoint> wayPoints = new ArrayList<>(); private boolean deleted; public EditGpxTrackSegment(GpxTrackSegment segment) { @@ -23,7 +23,7 @@ public class EditGpxTrackSegment { } public List<WayPoint> getNonDeletedWaypoints() { - List<WayPoint> result = new ArrayList<WayPoint>(); + List<WayPoint> result = new ArrayList<>(); for (EditGpxWayPoint wp: wayPoints) { if (!wp.isDeleted()) { diff --git a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java index f2a4f8a..5abc0b5 100644 --- a/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java +++ b/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java @@ -15,7 +15,7 @@ public class EditGpxWayPoint implements Comparable<EditGpxWayPoint> { public EditGpxWayPoint(WayPoint wayPoint) { this.time = wayPoint.time; this.coor = new CachedLatLon(wayPoint.getCoor()); - this.attributes = new HashMap<String, Object>(wayPoint.attr); + this.attributes = new HashMap<>(wayPoint.attr); } public WayPoint createWayPoint() { diff --git a/lakewalker/.settings/org.eclipse.jdt.core.prefs b/lakewalker/.settings/org.eclipse.jdt.core.prefs index 92ec4cc..f4e5715 100644 --- a/lakewalker/.settings/org.eclipse.jdt.core.prefs +++ b/lakewalker/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -57,7 +57,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java index a4d6f8b..69ad9a0 100644 --- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java +++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java @@ -92,7 +92,7 @@ public class Lakewalker { Boolean detect_loop = false; - ArrayList<double[]> nodelist = new ArrayList<double[]>(); + ArrayList<double[]> nodelist = new ArrayList<>(); int[] xy = geo_to_xy(lat,lon,this.resolution); @@ -254,7 +254,7 @@ public class Lakewalker { } double[] test_v = nodes.get(0); - ArrayList<double[]> reducednodes = new ArrayList<double[]>(); + ArrayList<double[]> reducednodes = new ArrayList<>(); double prox_sq = Math.pow(proximity, 2); @@ -361,7 +361,7 @@ public class Lakewalker { double[] first = nodes.get(0); double[] last = nodes.get(nodes.size()-1); - ArrayList<double[]> new_nodes = new ArrayList<double[]>(); + ArrayList<double[]> new_nodes = new ArrayList<>(); double d = 0; @@ -390,7 +390,7 @@ public class Lakewalker { } private ArrayList<double[]> sublist(ArrayList<double[]> l, int i, int f) throws ArrayIndexOutOfBoundsException { - ArrayList<double[]> sub = new ArrayList<double[]>(); + ArrayList<double[]> sub = new ArrayList<>(); if(f<i || i < 0 || f < 0 || f > l.size()){ throw new ArrayIndexOutOfBoundsException(); diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java index 803d32e..ca157ba 100644 --- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java +++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java @@ -45,8 +45,8 @@ class LakewalkerAction extends JosmAction implements MouseListener { protected boolean cancel; protected boolean active = false; - protected Collection<Command> commands = new LinkedList<Command>(); - protected Collection<Way> ways = new ArrayList<Way>(); + protected Collection<Command> commands = new LinkedList<>(); + protected Collection<Way> ways = new ArrayList<>(); public LakewalkerAction(String name) { super(name, "lakewalker-sml", tr("Lake Walker."), @@ -169,7 +169,7 @@ class LakewalkerAction extends JosmAction implements MouseListener { private void processnodelist(LatLon pos, LatLon topLeft, LatLon botRight, int waylen, int maxnode, int threshold, double epsilon, int resolution, int tilesize, String startdir, String wmslayer, File workingdir, ProgressMonitor progressMonitor){ progressMonitor.beginTask(null, 3); try { - ArrayList<double[]> nodelist = new ArrayList<double[]>(); + ArrayList<double[]> nodelist = new ArrayList<>(); Lakewalker lw = new Lakewalker(waylen,maxnode,threshold,epsilon,resolution,tilesize,startdir,wmslayer,workingdir); try { @@ -290,8 +290,8 @@ class LakewalkerAction extends JosmAction implements MouseListener { System.out.println("Failed"); } - commands = new LinkedList<Command>(); - ways = new ArrayList<Way>(); + commands = new LinkedList<>(); + ways = new ArrayList<>(); } finally { progressMonitor.finishTask(); } diff --git a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java index 2f97a2e..ef3ca7b 100644 --- a/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java +++ b/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java @@ -28,9 +28,9 @@ public class LakewalkerWMS { private int imagey; // Vector to cache images in memory - private List<BufferedImage> images = new Vector<BufferedImage>(); + private List<BufferedImage> images = new Vector<>(); // Hashmap to hold the mapping of cached images - private Map<String,Integer> imageindex = new HashMap<String,Integer>(); + private Map<String,Integer> imageindex = new HashMap<>(); private int resolution; private int tilesize; diff --git a/measurement/.settings/org.eclipse.jdt.core.prefs b/measurement/.settings/org.eclipse.jdt.core.prefs index eb377fb..27108f1 100644 --- a/measurement/.settings/org.eclipse.jdt.core.prefs +++ b/measurement/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault @@ -22,7 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -47,6 +48,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error @@ -59,7 +61,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore @@ -67,6 +69,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -90,6 +93,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7 diff --git a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java index 4edebc6..18eed7b 100644 --- a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java +++ b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java @@ -31,8 +31,8 @@ import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent; import org.openstreetmap.josm.data.osm.event.TagsChangedEvent; import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent; import org.openstreetmap.josm.gui.NavigatableComponent; -import org.openstreetmap.josm.gui.SideButton; import org.openstreetmap.josm.gui.NavigatableComponent.SoMChangeListener; +import org.openstreetmap.josm.gui.SideButton; import org.openstreetmap.josm.gui.dialogs.ToggleDialog; import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.util.GuiHelper; @@ -72,12 +72,12 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL * The measurement label for the segment angle, actually updated, if 2 nodes are selected */ protected JLabel segAngleLabel; - + private DataSet ds; private Collection<Way> ways; private Collection<Node> nodes; - + /** * Constructor */ @@ -130,7 +130,7 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL createLayout(valuePanel, false, Arrays.asList(new SideButton[] { resetButton })); - + DataSet.addSelectionListener(this); NavigatableComponent.addSoMChangeListener(this); } @@ -161,9 +161,9 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL double area = 0.0; Node lastNode = null; // Don't mix up way and nodes computation (fix #6872). Priority given to ways - ways = new SubclassFilteredCollection<OsmPrimitive, Way>(newSelection, OsmPrimitive.wayPredicate); + ways = new SubclassFilteredCollection<>(newSelection, OsmPrimitive.wayPredicate); if (ways.isEmpty()) { - nodes = new SubclassFilteredCollection<OsmPrimitive, Node>(newSelection, OsmPrimitive.nodePredicate); + nodes = new SubclassFilteredCollection<>(newSelection, OsmPrimitive.nodePredicate); for (Node n : nodes) { if (n.getCoor() != null) { if (lastNode == null) { @@ -197,11 +197,11 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL area += wayArea; } } - + final String lengthLabel = getDistText(length); final String angleLabel = getAngleText(segAngle); final String areaLabel = getAreaText(area); - + GuiHelper.runInEDT(new Runnable() { @Override public void run() { @@ -210,9 +210,9 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL selectAreaLabel.setText(areaLabel); } }); - + DataSet currentDs = Main.main.getCurrentDataSet(); - + if (ds != currentDs) { if (ds != null) { ds.removeDataSetListener(this); @@ -245,7 +245,7 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL } return false; } - + @Override public void nodeMoved(NodeMovedEvent event) { Node n = event.getNode(); // Refresh selection if a node belonging to a selected member has moved (example: scale action) diff --git a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java index 100c97c..be5afb7 100644 --- a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java +++ b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java @@ -51,7 +51,7 @@ public class MeasurementLayer extends Layer { } private static Icon icon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(MeasurementPlugin.class.getResource("/images/measurement.png"))); - private Collection<WayPoint> points = new ArrayList<WayPoint>(32); + private Collection<WayPoint> points = new ArrayList<>(32); @Override public Icon getIcon() { @@ -145,14 +145,14 @@ public class MeasurementLayer extends Layer { } last = p; } - if (MeasurementPlugin.measurementDialog != null) { + if (MeasurementPlugin.measurementDialog != null) { MeasurementPlugin.measurementDialog.pathLengthLabel.setText(NavigatableComponent.getDistText(pathLength)); } if (Main.map.mapMode instanceof MeasurementMode) { Main.map.statusLine.setDist(pathLength); } } - + /* * Use an equal area sinusoidal projection to improve accuracy and so we can still use normal polygon area calculation * https://stackoverflow.com/questions/4681737/how-to-calculate-the-area-of-a-polygon-on-the-earths-surface-using-python @@ -221,14 +221,14 @@ public class MeasurementLayer extends Layer { * The data model for the list component. */ private DefaultListModel<GpxLayer> model = new DefaultListModel<>(); - + /** * @param layer the targeting measurement layer */ public GPXLayerImportAction(MeasurementLayer layer) { super(tr("Import path from GPX layer"), ImageProvider.get("dialogs", "edit")); // TODO: find better image } - + @Override public void actionPerformed(ActionEvent e) { Box panel = Box.createVerticalBox(); @@ -236,7 +236,7 @@ public class MeasurementLayer extends Layer { Collection<Layer> data = Main.map.mapView.getAllLayers(); Layer lastLayer = null; int layerCnt = 0; - + for (Layer l : data) { if (l instanceof GpxLayer) { model.addElement((GpxLayer) l); @@ -260,12 +260,12 @@ public class MeasurementLayer extends Layer { return label; } }); - + JCheckBox dropFirst = new JCheckBox(tr("Drop existing path")); - + panel.add(layerList); panel.add(dropFirst); - + final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ @Override public void selectInitialValue() { @@ -274,16 +274,16 @@ public class MeasurementLayer extends Layer { }; final JDialog dlg = optionPane.createDialog(Main.parent, tr("Import path from GPX layer")); dlg.setVisible(true); - + Object answer = optionPane.getValue(); if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION)) { return; } - - GpxLayer gpx = (GpxLayer)layerList.getSelectedValue(); + + GpxLayer gpx = layerList.getSelectedValue(); if (dropFirst.isSelected()) { - points = new ArrayList<WayPoint>(32); + points = new ArrayList<>(32); } for (GpxTrack trk : gpx.data.tracks) { diff --git a/openvisible/.settings/org.eclipse.jdt.core.prefs b/openvisible/.settings/org.eclipse.jdt.core.prefs index 92ec4cc..f4e5715 100644 --- a/openvisible/.settings/org.eclipse.jdt.core.prefs +++ b/openvisible/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -57,7 +57,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore diff --git a/routing/.settings/org.eclipse.jdt.core.prefs b/routing/.settings/org.eclipse.jdt.core.prefs index eb377fb..27108f1 100644 --- a/routing/.settings/org.eclipse.jdt.core.prefs +++ b/routing/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault @@ -22,7 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -47,6 +48,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error @@ -59,7 +61,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore @@ -67,6 +69,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -90,6 +93,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7 diff --git a/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java b/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java index 3c93306..f0ac693 100644 --- a/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java +++ b/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java @@ -159,7 +159,7 @@ public class RoutingGraph { public void createGraph() { logger.debug("Creating Graph..."); - graph = new DirectedWeightedMultigraph<Node, OsmEdge>(OsmEdge.class); + graph = new DirectedWeightedMultigraph<>(OsmEdge.class); rgDelegator=new RoutingGraphDelegator(graph); rgDelegator.setRouteType(this.routeType); // iterate all ways and segments for all nodes: @@ -346,7 +346,7 @@ public class RoutingGraph { * @return new path. */ public List<OsmEdge> applyAlgorithm(List<Node> nodes, Algorithm algorithm) { - List<OsmEdge> path = new ArrayList<OsmEdge>(); + List<OsmEdge> path = new ArrayList<>(); Graph<Node,OsmEdge> g; double totalWeight = 0; RoutingLayer layer = (RoutingLayer)Main.map.mapView.getActiveLayer(); @@ -369,7 +369,7 @@ public class RoutingGraph { logger.debug("Using Dijkstra algorithm"); DijkstraShortestPath<Node, OsmEdge> routingk = null; for (int index = 1; index < nodes.size(); ++index) { - routingk = new DijkstraShortestPath<Node, OsmEdge>(g, nodes + routingk = new DijkstraShortestPath<>(g, nodes .get(index - 1), nodes.get(index)); if (routingk.getPathEdgeList() == null) { logger.debug("no path found!"); diff --git a/routing/src/com/innovant/josm/jrt/core/RoutingProfile.java b/routing/src/com/innovant/josm/jrt/core/RoutingProfile.java index da8be74..23d71d1 100644 --- a/routing/src/com/innovant/josm/jrt/core/RoutingProfile.java +++ b/routing/src/com/innovant/josm/jrt/core/RoutingProfile.java @@ -74,7 +74,7 @@ public class RoutingProfile { public RoutingProfile(String name) { logger.debug("Init RoutingProfile with name: "+name); this.name = name; - waySpeeds=new HashMap<String,Double>(); + waySpeeds=new HashMap<>(); Map<String,String> prefs=Main.pref.getAllPrefix("routing.profile."+name+".speed"); for(String key:prefs.keySet()){ waySpeeds.put((key.split("\\.")[4]), Double.valueOf(prefs.get(key))); diff --git a/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java b/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java index d0452fc..7a7b1f2 100644 --- a/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java +++ b/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java @@ -190,7 +190,7 @@ public class RoutingLayer extends Layer { @Override public Action[] getMenuEntries() { - Collection<Action> components = new ArrayList<Action>(); + Collection<Action> components = new ArrayList<>(); components.add(LayerListDialog.getInstance().createShowHideLayerAction()); // components.add(new JMenuItem(new LayerListDialog.ShowHideMarkerText(this))); components.add(LayerListDialog.getInstance().createDeleteLayerAction()); diff --git a/routing/src/com/innovant/josm/plugin/routing/RoutingModel.java b/routing/src/com/innovant/josm/plugin/routing/RoutingModel.java index 337ea48..349ce0e 100644 --- a/routing/src/com/innovant/josm/plugin/routing/RoutingModel.java +++ b/routing/src/com/innovant/josm/plugin/routing/RoutingModel.java @@ -78,7 +78,7 @@ public class RoutingModel { * Default Constructor. */ public RoutingModel(DataSet data) { - nodes = new ArrayList<Node>(); + nodes = new ArrayList<>(); System.out.println("gr " + data); routingGraph = new RoutingGraph(data); } @@ -127,7 +127,7 @@ public class RoutingModel { * Reverse list of nodes */ public void reverseNodes() { - List<Node> aux = new ArrayList<Node>(); + List<Node> aux = new ArrayList<>(); for (Node n : nodes) { aux.add(0,n); } diff --git a/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java b/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java index c248903..79ab208 100644 --- a/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java +++ b/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java @@ -147,7 +147,7 @@ public class RoutingPlugin extends Plugin implements LayerChangeListener,DataSet logger.debug("Loading routing plugin..."); preferenceSettings=new RoutingPreferenceDialog(); // Initialize layers list - layers = new ArrayList<RoutingLayer>(); + layers = new ArrayList<>(); // Add menu menu = new RoutingMenu(); // Register this class as LayerChangeListener diff --git a/svn-info.xml b/svn-info.xml index c264c1e..5847a40 100644 --- a/svn-info.xml +++ b/svn-info.xml @@ -2,7 +2,7 @@ <info> <entry path="plugins" - revision="30728" + revision="30763" kind="dir"> <url>http://svn.openstreetmap.org/applications/editors/josm/plugins</url> <repository> @@ -10,9 +10,9 @@ <uuid>b9d5c4c9-76e1-0310-9c85-f3177eceb1e4</uuid> </repository> <commit - revision="30726"> + revision="30762"> <author>donvip</author> -<date>2014-10-16T18:31:07.613920Z</date> +<date>2014-10-21T23:53:29.114941Z</date> </commit> </entry> </info> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel