Author: pkluegl
Date: Wed May 29 13:32:29 2013
New Revision: 1487478
URL: http://svn.apache.org/r1487478
Log:
UIMA-2671
- added getter for type system text to ICasDocument
- store string in DocumentUimaImpl
- use string for extending title tooltip
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.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=1487478&r1=1487477&r2=1487478&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
Wed May 29 13:32:29 2013
@@ -420,7 +420,7 @@ public class DefaultCasDocumentProvider
org.apache.uima.caseditor.editor.ICasDocument doc;
try {
- doc = new DocumentUimaImpl(cas, casIn, documentFormat);
+ doc = new DocumentUimaImpl(cas, casIn, documentFormat,
typeSystemFile.getFullPath().makeRelative().toString());
} finally {
try {
casIn.close();
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java?rev=1487478&r1=1487477&r2=1487478&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
Wed May 29 13:32:29 2013
@@ -187,4 +187,10 @@ public abstract class AbstractDocument i
});
}
}
+
+ public String getTypeSystemText() {
+ return null;
+ }
+
+
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java?rev=1487478&r1=1487477&r2=1487478&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
Wed May 29 13:32:29 2013
@@ -270,5 +270,12 @@ class AnnotationDocument extends Documen
}
+ public String getTypeSystemText() {
+ if(mDocument != null) {
+ return mDocument.getTypeSystemText();
+ }
+ return null;
+ }
+
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1487478&r1=1487477&r2=1487478&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Wed May 29 13:32:29 2013
@@ -590,7 +590,7 @@ public final class AnnotationEditor exte
CasDocumentProviderFactory.instance().getDocumentProvider(input);
setDocumentProvider(new TextDocumentProvider(casDocumentProvider));
-
+
super.init(site, input);
}
@@ -599,6 +599,26 @@ public final class AnnotationEditor exte
}
/**
+ * Retrieves the tooltip of the title.
+ *
+ * @return string of tooltip
+ */
+ @Override
+ public String getTitleToolTip() {
+ if (getEditorInput() == null) {
+ return super.getTitleToolTip();
+ }
+ ICasDocument document = getDocument();
+ String typeSystemText = document.getTypeSystemText();
+ String toolTipText = getEditorInput().getToolTipText();
+ if (typeSystemText != null) {
+ return toolTipText + " (" + typeSystemText + ")";
+ } else {
+ return toolTipText;
+ }
+ }
+
+ /**
* Retrieves annotation editor adapters.
*
* @param adapter
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java?rev=1487478&r1=1487477&r2=1487478&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
Wed May 29 13:32:29 2013
@@ -73,22 +73,39 @@ public class DocumentUimaImpl extends Ab
private final DocumentFormat format;
+ private final String typeSystemText;
+
/**
* Initializes a new instance.
*
* @param project
*/
public DocumentUimaImpl(CAS cas, InputStream in, DocumentFormat format)
throws CoreException {
+ this(cas, in, format, null);
+ }
+
+ /**
+ * Initializes a new instance.
+ *
+ * @param cas
+ * @param inputstream
+ * @param format
+ * @param type system string
+ */
+ public DocumentUimaImpl(CAS cas, InputStream in, DocumentFormat format,
String typeSystemText) throws CoreException {
mCAS = cas;
mTypeSystem = cas.getTypeSystem();
this.format = format;
+ this.typeSystemText = typeSystemText;
+
setContent(in);
}
-
+
+
/**
* Retrieves the {@link CAS}.
*/
@@ -96,6 +113,12 @@ public class DocumentUimaImpl extends Ab
return mCAS;
}
+ @Override
+ public String getTypeSystemText() {
+ return typeSystemText;
+ }
+
+
/**
* Internally removes an annotation from the {@link CAS}.
*
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java?rev=1487478&r1=1487477&r2=1487478&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
Wed May 29 13:32:29 2013
@@ -134,6 +134,11 @@ public interface ICasDocument {
*/
Type getType(String type);
-
+ /**
+ * Retrieves the string representation of the applied type system
+ *
+ * @return the string representation of the applied type system
+ */
+ String getTypeSystemText();
}
