Attachment #104673 for bug #95480

View | Details | Raw Unified | Return to bug 95480
Collapse All | Expand All




			"}";
		assertSourceEquals("Unexpected source", expectedSource, type.getSource());
	}

	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95480
	public void test007() throws Exception {
		JavaModelException expected = null;
		try {
			IType type = getCompilationUnit("CreateMembers/src/E.java").getType("E");
			type.createType("class Member {}", type.getField("E1"), false/*don't force*/, null/*no progress*/);
		} catch (JavaModelException e) {
			expected = e;
		}
		assertExceptionEquals(
			"Unexpected exception", 
			"Invalid sibling: E1 [in E [in E.java [in <default> [in src [in CreateMembers]]]]]", 
			expected);
	}
}




	}
	return JavaModelStatus.VERIFIED_OK;
}
public IJavaModelStatus verify() {
	IJavaModelStatus status = super.verify();
	if (!status.isOK())
		return status;
	try {
		IJavaElement parent = getParentElement();
		if (this.anchorElement != null && this.anchorElement.getElementType() == IJavaElement.FIELD 
				&& parent.getElementType() == IJavaElement.TYPE && ((IType)parent).isEnum())
			return new JavaModelStatus(IJavaModelStatusConstants.INVALID_SIBLING, this.anchorElement);
	} catch (JavaModelException e) {
		return e.getJavaModelStatus();
	}
	return JavaModelStatus.VERIFIED_OK;
}
private String getASTNodeName() {
	return ((AbstractTypeDeclaration) this.createdNode).getName().getIdentifier();
}

Return to bug 95480

Lines 151-154 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CreateMembersTests.java (+15 lines)
151	"}";	151	"}";
152	assertSourceEquals("Unexpected source", expectedSource, type.getSource());	152	assertSourceEquals("Unexpected source", expectedSource, type.getSource());
153	}	153	}
		154
		155	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95480
		156	public void test007() throws Exception {
		157	JavaModelException expected = null;
		158	try {
		159	IType type = getCompilationUnit("CreateMembers/src/E.java").getType("E");
		160	type.createType("class Member {}", type.getField("E1"), false/don't force/, null/no progress/);
		161	} catch (JavaModelException e) {
		162	expected = e;
		163	}
		164	assertExceptionEquals(
		165	"Unexpected exception",
		166	"Invalid sibling: E1 [in E [in E.java [in <default> [in src [in CreateMembers]]]]]",
		167	expected);
		168	}
154	}	169	}

Lines 102-107 Link Here

(-)model/org/eclipse/jdt/internal/core/CreateTypeOperation.java (+14 lines)
102	}	102	}
103	return JavaModelStatus.VERIFIED_OK;	103	return JavaModelStatus.VERIFIED_OK;
104	}	104	}
		105	public IJavaModelStatus verify() {
		106	IJavaModelStatus status = super.verify();
		107	if (!status.isOK())
		108	return status;
		109	try {
		110	IJavaElement parent = getParentElement();
		111	if (this.anchorElement != null && this.anchorElement.getElementType() == IJavaElement.FIELD
		112	&& parent.getElementType() == IJavaElement.TYPE && ((IType)parent).isEnum())
		113	return new JavaModelStatus(IJavaModelStatusConstants.INVALID_SIBLING, this.anchorElement);
		114	} catch (JavaModelException e) {
		115	return e.getJavaModelStatus();
		116	}
		117	return JavaModelStatus.VERIFIED_OK;
		118	}
105	private String getASTNodeName() {	119	private String getASTNodeName() {
106	return ((AbstractTypeDeclaration) this.createdNode).getName().getIdentifier();	120	return ((AbstractTypeDeclaration) this.createdNode).getName().getIdentifier();
107	}	121	}