Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 198037 Details for
Bug 349400
[1.7] Add Java 7 support to Debug
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
update
debug-java7.patch (text/plain), 12.19 KB, created by
Michael Rennie
on 2011-06-15 11:42:18 EDT
(
hide
)
Description:
update
Filename:
MIME Type:
Creator:
Michael Rennie
Created:
2011-06-15 11:42:18 EDT
Size:
12.19 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.jdt.debug >Index: eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java,v >retrieving revision 1.72 >diff -u -r1.72 ASTEvaluationEngine.java >--- eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java 5 May 2011 16:13:08 -0000 1.72 >+++ eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java 15 Jun 2011 15:37:55 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2000, 2010 IBM Corporation and others. >+ * Copyright (c) 2000, 2011 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -268,7 +268,7 @@ > } > > private CompilationUnit parseCompilationUnit(char[] source, String unitName, IJavaProject project) { >- ASTParser parser = ASTParser.newParser(AST.JLS3); >+ ASTParser parser = ASTParser.newParser(AST.JLS4); > parser.setSource(source); > parser.setUnitName(unitName); > parser.setProject(project); >Index: eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java,v >retrieving revision 1.45 >diff -u -r1.45 EvaluationSourceGenerator.java >--- eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java 24 Sep 2009 19:43:45 -0000 1.45 >+++ eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java 15 Jun 2011 15:37:55 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2000, 2009 IBM Corporation and others. >+ * Copyright (c) 2000, 2011 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -133,7 +133,7 @@ > } > > private void createEvaluationSourceFromSource(String source, IType type, boolean createInAStaticMethod, IJavaProject project) throws DebugException { >- ASTParser parser = ASTParser.newParser(AST.JLS3); >+ ASTParser parser = ASTParser.newParser(AST.JLS4); > parser.setSource(source.toCharArray()); > Map options=getCompilerOptions(project); > String sourceLevel = project.getOption(JavaCore.COMPILER_SOURCE, true); >Index: eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java,v >retrieving revision 1.47 >diff -u -r1.47 SourceBasedSourceGenerator.java >--- eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java 5 Apr 2011 19:47:30 -0000 1.47 >+++ eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java 15 Jun 2011 15:37:55 -0000 >@@ -105,6 +105,7 @@ > import org.eclipse.jdt.core.dom.TypeDeclarationStatement; > import org.eclipse.jdt.core.dom.TypeLiteral; > import org.eclipse.jdt.core.dom.TypeParameter; >+import org.eclipse.jdt.core.dom.UnionType; > import org.eclipse.jdt.core.dom.VariableDeclarationExpression; > import org.eclipse.jdt.core.dom.VariableDeclarationFragment; > import org.eclipse.jdt.core.dom.VariableDeclarationStatement; >@@ -1681,6 +1682,16 @@ > return true; > } > >+ /* (non-Javadoc) >+ * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.UnionType) >+ */ >+ public boolean visit(UnionType node) { >+ if (rightTypeFound()) { >+ return false; >+ } >+ return true; >+ } >+ > /** > * @see ASTVisitor#visit(TypeDeclaration) > */ >Index: model/org/eclipse/jdt/internal/debug/core/JavaDebugUtils.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JavaDebugUtils.java,v >retrieving revision 1.14 >diff -u -r1.14 JavaDebugUtils.java >--- model/org/eclipse/jdt/internal/debug/core/JavaDebugUtils.java 24 Sep 2009 19:38:16 -0000 1.14 >+++ model/org/eclipse/jdt/internal/debug/core/JavaDebugUtils.java 15 Jun 2011 15:37:55 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2009 IBM Corporation and others. >+ * Copyright (c) 2005, 2011 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -225,7 +225,7 @@ > Integer.parseInt(innerTypeName.substring(0, 1)); // throws NFE if not an integer > > // perform expensive lookup for anonymous types: >- ASTParser parser = ASTParser.newParser(AST.JLS3); >+ ASTParser parser = ASTParser.newParser(AST.JLS4); > parser.setResolveBindings(true); > parser.setSource(type.getTypeRoot()); > CompilationUnit cu = (CompilationUnit) parser.createAST(null); >Index: model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpointImportParticipant.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpointImportParticipant.java,v >retrieving revision 1.3 >diff -u -r1.3 JavaBreakpointImportParticipant.java >--- model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpointImportParticipant.java 25 Sep 2009 17:11:02 -0000 1.3 >+++ model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpointImportParticipant.java 15 Jun 2011 15:37:55 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2008, 2009 IBM Corporation and others. >+ * Copyright (c) 2008, 2011 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -470,7 +470,7 @@ > if(resource != null && resource.getType() == IResource.FILE) { > ICompilationUnit cunit = JavaCore.createCompilationUnitFrom((IFile) resource); > if(cunit != null) { >- ASTParser parser = ASTParser.newParser(AST.JLS3); >+ ASTParser parser = ASTParser.newParser(AST.JLS4); > parser.setSource(cunit); > parser.setResolveBindings(true); > unit = (CompilationUnit) parser.createAST(new NullProgressMonitor()); >Index: model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java,v >retrieving revision 1.3 >diff -u -r1.3 ValidBreakpointLocationLocator.java >--- model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java 1 Oct 2009 16:08:49 -0000 1.3 >+++ model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java 15 Jun 2011 15:37:55 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2003, 2009 IBM Corporation and others. >+ * Copyright (c) 2003, 2011 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -77,6 +77,7 @@ > import org.eclipse.jdt.core.dom.ParenthesizedExpression; > import org.eclipse.jdt.core.dom.PostfixExpression; > import org.eclipse.jdt.core.dom.PrefixExpression; >+import org.eclipse.jdt.core.dom.PrefixExpression.Operator; > import org.eclipse.jdt.core.dom.PrimitiveType; > import org.eclipse.jdt.core.dom.QualifiedName; > import org.eclipse.jdt.core.dom.QualifiedType; >@@ -101,12 +102,12 @@ > import org.eclipse.jdt.core.dom.TypeDeclarationStatement; > import org.eclipse.jdt.core.dom.TypeLiteral; > import org.eclipse.jdt.core.dom.TypeParameter; >+import org.eclipse.jdt.core.dom.UnionType; > import org.eclipse.jdt.core.dom.VariableDeclarationExpression; > import org.eclipse.jdt.core.dom.VariableDeclarationFragment; > import org.eclipse.jdt.core.dom.VariableDeclarationStatement; > import org.eclipse.jdt.core.dom.WhileStatement; > import org.eclipse.jdt.core.dom.WildcardType; >-import org.eclipse.jdt.core.dom.PrefixExpression.Operator; > > /** > * Compute a valid location where to put a breakpoint from an JDOM CompilationUnit. >@@ -1091,6 +1092,13 @@ > return visit(node, false); > } > >+ /* (non-Javadoc) >+ * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.UnionType) >+ */ >+ public boolean visit(UnionType node) { >+ return visit(node, false); >+ } >+ > /** > * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.TypeDeclaration) > */ >Index: model/org/eclipse/jdt/internal/debug/core/hcr/CompilationUnitDelta.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/CompilationUnitDelta.java,v >retrieving revision 1.19 >diff -u -r1.19 CompilationUnitDelta.java >--- model/org/eclipse/jdt/internal/debug/core/hcr/CompilationUnitDelta.java 24 Feb 2005 14:50:56 -0000 1.19 >+++ model/org/eclipse/jdt/internal/debug/core/hcr/CompilationUnitDelta.java 15 Jun 2011 15:37:55 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2000, 2005 IBM Corporation and others. >+ * Copyright (c) 2000, 2011 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -154,7 +154,7 @@ > char[] buffer= readString(input); > if (buffer != null) { > if (fParser == null) { >- fParser = ASTParser.newParser(AST.JLS3); >+ fParser = ASTParser.newParser(AST.JLS4); > } > fParser.setSource(buffer); > fParser.setProject(cu.getJavaProject()); >#P org.eclipse.jdt.debug.tests >Index: tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointLocationVerificationTests.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointLocationVerificationTests.java,v >retrieving revision 1.7 >diff -u -r1.7 BreakpointLocationVerificationTests.java >--- tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointLocationVerificationTests.java 28 Sep 2009 13:58:39 -0000 1.7 >+++ tests/org/eclipse/jdt/debug/tests/breakpoints/BreakpointLocationVerificationTests.java 15 Jun 2011 15:37:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2000, 2009 IBM Corporation and others. >+ * Copyright (c) 2000, 2011 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -41,7 +41,7 @@ > * @return the parsed <code>CompilationUnit</code> > */ > private CompilationUnit parseCompilationUnit(ICompilationUnit unit) { >- ASTParser parser = ASTParser.newParser(AST.JLS3); >+ ASTParser parser = ASTParser.newParser(AST.JLS4); > parser.setSource(unit); > parser.setUnitName(unit.getElementName()); > parser.setResolveBindings(true);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 349400
:
198037
|
200414
|
200417