You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2016/07/20 09:46:00 UTC
svn commit: r1753473 - in /uima/uimaj/trunk:
uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/
uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/
Author: pkluegl
Date: Wed Jul 20 09:46:00 2016
New Revision: 1753473
URL: http://svn.apache.org/viewvc?rev=1753473&view=rev
Log:
UIMA-4685
- use SerialFormat
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java?rev=1753473&r1=1753472&r2=1753473&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java Wed Jul 20 09:46:00 2016
@@ -35,6 +35,7 @@ import javax.swing.text.rtf.RTFEditorKit
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.SerialFormat;
import org.apache.uima.caseditor.core.TaeError;
import org.apache.uima.internal.util.XMLUtils;
import org.apache.uima.resource.ResourceInitializationException;
@@ -42,7 +43,6 @@ import org.apache.uima.resource.metadata
import org.apache.uima.util.CasCreationUtils;
import org.apache.uima.util.CasIOUtils;
import org.apache.uima.util.InvalidXMLException;
-import org.apache.uima.util.SerializationFormat;
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLParser;
import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
@@ -55,7 +55,7 @@ final class DocumentImportStructureProvi
private final String importEncoding; // https://issues.apache.org/jira/browse/UIMA-1808
- private final SerializationFormat casFormat;
+ private final SerialFormat casFormat;
/**
* Constructs a new DocumentImportStructureProvider object.
@@ -63,7 +63,7 @@ final class DocumentImportStructureProvi
* @param containerFullPath
*/
public DocumentImportStructureProvider(String language, String importEncoding,
- SerializationFormat casFormat) {
+ SerialFormat casFormat) {
this.language = language;
this.importEncoding = importEncoding; // https://issues.apache.org/jira/browse/UIMA-1808
this.casFormat = casFormat;
@@ -116,7 +116,7 @@ final class DocumentImportStructureProvi
}
private InputStream getDocument(String fileName, String text, String language,
- SerializationFormat format) {
+ SerialFormat format) {
String failedToImportLine = "Failed to import: " + fileName + "\n\n";
@@ -132,28 +132,6 @@ final class DocumentImportStructureProvi
throw new TaeError(failedToImportLine + e.getMessage(), e);
}
- // if (DocumentFormat.XCAS.equals(format)) {
- // try {
- // XCASSerializer.serialize(cas, out);
- // } catch (SAXException e) {
- // // should not happen
- // throw new TaeError(failedToImportLine + e.getMessage(), e);
- // } catch (IOException e) {
- // // will not happen, writing to memory
- // throw new TaeError(failedToImportLine + e.getMessage(), e);
- // }
- // }
- // else if (DocumentFormat.XMI.equals(format)) {
- // try {
- // XmiCasSerializer.serialize(cas, out);
- // } catch (SAXException e) {
- // // should not happen
- // throw new TaeError(failedToImportLine + e.getMessage(), e);
- // }
- // } else {
- // throw new TaeError(failedToImportLine + "Unkown document type!", null);
- // }
-
return new ByteArrayInputStream(out.toByteArray());
}
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java?rev=1753473&r1=1753472&r2=1753473&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java Wed Jul 20 09:46:00 2016
@@ -30,10 +30,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.uima.cas.SerialFormat;
import org.apache.uima.caseditor.CasEditorPlugin;
import org.apache.uima.caseditor.ide.CasEditorIdePlugin;
import org.apache.uima.caseditor.ide.CasEditorIdePreferenceConstants;
-import org.apache.uima.util.SerializationFormat;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -97,7 +97,7 @@ final class ImportDocumentWizardPage ext
private String language;
- private SerializationFormat documentFormat;
+ private SerialFormat documentFormat;
private TableViewer fileTable;
@@ -430,19 +430,19 @@ final class ImportDocumentWizardPage ext
final Combo casFormatCombo = new Combo(importOptions, SWT.READ_ONLY);
casFormatCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- SerializationFormat[] values = SerializationFormat.values();
+ SerialFormat[] values = SerialFormat.values();
String[] stringValues = new String[values.length];
for (int i = 0; i < values.length; i++) {
stringValues[i] = values[i].toString();
}
casFormatCombo.setItems(stringValues);
- documentFormat = SerializationFormat.XMI;
+ documentFormat = SerialFormat.XMI;
casFormatCombo.select(0);
casFormatCombo.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- documentFormat = SerializationFormat.valueOf(casFormatCombo.getText());
+ documentFormat = SerialFormat.valueOf(casFormatCombo.getText());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -482,7 +482,7 @@ final class ImportDocumentWizardPage ext
return language;
}
- SerializationFormat getCasFormat() {
+ SerialFormat getCasFormat() {
return documentFormat;
}
}
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=1753473&r1=1753472&r2=1753473&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 Jul 20 09:46:00 2016
@@ -34,6 +34,7 @@ import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FSIndex;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.SerialFormat;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
import org.apache.uima.cas.text.AnnotationFS;
@@ -48,7 +49,6 @@ import org.apache.uima.resource.metadata
import org.apache.uima.util.CasCreationUtils;
import org.apache.uima.util.CasIOUtils;
import org.apache.uima.util.InvalidXMLException;
-import org.apache.uima.util.SerializationFormat;
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLParser;
import org.eclipse.core.filesystem.EFS;
@@ -67,7 +67,7 @@ public class DocumentUimaImpl extends Ab
private CAS mCAS;
- private SerializationFormat format = SerializationFormat.XMI;
+ private SerialFormat format = SerialFormat.XMI;
private final String typeSystemText;