You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2013/03/28 19:21:03 UTC
svn commit: r1462246 - in /uima/uimaj/branches/filteredCompress-uima-2498:
./ PearPackagingMavenPlugin/ aggregate-uimaj-docbooks/
aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/ jVinci/ src/
src/main/scripts/ uima-docbook-overview-and-setup/ uima-doc...
Author: schor
Date: Thu Mar 28 18:21:01 2013
New Revision: 1462246
URL: http://svn.apache.org/r1462246
Log:
[UIMA-2498] merge in from trunk, spelling corrections mostly
Modified:
uima/uimaj/branches/filteredCompress-uima-2498/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/PearPackagingMavenPlugin/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj-docbooks/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj-eclipse-plugins/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/jVinci/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/src/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/src/main/scripts/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-overview-and-setup/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-references/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-tools/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-tutorials-and-users-guides/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-soap/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/UimaSaxVinciFrameBuilder.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-bootstrap/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-component-test-util/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-runtime/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools/src/main/resources/feature.xml
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-update-site/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/document.png (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/explorer.png (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/fsview.png (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/plugin.xml (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/pom.xml (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java (contents, props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/TypeSystemLocationPropertyPage.java (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/resources/org/apache/uima/caseditor/ide/wizards/ts.xml (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-debug/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-jcasgen/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-pear-packager/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-runtime/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-internal-tools/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-test-util/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/PearPackagingMavenPlugin/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/PearPackagingMavenPlugin:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/aggregate-uimaj:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj-docbooks/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/aggregate-uimaj-docbooks:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj-eclipse-plugins/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/jVinci/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/jVinci:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/src/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/src:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/src/main/scripts/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/src/main/scripts:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-overview-and-setup/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uima-docbook-overview-and-setup:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-references/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uima-docbook-references:r1462090-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-tools/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uima-docbook-tools:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-tutorials-and-users-guides/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides:r1462090-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-soap/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-adapter-soap:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-adapter-vinci:r1436573-1462242
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/UimaSaxVinciFrameBuilder.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/UimaSaxVinciFrameBuilder.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/UimaSaxVinciFrameBuilder.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/UimaSaxVinciFrameBuilder.java Thu Mar 28 18:21:01 2013
@@ -48,7 +48,7 @@ public class UimaSaxVinciFrameBuilder ex
/**
* Overridden to supress document content and include annotation spans.
*
- * @see SaxVinciFrameBuilder#getLeafContent(String, Attibutes, StringBuffer)
+ * @see SaxVinciFrameBuilder#getLeafContent(String, attributes, StringBuffer)
*/
protected String getLeafContent(String aFrameName, Attributes aAttributes,
StringBuffer aContentBuf) {
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-bootstrap/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-bootstrap:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-component-test-util/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-component-test-util:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-core:r1462090-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-core/src/main/java:r1462090-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-cpe:r1436573-1462242
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java Thu Mar 28 18:21:01 2013
@@ -328,7 +328,7 @@ public class NetworkCasProcessorImpl imp
/**
* This method gets called when the CPM completes processing the collection. Depending on the type
- * of deploymnet this routine may issue a shutdown command to the service.
+ * of deployment this routine may issue a shutdown command to the service.
*
* @see org.apache.uima.collection.base_cpm.CasProcessor#collectionProcessComplete(org.apache.uima.util.ProcessTrace)
*/
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-document-annotation:r1436573-1462242
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java Thu Mar 28 18:21:01 2013
@@ -22,12 +22,11 @@ package org.apache.uima.jcas.tcas;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCasImpl;
/**
* The JCas class definition for the CAS <code>DocumentAnnotation</code> type. When text CASs are
- * created, one instance of this type is created and made accessable via a call to the
- * {@link JCasImpl#getDocumentAnnotationFs()} method. It is also a subtype of {@link Annotation} and
+ * created, one instance of this type is created and made accessible via a call to the
+ * {@link JCas#getDocumentAnnotationFs()} method. It is also a subtype of {@link Annotation} and
* therefore would appear as one of the annotations that an iterator over all the annotations would
* return.
*/
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-runtime/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-eclipse-feature-runtime:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-eclipse-feature-tools:r1436573-1462242
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools/src/main/resources/feature.xml?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools/src/main/resources/feature.xml (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools/src/main/resources/feature.xml Thu Mar 28 18:21:01 2013
@@ -35,22 +35,19 @@ a CAS Editor, the Launcher, and the PEAR
and NOTICE files
</copyright>
- <license url="http://www.apache.org/licenses/LICENSE-2.0">
- Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
- </license>
+ <license>ASF 2.0 and BSD Software Licenses
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+BSD License (for SVG Icons project (http://freecode.com/projects/svg-icons) (Note: this is a generic BSD license; the svg-icons web site didn't have a specific instance)
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of the ORGANIZATION nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</license>
<url>
<discovery label="UIMA Eclipse Plugins update site" url="http://www.apache.org/dist/uima/eclipse-update-site/"/>
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-update-site/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-eclipse-update-site:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/document.png
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/icons/svgicons/document.png:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/explorer.png
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/icons/svgicons/explorer.png:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/fsview.png
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/icons/svgicons/fsview.png:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/plugin.xml
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/pom.xml
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/pom.xml:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java:r1436573-1462242
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java Thu Mar 28 18:21:01 2013
@@ -166,6 +166,14 @@ public class DefaultCasDocumentProvider
*/
private Map<String, String> documentToTypeSystemMap = new HashMap<String, String>();
+ /**
+ * This map stores temporarily the type system that should be used to open the next document.
+ * This functionality is separated from documentToTypeSystemMap since the preference for using
+ * the previously selected type system can be deactivated. The inlined file choose, for example,
+ * uses this field to remember the chosen type system.
+ */
+ private Map<String, String> typeSystemForNextDocumentOnly = new HashMap<String, String>();
+
private Map<String, IPreferenceStore> sessionPreferenceStores = new HashMap<String, IPreferenceStore>();
/**
@@ -220,12 +228,20 @@ public class DefaultCasDocumentProvider
// set by the editor for this specific CAS.
// apply that type system only if the setting is active in the preferences
String typeSystemFileString = null;
+
+ String document = casFile.getFullPath().toPortableString();
+ if(typeSystemForNextDocumentOnly.get(document) != null) {
+ // the type system was already set internally. Use this one and forget the information.
+ typeSystemFileString = typeSystemForNextDocumentOnly.get(document);
+ typeSystemForNextDocumentOnly.put(document, null);
+ }
+
IPreferenceStore prefStore = CasEditorIdePlugin.getDefault().getPreferenceStore();
boolean useLastTypesystem = prefStore
.getBoolean(CasEditorIdePreferenceConstants.CAS_EDITOR_REMEMBER_TYPESYSTEM);
if (useLastTypesystem) {
typeSystemFileString = documentToTypeSystemMap
- .get(casFile.getFullPath().toPortableString());
+ .get(document);
}
if (typeSystemFileString != null)
typeSystemFile = ResourcesPlugin.getWorkspace().getRoot()
@@ -359,7 +375,7 @@ public class DefaultCasDocumentProvider
typeSystemPreferences.put(prefFile.getFullPath().toPortableString(), tsPrefStore);
}
- documentToTypeSystemMap.put(casFile.getFullPath().toPortableString(), typeSystemFile
+ documentToTypeSystemMap.put(document, typeSystemFile
.getFullPath().toPortableString());
IPreferenceStore store = sessionPreferenceStores.get(getTypesystemId(element));
@@ -537,6 +553,11 @@ public class DefaultCasDocumentProvider
documentToTypeSystemMap.put(document, typeSystem);
}
+ void setTypeSystemForNextDocumentOnly(String document, String typeSystem) {
+ typeSystemForNextDocumentOnly.put(document, typeSystem);
+ }
+
+
@Override
public Composite createTypeSystemSelectorForm(final ICasEditor editor, Composite parent,
IStatus status) {
@@ -565,8 +586,8 @@ public class DefaultCasDocumentProvider
if (resource != null) {
FileEditorInput editorInput = (FileEditorInput) editor.getEditorInput();
- setTypeSystem(editorInput.getFile().getFullPath().toPortableString(), resource
- .getFullPath().toString());
+ setTypeSystemForNextDocumentOnly(editorInput.getFile().getFullPath().toPortableString(),
+ resource.getFullPath().toString());
// Now set the input again to open the editor with the
// specified type system
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/TypeSystemLocationPropertyPage.java
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/TypeSystemLocationPropertyPage.java:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/resources/org/apache/uima/caseditor/ide/wizards/ts.xml
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/resources/org/apache/uima/caseditor/ide/wizards/ts.xml:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-configurator:r1436573-1462242
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java Thu Mar 28 18:21:01 2013
@@ -439,7 +439,7 @@ public class FlowSection extends Abstrac
FlowConstraints flowConstraints = getModelFlow();
if (null == flowConstraints) {
// no constraints declared
- // set up Fix Flow style of contraints
+ // set up Fix Flow style of constraints
// This can happen if the style is user-defined flow
flowConstraints = UIMAFramework.getResourceSpecifierFactory().createFixedFlow();
getAnalysisEngineMetaData().setFlowConstraints(flowConstraints);
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-debug/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-debug:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-jcasgen/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-jcasgen:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-pear-packager/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-pear-packager:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-runtime/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-runtime:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-examples:r1436573-1462242
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java Thu Mar 28 18:21:01 2013
@@ -61,7 +61,7 @@ public class SimpleTextSegmenter extends
public void process(JCas aJCas) throws AnalysisEngineProcessException {
mDoc = aJCas.getDocumentText();
mPos = 0;
- // retreive the filename of the input file from the CAS so that it can be added
+ // retrieve the filename of the input file from the CAS so that it can be added
// to each segment
FSIterator it = aJCas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
if (it.hasNext()) {
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java Thu Mar 28 18:21:01 2013
@@ -87,7 +87,7 @@ public class InlineXmlCasConsumer extend
throw new ResourceProcessException(e);
}
- // retreive the filename of the input file from the CAS
+ // retrieve the filename of the input file from the CAS
FSIterator it = jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
File outFile = null;
if (it.hasNext()) {
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java Thu Mar 28 18:21:01 2013
@@ -99,7 +99,7 @@ public class XCasWriterCasConsumer exten
throw new ResourceProcessException(e);
}
- // retreive the filename of the input file from the CAS
+ // retrieve the filename of the input file from the CAS
FSIterator it = jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
File outFile = null;
if (it.hasNext()) {
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java Thu Mar 28 18:21:01 2013
@@ -113,7 +113,7 @@ public class XmiEcoreCasConsumer extends
throw new ResourceProcessException(e);
}
- // retreive the filename of the input file from the CAS
+ // retrieve the filename of the input file from the CAS
FSIterator it = jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
File outFile = null;
if (it.hasNext()) {
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java Thu Mar 28 18:21:01 2013
@@ -86,7 +86,7 @@ public class XmiWriterCasConsumer extend
throw new ResourceProcessException(e);
}
- // retreive the filename of the input file from the CAS
+ // retrieve the filename of the input file from the CAS
FSIterator it = jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
File outFile = null;
if (it.hasNext()) {
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-internal-tools/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-internal-tools:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-test-util/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-test-util:r1436573-1462242
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-tools:r1436573-1462242
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java Thu Mar 28 18:21:01 2013
@@ -117,7 +117,7 @@ public class InlineXmlCasConsumer extend
throw new ResourceProcessException(e);
}
- // retreive the filename of the input file from the CAS
+ // retrieve the filename of the input file from the CAS
File outFile = null;
boolean hasDefaultView = false;
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java Thu Mar 28 18:21:01 2013
@@ -100,7 +100,7 @@ public class XCasWriterCasConsumer exten
throw new ResourceProcessException(e);
}
- // retreive the filename of the input file from the CAS
+ // retrieve the filename of the input file from the CAS
FSIterator it = jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
File outFile = null;
if (it.hasNext()) {
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java?rev=1462246&r1=1462245&r2=1462246&view=diff
==============================================================================
--- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java (original)
+++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java Thu Mar 28 18:21:01 2013
@@ -94,7 +94,7 @@ public class XmiWriterCasConsumer extend
throw new ResourceProcessException(e);
}
- // retreive the filename of the input file from the CAS
+ // retrieve the filename of the input file from the CAS
FSIterator it = jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
File outFile = null;
if (it.hasNext()) {