Author: pkluegl
Date: Fri Oct 21 12:59:39 2011
New Revision: 1187321
URL: http://svn.apache.org/viewvc?rev=1187321&view=rev
Log:
UIMA-2266
Use search strategy before default location in the properties.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1187321&r1=1187320&r2=1187321&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Fri Oct 21 12:59:39 2011
@@ -219,10 +219,6 @@ public class DefaultCasDocumentProvider
typeSystemFile = ResourcesPlugin.getWorkspace().getRoot()
.getFile(new Path(typeSystemFileString));
- // If non was found get it from project
- if (typeSystemFile == null)
- typeSystemFile =
TypeSystemLocationPropertyPage.getTypeSystemLocation(casFile.getProject());
-
// use search strategies for finding the type system
if (typeSystemFile == null || !typeSystemFile.exists()) {
Map<Integer, ITypeSystemSearchStrategy> searchStrategies =
TypeSystemSearchStrategyFactory
@@ -238,6 +234,10 @@ public class DefaultCasDocumentProvider
}
}
+ // If non was found get it from project
+ if (typeSystemFile == null)
+ typeSystemFile =
TypeSystemLocationPropertyPage.getTypeSystemLocation(casFile.getProject());
+
if (typeSystemFile != null && typeSystemFile.exists()) {
if (!typeSystemFile.isSynchronized(IResource.DEPTH_ZERO)) {
