Ignore:
Timestamp:
2013-08-21T03:47:16+02:00 (12 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/graphview
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r29853 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
    410org.eclipse.jdt.core.compiler.compliance=1.6
     11org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
    512org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
     13org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
     14org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
     15org.eclipse.jdt.core.compiler.problem.deadCode=warning
     16org.eclipse.jdt.core.compiler.problem.deprecation=warning
     17org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
     18org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
     19org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
     20org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
    621org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
     22org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
     23org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
     24org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
     25org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
     26org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
     27org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
     28org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
     29org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
     30org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
     31org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
     32org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
     33org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
     34org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
     35org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
     36org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
     37org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
     38org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
     39org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
     40org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
     41org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
     42org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
     43org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
     44org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
     45org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
     46org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
     47org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
     48org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
     49org.eclipse.jdt.core.compiler.problem.nullReference=warning
     50org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
     51org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
     52org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
     53org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
     54org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
     55org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
     56org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
     57org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
     58org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
     59org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
     60org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
     61org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
     62org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
     63org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
     64org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
     65org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
     66org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
     67org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
     68org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
     69org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
     70org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
     71org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
     72org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
     73org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
     74org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
     75org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
     76org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
     77org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
     78org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
     79org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
     80org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
     81org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
     82org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
     83org.eclipse.jdt.core.compiler.problem.unusedImport=warning
     84org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
     85org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
     86org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
     87org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
     88org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
     89org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
     90org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
     91org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
     92org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
     93org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
     94org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
    795org.eclipse.jdt.core.compiler.source=1.6

  • applications/editors/josm/plugins/graphview/build.xml

    r29435 r29854  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is the build file for the graphview plugin
    4 **
    5 ** Maintaining versions
    6 ** ====================
    7 ** see README.template
    8 **
    9 ** Usage
    10 ** =====
    11 ** To build it run
    12 **
    13 **    > ant  dist
    14 **
    15 ** To install the generated plugin locally (in your default plugin directory) run
    16 **
    17 **    > ant  install
    18 **
    19 ** To build against the core in ../../core, create a correct manifest and deploy to
    20 ** SVN,
    21 **    set the properties commit.message and plugin.main.version
    22 ** and run
    23 **    > ant  publish
    24 **
    25 **
    26 -->
    272<project name="graphview" default="dist" basedir=".">
    283    <property name="commit.message" value="option to change graph colors; closes ticket 5523 in JOSM Trac"/>
    29     <property name="plugin.main.version" value="4968"/>
     4    <property name="plugin.main.version" value="6162"/>
    305    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    316    <property name="plugin.build.dir" value="build"/>
    … …  
    338    <!-- this is the directory where the plugin jar is copied to -->
    349    <property name="plugin.dist.dir" value="../../dist"/>
    35     <property name="ant.build.javac.target" value="1.5"/>
     10    <property name="ant.build.javac.target" value="1.6"/>
    3611    <property name="plugin.dist.dir" value="../../dist"/>
    3712    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>

  • applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/GraphEdge.java

    r23189 r29854  
    22
    33import java.util.Collection;
    4 import java.util.List;
    54
    65import org.openstreetmap.josm.plugins.graphview.core.property.GraphEdgePropertyType;
    7 import org.openstreetmap.josm.plugins.graphview.core.transition.Segment;
    86
    97/**

  • applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/TSBasedWayGraph.java

    r23189 r29854  
    8989        }
    9090        public <V> V getPropertyValue(GraphEdgePropertyType<V> property) {
     91            @SuppressWarnings("unchecked")
    9192            V result = (V) properties.get(property);
    9293            return result;
    … …  
    429430
    430431        if (!objectSetMap.containsKey(object)) {
    431             @SuppressWarnings("unchecked") //no set with generic parameter can be created directly
    432             Set<T> set = new HashSet();
     432            Set<T> set = new HashSet<T>();
    433433            set.add(object);
    434434            objectSetMap.put(object, set);
    435435        }
    436 
    437436    }
    438437

  • applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/transition/GenericTransitionStructure.java

    r23189 r29854  
    6666        }
    6767
    68         public <P> void setProperty(RoadPropertyType<P> property, P value) {
     68        /*public <P> void setProperty(RoadPropertyType<P> property, P value) {
    6969            properties.put(property, value);
    70         }
     70        }*/
    7171        public Collection<RoadPropertyType<?>> getAvailableProperties() {
    7272            return properties.keySet();
    … …  
    102102            return node2;
    103103        }
    104         public <P> void setProperty(RoadPropertyType<P> property, P value) {
     104        /*public <P> void setProperty(RoadPropertyType<P> property, P value) {
    105105            properties.put(property, value);
    106         }
     106        }*/
    107107        public Collection<RoadPropertyType<?>> getAvailableProperties() {
    108108            return properties.keySet();

  • applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java

    r26174 r29854  
    11package org.openstreetmap.josm.plugins.graphview.plugin.dialogs;
    2 
    3 import static org.openstreetmap.josm.tools.I18n.tr;
    42
    53import static org.openstreetmap.josm.plugins.graphview.core.property.VehiclePropertyTypes.MAX_INCLINE_DOWN;
    … …  
    75import static org.openstreetmap.josm.plugins.graphview.core.property.VehiclePropertyTypes.MAX_TRACKTYPE;
    86import static org.openstreetmap.josm.plugins.graphview.core.property.VehiclePropertyTypes.SURFACE_BLACKLIST;
     7import static org.openstreetmap.josm.tools.I18n.tr;
    98
    109import java.awt.Frame;

  • applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java

    r27359 r29854  
    33import static org.openstreetmap.josm.tools.I18n.tr;
    44
    5 import java.awt.BorderLayout;
    65import java.awt.Color;
    76import java.awt.GridBagConstraints;
    … …  
    2827import javax.swing.JPanel;
    2928
     29import org.openstreetmap.josm.gui.SideButton;
    3030import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
    31 import org.openstreetmap.josm.gui.SideButton;
    3231import org.openstreetmap.josm.plugins.graphview.core.access.AccessRulesetReader;
    3332import org.openstreetmap.josm.plugins.graphview.core.visualisation.ColorScheme;
Note: See TracChangeset for help on using the changeset viewer.