User: ara_e_w
Date: 02/02/25 10:40:29
Modified: src/xjavadoc SourceClass.java
Log:
fixed the ambiguity problem
Revision Changes Path
1.11 +5 -8 xjavadoc/src/xjavadoc/SourceClass.java
Index: SourceClass.java
===================================================================
RCS file: /cvsroot/xdoclet/xjavadoc/src/xjavadoc/SourceClass.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- SourceClass.java 25 Feb 2002 00:02:51 -0000 1.10
+++ SourceClass.java 25 Feb 2002 18:40:29 -0000 1.11
@@ -229,10 +229,7 @@
return result;
}
result =
isUnqualifiedNameInImportedPackages(unqualifiedClassName, result);
- /*
- * Results in ambiguous class if java.lang is explcitly
imported
- * result =
isUnqualifiedNameInJavaLangPackage(unqualifiedClassName, result);
- */
+ result =
isUnqualifiedNameInJavaLangPackage(unqualifiedClassName, result);
}
if (result == null) {
// We'll get here when we use inner classes and nonexisting
classes
@@ -316,7 +313,7 @@
if (importedClassName.endsWith(suffix)) {
// We've found a candidate. Get a proxy for it.
XClass clazz =
XJavaDoc.getInstance().getXClass(importedClassName, true);
- if (clazz != null && result != null) {
+ if (clazz != null && result != null && result !=
clazz) {
throw new IllegalStateException("In class " +
qualifiedName() + ": Ambiguous class:" + unqualifiedClassName);
}
if (clazz != null) {
@@ -357,7 +354,7 @@
String qualifiedClassName = importedPackageName + "." +
unqualifiedClassName;
XClass clazz =
XJavaDoc.getInstance().getXClass(qualifiedClassName, true);
- if (result != null && clazz != null) {
+ if (result != null && clazz != null && result != clazz) {
throw new IllegalStateException("In class " +
qualifiedName() + ": Ambiguous class:" + unqualifiedClassName);
}
@@ -382,7 +379,7 @@
private XClass isUnqualifiedNameInTheSamePackage(String unqualifiedClassName,
XClass result) {
String qualifiedClassName = containingPackage().name() + "." +
unqualifiedClassName;
XClass clazz = XJavaDoc.getInstance().getXClass(qualifiedClassName,
true);
- if (result != null && clazz != null) {
+ if (result != null && clazz != null && result != clazz) {
throw new IllegalStateException("In class " + qualifiedName()
+ ": Ambiguous class:" + unqualifiedClassName + " " + result.qualifiedName() + " or "
+ clazz.qualifiedName() + " ?");
}
if (clazz != null) {
@@ -405,7 +402,7 @@
private XClass isUnqualifiedNameInJavaLangPackage(String unqualifiedClassName,
XClass result) {
String qualifiedClassName = "java.lang." + unqualifiedClassName;
XClass clazz = XJavaDoc.getInstance().getXClass(qualifiedClassName,
true);
- if (result != null && clazz != null) {
+ if (result != null && clazz != null && result != clazz) {
throw new IllegalStateException("In class " + qualifiedName()
+ ": Ambiguous class:" + unqualifiedClassName);
}
if (clazz != null) {
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
