Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipe Mulet2001-08-01 14:03:26 +0000
committerPhilipe Mulet2001-08-01 14:03:26 +0000
commit9dcc029d1a2a3d870c3dbba6d8990a6eb23fa085 (patch)
tree9ab6e60b97cfce534f1a6ce6831d738e124c917a
parente97dff1004437e7793059cc79f21bd49d58afcab (diff)
downloadeclipse.jdt.core-9dcc029d1a2a3d870c3dbba6d8990a6eb23fa085.tar.gz
eclipse.jdt.core-9dcc029d1a2a3d870c3dbba6d8990a6eb23fa085.tar.xz
eclipse.jdt.core-9dcc029d1a2a3d870c3dbba6d8990a6eb23fa085.zip
*** empty log message ***v128_OPEN_01
-rw-r--r--org.eclipse.jdt.core/changes.txt3
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java1
3 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.jdt.core/changes.txt b/org.eclipse.jdt.core/changes.txt
index cd9cdba681..ac42deb6a9 100644
--- a/org.eclipse.jdt.core/changes.txt
+++ b/org.eclipse.jdt.core/changes.txt
@@ -62,6 +62,9 @@ PRs Fixed in 1.0NL stream (since 0.9)
PRs Closed in this Release
==================================================================================
+1GGRCGZ: ITPJUI:WIN2000 - Can't rename/copy/move/delete default package
+1GDRXHP: ITPDUI:WINNT - NPE inspecting local var
+1G7RAO5: ITPJCORE:ALL - Java Model Core Tests: JavaProjectTests>>testProjectClose() has been removed
1GF7PZW: ITPJCORE:WINNT - Evaluation - Walkback reporting error on local variable type
1GGLNOQ: ITPJCORE:WINNT - @deprecated does not work if it is followed by a TAB - use a space instead.
1G295FE: ITPJCORE:ALL - Improve package fragment root management for java project
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java
index fadea5a860..1c81b87c15 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java
@@ -27,7 +27,8 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
currentScope.referenceType().recordReferenceTo(binding);
}
*/
-
+ if (constantExpression.constant == NotAConstant)
+ currentScope.problemReporter().caseExpressionMustBeConstant(constantExpression);
return flowInfo;
}
/**
@@ -53,8 +54,6 @@ public Constant resolveCase(BlockScope scope, TypeBinding testTb, SwitchStatemen
// add into the collection of cases of the associated switch statement
switchStatement.cases[switchStatement.caseCount++] = this;
TypeBinding caseTb = constantExpression.resolveType(scope);
- if (constantExpression.constant == NotAConstant)
- scope.problemReporter().caseExpressionMustBeConstant(constantExpression);
if (caseTb == null || testTb == null)
return null;
if (constantExpression.isConstantValueOfTypeAssignableToType(caseTb, testTb))
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java
index 61c07768a4..cbca95b9bc 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java
@@ -193,7 +193,6 @@ public void resolve(BlockScope upperScope) {
if ((cst = statements[i].resolveCase(scope, testType, this)) != null) {
//----check for duplicate case statement------------
if (cst != NotAConstant) {
- // a case with a welled typed constant, so intValue() is valid
int key = cst.intValue();
for (int j = 0; j < counter; j++) {
if (casesValues[j] == key) {

Back to the top