You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2007/07/10 19:59:11 UTC
svn commit: r555021 -
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
Author: alally
Date: Tue Jul 10 10:59:11 2007
New Revision: 555021
URL: http://svn.apache.org/viewvc?view=rev&rev=555021
Log:
Remove uses of URL.equals
UIMA-494: https://issues.apache.org/jira/browse/UIMA-494
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java?view=diff&rev=555021&r1=555020&r2=555021
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java Tue Jul 10 10:59:11 2007
@@ -33,8 +33,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.security.auth.callback.LanguageCallback;
-
import org.apache.uima.Constants;
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
@@ -728,7 +726,7 @@
ResourceManager aResourceManager) throws InvalidXMLException {
// add our own URL, if known, to the collection of already imported URLs
if (getSourceUrl() != null) {
- aAlreadyImportedDelegateAeUrls.add(getSourceUrl());
+ aAlreadyImportedDelegateAeUrls.add(getSourceUrl().toString());
}
// resolve delegate AE imports (and recursively resolve imports therein)
resolveDelegateAnalysisEngineImports(aAlreadyImportedDelegateAeUrls, aResourceManager, true);
@@ -761,7 +759,7 @@
// add our own URL, if known, to the collection of enclosing aggregate URLs
Set urls = new HashSet();
if (getSourceUrl() != null) {
- urls.add(getSourceUrl());
+ urls.add(getSourceUrl().toString());
}
resolveDelegateAnalysisEngineImports(urls, aResourceManager, aRecursive);
}
@@ -800,7 +798,7 @@
URL url = aeImport.findAbsoluteUrl(aResourceManager);
// check for resursive import
- if (aEnclosingAggregateAeUrls.contains(url)) {
+ if (aEnclosingAggregateAeUrls.contains(url.toString())) {
String name = getMetaData() == null ? "<null>" : getMetaData().getName();
throw new InvalidXMLException(InvalidXMLException.CIRCULAR_AE_IMPORT, new Object[] {
name, url });
@@ -825,7 +823,7 @@
// now resolve imports in ths delegate
if (spec instanceof AnalysisEngineDescription) {
Set alreadyImportedUrls = new HashSet(aEnclosingAggregateAeUrls);
- alreadyImportedUrls.add(url);
+ alreadyImportedUrls.add(url.toString());
((AnalysisEngineDescription) spec).resolveImports(alreadyImportedUrls, aResourceManager);
}
} else {