Ignore:
Timestamp:
2013-08-21T03:47:16+02:00 (11 years ago)
Author:
donvip
Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:
applications/editors/josm/plugins/merge-overlap
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/merge-overlap/.settings/org.eclipse.jdt.core.prefs

    r29645 r29854  
    11eclipse.preferences.version=1
     2org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
     3org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
     4org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
     5org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
     6org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
     7org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
    28org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
    39org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
     
    713org.eclipse.jdt.core.compiler.debug.localVariable=generate
    814org.eclipse.jdt.core.compiler.debug.sourceFile=generate
     15org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
    916org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
     17org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
     18org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
     19org.eclipse.jdt.core.compiler.problem.deadCode=warning
     20org.eclipse.jdt.core.compiler.problem.deprecation=warning
     21org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
     22org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
     23org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
     24org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
    1025org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
     26org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
     27org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
     28org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
     29org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
     30org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
     31org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
     32org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
     33org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
     34org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
     35org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
     36org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
     37org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
     38org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
     39org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
     40org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
     41org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
     42org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
     43org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
     44org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
     45org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
     46org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
     47org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
     48org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
     49org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
     50org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
     51org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
     52org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
     53org.eclipse.jdt.core.compiler.problem.nullReference=warning
     54org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
     55org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
     56org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
     57org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
     58org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
     59org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
     60org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
     61org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
     62org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
     63org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
     64org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
     65org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
     66org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
     67org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
     68org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
     69org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
     70org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
     71org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
     72org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
     73org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
     74org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
     75org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
     76org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
     77org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
     78org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
     79org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
     80org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
     81org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
     82org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
     83org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
     84org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
     85org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
     86org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
     87org.eclipse.jdt.core.compiler.problem.unusedImport=warning
     88org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
     89org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
     90org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
     91org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
     92org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
     93org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
     94org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
     95org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
     96org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
     97org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
     98org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
    1199org.eclipse.jdt.core.compiler.source=1.6
  • applications/editors/josm/plugins/merge-overlap/build.xml

    r29778 r29854  
    44    <property name="commit.message" value="MergeOverlap: help shortcut parser, rebuild"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="6082"/>
     6    <property name="plugin.main.version" value="6162"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).
  • applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

    r29778 r29854  
    695695                }
    696696        }
    697 
     697/*
    698698        private Way getOld(Way r) {
    699699                return getOld(r, oldWays);
    700         }
     700        }*/
    701701
    702702        public static Way getOld(Way w, Map<Way, Way> oldWays) {
  • applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java

    r29778 r29854  
    173173    protected void updateTitle() {
    174174        if (targetPrimitive == null) {
    175             setTitle(tr("Conflicts when combining primitives", null));
     175            setTitle(tr("Conflicts when combining primitives"));
    176176            return;
    177177        }
Note: See TracChangeset for help on using the changeset viewer.