Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2670] trunk
|
From: <caw...@us...> - 2007-06-25 16:32:04
|
Revision: 2670
http://svn.sourceforge.net/rubyeclipse/?rev=2670&view=rev
Author: cawilliams
Date: 2007-06-25 09:32:00 -0700 (Mon, 25 Jun 2007)
Log Message:
-----------
fix all sorts of problems with not adhering to user preferences with the errors/warnings
Modified Paths:
--------------
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/AccidentalBooleanAssignmentVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ComparableInclusionVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/EnumerableInclusionVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/LocalsMaskingMethodsVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/MisspelledConstructorVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/SimilarVariableNameVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/SubclassCallsSuper.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyArgumentsVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyBranchesVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLinesVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLocalsVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyReturnsVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnecessaryElseVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnusedParameterVisitor.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnusedPrivateMethodVisitor.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/warnings/RubyLintVisitor.java
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/AccidentalBooleanAssignmentVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/AccidentalBooleanAssignmentVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/AccidentalBooleanAssignmentVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -14,7 +14,7 @@
public class AccidentalBooleanAssignmentVisitor extends RubyLintVisitor {
public AccidentalBooleanAssignmentVisitor(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ComparableInclusionVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ComparableInclusionVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ComparableInclusionVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -23,7 +23,7 @@
private ISourcePosition pos;
public ComparableInclusionVisitor(String code) {
- super(code);
+ super(AptanaRDTPlugin.getDefault().getOptions(), code);
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/EnumerableInclusionVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/EnumerableInclusionVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/EnumerableInclusionVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -23,7 +23,7 @@
private ISourcePosition pos;
public EnumerableInclusionVisitor(String code) {
- super(code);
+ super(AptanaRDTPlugin.getDefault().getOptions(), code);
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/LocalsMaskingMethodsVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/LocalsMaskingMethodsVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/LocalsMaskingMethodsVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -17,7 +17,7 @@
private HashSet<String> methods;
public LocalsMaskingMethodsVisitor(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
locals = new ArrayList<LocalAsgnNode>();
methods = new HashSet<String>();
}
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/MisspelledConstructorVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/MisspelledConstructorVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/MisspelledConstructorVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -9,7 +9,7 @@
public class MisspelledConstructorVisitor extends RubyLintVisitor {
public MisspelledConstructorVisitor(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
public Instruction visitDefnNode(DefnNode iVisited) {
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/SimilarVariableNameVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/SimilarVariableNameVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/SimilarVariableNameVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -31,7 +31,7 @@
private List<Map<String, Node>> stack;
public SimilarVariableNameVisitor(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
stack = new ArrayList<Map<String, Node>>();
}
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/SubclassCallsSuper.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/SubclassCallsSuper.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/SubclassCallsSuper.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -17,7 +17,7 @@
private boolean isSubClass;
public SubclassCallsSuper(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyArgumentsVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyArgumentsVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyArgumentsVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -13,15 +13,13 @@
public class TooManyArgumentsVisitor extends RubyLintVisitor {
private int maxArgLength;
- private Map fOptions;
public TooManyArgumentsVisitor(String contents) {
this(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
public TooManyArgumentsVisitor(Map options, String contents) {
- super(contents);
- fOptions = options;
+ super(options, contents);
maxArgLength = getInt(AptanaRDTPlugin.COMPILER_PB_MAX_ARGUMENTS, 5);
}
private int getInt(String key, int defaultValue) {
@@ -34,7 +32,7 @@
@Override
protected String getOptionKey() {
- return AptanaRDTPlugin.COMPILER_PB_MAX_ARGUMENTS;
+ return AptanaRDTPlugin.COMPILER_PB_CODE_COMPLEXITY_ARGUMENTS;
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyBranchesVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyBranchesVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyBranchesVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -6,7 +6,6 @@
import org.jruby.ast.DefnNode;
import org.jruby.ast.DefsNode;
import org.jruby.ast.IfNode;
-import org.jruby.ast.NewlineNode;
import org.jruby.ast.Node;
import org.jruby.ast.WhenNode;
import org.jruby.evaluator.Instruction;
@@ -18,15 +17,13 @@
private int maxBranches;
private int branchCount;
- private Map fOptions;
public TooManyBranchesVisitor(String contents) {
this(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
public TooManyBranchesVisitor(Map options, String contents) {
- super(contents);
- fOptions = options;
+ super(options, contents);
maxBranches = getInt(AptanaRDTPlugin.COMPILER_PB_MAX_BRANCHES, 5);
branchCount = 0;
}
@@ -40,7 +37,7 @@
@Override
protected String getOptionKey() {
- return AptanaRDTPlugin.COMPILER_PB_MAX_BRANCHES;
+ return AptanaRDTPlugin.COMPILER_PB_CODE_COMPLEXITY_BRANCHES;
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLinesVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLinesVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLinesVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -13,15 +13,13 @@
public class TooManyLinesVisitor extends RubyLintVisitor {
private int maxLines;
- private Map fOptions;
public TooManyLinesVisitor(String contents) {
this(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
public TooManyLinesVisitor(Map options, String contents) {
- super(contents);
- fOptions = options;
+ super(options, contents);
maxLines = getInt(AptanaRDTPlugin.COMPILER_PB_MAX_LINES, 20);
}
private int getInt(String key, int defaultValue) {
@@ -34,7 +32,7 @@
@Override
protected String getOptionKey() {
- return AptanaRDTPlugin.COMPILER_PB_MAX_LINES;
+ return AptanaRDTPlugin.COMPILER_PB_CODE_COMPLEXITY_LINES;
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLocalsVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLocalsVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLocalsVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -15,18 +15,15 @@
public class TooManyLocalsVisitor extends RubyLintVisitor {
-
private int maxLocals;
private Set locals;
- private Map fOptions;
public TooManyLocalsVisitor(String contents) {
this(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
public TooManyLocalsVisitor(Map options, String contents) {
- super(contents);
- fOptions = options;
+ super(options, contents);
maxLocals = getInt(AptanaRDTPlugin.COMPILER_PB_MAX_LOCALS, 4);
}
private int getInt(String key, int defaultValue) {
@@ -39,7 +36,7 @@
@Override
protected String getOptionKey() {
- return AptanaRDTPlugin.COMPILER_PB_MAX_LOCALS;
+ return AptanaRDTPlugin.COMPILER_PB_CODE_COMPLEXITY_LOCALS;
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyReturnsVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyReturnsVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyReturnsVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -14,15 +14,13 @@
private int maxReturns;
private int returnCount;
- private Map fOptions;
public TooManyReturnsVisitor(String contents) {
this(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
public TooManyReturnsVisitor(Map options, String contents) {
- super(contents);
- fOptions = options;
+ super(options, contents);
maxReturns = getInt(AptanaRDTPlugin.COMPILER_PB_MAX_RETURNS, 5);
returnCount = 0;
}
@@ -36,7 +34,7 @@
@Override
protected String getOptionKey() {
- return AptanaRDTPlugin.COMPILER_PB_MAX_RETURNS;
+ return AptanaRDTPlugin.COMPILER_PB_CODE_COMPLEXITY_RETURNS;
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnecessaryElseVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnecessaryElseVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnecessaryElseVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -19,7 +19,7 @@
public class UnecessaryElseVisitor extends RubyLintVisitor {
public UnecessaryElseVisitor(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnusedParameterVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnusedParameterVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnusedParameterVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -22,7 +22,7 @@
private Map<String, Node> declared;
public UnusedParameterVisitor(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
declared = new HashMap<String, Node>();
}
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnusedPrivateMethodVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnusedPrivateMethodVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/UnusedPrivateMethodVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -23,7 +23,7 @@
private Visibility visibility;
public UnusedPrivateMethodVisitor(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
visibility = Visibility.PUBLIC;
}
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/warnings/RubyLintVisitor.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/warnings/RubyLintVisitor.java 2007-06-22 19:27:56 UTC (rev 2669)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/warnings/RubyLintVisitor.java 2007-06-25 16:32:00 UTC (rev 2670)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.jruby.ast.BlockNode;
import org.jruby.ast.ClassNode;
@@ -25,11 +26,17 @@
public abstract class RubyLintVisitor extends AbstractVisitor {
private String contents;
+ protected Map fOptions;
private List<CategorizedProblem> problems;
public RubyLintVisitor(String contents) {
+ this(RubyCore.getOptions(), contents);
+ }
+
+ public RubyLintVisitor(Map options, String contents) {
this.problems = new ArrayList<CategorizedProblem>();
this.contents = contents;
+ this.fOptions = options;
}
protected String getSource(Node node) {
@@ -53,7 +60,7 @@
}
protected String getSeverity() {
- return RubyCore.getOption(getOptionKey());
+ return (String) fOptions.get(getOptionKey());
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
