Attachment 183598 Details for Bug 330845 – Proposed fix + regression test

[patch] Proposed fix + regression test

patch_330845.txt (text/plain), 3.14 KB, created by Olivier Thomann

on 2010-11-22 15:12:36 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2010-11-22 15:12:36 EST

Size: 3.14 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/JavaProject.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java,v
>retrieving revision 1.439
>diff -u -r1.439 JavaProject.java
>--- model/org/eclipse/jdt/internal/core/JavaProject.java	19 Nov 2010 11:25:43 -0000	1.439
>+++ model/org/eclipse/jdt/internal/core/JavaProject.java	22 Nov 2010 20:10:15 -0000
>@@ -1732,7 +1732,7 @@
> 		if (resource == null) {
> 			// resource doesn't exist in workspace
> 			if (path.getFileExtension() != null) {
>-				if (!workspaceRoot.getProject(path.lastSegment()).exists()) {
>+				if (!workspaceRoot.getProject(path.segment(0)).exists()) {
> 					// assume it is an external ZIP archive
> 					return getPackageFragmentRoot0(path);
> 				} else {
>Index: model/org/eclipse/jdt/internal/core/Member.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Member.java,v
>retrieving revision 1.54
>diff -u -r1.54 Member.java
>--- model/org/eclipse/jdt/internal/core/Member.java	7 Sep 2010 19:14:26 -0000	1.54
>+++ model/org/eclipse/jdt/internal/core/Member.java	22 Nov 2010 20:10:15 -0000
>@@ -220,7 +220,7 @@
> 			int flags = Integer.parseInt(memento.nextToken());
> 			memento.nextToken(); // JEM_COUNT
> 			if (!memento.hasMoreTokens()) return this;
>-			boolean isParameter = Boolean.getBoolean(memento.nextToken());
>+			boolean isParameter = Boolean.valueOf(memento.nextToken()).booleanValue();
> 			return new LocalVariable(this, varName, declarationStart, declarationEnd, nameStart, nameEnd, typeSignature, null, flags, isParameter);
> 		case JEM_TYPE_PARAMETER:
> 			if (!memento.hasMoreTokens()) return this;
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/MementoTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/MementoTests.java,v
>retrieving revision 1.28
>diff -u -r1.28 MementoTests.java
>--- src/org/eclipse/jdt/core/tests/model/MementoTests.java	7 Sep 2010 19:14:27 -0000	1.28
>+++ src/org/eclipse/jdt/core/tests/model/MementoTests.java	22 Nov 2010 20:10:15 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -63,6 +63,11 @@
> 		"Unexpected restored element",
> 		element,
> 		restored);
>+	String restoredHandleIdentifier = restored.getHandleIdentifier();
>+	assertEquals(
>+		"Unexpected memento for restored element " + restored,
>+		expected,
>+		restoredHandleIdentifier);
> }
> protected String getEscapedExternalJCLPath() {
> 	return getEscapedPath(getExternalJCLPath().toString());

Actions: View | Diff

Attachments on bug 330845: 183598