Attachment 200414 Details for Bug 349400 – patch to merge branch with HEAD

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch to merge branch with HEAD

debug-1.7-head.patch (text/plain), 20.30 KB, created by Michael Rennie

on 2011-07-27 02:32:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2011-07-27 02:32:27 EDT

Size: 20.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.debug
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/META-INF/MANIFEST.MF,v
>retrieving revision 1.22
>diff -u -r1.22 MANIFEST.MF
>--- META-INF/MANIFEST.MF	24 Nov 2010 04:28:11 -0000	1.22
>+++ META-INF/MANIFEST.MF	27 Jul 2011 06:31:24 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.jdt.debug; singleton:=true
>-Bundle-Version: 3.7.0.qualifier
>+Bundle-Version: 3.7.100.qualifier
> Bundle-ClassPath: jdi.jar,
>  jdimodel.jar,
>  tools.jar
>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	27 Jul 2011 06:31:24 -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/ASTInstructionCompiler.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java,v
>retrieving revision 1.84
>diff -u -r1.84 ASTInstructionCompiler.java
>--- eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java	15 Jul 2010 14:20:35 -0000	1.84
>+++ eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java	27 Jul 2011 06:31:24 -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
>@@ -3583,7 +3583,12 @@
> 					storeInstruction(); // jump
> 					statementsDefault= new ArrayList();
> 				} else {
>-					push(new EqualEqualOperator(Instruction.T_int, Instruction.T_int, true, fCounter));
>+					if(switchCase.getExpression() instanceof StringLiteral) {
>+						push(new SendMessage("equals", "(Ljava/lang/Object;)Z", 1, null, fCounter)); //$NON-NLS-1$ //$NON-NLS-2$
>+					}
>+					else {
>+						push(new EqualEqualOperator(Instruction.T_int, Instruction.T_int, true, fCounter));
>+					}
> 					push(new Dup());
> 					storeInstruction(); // dupe
> 					switchCase.getExpression().accept(this);
>@@ -3660,7 +3665,6 @@
> 				}
> 			}
> 		}
>-
> 		return false;
> 	}
> 
>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	27 Jul 2011 06:31:24 -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	27 Jul 2011 06:31:25 -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	27 Jul 2011 06:31:25 -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	27 Jul 2011 06:31:25 -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	27 Jul 2011 06:31:25 -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	27 Jul 2011 06:31:25 -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());
>Index: model/org/eclipse/jdt/internal/debug/core/hcr/MethodSearchVisitor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/MethodSearchVisitor.java,v
>retrieving revision 1.4
>diff -u -r1.4 MethodSearchVisitor.java
>--- model/org/eclipse/jdt/internal/debug/core/hcr/MethodSearchVisitor.java	24 Feb 2005 14:50:56 -0000	1.4
>+++ model/org/eclipse/jdt/internal/debug/core/hcr/MethodSearchVisitor.java	27 Jul 2011 06:31:25 -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
>@@ -92,6 +92,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;
>@@ -99,7 +100,7 @@
> import org.eclipse.jdt.core.dom.WildcardType;
> 
> /**
>- * Visits an AST to find a method declartion
>+ * Visits an AST to find a method declaration
>  */
> public class MethodSearchVisitor extends ASTVisitor {
>     
>@@ -404,6 +405,9 @@
>     public boolean visit(TypeParameter node) {
>         return isSearching();
>     }
>+    public boolean visit(UnionType node) {
>+    	return super.visit(node);
>+    }
>     public boolean visit(VariableDeclarationExpression node) {
>         return isSearching();
>     }
>#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	27 Jul 2011 06:31:26 -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);
>#P org.eclipse.jdt.debug.ui
>Index: ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java,v
>retrieving revision 1.53
>diff -u -r1.53 JavaDebugHover.java
>--- ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java	14 Apr 2010 18:39:39 -0000	1.53
>+++ ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java	27 Jul 2011 06:31:26 -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
>@@ -339,7 +339,7 @@
>             		    		ITypeRoot typeRoot = (ITypeRoot) codeAssist;
>             		    		ASTNode root= SharedASTProvider.getAST(typeRoot, SharedASTProvider.WAIT_NO, null);
>             		    		if (root == null) {
>-	            		    		ASTParser parser = ASTParser.newParser(AST.JLS3);
>+	            		    		ASTParser parser = ASTParser.newParser(AST.JLS4);
> 	            		    		parser.setSource(typeRoot);
> 	            		    		parser.setFocalPosition(hoverRegion.getOffset());
> 									root = parser.createAST(null);
>Index: ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineAdapter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineAdapter.java,v
>retrieving revision 1.22
>diff -u -r1.22 RunToLineAdapter.java
>--- ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineAdapter.java	31 Mar 2009 20:43:07 -0000	1.22
>+++ ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineAdapter.java	27 Jul 2011 06:31:26 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- *  Copyright (c) 2000, 2008 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
>@@ -71,7 +71,7 @@
> 					Runnable r = new Runnable() {
> 						public void run() {
> 							lineNumber[0] = textSelection.getStartLine() + 1;
>-							ASTParser parser = ASTParser.newParser(AST.JLS3);
>+							ASTParser parser = ASTParser.newParser(AST.JLS4);
> 							parser.setSource(document.get().toCharArray());
> 							CompilationUnit compilationUnit= (CompilationUnit)parser.createAST(null);
> 							ValidBreakpointLocationLocator locator= new ValidBreakpointLocationLocator(compilationUnit, lineNumber[0], false, false);
>#P org.eclipse.jdt.launching
>Index: launching/org/eclipse/jdt/launching/JavaRuntime.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java,v
>retrieving revision 1.220
>diff -u -r1.220 JavaRuntime.java
>--- launching/org/eclipse/jdt/launching/JavaRuntime.java	18 Apr 2011 13:59:06 -0000	1.220
>+++ launching/org/eclipse/jdt/launching/JavaRuntime.java	27 Jul 2011 06:31:27 -0000
>@@ -2754,8 +2754,7 @@
>             	} else if (javaVersion.startsWith(JavaCore.VERSION_1_6)) {
>             		compliance = JavaCore.VERSION_1_6;
>             	} else if (javaVersion.startsWith(JavaCore.VERSION_1_7)) {
>-            		// since 1.7 compliance options are not yet supported, default to 1.6 compliance when running on 1.7, see https://bugs.eclipse.org/321043
>-            		compliance = JavaCore.VERSION_1_6;
>+            		compliance = JavaCore.VERSION_1_7;
>             	}
>             	if (compliance != null) {
> 	                Hashtable options= JavaCore.getOptions();

Actions: View | Diff

Attachments on bug 349400: 198037 | 200414 | 200417