Changeset 29854 in osm for applications/editors/josm/plugins/junctionchecking

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/junctionchecking

Files:

• .settings/org.eclipse.core.resources.prefs (added)
• .settings/org.eclipse.jdt.core.prefs (modified) (2 diffs)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/DiGraphSealer.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/JunctionChecker/converting/PseudoChannelRemover.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/JunctionChecker/converting/TurnRestrictionChecker.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/BackPropagation.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java (modified) (4 diffs)

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

@@ -1 +1 @@
 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.6
@@ -7 +13 @@
 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
+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=ignore
+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=ignore
+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=ignore
+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.6

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

@@ -3 +3 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5960"/>
+    <property name="plugin.main.version" value="6162"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/DiGraphSealer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.JunctionChecker.connectedness;
 
-import java.util.ArrayList;
 import java.util.Vector;
+
 import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel;
 import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.ChannelDiGraph;
@@ -45 +45 @@
                         }
                 }
-                int counter = 0;
                 Channel tempChannel;
                 LeadsTo tempLeadsTo;
@@ -73 +72 @@
                                 newID++;
                                 digraph.addChannel(tempChannel);
-                                counter++;
                         }
                 }
@@ -103 +101 @@
                                 newID++;
                                 digraph.addChannel(tempChannel);
-                                counter++;
                         }
                 }
@@ -125 +122 @@
          */
         private void deleteDuplicateChannels() {
-                ArrayList<Integer> pointer = new ArrayList<Integer>();
 
                 for (int i = 0; i < digraph.getChannels().size(); i++) {
@@ -136 +132 @@
                                 }
                         }
-
                 }
         }

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/PseudoChannelRemover.java

@@ -13 +13 @@
 
         private final ChannelDiGraph digraph;
-        private final ArrayList<Channel> pseudochannels = new ArrayList<Channel>();
-        private int c = 0;
+        //private final ArrayList<Channel> pseudochannels = new ArrayList<Channel>();
         private Channel succChannel;
-        private String s;
         private Channel tempToChannel;
         private LeadsTo tempLeadsTo;
@@ -27 +25 @@
                 succChannel = tempchannel.getLeadsTo().get(0).getToChannel();
                 tempchannel.setToNode(succChannel.getToNode());
-                s = "";
                 //log.trace("---Folgender Channel ist überflüssig: " + succChannel.getNewid() + "---");
                 //log.trace("... und wird durch diesen ersetzt: " + tempchannel.getNewid());
@@ -57 +54 @@
                 digraph.removeChannel(succChannel);
                 //pseudochannels.add(tempchannel.getSuccChannels().get(0));
-                c++;
         }
 

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/TurnRestrictionChecker.java

@@ -20 +20 @@
         private final ArrayList<OSMRelation> turnrestrictionsrelations = new ArrayList<OSMRelation>();
         private final ChannelDiGraph channelDigraph;
-        private final boolean isInturnrestriction;
         private int relationpointer;
         private LeadsTo tempLeadsTo;
@@ -35 +34 @@
                 }
                 this.channelDigraph = channelDigraph;
-                this.isInturnrestriction = false;
         }
 

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java

@@ -64 +64 @@
                 }
                 
-                public Class getType() {
+                public Class<? extends OSMEntity> getType() {
                         return member.getClass();
                 }

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/BackPropagation.java

@@ -11 +11 @@
 public class BackPropagation {
 
-        private Channel y;
-        private Channel z;
         private final ChannelDiGraph digraph;
 
@@ -25 +23 @@
          */
         public void backPropagation(Channel y, Channel z, Channel zstrich) {
-                this.y = y;
-                this.z = z;
                 for (int i = 0; i < z.getReachableNodes().size(); i++) {
                         y.addReachableNode(z.getReachableNodeAt(i));

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java

@@ -30 +30 @@
         private long EEovern = 0;
         private final HashSet<Channel> subgraph = new HashSet<Channel>();//The candidate subgraph to be tested
-        private double durchlauf = 1;
         private ProgressMonitor pm;
         private final boolean pmenabled;
-        private final ArrayList<Integer> anzahlchannels = new ArrayList<Integer>();
         private final ArrayList<HashSet<Channel>> junctions = new ArrayList<HashSet<Channel>>();
         private final boolean searchFirstJunction;
@@ -85 +83 @@
 
                 Combination c = new Combination(Grid.length, n);
-                EEovern = (int) c.Choose(Grid.length*Grid.length, n*n);
+                EEovern = (int) Combination.Choose(Grid.length*Grid.length, n*n);
                 long ans = c.Choose(); //This is the number of subcolumns to be generated
                 int[][] v; // this is a column variable containing n y-index entries plus true false values (0/1)
@@ -135 +133 @@
                 ArrayList<int[]> CandidateK = new ArrayList<int[]>(n*n); //saves the candidate K_{n-1} in entry-exit pairs
                 long lindex= 0;
-                int countk = 0;
                 int h = 0;
                 int m = 0;
@@ -188 +185 @@
                                         }
                                         if (missing <=1 && smallerjunction == true){//The k-subgrid is a different junction candidate satisfying total reachability
-                                                countk++;
                                                 CheckMinimal = CheckSmallJunction(CandidateK)==false;// If the candidate is a smaller junction, then minimality is false
-                                                durchlauf++;
                                                 //log.info("durchlauf: " + durchlauf + " Wert von CheckMinimal: " + CheckMinimal);
                                                 if (!CheckMinimal) {