You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2020/10/12 18:17:48 UTC
[uima-uimaj] 01/01: Merge branch 'master' into
UIMA-3484-Fix-JavaDoc-v3
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch UIMA-3484-Fix-JavaDoc-v3
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit d7b5690d5e751e21a64ee4d9106ede2dd9bbfdf7
Merge: b7d0a36 2386b33
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon Oct 12 20:18:11 2020 +0200
Merge branch 'master' into UIMA-3484-Fix-JavaDoc-v3
* master: (2076 commits)
[UIMA-6243] JCas returns Annotation when asked for a specific subtype
No jira: Revert switch building using Java 11 to building using Java 8. Eclipse bundles that are resolved during the build require Java 11.
[UIMA-6259] Jenkinsfile for UIMA Java SDK
[UIMA-6259] Jenkinsfile for UIMA Java SDK
[UIMA-6249] avoid sync in getJCasRegisteredType
Fix CVD makeNodes to used array length
[UIMA-6244] change special xml chars to ones that are valid with windows
UIMA-6199 add comment
UIMA-6199 add comments describing meaning of length
make forAllViews public so it can be accessed from another internl pkg
UIMA-6199 2 part fix for edge case of non-indexed doc_annot
[UIMA-6199] Unindexed document annotation added back to index during deserialization
[UIMA-6199] Unindexed document annotation added back to index during deserialization
[UIMA-6187] add apache license, gitignore issuesFixed
[UIMA-6187] gitattributes: .sh files checked out with just LF
[UIMA-6176] add .asf.yaml with description and homepage link
[UIMA-6170] Ambiguous method call when compiling on Java 13
[UIMA-6160] nonsense comment change only to try to retrigger test
[UIMA-6160] fix typo in javadoc
[UIMA-6160] fix javadoc comment, also in AnnotationFS
...
% Conflicts:
% uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java
% uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java
% uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java
% uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java
% uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
% uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
% uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
% uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
% uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/ChunkMetadata.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/DATACasUtils.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCheckpointImpl.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java
% uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java
% uimaj-cpe/src/test/java/org/apache/uima/cas/impl/CasTestUtil.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/InternalErrorCDE.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/FlowSection.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/GeneralSection.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportSection.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/MetaDataSection.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/OverviewPage.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSettingsSection.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PrimitiveSection.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerify.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerifyJavaNames.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddAllowedValueDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddExternalResourceDependencyDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddParameterDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddSofaDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddTypeToPriorityListDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/EditSofaBindingsDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/FindComponentDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/PickTaeForTypesDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SelectTypeDialog.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/xml/NonRuleBasedDamagerRepairer.java
% uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialogWithFlowOption.java
% uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java
% uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/LauncherPlugin.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearPlugin.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/GeneratePearWizard.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExport.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearFileResourceExportPage.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/EditInstallationDescriptorWizard.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java
% uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java
% uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPE.java
% uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java
% uimaj-examples/src/main/java/org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java
% uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java
% uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java
% uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java
% uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java
% uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java
% uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java
% uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java
% uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java
% uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java
% uimaj-tools/src/main/java/org/apache/uima/tools/AnnotationViewerMain.java
% uimaj-tools/src/main/java/org/apache/uima/tools/RunAE.java
% uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
% uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiAnnotViewerFrame.java
% uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/IndexPopupListener.java
% uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/ShowTypesystemHandler.java
% uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/FeatureTableModel.java
% uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/MainFrame.java
% uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
% uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java
% uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SpringUtilities.java
.asf.yaml | 19 +
PearPackagingMavenPlugin/pom.xml | 11 +-
README | 105 +-
RELEASE_NOTES.html | 40 +-
aggregate-uimaj-docbooks/pom.xml | 10 +-
aggregate-uimaj-eclipse-plugins/pom.xml | 9 +-
aggregate-uimaj/pom.xml | 10 +-
jVinci/pom.xml | 9 +-
.../vinci/transport/document/XMLToXTalk.java | 9 +-
.../transport/util/TransportableConverter.java | 13 +-
.../vinci/transport/vns/service/Service.java | 10 +-
.../transport/vns/service/ServiceRegistry.java | 6 +-
.../apache/vinci/transport/vns/service/VNS.java | 15 +-
jcasgen-maven-plugin/pom.xml | 221 +-
jcasgen-maven-plugin/src/it/classpath/pom.xml | 8 +-
jcasgen-maven-plugin/src/it/m2e/pom.xml | 6 +-
.../src/it/m2e/projects/jcasgen/classpath/pom.xml | 4 +-
.../src/it/m2e/projects/jcasgen/crossref1/pom.xml | 4 +-
.../src/it/m2e/projects/jcasgen/crossref2/pom.xml | 2 +-
.../src/it/m2e/projects/jcasgen/simple/pom.xml | 2 +-
.../src/it/multimodule/crossref1/pom.xml | 5 +-
.../src/it/multimodule/crossref2/pom.xml | 5 +-
jcasgen-maven-plugin/src/it/multimodule/pom.xml | 1 +
jcasgen-maven-plugin/src/it/simple/pom.xml | 5 +-
.../uima/tools/jcasgen/maven/JCasGenMojo.java | 2 +-
.../uima/tools/jcasgen/maven/JCasGenMojoTest.java | 8 +-
pom.xml | 87 +-
src/main/analysis-of-API-changes.xlsx | Bin 0 -> 18906 bytes
src/main/assembly/bin-without-jackson.xml | 51 +-
src/main/assembly/bin.xml | 50 +-
src/main/bin_distr_license_notices/LICENSE | 263 +
src/main/bin_distr_license_notices/NOTICE | 35 +
.../NOTICE-without-jackson | 14 +
src/main/license_notice_research.txt | 39 +
src/main/readme/LICENSE | 237 -
src/main/readme/NOTICE | 33 -
src/main/readme/NOTICE-without-jackson | 12 -
src/main/scripts/ibmUimaToApacheUima.bat | 32 -
src/main/scripts/ibmUimaToApacheUima.sh | 32 -
src/main/scripts/runUimaClass.bat | 2 +-
src/main/scripts/runUimaClass.sh | 4 +-
src/main/scripts/runV3migrateJCas.bat | 29 +
src/main/scripts/runV3migrateJCas.sh | 26 +
src/main/scripts/setUimaClassPath.bat | 4 +
src/main/scripts/setUimaClassPath.sh | 2 +
uima-docbook-overview-and-setup/pom.xml | 9 +-
.../src/docbook/conceptual_overview.xml | 18 +-
.../src/docbook/eclipse_setup.xml | 33 +-
.../src/docbook/faqs.xml | 97 +-
.../src/docbook/glossary.xml | 42 +-
.../src/docbook/project_overview.xml | 468 +-
uima-docbook-references/pom.xml | 9 +-
uima-docbook-references/src/docbook/ref.cas.xml | 189 +-
uima-docbook-references/src/docbook/ref.config.xml | 57 +-
.../src/docbook/ref.javadocs.xml | 2 +-
uima-docbook-references/src/docbook/ref.jcas.xml | 40 +-
.../src/docbook/ref.xml.component_descriptor.xml | 7 +-
uima-docbook-tools/pom.xml | 9 +-
uima-docbook-tutorials-and-users-guides/pom.xml | 9 +-
.../docbook/annotator_analysis_engine_guide.xml | 317 +-
.../src/docbook/tug.application.xml | 153 +-
.../src/docbook/tug.multi_views.xml | 43 +-
uima-docbook-v3-users-guide/pom.xml | 62 +
.../custom_java_objects/5_steps.png | Bin 0 -> 64814 bytes
.../version_3_users_guide/migrate/multiples.png | Bin 0 -> 26915 bytes
.../select/select_big_pic.png | Bin 0 -> 19046 bytes
.../select/select_processing_actions.png | Bin 0 -> 45915 bytes
.../select/select_selection_and_ordering.png | Bin 0 -> 63212 bytes
.../select/select_source_type.png | Bin 0 -> 78674 bytes
.../select/select_terminal_form_actions.png | Bin 0 -> 47533 bytes
.../src/docbook/uv3.backwards_compatibility.xml | 418 ++
.../src/docbook/uv3.custom_java_objects.xml | 300 +
.../src/docbook/uv3.logging.xml | 308 +
.../src/docbook/uv3.migration.aids.xml | 215 +
.../src/docbook/uv3.migration.xml | 674 ++
.../src/docbook/uv3.new_extended_apis.xml | 405 ++
.../src/docbook/uv3.overview.xml | 336 +
.../src/docbook/uv3.pears.xml | 118 +
.../src/docbook/uv3.performance.xml | 89 +
.../src/docbook/uv3.select.xml | 904 +++
.../src/docbook/version_3_users_guide.xml | 39 +
.../src/image-source/source.pptx | Bin 0 -> 74273 bytes
uimaj-adapter-soap/pom.xml | 9 +-
.../soap/AxisAnalysisEngineServiceStub.java | 23 +-
.../soap/AxisAnalysisEngineService_impl.java | 19 +-
.../adapter/soap/AxisResourceServiceManager.java | 13 +-
.../uima/adapter/soap/AxisResourceServiceStub.java | 6 +
.../uima/adapter/soap/BinaryDeserializer.java | 35 +-
.../adapter/soap/BinaryDeserializerFactory.java | 11 +
.../apache/uima/adapter/soap/BinarySerializer.java | 41 +-
.../uima/adapter/soap/BinarySerializerFactory.java | 19 +
.../soap/SoapAnalysisEngineServiceAdapter.java | 8 +
.../apache/uima/adapter/soap/XmlDeserializer.java | 54 +-
.../uima/adapter/soap/XmlDeserializerFactory.java | 11 +
.../apache/uima/adapter/soap/XmlSerializer.java | 58 +-
.../uima/adapter/soap/XmlSerializerFactory.java | 11 +
.../soap/axis11/BinaryDeserializer_Axis11.java | 34 +-
.../soap/axis11/BinarySerializer_Axis11.java | 41 +-
.../soap/axis11/XmlDeserializer_Axis11.java | 53 +-
.../adapter/soap/axis11/XmlSerializer_Axis11.java | 57 +-
uimaj-adapter-vinci/pom.xml | 16 +-
.../uima/adapter/vinci/CASTransportable.java | 89 +-
.../vinci/VinciAnalysisEngineServiceAdapter.java | 7 +
.../vinci/VinciAnalysisEngineServiceStub.java | 72 +-
.../vinci/VinciAnalysisEngineService_impl.java | 77 +-
.../VinciBinaryAnalysisEngineServiceStub.java | 50 +-
.../VinciBinaryAnalysisEngineService_impl.java | 74 +-
.../apache/uima/adapter/vinci/util/Constants.java | 25 +-
.../apache/uima/adapter/vinci/util/Descriptor.java | 72 +
.../uima/adapter/vinci/util/NetworkUtil.java | 1 +
.../adapter/vinci/util/SaxVinciFrameBuilder.java | 33 +-
.../apache/uima/adapter/vinci/util/Shutdown.java | 9 +
.../vinci/util/UimaSaxVinciFrameBuilder.java | 18 +-
.../uima/adapter/vinci/util/VinciSaxParser.java | 26 +
.../uima/adapter/vinci/util/VinciTAEClient.java | 9 +
.../VinciAnalysisEngineServiceAdapterTest.java | 13 +-
uimaj-bootstrap/pom.xml | 9 +-
.../org/apache/uima/bootstrap/UimaBootstrap.java | 2 +-
uimaj-component-test-util/pom.xml | 9 +-
.../test/junit_extension/AnnotationWriter.java | 53 +-
.../AnnotatorPerformanceTester.java | 36 +-
.../uima/test/junit_extension/AnnotatorTester.java | 53 +-
.../junit_extension/PerformanceTestResult.java | 39 +-
.../junit_extension/PerformanceTestResultImpl.java | 126 +-
uimaj-core/pom.xml | 224 +-
.../main/java/org/apache/uima/I18nExceptionI.java | 107 +
.../apache/uima/InternationalizedException.java | 17 +-
.../uima/InternationalizedRuntimeException.java | 3 +-
.../main/java/org/apache/uima/List_of_ints.java | 407 ++
.../main/java/org/apache/uima/UIMAException.java | 123 +-
.../main/java/org/apache/uima/UIMAFramework.java | 44 +-
.../java/org/apache/uima/UIMARuntimeException.java | 195 +-
.../apache/uima/UIMA_IllegalArgumentException.java | 4 +-
.../apache/uima/UIMA_IllegalStateException.java | 10 +-
.../uima/UIMA_UnsupportedOperationException.java | 2 +-
.../java/org/apache/uima/UimaContextHolder.java | 6 +-
.../java/org/apache/uima/UimaSerializable.java | 50 +
.../java/org/apache/uima/UimaSerializableFSs.java | 40 +
.../AnalysisComponent_ImplBase.java | 11 +-
.../analysis_component/CasAnnotator_ImplBase.java | 4 +-
.../analysis_component/CasMultiplier_ImplBase.java | 4 +-
.../uima/analysis_engine/AnalysisEngine.java | 21 +
.../uima/analysis_engine/asb/impl/ASB_impl.java | 24 +-
.../asb/impl/FlowControllerContainer.java | 39 +-
.../impl/AggregateAnalysisEngine_impl.java | 18 +-
.../impl/AnalysisEngineDescription_impl.java | 30 +-
.../impl/AnalysisEngineImplBase.java | 110 +-
.../impl/AnalysisEngineManagementImpl.java | 5 +-
.../impl/MultiThreadCoordination.java | 1880 -----
.../impl/MultiprocessingAnalysisEngine_impl.java | 10 +-
.../impl/PearAnalysisEngineWrapper.java | 33 +-
.../impl/PrimitiveAnalysisEngine_impl.java | 85 +-
.../impl/ResultSpecification_impl.java | 10 +-
.../apache/uima/analysis_engine/impl/RsFeats.java | 4 +-
.../uima/analysis_engine/impl/RsFullFeatNames.java | 6 +-
.../apache/uima/analysis_engine/impl/RsLang.java | 2 +-
.../apache/uima/analysis_engine/impl/RsLangs.java | 15 +-
.../apache/uima/analysis_engine/impl/RsType.java | 2 +-
.../uima/analysis_engine/impl/RsTypesMap.java | 4 +-
.../impl/UimacppAnalysisEngineImpl.java | 19 +-
.../impl/compatibility/AnnotatorAdapter.java | 4 +-
.../impl/compatibility/CasConsumerAdapter.java | 2 +-
.../compatibility/CollectionReaderAdapter.java | 2 +-
.../metadata/impl/CapabilityLanguageFlow_impl.java | 3 +-
.../metadata/impl/FixedFlow_impl.java | 3 +-
.../service/impl/AnalysisEngineService_impl.java | 13 +-
.../org/apache/uima/cas/AbstractCas_ImplBase.java | 1 +
.../java/org/apache/uima/cas/AnnotationBaseFS.java | 3 +-
.../src/main/java/org/apache/uima/cas/ArrayFS.java | 41 +-
.../java/org/apache/uima/cas/BooleanArrayFS.java | 8 +-
.../main/java/org/apache/uima/cas/ByteArrayFS.java | 7 +-
.../src/main/java/org/apache/uima/cas/CAS.java | 353 +-
.../java/org/apache/uima/cas/CASException.java | 18 +-
.../org/apache/uima/cas/CASRuntimeException.java | 164 +-
.../java/org/apache/uima/cas/CommonArrayFS.java | 42 +-
.../java/org/apache/uima/cas/DoubleArrayFS.java | 2 +-
.../java/org/apache/uima/cas/FSComparators.java | 32 +
.../src/main/java/org/apache/uima/cas/FSIndex.java | 155 +-
.../org/apache/uima/cas/FSIndexRepository.java | 93 +-
.../main/java/org/apache/uima/cas/FSIterator.java | 259 +-
.../main/java/org/apache/uima/cas/FeaturePath.java | 75 +-
.../java/org/apache/uima/cas/FeatureStructure.java | 134 +-
.../java/org/apache/uima/cas/FloatArrayFS.java | 10 +-
.../main/java/org/apache/uima/cas/IntArrayFS.java | 12 +-
.../main/java/org/apache/uima/cas/LongArrayFS.java | 10 +-
.../java/org/apache/uima/cas/ParsingException.java | 1 -
.../main/java/org/apache/uima/cas/SelectFSs.java | 818 +++
.../java/org/apache/uima/cas/ShortArrayFS.java | 7 +-
.../src/main/java/org/apache/uima/cas/SofaFS.java | 12 +-
.../java/org/apache/uima/cas/StringArrayFS.java | 80 +-
.../src/main/java/org/apache/uima/cas/Type.java | 27 +-
.../main/java/org/apache/uima/cas/TypeClass.java | 31 +-
.../main/java/org/apache/uima/cas/TypeSystem.java | 28 +-
.../apache/uima/cas/admin/CASAdminException.java | 167 +-
.../java/org/apache/uima/cas/admin/CASFactory.java | 24 +-
.../java/org/apache/uima/cas/admin/CASMgr.java | 5 +
.../apache/uima/cas/admin/FSIndexComparator.java | 12 +-
.../uima/cas/admin/FSIndexRepositoryMgr.java | 12 +-
.../org/apache/uima/cas/admin/LinearTypeOrder.java | 14 +
.../org/apache/uima/cas/admin/TypeSystemMgr.java | 45 +-
.../main/java/org/apache/uima/cas/impl/AllFSs.java | 190 +
.../apache/uima/cas/impl/AnnotationBaseImpl.java | 126 +-
.../org/apache/uima/cas/impl/AnnotationImpl.java | 136 +-
.../uima/cas/impl/AnnotationImplException.java | 4 +-
.../apache/uima/cas/impl/AnnotationIndexImpl.java | 198 -
.../uima/cas/impl/AnnotationTreeNodeImpl.java | 8 +-
.../org/apache/uima/cas/impl/ArrayFSGenerator.java | 36 -
.../java/org/apache/uima/cas/impl/ArrayFSImpl.java | 128 -
.../org/apache/uima/cas/impl/BinaryCasSerDes.java | 1989 ++++++
.../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 3176 +++++----
.../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 3707 +++++-----
.../apache/uima/cas/impl/BooleanArrayFSImpl.java | 146 +-
.../org/apache/uima/cas/impl/BuiltinTypeKinds.java | 195 +
.../org/apache/uima/cas/impl/ByteArrayFSImpl.java | 141 +-
.../java/org/apache/uima/cas/impl/ByteHeap.java | 205 +-
.../java/org/apache/uima/cas/impl/CASImpl.java | 7521 ++++++++++----------
.../java/org/apache/uima/cas/impl/CASMetadata.java | 170 -
.../org/apache/uima/cas/impl/CASMgrSerializer.java | 93 +-
.../org/apache/uima/cas/impl/CASSerializer.java | 898 ++-
.../java/org/apache/uima/cas/impl/CasCompare.java | 2168 ++++++
.../org/apache/uima/cas/impl/CasSeqAddrMaps.java | 137 +-
.../apache/uima/cas/impl/CasSerializerSupport.java | 662 +-
.../java/org/apache/uima/cas/impl/CasState.java | 29 +-
.../apache/uima/cas/impl/CasTypeSystemMapper.java | 359 +-
.../apache/uima/cas/impl/CommonArrayFSImpl.java | 78 +-
.../apache/uima/cas/impl/CommonAuxArrayFSImpl.java | 97 -
.../org/apache/uima/cas/impl/CommonAuxHeap.java | 402 +-
.../org/apache/uima/cas/impl/CommonSerDes.java | 18 +-
.../uima/cas/impl/CommonSerDesSequential.java | 211 +
.../uima/cas/impl/ConstraintFactoryImpl.java | 29 +-
.../apache/uima/cas/impl/CopyOnWriteIndexPart.java | 57 +
.../uima/cas/impl/DebugFSLogicalStructure.java | 49 +-
.../apache/uima/cas/impl/DebugNameValuePair.java | 9 +-
.../uima/cas/impl/DefaultAnnotationComparator.java | 91 -
.../cas/impl/DefaultFSAnnotationComparator.java | 59 -
.../apache/uima/cas/impl/DeferredIndexUpdates.java | 17 +-
.../apache/uima/cas/impl/DoubleArrayFSImpl.java | 144 +-
.../apache/uima/cas/impl/EmbeddedConstraint.java | 6 +-
.../java/org/apache/uima/cas/impl/FSBagIndex.java | 320 -
.../uima/cas/impl/FSBooleanConstraintImpl.java | 3 +
.../org/apache/uima/cas/impl/FSClassRegistry.java | 1588 ++++-
.../org/apache/uima/cas/impl/FSComparator.java | 4 +-
.../uima/cas/impl/FSFloatConstraintImpl.java | 29 +-
.../java/org/apache/uima/cas/impl/FSGenerator.java | 65 +-
.../org/apache/uima/cas/impl/FSImplComparator.java | 3 +-
.../uima/cas/impl/FSIndexComparatorImpl.java | 182 +-
.../java/org/apache/uima/cas/impl/FSIndexFlat.java | 708 --
.../java/org/apache/uima/cas/impl/FSIndexImpl.java | 42 -
.../uima/cas/impl/FSIndexRepositoryImpl.java | 4028 ++++-------
.../org/apache/uima/cas/impl/FSIntArrayIndex.java | 440 --
.../uima/cas/impl/FSIntIteratorImplBase.java | 137 -
.../apache/uima/cas/impl/FSIteratorAggregate.java | 187 -
.../apache/uima/cas/impl/FSIteratorImplBase.java | 206 +-
.../apache/uima/cas/impl/FSIteratorWrapper.java | 125 -
.../cas/impl/FSIteratorWrapperDoubleCheck.java | 156 -
.../org/apache/uima/cas/impl/FSLeafIndexImpl.java | 541 --
.../apache/uima/cas/impl/FSListIteratorImpl.java | 161 -
.../java/org/apache/uima/cas/impl/FSRBTIndex.java | 151 -
.../org/apache/uima/cas/impl/FSRBTSetIndex.java | 172 -
.../uima/cas/impl/FSStringConstraintImpl.java | 3 +
.../apache/uima/cas/impl/FSTypeConstraintImpl.java | 12 +-
.../org/apache/uima/cas/impl/FSsTobeAddedback.java | 181 +-
.../java/org/apache/uima/cas/impl/FeatureImpl.java | 290 +-
.../uima/cas/impl/FeatureImpl_jcas_only.java | 47 +
.../org/apache/uima/cas/impl/FeaturePathImpl.java | 1713 ++---
.../apache/uima/cas/impl/FeatureStructureImpl.java | 673 +-
.../uima/cas/impl/FeatureStructureImplC.java | 1818 ++++-
.../apache/uima/cas/impl/FeatureValuePathImpl.java | 101 +-
.../org/apache/uima/cas/impl/FilteredIterator.java | 91 +-
.../org/apache/uima/cas/impl/FloatArrayFSImpl.java | 159 +-
.../org/apache/uima/cas/impl/FloatConstraint.java | 2 +
.../org/apache/uima/cas/impl/FsGenerator3.java | 32 +
.../org/apache/uima/cas/impl/FsGeneratorArray.java | 33 +
.../apache/uima/cas/impl/FsIndex_annotation.java | 149 +
.../java/org/apache/uima/cas/impl/FsIndex_bag.java | 265 +
.../org/apache/uima/cas/impl/FsIndex_flat.java | 228 +
.../org/apache/uima/cas/impl/FsIndex_iicp.java | 628 ++
.../apache/uima/cas/impl/FsIndex_set_sorted.java | 281 +
.../apache/uima/cas/impl/FsIndex_singletype.java | 603 ++
.../org/apache/uima/cas/impl/FsIndex_snapshot.java | 158 +
.../cas/impl/FsIterator_aggregation_common.java | 294 +
.../apache/uima/cas/impl/FsIterator_backwards.java | 148 +
.../org/apache/uima/cas/impl/FsIterator_bag.java | 195 +
.../apache/uima/cas/impl/FsIterator_bag_pear.java | 49 +
.../apache/uima/cas/impl/FsIterator_limited.java | 144 +
.../uima/cas/impl/FsIterator_multiple_indexes.java | 204 +
.../uima/cas/impl/FsIterator_set_sorted2.java | 328 +
.../uima/cas/impl/FsIterator_set_sorted_pear.java | 49 +
.../uima/cas/impl/FsIterator_singletype.java | 100 +
.../uima/cas/impl/FsIterator_subtypes_ordered.java | 515 ++
.../cas/impl/FsIterator_subtypes_snapshot.java | 268 +
.../main/java/org/apache/uima/cas/impl/Heap.java | 619 +-
.../main/java/org/apache/uima/cas/impl/Id2FS.java | 341 +
.../org/apache/uima/cas/impl/IntArrayFSImpl.java | 153 +-
.../org/apache/uima/cas/impl/IntIterator4bag.java | 108 -
.../org/apache/uima/cas/impl/IntIterator4set.java | 126 -
.../apache/uima/cas/impl/IntIterator4sorted.java | 180 -
.../uima/cas/impl/LLUnambiguousIteratorImpl.java | 161 +-
.../uima/cas/impl/LinearTypeOrderBuilderImpl.java | 208 +-
.../java/org/apache/uima/cas/impl/ListUtils.java | 561 --
.../org/apache/uima/cas/impl/LongArrayFSImpl.java | 187 +-
.../java/org/apache/uima/cas/impl/LongHeap.java | 202 +-
.../java/org/apache/uima/cas/impl/LongSet.java | 76 +
.../java/org/apache/uima/cas/impl/LowLevelCAS.java | 67 +-
.../apache/uima/cas/impl/LowLevelException.java | 121 +-
.../org/apache/uima/cas/impl/LowLevelIndex.java | 182 +-
.../uima/cas/impl/LowLevelIndexRepository.java | 8 +-
.../org/apache/uima/cas/impl/LowLevelIterator.java | 171 +-
.../uima/cas/impl/LowLevelIteratorAggregate.java | 180 -
.../uima/cas/impl/LowLevelIterator_empty.java | 68 +
.../apache/uima/cas/impl/LowLevelTypeSystem.java | 2 +-
.../java/org/apache/uima/cas/impl/MarkerImpl.java | 72 +-
.../apache/uima/cas/impl/MethodHandlesLookup.java | 32 +
.../apache/uima/cas/impl/OutOfTypeSystemData.java | 56 +-
.../org/apache/uima/cas/impl/PathConstraint.java | 1 +
.../org/apache/uima/cas/impl/SelectFSs_impl.java | 1626 +++++
.../org/apache/uima/cas/impl/Serialization.java | 6 +-
.../org/apache/uima/cas/impl/ShortArrayFSImpl.java | 140 +-
.../java/org/apache/uima/cas/impl/ShortHeap.java | 196 +-
.../java/org/apache/uima/cas/impl/SlotKinds.java | 18 +
.../apache/uima/cas/impl/SlotKindsConstants.java | 70 +
.../java/org/apache/uima/cas/impl/SofaFSImpl.java | 263 +-
.../apache/uima/cas/impl/StringArrayFSImpl.java | 153 +-
.../java/org/apache/uima/cas/impl/StringHeap.java | 24 +-
.../java/org/apache/uima/cas/impl/StringSet.java | 77 +
.../org/apache/uima/cas/impl/StringTypeImpl.java | 40 -
.../java/org/apache/uima/cas/impl/Subiterator.java | 1393 ++--
.../java/org/apache/uima/cas/impl/TypeImpl.java | 1121 ++-
.../org/apache/uima/cas/impl/TypeImpl_annot.java | 37 +
.../apache/uima/cas/impl/TypeImpl_annotBase.java | 37 +
.../org/apache/uima/cas/impl/TypeImpl_array.java | 157 +
.../org/apache/uima/cas/impl/TypeImpl_list.java | 37 +
.../apache/uima/cas/impl/TypeImpl_primitive.java | 38 +
.../org/apache/uima/cas/impl/TypeImpl_string.java | 48 +
.../uima/cas/impl/TypeImpl_stringSubtype.java | 51 +
.../org/apache/uima/cas/impl/TypeSystem2Xml.java | 18 +-
.../apache/uima/cas/impl/TypeSystemConstants.java | 113 +
.../org/apache/uima/cas/impl/TypeSystemImpl.java | 3712 ++++++----
.../org/apache/uima/cas/impl/TypeSystemUtils.java | 121 +-
.../org/apache/uima/cas/impl/UimaDecompiler.java | 345 +
.../org/apache/uima/cas/impl/XCASDeserializer.java | 683 +-
.../apache/uima/cas/impl/XCASParsingException.java | 17 +-
.../org/apache/uima/cas/impl/XCASSerializer.java | 452 +-
.../apache/uima/cas/impl/XmiCasDeserializer.java | 1708 +++--
.../org/apache/uima/cas/impl/XmiCasSerializer.java | 308 +-
.../uima/cas/impl/XmiSerializationSharedData.java | 344 +-
.../java/org/apache/uima/cas/impl/package.html | 115 +-
.../src/main/java/org/apache/uima/cas/package.html | 129 +-
.../org/apache/uima/cas/text/AnnotationFS.java | 36 +
.../org/apache/uima/cas/text/AnnotationIndex.java | 12 +-
.../org/apache/uima/cas_data/impl/CasDataImpl.java | 2 +-
.../apache/uima/cas_data/impl/CasDataUtils.java | 2 +-
.../uima/cas_data/impl/FeatureStructureImpl.java | 7 +-
.../uima/cas_data/impl/PrimitiveValueImpl.java | 8 +-
.../cas_data/impl/XCasToCasDataSaxHandler.java | 5 +-
.../impl/CasConsumerDescription_impl.java | 4 +-
.../impl/CasInitializerDescription_impl.java | 9 +-
.../impl/CollectionReaderDescription_impl.java | 3 +-
.../uima/examples/SourceDocumentInformation.java | 320 +-
.../examples/SourceDocumentInformation_Type.java | 219 -
.../apache/uima/flow/FlowController_ImplBase.java | 9 +
.../impl/CapabilityLanguageFlowController.java | 16 +-
.../apache/uima/flow/impl/FixedFlowController.java | 4 +-
.../apache/uima/impl/CasConsumerFactory_impl.java | 2 +-
.../uima/impl/CasInitializerFactory_impl.java | 6 +-
.../apache/uima/impl/ChildUimaContext_impl.java | 12 +-
.../uima/impl/CompositeResourceFactory_impl.java | 2 +-
.../uima/impl/ResourceSpecifierFactory_impl.java | 1 +
.../org/apache/uima/impl/RootUimaContext_impl.java | 14 +-
.../org/apache/uima/impl/UIMAFramework_impl.java | 67 +-
.../org/apache/uima/impl/UimaContext_ImplBase.java | 87 +-
.../src/main/java/org/apache/uima/impl/Util.java | 48 +-
.../main/java/org/apache/uima/impl/package.html | 4 +-
.../uima/internal/util/AnalysisEnginePool.java | 12 +-
.../uima/internal/util/CharArraySpanMap.java | 2 +-
.../apache/uima/internal/util/CharacterUtils.java | 6 +-
.../org/apache/uima/internal/util/Class_TCCL.java | 15 +-
.../uima/internal/util/CommandLineParser.java | 10 +-
.../uima/internal/util/Common_hash_support.java | 546 ++
.../uima/internal/util/ComparableFSIterator.java | 39 +
.../util/ComparableIntPointerIterator.java | 47 -
.../uima/internal/util/CopyOnWriteObjHashSet.java | 197 +
.../util/CopyOnWriteOrderedFsSet_array.java | 150 +
.../org/apache/uima/internal/util/GraphNode.java | 4 +-
.../org/apache/uima/internal/util/I18nUtil.java | 42 +-
.../apache/uima/internal/util/Int2IntHashMap.java | 515 --
.../apache/uima/internal/util/Int2ObjHashMap.java | 610 ++
.../apache/uima/internal/util/Int2ObjListMap.java | 68 +
.../org/apache/uima/internal/util/IntBitSet.java | 27 +-
.../org/apache/uima/internal/util/IntHashSet.java | 907 ++-
.../apache/uima/internal/util/IntListIterator.java | 36 +-
.../java/org/apache/uima/internal/util/IntSet.java | 22 +-
.../org/apache/uima/internal/util/IntStack.java | 4 +-
.../org/apache/uima/internal/util/IntVector.java | 100 +-
.../java/org/apache/uima/internal/util/Misc.java | 1225 ++++
.../org/apache/uima/internal/util/MiscImpl.java | 101 -
.../internal/util/MsgLocalizationClassLoader.java | 170 +-
.../uima/internal/util/Obj2IntIdentityHashMap.java | 588 ++
.../org/apache/uima/internal/util/ObjHashSet.java | 694 ++
.../uima/internal/util/OrderedFsSet_array.java | 689 ++
.../uima/internal/util/OrderedFsSet_array2.java | 2141 ++++++
.../java/org/apache/uima/internal/util/Pair.java | 79 +
.../apache/uima/internal/util/PositiveIntSet.java | 20 +
.../uima/internal/util/PositiveIntSet_impl.java | 42 +-
.../apache/uima/internal/util/ResourcePool.java | 4 +-
.../uima/internal/util/SerializationUtils.java | 18 +-
.../apache/uima/internal/util/StringToIntMap.java | 8 +-
.../org/apache/uima/internal/util/StringUtils.java | 2 +-
.../org/apache/uima/internal/util/SymbolTable.java | 8 +-
.../apache/uima/internal/util/SystemEnvReader.java | 13 +-
.../uima/internal/util/TextStringTokenizer.java | 10 +-
.../apache/uima/internal/util/TextTokenizer.java | 10 +-
.../apache/uima/internal/util/UIMAClassLoader.java | 50 +-
.../org/apache/uima/internal/util/Utilities.java | 2 +
.../apache/uima/internal/util/XmlAttribute.java | 4 +-
.../internal/util/XmlElementNameAndContents.java | 6 +-
.../uima/internal/util/function/Consumer2.java | 24 +
.../function/Consumer_T_int_withIOException.java | 26 +
.../util/function/Consumer_T_withIOException.java | 26 +
.../util/function/Consumer_withSaxException.java | 26 +
.../internal/util/function/DeserBinaryIndexes.java | 26 +
.../util/function/IntConsumer_withIOException.java | 26 +
.../util/function/Runnable_withException.java | 24 +
.../util/function/Runnable_withSaxException.java | 26 +
.../uima/internal/util/function/package-info.java | 24 +
.../uima/internal/util/rb_trees/Int2IntRBT.java | 39 +-
.../uima/internal/util/rb_trees/IntArrayRBT.java | 41 +-
.../internal/util/rb_trees/IntArrayRBTcommon.java | 15 +-
.../uima/internal/util/rb_trees/IntRBTNode.java | 2 +-
.../internal/util/rb_trees/IntRedBlackTree.java | 3 +-
.../uima/internal/util/rb_trees/RedBlackTree.java | 6 +-
.../src/main/java/org/apache/uima/jcas/JCas.java | 445 +-
.../java/org/apache/uima/jcas/JCasRegistry.java | 94 +-
.../org/apache/uima/jcas/JFSIndexRepository.java | 3 +-
.../org/apache/uima/jcas/cas/AnnotationBase.java | 93 +-
.../apache/uima/jcas/cas/AnnotationBase_Type.java | 170 +-
.../java/org/apache/uima/jcas/cas/ArrayFSImpl.java | 32 +
.../org/apache/uima/jcas/cas/BooleanArray.java | 139 +-
.../apache/uima/jcas/cas/BooleanArray_Type.java | 150 -
.../java/org/apache/uima/jcas/cas/ByteArray.java | 148 +-
.../org/apache/uima/jcas/cas/ByteArray_Type.java | 149 -
.../org/apache/uima/jcas/cas/CommonArray_Type.java | 53 -
.../java/org/apache/uima/jcas/cas/CommonList.java | 318 +
.../apache/uima/jcas/cas/CommonPrimitiveArray.java | 40 +
.../java/org/apache/uima/jcas/cas/DoubleArray.java | 189 +-
.../org/apache/uima/jcas/cas/DoubleArray_Type.java | 145 -
.../java/org/apache/uima/jcas/cas/EmptyFSList.java | 30 +-
.../org/apache/uima/jcas/cas/EmptyFSList_Type.java | 63 -
.../org/apache/uima/jcas/cas/EmptyFloatList.java | 26 +-
.../apache/uima/jcas/cas/EmptyFloatList_Type.java | 65 -
.../org/apache/uima/jcas/cas/EmptyIntegerList.java | 27 +-
.../uima/jcas/cas/EmptyIntegerList_Type.java | 65 -
.../java/org/apache/uima/jcas/cas/EmptyList.java | 27 +
.../org/apache/uima/jcas/cas/EmptyStringList.java | 28 +-
.../apache/uima/jcas/cas/EmptyStringList_Type.java | 63 -
.../java/org/apache/uima/jcas/cas/FSArray.java | 287 +-
.../java/org/apache/uima/jcas/cas/FSArrayList.java | 1116 +++
.../org/apache/uima/jcas/cas/FSArray_Type.java | 167 -
.../java/org/apache/uima/jcas/cas/FSHashSet.java | 554 ++
.../org/apache/uima/jcas/cas/FSLinkedHashSet.java | 111 +
.../main/java/org/apache/uima/jcas/cas/FSList.java | 193 +-
.../java/org/apache/uima/jcas/cas/FSList_Type.java | 64 -
.../java/org/apache/uima/jcas/cas/FloatArray.java | 182 +-
.../org/apache/uima/jcas/cas/FloatArray_Type.java | 151 -
.../java/org/apache/uima/jcas/cas/FloatList.java | 122 +-
.../org/apache/uima/jcas/cas/FloatList_Type.java | 64 -
.../main/java/org/apache/uima/jcas/cas/Int2FS.java | 361 +
.../org/apache/uima/jcas/cas/IntegerArray.java | 222 +-
.../org/apache/uima/jcas/cas/IntegerArrayList.java | 568 ++
.../apache/uima/jcas/cas/IntegerArray_Type.java | 156 -
.../java/org/apache/uima/jcas/cas/IntegerList.java | 144 +-
.../org/apache/uima/jcas/cas/IntegerList_Type.java | 64 -
.../java/org/apache/uima/jcas/cas/LongArray.java | 197 +-
.../org/apache/uima/jcas/cas/LongArray_Type.java | 152 -
.../org/apache/uima/jcas/cas/NonEmptyFSList.java | 150 +-
.../apache/uima/jcas/cas/NonEmptyFSList_Type.java | 108 -
.../apache/uima/jcas/cas/NonEmptyFloatList.java | 132 +-
.../uima/jcas/cas/NonEmptyFloatList_Type.java | 107 -
.../apache/uima/jcas/cas/NonEmptyIntegerList.java | 147 +-
.../uima/jcas/cas/NonEmptyIntegerList_Type.java | 107 -
.../org/apache/uima/jcas/cas/NonEmptyList.java | 25 +
.../apache/uima/jcas/cas/NonEmptyStringList.java | 138 +-
.../uima/jcas/cas/NonEmptyStringList_Type.java | 108 -
.../apache/uima/jcas/cas/SelectViaCopyToArray.java | 90 +
.../java/org/apache/uima/jcas/cas/ShortArray.java | 145 +-
.../org/apache/uima/jcas/cas/ShortArray_Type.java | 153 -
.../main/java/org/apache/uima/jcas/cas/Sofa.java | 384 +-
.../java/org/apache/uima/jcas/cas/Sofa_Type.java | 108 -
.../java/org/apache/uima/jcas/cas/StringArray.java | 145 +-
.../org/apache/uima/jcas/cas/StringArray_Type.java | 155 -
.../java/org/apache/uima/jcas/cas/StringList.java | 118 +-
.../org/apache/uima/jcas/cas/StringList_Type.java | 64 -
.../main/java/org/apache/uima/jcas/cas/TOP.java | 175 +-
.../java/org/apache/uima/jcas/cas/TOP_Type.java | 422 +-
.../org/apache/uima/jcas/impl/JCasHashMap.java | 261 +-
.../apache/uima/jcas/impl/JCasHashMapSubMap.java | 706 +-
.../java/org/apache/uima/jcas/impl/JCasImpl.java | 1374 +---
.../uima/jcas/impl/JFSIndexRepositoryImpl.java | 1 -
.../java/org/apache/uima/jcas/impl/package.html | 4 +-
.../java/org/apache/uima/jcas/tcas/Annotation.java | 225 +-
.../org/apache/uima/jcas/tcas/Annotation_Type.java | 263 +-
.../java/org/apache/uima/jcas/tcas/package.html | 24 -
.../src/main/java/org/apache/uima/package.html | 25 +-
.../uima/pear/tools/InstallationController.java | 78 +-
.../uima/pear/tools/InstallationDescriptor.java | 23 +-
.../pear/tools/InstallationDescriptorHandler.java | 18 +-
.../uima/pear/tools/InstallationProcessor.java | 18 +-
.../uima/pear/tools/LocalInstallationAgent.java | 54 +-
.../org/apache/uima/pear/tools/PackageBrowser.java | 13 +-
.../java/org/apache/uima/pear/util/FileUtil.java | 233 +-
.../org/apache/uima/pear/util/MessageRouter.java | 4 +-
.../org/apache/uima/pear/util/ProcessUtil.java | 2 +-
.../java/org/apache/uima/pear/util/UIMAUtil.java | 2 +-
.../java/org/apache/uima/pear/util/XMLUtil.java | 15 +-
.../org/apache/uima/resource/CasDefinition.java | 23 +-
.../java/org/apache/uima/resource/Resource.java | 2 +-
.../org/apache/uima/resource/ResourceManager.java | 20 +-
.../apache/uima/resource/Resource_ImplBase.java | 58 +-
.../apache/uima/resource/impl/CasManager_impl.java | 13 +-
.../impl/ConfigurableDataResource_impl.java | 19 +-
.../impl/ConfigurationManagerImplBase.java | 10 +-
.../resource/impl/ConfigurationManager_impl.java | 2 +-
.../resource/impl/FileLanguageResource_impl.java | 4 +-
.../resource/impl/FileResourceSpecifier_impl.java | 2 -
.../resource/impl/RelativePathResolver_impl.java | 16 +-
.../impl/ResourceCreationSpecifier_impl.java | 14 +-
.../uima/resource/impl/ResourceManager_impl.java | 69 +-
.../apache/uima/resource/impl/Session_impl.java | 2 +-
.../resource/metadata/ExternalResourceBinding.java | 4 +-
.../resource/metadata/impl/Capability_impl.java | 41 +-
.../metadata/impl/ConfigurationGroup_impl.java | 5 +-
.../ConfigurationParameterDeclarations_impl.java | 15 +-
.../impl/ConfigurationParameterSettings_impl.java | 10 +-
.../metadata/impl/ConfigurationParameter_impl.java | 7 +-
.../metadata/impl/FsIndexCollection_impl.java | 16 +-
.../metadata/impl/FsIndexDescription_impl.java | 4 +-
.../impl/MetaDataObjectSerializer_plain.java | 1 -
.../metadata/impl/MetaDataObject_impl.java | 16 +-
.../impl/ResourceManagerConfiguration_impl.java | 16 +-
.../metadata/impl/TypeDescription_impl.java | 8 +-
.../metadata/impl/TypePriorities_impl.java | 14 +-
.../metadata/impl/TypePriorityList_impl.java | 2 +-
.../metadata/impl/TypeSystemDescription_impl.java | 14 +-
.../org/apache/uima/uimacpp/CppUimajEngine.java | 9 +-
.../uima/uimacpp/UimacppAnalysisComponent.java | 2 +-
.../util/AnalysisEnginePerformanceReports.java | 2 +-
.../org/apache/uima/util/AnalysisEngineUtils.java | 2 +-
.../apache/uima/util/AutoCloseableNoException.java | 33 +
.../main/java/org/apache/uima/util/CasCopier.java | 1025 +--
.../org/apache/uima/util/CasCreationUtils.java | 156 +-
.../main/java/org/apache/uima/util/CasIOUtils.java | 29 +-
.../java/org/apache/uima/util/CasLoadMode.java | 2 +-
.../main/java/org/apache/uima/util/CasPool.java | 10 +-
.../java/org/apache/uima/util/CasToInlineXml.java | 5 +-
.../org/apache/uima/util/ConsumerCasUtils.java | 3 +-
.../main/java/org/apache/uima/util/FileUtils.java | 79 +-
.../main/java/org/apache/uima/util/IntEntry.java | 85 +
.../java/org/apache/uima/util/IteratorNvc.java | 34 +
.../main/java/org/apache/uima/util/JCasPool.java | 6 +-
.../src/main/java/org/apache/uima/util/Level.java | 15 +-
.../src/main/java/org/apache/uima/util/Logger.java | 247 +-
.../java/org/apache/uima/util/MessageReport.java | 1 +
.../src/main/java/org/apache/uima/util/Misc.java | 2 +-
.../apache/uima/util/SimpleResourceFactory.java | 10 +-
.../java/org/apache/uima/util/TCasToInlineXml.java | 11 +-
.../java/org/apache/uima/util/TypeSystemUtil.java | 5 +-
.../java/org/apache/uima/util/XMLSerializer.java | 16 +-
.../org/apache/uima/util/XmlCasDeserializer.java | 10 +-
.../org/apache/uima/util/XmlCasSerializer.java | 6 +-
.../uima/util/impl/CasPoolManagementImpl.java | 2 +-
.../java/org/apache/uima/util/impl/Constants.java | 42 +
.../java/org/apache/uima/util/impl/DataIO.java | 8 +-
.../apache/uima/util/impl/JSR47Logger_impl.java | 566 +-
.../apache/uima/util/impl/Log4jLogger_impl.java | 637 +-
.../apache/uima/util/impl/Logger_common_impl.java | 1200 ++++
.../org/apache/uima/util/impl/Logger_impl.java | 313 +-
.../org/apache/uima/util/impl/OptimizeStrings.java | 22 +-
.../uima/util/impl/ProcessTraceEvent_impl.java | 2 +-
.../apache/uima/util/impl/ProcessTrace_impl.java | 12 +-
.../org/apache/uima/util/impl/Settings_impl.java | 11 +-
.../apache/uima/util/impl/Slf4jLogger_impl.java | 410 ++
.../org/apache/uima/util/impl/XMLParser_impl.java | 2 +-
.../apache/uima/UIMAException_Messages.properties | 58 +-
.../apache/uima/cas/admin/admin_errors.properties | 13 +
.../uima/cas/impl/ll_runtimeException.properties | 3 +-
.../org/apache/uima/cas/impl/xcas.properties | 4 +-
.../org/apache/uima/impl/factoryConfig.xml | 3 +-
.../resources/org/apache/uima/semibuiltins.xml | 101 +
uimaj-core/src/test/java/aa/AbstractType.java | 149 +-
uimaj-core/src/test/java/aa/AbstractType_Type.java | 104 -
uimaj-core/src/test/java/aa/ConcreteType.java | 152 +-
uimaj-core/src/test/java/aa/ConcreteType_Type.java | 103 -
.../src/test/java/aa/MissingFeatureInCas.java | 240 +-
.../src/test/java/aa/MissingFeatureInCas_Type.java | 154 -
uimaj-core/src/test/java/aa/MissingInCas.java | 114 +-
uimaj-core/src/test/java/aa/MissingInCas_Type.java | 77 -
uimaj-core/src/test/java/aa/Root.java | 293 +-
uimaj-core/src/test/java/aa/Root_Type.java | 557 --
uimaj-core/src/test/java/aa/T.java | 118 +
.../test/java/org/apache/lang/LanguagePair.java | 226 +-
.../java/org/apache/lang/LanguagePair_Type.java | 135 -
.../uima/ae/multiplier/SimpleCasGenerator.java | 4 +-
.../org/apache/uima/ae/noop/NoOpAnnotator.java | 9 +-
.../impl/AnalysisEngineDescription_implTest.java | 32 +-
.../impl/AnalysisEngineManagementImplTest.java | 7 +-
.../impl/AnalysisEngine_implTest.java | 448 +-
.../analysis_engine/impl/AnnotationWriter.java | 7 +-
.../impl/AnnotatorContext_implTest.java | 14 +-
.../uima/analysis_engine/impl/ErrorAnnotator.java | 9 +
.../impl/FlowControllerForErrorTest.java | 6 +-
.../analysis_engine/impl/MultiViewAnnotator.java | 1 -
.../MultiprocessingAnalysisEngine_implTest.java | 44 +-
.../impl/PearAnalysisEngineWrapperTest.java | 3 +-
.../uima/analysis_engine/impl/ResultSpecTest.java | 24 +-
.../impl/ResultSpecWithTypeSystemTest.java | 27 +-
.../impl/ResultSpecification_implTest.java | 8 +-
.../impl/TaeDescription_implTest.java | 6 +-
.../uima/analysis_engine/impl/TestAnnotator2.java | 18 +-
.../impl/metadata/SofaMapping_implTest.java | 6 +-
.../sequencer/SequencerCapabilityLanguageTest.java | 6 +-
.../impl/sequencer/SequencerFixedTest.java | 18 +-
.../impl/sequencer/SequencerTestAnnotator.java | 3 +-
.../uima/cas/impl/BinaryCasSerDesPerformance.java | 4 +-
.../cas/impl/CasPerformanceTuningSettingsTest.java | 79 -
.../java/org/apache/uima/cas/impl/CasPoolTest.java | 12 +-
.../apache/uima/cas/impl/CasResetResizeTest.java | 127 -
.../uima/cas/impl/CasTypeSystemMapperTst.java | 463 +-
.../apache/uima/cas/impl/CommonAuxHeapTest.java | 106 -
.../apache/uima/cas/impl/ComponentInfoTest.java | 4 +-
.../impl/ConcurrentBinarySerializationTest.java | 127 +
.../org/apache/uima/cas/impl/FSBagIndexTest.java | 99 +-
.../org/apache/uima/cas/impl/FeaturePathTest.java | 36 +-
.../java/org/apache/uima/cas/impl/Id2FSTest.java | 111 +
.../cas/impl/IndexCorruptionReportingTest.java | 19 +-
.../org/apache/uima/cas/impl/JCasReinitTest.java | 95 +
.../uima/cas/impl/OrderedFsSet_array_test.java | 220 +
.../org/apache/uima/cas/impl/SelectFsTest.java | 232 +
.../apache/uima/cas/impl/SelectFsTestNoJCas.java | 66 +
.../java/org/apache/uima/cas/impl/SerDesTest4.java | 1128 ++-
.../java/org/apache/uima/cas/impl/SerDesTest6.java | 648 +-
.../org/apache/uima/cas/impl/SerDesTstCommon.java | 9 +-
.../uima/cas/impl/UnambiguousIteratorTest.java | 6 +-
.../apache/uima/cas/impl/XCASDeserializerTest.java | 118 +-
.../uima/cas/impl/XmiCasDeserializerTest.java | 355 +-
.../apache/uima/cas/impl/XmiCasSerializerTest.java | 4 +-
.../java/org/apache/uima/cas/impl/XmiCompare.java | 530 ++
.../apache/uima/cas/test/AnnotationIndexTest.java | 153 +-
.../uima/cas/test/AnnotationIteratorTest.java | 639 +-
.../apache/uima/cas/test/AnnotationTreeTest.java | 21 +-
.../java/org/apache/uima/cas/test/ArrayFSTest.java | 6 +-
.../org/apache/uima/cas/test/ArrayIndexTest.java | 4 +-
.../org/apache/uima/cas/test/CASInitializer.java | 14 +-
.../java/org/apache/uima/cas/test/CASTest.java | 9 +-
.../org/apache/uima/cas/test/CASTestSetup.java | 55 +-
.../uima/cas/test/CompleteSerializationTest.java | 107 +-
.../org/apache/uima/cas/test/CrossAnnotation.java | 151 +-
.../apache/uima/cas/test/CrossAnnotation_Type.java | 94 -
.../apache/uima/cas/test/FeatureStructureTest.java | 267 +-
.../apache/uima/cas/test/FilteredIteratorTest.java | 51 +-
.../org/apache/uima/cas/test/FloatArrayFSTest.java | 6 +-
.../apache/uima/cas/test/GetAllIndexedTest.java | 8 +-
.../apache/uima/cas/test/GrowingTheCasTest.java | 103 +-
.../cas/test/GrowingTheCasTestNoJcasCache.java | 73 +-
.../apache/uima/cas/test/IndexComparitorTest.java | 67 +-
.../uima/cas/test/IndexRepositoryMergingTest.java | 114 +
.../apache/uima/cas/test/IndexRepositoryTest.java | 128 +-
.../uima/cas/test/IndexSerializationTest.java | 9 +-
.../org/apache/uima/cas/test/IntArrayFSTest.java | 6 +-
.../org/apache/uima/cas/test/IteratorTest.java | 360 +-
.../apache/uima/cas/test/IteratorTestSorted.java | 154 +-
.../apache/uima/cas/test/JCasClassLoaderTest.java | 6 -
.../org/apache/uima/cas/test/JcasSofaTest.java | 18 +-
.../java/org/apache/uima/cas/test/Level_1.java | 252 +-
.../org/apache/uima/cas/test/Level_1_Type.java | 111 -
.../java/org/apache/uima/cas/test/Level_2.java | 186 +-
.../org/apache/uima/cas/test/Level_2_Type.java | 80 -
.../java/org/apache/uima/cas/test/Level_3.java | 186 +-
.../org/apache/uima/cas/test/Level_3_Type.java | 80 -
.../java/org/apache/uima/cas/test/Level_4.java | 186 +-
.../org/apache/uima/cas/test/Level_4_Type.java | 80 -
.../java/org/apache/uima/cas/test/Level_5.java | 186 +-
.../org/apache/uima/cas/test/Level_5_Type.java | 80 -
.../java/org/apache/uima/cas/test/Level_6.java | 186 +-
.../org/apache/uima/cas/test/Level_6_Type.java | 80 -
.../uima/cas/test/NewPrimitiveTypesTest.java | 55 +-
.../java/org/apache/uima/cas/test/SelectTest.java | 66 +
.../java/org/apache/uima/cas/test/Sentence.java | 101 +-
.../org/apache/uima/cas/test/Sentence_Type.java | 74 -
.../uima/cas/test/SerializationNoMDTest.java | 26 +-
.../uima/cas/test/SerializationReinitTest.java | 40 +-
.../java/org/apache/uima/cas/test/SofaTest.java | 61 +-
.../org/apache/uima/cas/test/StringArrayTest.java | 10 +-
.../uima/cas/test/StringSubtypeAnnotation.java | 104 +-
.../cas/test/StringSubtypeAnnotation_Type.java | 96 -
.../apache/uima/cas/test/StringSubtypeTest.java | 4 +-
.../org/apache/uima/cas/test/SubiteratorTest.java | 11 +-
.../test/java/org/apache/uima/cas/test/Token.java | 101 +-
.../java/org/apache/uima/cas/test/Token_Type.java | 74 -
.../org/apache/uima/cas/test/TypeOrderTest.java | 9 +-
.../org/apache/uima/cas/test/TypePriorityTest.java | 12 +-
.../apache/uima/cas/test/TypeSystemReinitTest.java | 10 +-
.../org/apache/uima/cas/test/TypeSystemTest.java | 88 +-
.../apache/uima/cas/test/TypeSystemUtilsTest.java | 18 +-
.../org/apache/uima/cas_data/impl/CasComparer.java | 211 +-
.../uima/cas_data/impl/CasDataToXCasTest.java | 6 +-
.../cas_data/impl/XCasToCasDataSaxHandlerTest.java | 6 +-
.../impl/CasConsumerDescription_implTest.java | 6 +-
.../impl/CasInitializerDescription_implTest.java | 6 +-
.../impl/CollectionReaderDescription_implTest.java | 6 +-
.../uima/flow/impl/FixedFlowControllerTest.java | 11 +-
.../uima/impl/AnalysisEngineFactory_implTest.java | 4 +-
.../uima/impl/CasConsumerFactory_implTest.java | 4 +-
.../impl/CollectionReaderFactory_implTest.java | 4 +-
.../CustomResourceSpecifierFactory_implTest.java | 4 +-
.../org/apache/uima/impl/SomeCustomResource.java | 6 +-
.../org/apache/uima/impl/UimaContext_implTest.java | 28 +-
.../uima/internal/util/AnalysisEnginePoolTest.java | 6 +-
.../uima/internal/util/Int2IntHashMapTest.java | 103 -
.../apache/uima/internal/util/Int2IntPerfTest.java | 153 -
.../uima/internal/util/Int2ObjHashMapTest.java | 133 +
.../apache/uima/internal/util/IntBitSetTest.java | 24 +-
.../uima/internal/util/IntHashSetPerfTest.java | 27 +-
.../apache/uima/internal/util/IntHashSetTest.java | 129 +-
.../apache/uima/internal/util/IntVectorTest.java | 6 +-
.../org/apache/uima/internal/util/MiscTest.java | 44 +
.../uima/internal/util/MultiThreadUtils.java | 11 +-
.../internal/util/Obj2IntIdentityHashMapTest.java | 147 +
.../apache/uima/internal/util/ObjHashSetTest.java | 185 +
.../uima/internal/util/PositiveIntSetTest.java | 10 +-
.../uima/internal/util/ResourcePoolTest.java | 6 +-
.../uima/internal/util/UIMAClassLoaderTest.java | 66 +-
.../internal/util/rb_trees/Int2IntRBTtest.java | 8 +-
.../internal/util/rb_trees/IntArrayRBTtest.java | 7 +-
.../uima/jcas/impl/JCasHashMapCompareTest.java | 136 +-
.../org/apache/uima/jcas/impl/JCasHashMapTest.java | 295 +-
.../org/apache/uima/jcas/tcas/AnnotationTest.java | 205 +
.../org/apache/uima/jcas/test/CASInitializer.java | 9 +-
.../org/apache/uima/jcas/test/CASTestSetup.java | 33 +-
.../org/apache/uima/jcas/test/FSArrayListTest.java | 93 +
.../org/apache/uima/jcas/test/FSHashSetTest.java | 118 +
.../uima/jcas/test/IntegerArrayListTest.java | 91 +
.../java/org/apache/uima/jcas/test/JCasTest.java | 346 +-
.../java/org/apache/uima/jcas/test/JCasTest2.java | 128 +
.../java/org/apache/uima/jcas/test/generatedx.xml | 38 +-
.../uima/pear/util/ComponentCategoryTest.java | 4 +-
.../apache/uima/pear/util/PearEncodingTest.java | 4 +-
.../apache/uima/pear/util/PearInstallerTest.java | 6 +-
.../org/apache/uima/pear/util/PearRuntimeTest.java | 17 +-
.../util/TestPearInstallationVerification.java | 1 -
.../resource/ConfigurableResource_implTest.java | 42 +-
.../uima/resource/impl/CasManager_implTest.java | 4 +-
...ConfigurableDataResourceSpecifier_implTest.java | 7 +-
.../impl/ConfigurableDataResource_implTest.java | 4 +-
.../uima/resource/impl/DataResource_implTest.java | 9 +-
.../impl/FileLanguageResource_implTest.java | 6 +-
.../uima/resource/impl/PearSpecifier_implTest.java | 6 +-
.../impl/RelativePathResolver_implTest.java | 4 +-
.../impl/ResourceCreationSpecifier_implTest.java | 4 +-
.../resource/impl/ResourceManager_implTest.java | 14 +-
.../resource/impl/TestResourceInterface_impl.java | 3 +-
.../uima/resource/impl/URISpecifier_implTest.java | 4 +-
...onfigurationParameterDeclarations_implTest.java | 6 +-
.../metadata/impl/FsIndexCollection_implTest.java | 5 +-
.../resource/metadata/impl/Import_implTest.java | 4 +-
.../metadata/impl/MetaDataObject_implTest.java | 30 +-
.../ResourceManagerConfiguration_implTest.java | 5 +-
.../resource/metadata/impl/TestFruitBagObject.java | 2 +-
.../resource/metadata/impl/TestFruitObject.java | 4 +-
.../metadata/impl/TypePriorities_implTest.java | 5 +-
.../impl/TypeSystemDescription_implTest.java | 7 +-
.../impl/ResourceServiceAdapter_implTest.java | 6 +-
.../service/impl/ResourceService_implTest.java | 6 +-
.../uima/testTypeSystem_arrays/OfShorts.java | 123 +-
.../uima/testTypeSystem_arrays/OfShorts_Type.java | 116 -
.../uima/testTypeSystem_arrays/OfStrings.java | 123 +-
.../uima/testTypeSystem_arrays/OfStrings_Type.java | 116 -
.../java/org/apache/uima/util/CasCopierTest.java | 74 +-
.../org/apache/uima/util/CasCreationUtilsTest.java | 18 +-
.../uima/util/CasIOUtilsAlwaysHoldOnTest.java | 80 +
.../java/org/apache/uima/util/CasIOUtilsTest.java | 69 +-
.../org/apache/uima/util/CasToInlineXmlTest.java | 8 +-
.../org/apache/uima/util/CasWrapperForTstng.java | 6 +-
.../test/java/org/apache/uima/util/LevelTest.java | 2 +-
.../org/apache/uima/util/TypeSystemUtilTest.java | 4 +-
.../org/apache/uima/util/XMLSerializerTest.java | 7 +-
.../uima/util/impl/JSR47Logger_implTest.java | 42 +-
.../org/apache/uima/util/impl/Logger_implTest.java | 11 +-
.../org/apache/uima/util/impl/LoggingTest.java | 20 +-
.../apache/uima/util/impl/OptimizeStringsTest.java | 57 +-
.../uima/util/impl/ProcessTrace_implTest.java | 6 +-
.../uima/util/impl/TestLog4jLogger_impl.java | 200 +-
.../apache/uima/util/impl/XMLParser_implTest.java | 15 +-
.../src/test/java/sofa/test/CrossAnnotation.java | 142 +
uimaj-core/src/test/java/x/y/z/EndOfSentence.java | 111 +-
.../src/test/java/x/y/z/EndOfSentence_Type.java | 66 -
uimaj-core/src/test/java/x/y/z/Sentence.java | 146 +-
uimaj-core/src/test/java/x/y/z/Sentence_Type.java | 67 -
uimaj-core/src/test/java/x/y/z/Separator.java | 117 +-
uimaj-core/src/test/java/x/y/z/Separator_Type.java | 66 -
uimaj-core/src/test/java/x/y/z/Token.java | 331 +-
uimaj-core/src/test/java/x/y/z/TokenType.java | 119 +-
uimaj-core/src/test/java/x/y/z/TokenType_Type.java | 67 -
uimaj-core/src/test/java/x/y/z/Token_Type.java | 196 -
uimaj-core/src/test/java/x/y/z/Word.java | 117 +-
uimaj-core/src/test/java/x/y/z/Word_Type.java | 66 -
.../resources/CASTests/desc/ArrayIndexTest.xml | 192 +-
.../CASTests/desc/casTestCaseTypesystem.xml | 3 +
.../src/test/resources/CASTests/desc/levels.xml | 65 -
.../testTypeSystem_small_withMixedRefs.xml | 52 +
.../ExampleCas/testTypeSystem_t_1_feature.xml | 35 +
.../ExampleCas/testTypeSystem_t_nofeatures.xml | 32 +
.../testTypeSystem_token_no_features.xml | 28 +
.../testTypeSystem_token_sentence_no_features.xml | 34 +
.../testTypeSystem_token_sentence_no_jcas.xml | 34 +
.../resources/ExtraTests/UIMA-5961/peartest.zip | Bin 0 -> 14727 bytes
.../test/resources/ExtraTests/UIMA-5961/readme.txt | 2 +
.../ExtraTests/UIMA-6057/classloadertest.zip | Bin 0 -> 120421 bytes
.../test/resources/ExtraTests/UIMA-6057/readme.txt | 2 +
.../src/test/resources/ExtraTests/readme.txt | 6 +
.../test/resources/JCasGen/typeSystemAllKinds.xml | 130 +
uimaj-core/src/test/resources/log4j2.xml | 36 +
.../uima/util/impl/logger_test_messages.properties | 2 +-
.../src/test/resources/pearTests/DateTime.pear | Bin 38739 -> 23719 bytes
.../src/test/resources/pearTests/RoomNumber.pear | Bin 35953 -> 10760 bytes
.../test/resources/pearTests/analysisEngine.pear | Bin 17062 -> 14437 bytes
.../test/resources/pearTests/analysisEngine2.pear | Bin 16580 -> 15123 bytes
.../src/test/resources/pearTests/casConsumer.pear | Bin 13642 -> 11099 bytes
.../src/test/resources/pearTests/pearSofaMap.pear | Bin 3718 -> 11250 bytes
.../src/test/resources/pearTests/typeSystem.pear | Bin 14753 -> 37220 bytes
uimaj-cpe/.gitignore | 3 +
uimaj-cpe/checkpoint.dat.prev | Bin 971 -> 0 bytes
uimaj-cpe/pom.xml | 16 +-
.../cas_data/impl/vinci/VinciCasDataConverter.java | 73 +-
.../uima/collection/impl/cpm/BaseCPMImpl.java | 188 +-
.../uima/collection/impl/cpm/Checkpoint.java | 87 +-
.../collection/impl/cpm/container/CPEFactory.java | 169 +-
.../CasObjectNetworkCasProcessorImpl.java | 47 +-
.../cpm/container/ProcessingContainer_Impl.java | 243 +-
.../container/deployer/CPEDeployerDefaultImpl.java | 29 +-
.../cpm/container/deployer/JavaApplication.java | 23 +-
.../container/deployer/RunnableApplication.java | 23 +-
.../impl/cpm/container/deployer/VinciTAP.java | 111 +-
.../deployer/socket/OFSocketTransportImpl.java | 11 +-
.../deployer/socket/ProcessControllerAdapter.java | 10 +-
.../socket/SocketCasProcessorDeployer.java | 35 +-
.../container/deployer/socket/SocketTransport.java | 27 +-
.../deployer/vinci/VinciCasProcessorDeployer.java | 111 +-
.../impl/cpm/container/deployer/vns/LocalVNS.java | 35 +-
.../impl/cpm/engine/ArtifactProducer.java | 87 +-
.../impl/cpm/engine/BoundedWorkQueue.java | 25 +-
.../collection/impl/cpm/engine/CPECasPool.java | 19 +-
.../impl/cpm/engine/CPMChunkTimeoutException.java | 21 +-
.../uima/collection/impl/cpm/engine/CPMEngine.java | 394 +-
.../collection/impl/cpm/engine/CPMThreadGroup.java | 34 +-
.../impl/cpm/engine/ConsumerCasUtils.java | 22 +-
.../impl/cpm/engine/DebugControlThread.java | 56 +-
.../impl/cpm/engine/NonThreadedProcessingUnit.java | 205 +-
.../collection/impl/cpm/engine/ProcessingUnit.java | 424 +-
.../collection/impl/cpm/engine/SequencedQueue.java | 28 +-
.../uima/collection/impl/cpm/engine/WorkUnit.java | 36 +
.../uima/collection/impl/cpm/utils/CPMUtils.java | 62 +-
.../collection/impl/cpm/utils/CasMetaData.java | 23 +-
.../collection/impl/cpm/utils/ChunkMetadata.java | 67 +
.../impl/cpm/utils/ConfigurableFeature.java | 62 +
.../impl/cpm/utils/CpmLocalizedMessage.java | 12 +
.../uima/collection/impl/cpm/utils/Execute.java | 23 +-
.../collection/impl/cpm/utils/ExpirationTimer.java | 7 +
.../uima/collection/impl/cpm/utils/FeatureMap.java | 37 +
.../uima/collection/impl/cpm/utils/Filter.java | 150 +-
.../uima/collection/impl/cpm/utils/JavaTimer.java | 41 +-
.../collection/impl/cpm/utils/QueueEntity.java | 8 +
.../uima/collection/impl/cpm/utils/Timer.java | 36 +-
.../collection/impl/cpm/utils/TimerFactory.java | 20 +-
.../cpm/utils/TypeComplianceConverterImpl.java | 6 +
.../uima/collection/impl/cpm/utils/ValuePair.java | 13 +
.../collection/impl/cpm/vinci/DATACasUtils.java | 115 +-
.../uima/collection/impl/cpm/vinci/Vinci.java | 57 +-
...rocessorConfigurationParameterSettingsImpl.java | 24 +
.../impl/metadata/cpe/CasProcessorCpeObject.java | 161 +-
.../cpe/CasProcessorDeploymentParamImpl.java | 43 +-
.../cpe/CasProcessorDeploymentParamsImpl.java | 30 +-
.../cpe/CasProcessorErrorHandlingImpl.java | 22 +
.../cpe/CasProcessorErrorRateThresholdImpl.java | 51 +-
.../impl/metadata/cpe/CasProcessorExecArgImpl.java | 40 +-
.../metadata/cpe/CasProcessorExecArgsImpl.java | 14 +
.../metadata/cpe/CasProcessorExecutableImpl.java | 95 +-
.../impl/metadata/cpe/CasProcessorFilterImpl.java | 43 +-
.../metadata/cpe/CasProcessorMaxRestartsImpl.java | 49 +-
.../cpe/CasProcessorRunInSeperateProcessImpl.java | 22 +-
.../cpe/CasProcessorRuntimeEnvParamImpl.java | 46 +-
.../impl/metadata/cpe/CasProcessorTimeoutImpl.java | 50 +-
.../impl/metadata/cpe/CpeCasProcessorsImpl.java | 72 +-
.../impl/metadata/cpe/CpeCheckpointImpl.java | 51 +-
.../cpe/CpeCollectionReaderCasInitializerImpl.java | 30 +
.../impl/metadata/cpe/CpeCollectionReaderImpl.java | 25 +
.../cpe/CpeCollectionReaderIteratorImpl.java | 26 +
.../metadata/cpe/CpeComponentDescriptorImpl.java | 26 +
.../impl/metadata/cpe/CpeConfigurationImpl.java | 62 +
.../impl/metadata/cpe/CpeDescriptionImpl.java | 118 +-
.../impl/metadata/cpe/CpeDescriptorFactory.java | 189 +-
.../impl/metadata/cpe/CpeIncludeImpl.java | 39 +-
.../cpe/CpeIntegratedCasProcessorImpl.java | 13 +
.../metadata/cpe/CpeLocalCasProcessorImpl.java | 82 +-
.../collection/impl/metadata/cpe/CpeObject.java | 21 +
.../metadata/cpe/CpeRemoteCasProcessorImpl.java | 13 +
.../cpe/CpeResourceManagerConfigurationImpl.java | 37 +-
.../impl/metadata/cpe/CpeSofaMappingImpl.java | 40 +-
.../impl/metadata/cpe/CpeSofaMappingsImpl.java | 31 +-
.../collection/impl/metadata/cpe/CpeTimerImpl.java | 13 +
.../impl/metadata/cpe/NameValuePairImpl.java | 32 +
.../impl/metadata/cpe/OutputQueue_impl.java | 40 +-
.../java/org/apache/uima/cas/impl/CasTestUtil.java | 4 +-
.../impl/CasHeapSizeTestCollectionReader.java | 5 +-
.../impl/cpm/utils/DescriptorMakeUtil.java | 10 +-
.../impl/cpm/utils/ErrorTestAnnotator.java | 5 +-
.../impl/cpm/utils/ErrorTestCasConsumer.java | 2 +-
.../impl/cpm/utils/ErrorTestCollectionReader.java | 4 +-
.../test/resources/pearTests/pearForCPMtest.pear | Bin 18537 -> 19067 bytes
uimaj-document-annotation/pom.xml | 16 +-
.../apache/uima/jcas/tcas/DocumentAnnotation.java | 45 +-
.../uima/jcas/tcas/DocumentAnnotation_Type.java | 89 -
.../java/org/apache/uima/jcas/tcas/DocMeta.java | 163 +-
.../org/apache/uima/jcas/tcas/DocMeta_Type.java | 307 -
.../uima/jcas/tcas/DocumentAnnotationTest.java | 22 +-
.../ExampleCas/testTypeSystem_docmetadata.xml | 3 +-
uimaj-eclipse-feature-runtime/feature.properties | 2 +-
uimaj-eclipse-feature-runtime/pom.xml | 9 +-
.../src/main/resources/feature.xml | 5 +
uimaj-eclipse-feature-tools/feature.properties | 2 +-
uimaj-eclipse-feature-tools/pom.xml | 9 +-
uimaj-eclipse-update-site/pom.xml | 592 +-
uimaj-ep-cas-editor-ide/pom.xml | 19 +-
.../uima/caseditor/ide/CasEditorIdePlugin.java | 12 +-
.../caseditor/ide/CasEditorIdePreferencePage.java | 11 +-
.../caseditor/ide/CasEditorPerspectiveFactory.java | 1 -
.../caseditor/ide/CasEditorPreferencePage.java | 2 -
.../caseditor/ide/DefaultCasDocumentProvider.java | 26 +-
.../org/apache/uima/caseditor/ide/NlpProject.java | 2 +-
.../caseditor/ide/WorkspaceResourceDialog.java | 3 +-
.../TypeSystemSearchStrategyFactory.java | 2 +-
.../wizards/DocumentImportStructureProvider.java | 48 +-
.../ide/wizards/ImportDocumentWizard.java | 4 +-
.../ide/wizards/ImportDocumentWizardPage.java | 11 +-
uimaj-ep-cas-editor/pom.xml | 19 +-
.../editor/annotation/EclipseAnnotationPeer.java | 2 +-
.../fsview/FeatureStructureLabelProvider.java | 3 +-
.../editor/outline/AnnotationTreeNode.java | 2 +-
.../core/model/dotcorpus/AnnotationStyleTest.java | 10 +-
.../uima/caseditor/editor/util/SpanTest.java | 33 +-
uimaj-ep-configurator/pom.xml | 26 +-
.../uima/taeconfigurator/CDEpropertyPage.java | 68 +
.../uima/taeconfigurator/InternalErrorCDE.java | 23 +
.../org/apache/uima/taeconfigurator/Messages.java | 21 +
.../uima/taeconfigurator/PreferencePage.java | 22 +
.../uima/taeconfigurator/StandardStrings.java | 16 +
.../taeconfigurator/TAEConfiguratorPlugin.java | 59 +-
.../uima/taeconfigurator/editors/Form2Panel.java | 13 +-
.../taeconfigurator/editors/MultiPageEditor.java | 1171 ++-
.../editors/MultiPageEditorContributor.java | 135 +-
.../editors/point/IUimaEditorExtension.java | 4 +-
.../editors/point/IUimaMultiPageEditor.java | 20 +-
.../editors/ui/AbstractImportablePartSection.java | 2 +-
.../editors/ui/AbstractSectionParm.java | 332 +-
.../taeconfigurator/editors/ui/AggregatePage.java | 28 +-
.../taeconfigurator/editors/ui/CapabilityPage.java | 20 +-
.../editors/ui/ExtnlResBindSection.java | 114 +-
.../editors/ui/FileAndShortName.java | 12 +
.../taeconfigurator/editors/ui/FlowSection.java | 100 +-
.../taeconfigurator/editors/ui/GeneralSection.java | 27 +-
.../taeconfigurator/editors/ui/HeaderPage.java | 164 +-
.../editors/ui/HeaderPageWithSash.java | 32 +-
.../editors/ui/ImportResBindSection.java | 50 +-
.../taeconfigurator/editors/ui/ImportSection.java | 110 +-
.../editors/ui/IndexImportSection.java | 40 +-
.../taeconfigurator/editors/ui/IndexesPage.java | 34 +
.../editors/ui/MetaDataSection.java | 27 +-
.../taeconfigurator/editors/ui/OverviewPage.java | 26 +-
.../taeconfigurator/editors/ui/ParameterPage.java | 26 +-
.../editors/ui/ParameterSettingsSection.java | 31 +-
.../editors/ui/PrimitiveSection.java | 32 +-
.../editors/ui/ResourceDependencySection.java | 115 +-
.../taeconfigurator/editors/ui/ResourcesPage.java | 32 +-
.../taeconfigurator/editors/ui/SettingsPage.java | 26 +-
.../editors/ui/TypeImportSection.java | 35 +
.../uima/taeconfigurator/editors/ui/TypePage.java | 26 +-
.../editors/ui/TypePriorityImportSection.java | 40 +-
.../uima/taeconfigurator/editors/ui/Utility.java | 133 +-
.../taeconfigurator/editors/ui/ValueSection.java | 79 +-
.../ui/dialogs/AbstractDialogKeyVerify.java | 38 +-
.../dialogs/AbstractDialogKeyVerifyJavaNames.java | 30 +-
.../editors/ui/dialogs/AddAllowedValueDialog.java | 41 +-
.../AddExternalResourceDependencyDialog.java | 58 +-
.../ui/dialogs/AddExternalResourceDialog.java | 50 +-
.../editors/ui/dialogs/AddFeatureDialog.java | 94 +-
.../editors/ui/dialogs/AddIndexDialog.java | 97 +-
.../editors/ui/dialogs/AddIndexKeyDialog.java | 60 +-
.../editors/ui/dialogs/AddParameterDialog.java | 58 +-
.../editors/ui/dialogs/AddRemoteServiceDialog.java | 151 +-
.../editors/ui/dialogs/AddSofaDialog.java | 54 +
.../editors/ui/dialogs/AddTypeDialog.java | 48 +-
.../ui/dialogs/AddTypeToPriorityListDialog.java | 40 +-
.../editors/ui/dialogs/CommonInputDialog.java | 57 +
.../editors/ui/dialogs/ContentAssistField32.java | 16 +
.../editors/ui/dialogs/EditSofaBindingsDialog.java | 28 +
.../ui/dialogs/ExportImportablePartDialog.java | 63 +
.../editors/ui/dialogs/FindComponentDialog.java | 63 +
.../editors/ui/dialogs/PickTaeForTypesDialog.java | 60 +-
.../editors/ui/dialogs/ResourcePickerDialog.java | 47 +
.../editors/ui/dialogs/SearchMonitoringThread.java | 18 +
.../editors/ui/dialogs/SearchThread.java | 106 +
.../editors/ui/dialogs/SelectTypeDialog.java | 32 +
.../editors/ui/dialogs/TypesWithNameSpaces.java | 10 +
.../editors/ui/dialogs/TypesWithNameSpaces32.java | 50 +
.../taeconfigurator/editors/xml/ColorManager.java | 14 +
.../editors/xml/IXMLColorConstants.java | 10 +
.../editors/xml/NonRuleBasedDamagerRepairer.java | 26 +-
.../uima/taeconfigurator/editors/xml/TagRule.java | 13 +
.../editors/xml/XMLConfiguration.java | 46 +-
.../editors/xml/XMLDocumentProvider.java | 8 +
.../editors/xml/XMLDoubleClickStrategy.java | 28 +
.../taeconfigurator/editors/xml/XMLEditor.java | 45 +-
.../editors/xml/XMLPartitionScanner.java | 11 +
.../taeconfigurator/editors/xml/XMLScanner.java | 9 +
.../taeconfigurator/editors/xml/XMLTagScanner.java | 9 +
.../editors/xml/XMLWhitespaceDetector.java | 8 +
.../files/ContextForPartDialog.java | 28 +
.../files/MultiResourceSelectionDialog.java | 101 +-
...MultiResourceSelectionDialogWithFlowOption.java | 30 +-
.../files/PickOverrideKeysAndParmName.java | 50 +-
.../taeconfigurator/model/AbstractModelPart.java | 14 +
.../uima/taeconfigurator/model/AllTypes.java | 15 +-
.../uima/taeconfigurator/model/BuiltInTypes.java | 8 +-
.../uima/taeconfigurator/model/ConfigGroup.java | 52 +
.../model/DefinedTypesWithSupers.java | 12 +
.../taeconfigurator/model/DescriptorMetaData.java | 47 +
.../uima/taeconfigurator/model/DescriptorTCAS.java | 24 +-
.../uima/taeconfigurator/model/FlowNodes.java | 18 +
.../taeconfigurator/wizards/AbstractNewWizard.java | 43 +
.../wizards/AbstractNewWizardPage.java | 51 +-
.../wizards/CasConsumerNewWizard.java | 12 +
.../wizards/CasConsumerNewWizardPage.java | 6 +
.../wizards/CasInitializerNewWizard.java | 12 +
.../wizards/CasInitializerNewWizardPage.java | 6 +
.../wizards/CollectionReaderNewWizard.java | 12 +
.../wizards/CollectionReaderNewWizardPage.java | 6 +
.../wizards/FlowControllerNewWizard.java | 12 +
.../wizards/FlowControllerNewWizardPage.java | 6 +
.../wizards/FsIndexCollectionNewWizard.java | 15 +-
.../wizards/FsIndexCollectionNewWizardPage.java | 6 +
.../ResourceManagerConfigurationNewWizard.java | 15 +-
.../ResourceManagerConfigurationNewWizardPage.java | 6 +
.../wizards/TAEConfiguratorNewWizard.java | 12 +
.../wizards/TAEConfiguratorNewWizardPage.java | 6 +
.../wizards/TypePrioritiesNewWizard.java | 15 +-
.../wizards/TypePrioritiesNewWizardPage.java | 6 +
.../wizards/TypeSystemNewWizard.java | 15 +-
.../wizards/TypeSystemNewWizardPage.java | 6 +
uimaj-ep-debug/pom.xml | 10 +-
.../java/org/apache/uima/ep_debug/DebugPlugin.java | 4 +-
uimaj-ep-jcasgen/pom.xml | 61 +-
.../uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java | 6 +
.../org/apache/uima/jcas/jcasgenp/JgPlugin.java | 16 +-
.../apache/uima/jcas/jcasgenp/JgPluginRunner.java | 15 +-
.../org/apache/uima/jcas/jcasgenp/MergerImpl.java | 11 +
.../uima/jcas/jcasgenp/ProgressMonitorImpl.java | 47 +
uimaj-ep-launcher/pom.xml | 19 +-
.../AnalysisEngineLaunchConfigurationDelegate.java | 2 +-
.../apache/uima/ep_launcher/LauncherPlugin.java | 33 +-
.../apache/uima/ep_launcher/RemoteLauncher.java | 20 +-
.../uima/ep_launcher/ui/AnalysisEngineMainTab.java | 8 +-
uimaj-ep-pear-packager/pom.xml | 18 +-
.../java/org/apache/uima/pear/PearException.java | 36 +-
.../main/java/org/apache/uima/pear/PearPlugin.java | 18 +-
.../uima/pear/actions/AddUimaNatureAction.java | 26 +-
.../actions/EditInstallationDescriptorAction.java | 20 +-
.../uima/pear/actions/GeneratePearFileAction.java | 20 +-
.../actions/PearProjectCustomizationException.java | 57 +-
.../uima/pear/generate/GeneratePearWizard.java | 42 +-
.../org/apache/uima/pear/generate/PearExport.java | 9 +-
.../uima/pear/generate/PearExportMessages.java | 12 +-
.../uima/pear/generate/PearExportOperation.java | 35 +-
.../pear/generate/PearFileResourceExportPage.java | 87 +-
.../edit/EditInstallationDescriptorWizard.java | 36 +-
.../uima/pear/insd/edit/INSDComponentPage.java | 97 +-
.../uima/pear/insd/edit/INSDEnvironmentPage.java | 99 +-
.../apache/uima/pear/insd/edit/InsdConstants.java | 12 +
.../pear/insd/edit/PearInstallationDescriptor.java | 23 +-
.../edit/vars/AbstractVarValViewerHandler.java | 97 +-
.../pear/insd/edit/vars/IVarValListViewer.java | 23 +-
.../apache/uima/pear/insd/edit/vars/VarVal.java | 34 +-
.../pear/insd/edit/vars/VarValCellModifier.java | 32 +-
.../pear/insd/edit/vars/VarValLabelProvider.java | 19 +-
.../uima/pear/insd/edit/vars/VarValList.java | 56 +-
.../uima/pear/insd/edit/vars/VarValSorter.java | 8 +-
.../pear/insd/edit/vars/VarValViewerHandler.java | 32 +-
.../apache/uima/pear/nature/ProjectCustomizer.java | 3 +-
uimaj-ep-runtime/pom.xml | 537 +-
uimaj-examples/pom.xml | 130 +-
uimaj-examples/src/main/eclipseProject/classpath | 13 +-
.../src/main/java/example/PersonTitle.java | 178 +-
.../org/apache/uima/examples/PrintAnnotations.java | 30 +-
.../main/java/org/apache/uima/examples/RunAE.java | 41 +-
.../uima/examples/SofaExampleApplication.java | 61 +-
.../uima/examples/SourceDocumentInformation.java | 449 +-
.../examples/SourceDocumentInformation_Type.java | 219 -
.../java/org/apache/uima/examples/XmlDetagger.java | 14 +-
.../uima/examples/cas/PersonTitleAnnotator.java | 49 +-
.../apache/uima/examples/cas/RegExAnnotator.java | 21 +-
.../CasMultiplierExampleApplication.java | 1 +
.../casMultiplier/SimpleTextSegmenter.java | 2 +-
.../uima/examples/cpe/AnnotationPrinter.java | 7 +
.../examples/cpe/FileSystemCollectionReader.java | 29 +-
.../uima/examples/cpe/InlineXmlCasConsumer.java | 10 +-
.../cpe/PersonTitleDBWriterCasConsumer.java | 29 +
.../org/apache/uima/examples/cpe/SimpleRunCPE.java | 29 +-
.../org/apache/uima/examples/cpe/SimpleRunCPM.java | 21 +-
.../uima/examples/cpe/XCasWriterCasConsumer.java | 34 +-
.../examples/flow/AdvancedFixedFlowController.java | 22 +-
.../examples/flow/WhiteboardFlowController2.java | 4 +-
.../apache/uima/examples/tokenizer/Sentence.java | 92 +-
.../tokenizer/SimpleTokenAndSentenceAnnotator.java | 29 +
.../org/apache/uima/examples/tokenizer/Token.java | 92 +-
.../uima/examples/xmi/Ecore2UimaTypeSystem.java | 75 +-
.../uima/examples/xmi/UimaTypeSystem2Ecore.java | 94 +-
.../uima/examples/xmi/XmiCollectionReader.java | 8 +-
.../uima/examples/xmi/XmiWriterCasConsumer.java | 9 +-
.../java/org/apache/uima/tutorial/DateAnnot.java | 138 +-
.../org/apache/uima/tutorial/DateTimeAnnot.java | 193 +-
.../java/org/apache/uima/tutorial/Meeting.java | 398 +-
.../java/org/apache/uima/tutorial/RoomNumber.java | 191 +-
.../org/apache/uima/tutorial/SentenceAnnot.java | 129 +-
.../java/org/apache/uima/tutorial/TimeAnnot.java | 138 +-
.../java/org/apache/uima/tutorial/UimaAcronym.java | 207 +-
.../java/org/apache/uima/tutorial/UimaMeeting.java | 156 +-
.../java/org/apache/uima/tutorial/WordAnnot.java | 129 +-
.../uima/tutorial/ex1/RoomNumberAnnotator.java | 16 +-
.../uima/tutorial/ex2/RoomNumberAnnotator.java | 9 +-
.../apache/uima/tutorial/ex4/MeetingAnnotator.java | 54 +-
.../uima/tutorial/ex5/RoomNumberAnnotator.java | 6 +-
.../uima/tutorial/ex6/StringMapResource_impl.java | 12 +-
.../uima/tutorial/ex6/UimaMeetingAnnotator.java | 14 +-
.../UIMA CAS Visual Debugger.launch | 80 +-
.../UIMA Document Analyzer.launch | 76 +-
.../src/main/run_configuration/UIMA JCasGen.launch | 66 +-
.../run_configuration/UIMA PEAR Installer.launch | 76 +-
.../src/main/run_configuration/UIMA Run AE.launch | 78 +-
.../src/main/run_configuration/UIMA Run CPE.launch | 78 +-
...A Run V3 migrate JCas from classes roots.launch | 29 +
...A Run V3 migrate JCas from sources roots.launch | 29 +
.../main/run_configuration/UIMA Start VNS.launch | 64 +-
.../UIMA Start Vinci Service.launch | 78 +-
uimaj-jet-expander/Readme.txt | 8 +-
.../src/org/apache/uima/util/jet/JetExpander.java | 17 +-
uimaj-json/pom.xml | 25 +-
.../org/apache/uima/json/JsonCasSerializer.java | 581 +-
.../impl/JsonContentHandlerJacksonWrapper.java | 8 +-
.../apache/uima/json/JsonCasSerializerTest.java | 20 +-
.../apache/uima/json/JsonMetaDataObjectTest.java | 18 +-
.../apache/uima/json/JsonXmiCasSerializerTest.java | 2 +
.../resource/metadata/impl/TestFruitBagObject.java | 2 +-
.../resource/metadata/impl/TestFruitObject.java | 4 +-
.../test/java/org/apache/uima/test/AllTypes.java | 471 +-
.../java/org/apache/uima/test/AllTypes_Type.java | 980 ---
.../test/java/org/apache/uima/test/RefTypes.java | 96 +-
.../java/org/apache/uima/test/RefTypes_Type.java | 176 -
.../expected/json/allValuesNoOmits.txt | 9 +-
.../expected/json/allValuesOmits.txt | 9 +-
.../expected/json/allValuesStaticNoOmits.txt | 14 +-
.../expected/json/array-a1-not-a.txt | 10 +-
.../expected/json/array-a1-not-l.txt | 21 +-
.../expected/json/array-a2-not-a.txt | 10 +-
.../expected/json/array-a2-not-l.txt | 20 +-
.../expected/json/array-a3-not-a.txt | 10 +-
.../expected/json/array-a3-not-l.txt | 18 +-
.../expected/json/array-all-embeddable-a.txt | 10 +-
.../expected/json/array-all-embeddable-l.txt | 21 +-
.../expected/json/array-non-embeddable-a.txt | 10 +-
.../expected/json/array-non-embeddable-l.txt | 17 +-
.../json/array-self-items-all-embeddable-a.txt | 14 +-
.../json/array-self-items-all-embeddable-l.txt | 18 +-
.../expected/json/array-self-non-embeddable-a.txt | 14 +-
.../expected/json/array-self-non-embeddable-l.txt | 17 +-
.../expected/json/indexedAndRef.txt | 6 +-
.../expected/json/indexedSingleList.txt | 2 +-
.../expected/json/indexedSingleListStatic.txt | 6 +-
.../expected/json/multipleViews.txt | 18 +-
.../expected/json/nameSpaceCollision.txt | 2 +-
.../expected/json/nameSpaceCollision2.txt | 2 +-
.../expected/json/nameSpaceCollision2Omits.txt | 2 +-
.../expected/json/nameSpaceCollision2pp.txt | 8 +-
.../expected/json/nameSpaceCollision2ppOmits.txt | 8 +-
.../expected/json/nameSpaceCollisionOmits.txt | 2 +-
.../expected/json/nameSpaceCollsionFiltered.txt | 2 +-
.../expected/json/nameSpaceNoCollsionFiltered.txt | 2 +-
.../expected/json/topAndTokenOnly.txt | 2 +-
.../expected/json/topAndTokenOnlyNoContext.txt | 2 +-
.../json/topAndTokenOnlyNoExpandedTypeNames.txt | 2 +-
.../expected/json/topAndTokenOnlyNoSubtypes.txt | 2 +-
.../expected/json/topWithDefaultViewOmits.txt | 2 +-
.../expected/json/topWithNamedViewOmits.txt | 2 +-
.../expected/json/twoListMerge.txt | 6 +-
.../expected/json/twoListMergeStatic.txt | 8 +-
.../expected/xmi/allValuesNoOmits.xml | 20 +-
.../expected/xmi/allValuesOmits.xml | 20 +-
.../expected/xmi/allValuesStaticNoOmits.xml | 20 +-
.../expected/xmi/array-a1-not-a.xml | 16 +-
.../expected/xmi/array-a1-not-l.xml | 16 +-
.../expected/xmi/array-a2-not-a.xml | 16 +-
.../expected/xmi/array-a2-not-l.xml | 16 +-
.../expected/xmi/array-a3-not-a.xml | 16 +-
.../expected/xmi/array-a3-not-l.xml | 16 +-
.../expected/xmi/array-all-embeddable-a.xml | 16 +-
.../expected/xmi/array-all-embeddable-l.xml | 16 +-
.../expected/xmi/array-non-embeddable-a.xml | 16 +-
.../expected/xmi/array-non-embeddable-l.xml | 16 +-
.../xmi/array-self-items-all-embeddable-a.xml | 18 +-
.../xmi/array-self-items-all-embeddable-l.xml | 24 +-
.../expected/xmi/array-self-non-embeddable-a.xml | 18 +-
.../expected/xmi/array-self-non-embeddable-l.xml | 24 +-
.../CasSerialization/expected/xmi/emptyCAS.xml | 2 +-
.../expected/xmi/indexedAndRef.xml | 12 +-
.../expected/xmi/indexedSingleList.xml | 12 +-
.../expected/xmi/indexedSingleListStatic.xml | 12 +-
.../expected/xmi/multipleViews.xml | 35 +-
.../expected/xmi/nameSpaceCollision.xml | 2 +-
.../expected/xmi/nameSpaceCollision2.xml | 2 +-
.../expected/xmi/nameSpaceCollision2Omits.xml | 2 +-
.../expected/xmi/nameSpaceCollision2pp.xml | 16 +-
.../expected/xmi/nameSpaceCollision2ppOmits.xml | 16 +-
.../expected/xmi/nameSpaceCollisionOmits.xml | 2 +-
.../expected/xmi/nameSpaceCollsionFiltered.xml | 2 +-
.../expected/xmi/nameSpaceNoCollsionFiltered.xml | 2 +-
.../expected/xmi/topAndTokenOnly.xml | 2 +-
.../expected/xmi/topAndTokenOnlyNoContext.xml | 2 +-
.../xmi/topAndTokenOnlyNoExpandedTypeNames.xml | 2 +-
.../expected/xmi/topAndTokenOnlyNoSubtypes.xml | 2 +-
.../expected/xmi/topExpandedNamesNoViews.xml | 2 +-
.../CasSerialization/expected/xmi/topNoContext.xml | 2 +-
.../expected/xmi/topNoExpandedTypeNames.xml | 2 +-
.../expected/xmi/topWithDefaultViewOmits.xml | 2 +-
.../expected/xmi/topWithNamedViewOmits.xml | 2 +-
.../CasSerialization/expected/xmi/twoListMerge.xml | 14 +-
.../expected/xmi/twoListMergeStatic.xml | 14 +-
uimaj-parent/pom.xml | 160 +-
uimaj-parent/src/main/groovy/api-report.groovy | 5 +-
uimaj-test-util/pom.xml | 20 +-
.../uima/test/junit_extension/FileCompare.java | 31 +-
uimaj-tools/pom.xml | 19 +-
.../uima/tools/AnnotationFeaturesViewer.java | 32 +
.../apache/uima/tools/AnnotationViewerMain.java | 40 +-
.../src/main/java/org/apache/uima/tools/RunAE.java | 51 +-
.../org/apache/uima/tools/ValidateDescriptor.java | 3 +-
.../org/apache/uima/tools/annot_view/Gladis.java | 1 +
.../tools/components/InlineXmlCasConsumer.java | 3 +-
.../tools/components/XCasWriterCasConsumer.java | 10 +-
.../tools/components/XmiWriterCasConsumer.java | 9 +-
.../apache/uima/tools/cpm/AnalysisEnginePanel.java | 44 +
.../org/apache/uima/tools/cpm/ConfigField.java | 54 +-
.../org/apache/uima/tools/cpm/ConsumerPanel.java | 43 +
.../java/org/apache/uima/tools/cpm/CpmFrame.java | 31 +
.../java/org/apache/uima/tools/cpm/CpmPanel.java | 281 +-
.../uima/tools/cpm/ElapsedTimeFormatter.java | 11 +
.../uima/tools/cpm/JTabbedPaneWithCloseIcons.java | 52 +
.../org/apache/uima/tools/cpm/MetaDataPanel.java | 43 +-
.../uima/tools/cpm/PerformanceReportDialog.java | 23 +
.../apache/uima/tools/cpm/TabClosedListener.java | 15 +-
.../cvd/AnnotationDisplayCustomizationFrame.java | 118 +
.../apache/uima/tools/cvd/AnnotationExtent.java | 28 +-
.../java/org/apache/uima/tools/cvd/ArrayNode.java | 29 +
.../org/apache/uima/tools/cvd/AutoFoldingMenu.java | 19 +
.../main/java/org/apache/uima/tools/cvd/CVD.java | 43 +
.../java/org/apache/uima/tools/cvd/ColorIcon.java | 19 +
.../java/org/apache/uima/tools/cvd/FSNode.java | 427 +-
.../org/apache/uima/tools/cvd/FSTreeModel.java | 213 +-
.../java/org/apache/uima/tools/cvd/FSTreeNode.java | 28 +-
.../org/apache/uima/tools/cvd/IndexTreeNode.java | 23 +
.../org/apache/uima/tools/cvd/LogFileViewer.java | 38 +-
.../java/org/apache/uima/tools/cvd/MainFrame.java | 686 +-
.../org/apache/uima/tools/cvd/MarkupExtent.java | 25 +
.../uima/tools/cvd/MultiAnnotViewerFrame.java | 45 +
.../org/apache/uima/tools/cvd/MultiMarkup.java | 45 +-
.../org/apache/uima/tools/cvd/RecentFilesList.java | 10 +-
.../uima/tools/cvd/StringFsPopupEventAdapter.java | 27 +
.../org/apache/uima/tools/cvd/TypeTreeNode.java | 15 +
.../uima/tools/cvd/control/AboutHandler.java | 15 +-
.../uima/tools/cvd/control/AboutUimaHandler.java | 14 +
.../uima/tools/cvd/control/AddLanguageHandler.java | 14 +
.../cvd/control/AnnotatorOpenEventHandler.java | 14 +
.../cvd/control/AnnotatorRerunEventHandler.java | 14 +
.../cvd/control/AnnotatorRunCPCEventHandler.java | 14 +
.../cvd/control/AnnotatorRunOnCasEventHandler.java | 14 +
.../uima/tools/cvd/control/CaretChangeHandler.java | 11 +
.../cvd/control/CloseAnnotationViewHandler.java | 11 +
.../tools/cvd/control/CloseLogViewHandler.java | 14 +
.../tools/cvd/control/CloseTypeSystemHandler.java | 14 +
.../tools/cvd/control/ColorPrefsOpenHandler.java | 14 +
.../tools/cvd/control/ColorPrefsSaveHandler.java | 14 +
.../tools/cvd/control/FSTreeSelectionListener.java | 13 +
.../tools/cvd/control/FileOpenEventHandler.java | 14 +
.../tools/cvd/control/FileSaveAsEventHandler.java | 14 +
.../tools/cvd/control/FileSaveEventHandler.java | 14 +
.../uima/tools/cvd/control/FocusFSAction.java | 12 +
.../uima/tools/cvd/control/FocusIRAction.java | 12 +
.../uima/tools/cvd/control/FocusTextAction.java | 12 +
.../apache/uima/tools/cvd/control/HelpHandler.java | 14 +
.../uima/tools/cvd/control/IndexPopupListener.java | 29 +
.../cvd/control/IndexTreeSelectionListener.java | 13 +
.../control/LoadRecentDescFileEventHandler.java | 17 +
.../control/LoadRecentTextFileEventHandler.java | 17 +
.../uima/tools/cvd/control/MainFrameClosing.java | 16 +
.../uima/tools/cvd/control/ManualHandler.java | 18 +
.../tools/cvd/control/NewTextEventHandler.java | 11 +
.../uima/tools/cvd/control/PopupHandler.java | 13 +
.../uima/tools/cvd/control/PopupListener.java | 22 +
.../tools/cvd/control/RemoveLanguageHandler.java | 14 +
.../cvd/control/RestoreLangDefaultsHandler.java | 14 +
.../uima/tools/cvd/control/SetCodePageHandler.java | 14 +
.../uima/tools/cvd/control/SetDataPathHandler.java | 14 +
.../uima/tools/cvd/control/SetLanguageHandler.java | 14 +
.../tools/cvd/control/SetLogConfigHandler.java | 11 +
.../cvd/control/ShowAnnotatedTextHandler.java | 11 +
.../control/ShowAnnotationCustomizerHandler.java | 14 +
.../tools/cvd/control/ShowTypesystemHandler.java | 13 +
.../tools/cvd/control/SofaSelectionListener.java | 22 +
.../uima/tools/cvd/control/SystemExitHandler.java | 14 +
.../tools/cvd/control/TextChangedListener.java | 18 +
.../tools/cvd/control/TextContextMenuAction.java | 12 +
.../uima/tools/cvd/control/TextFocusHandler.java | 12 +
.../uima/tools/cvd/control/TreeFocusHandler.java | 18 +
.../control/TypeSystemFileOpenEventHandler.java | 11 +
.../org/apache/uima/tools/cvd/control/UndoMgr.java | 20 +
.../cvd/control/XCASFileOpenEventHandler.java | 11 +
.../uima/tools/cvd/control/XCASSaveHandler.java | 14 +
.../uima/tools/cvd/control/XCASSaveTSHandler.java | 14 +
.../tools/cvd/control/XmiCasFileOpenHandler.java | 11 +
.../uima/tools/cvd/control/XmiCasSaveHandler.java | 13 +-
.../uima/tools/cvd/tsview/FeatureTableModel.java | 33 +
.../apache/uima/tools/cvd/tsview/MainFrame.java | 77 +
.../tools/docanalyzer/AnnotationViewerDialog.java | 115 +-
.../uima/tools/docanalyzer/DocumentAnalyzer.java | 182 +-
.../uima/tools/docanalyzer/FileSelector.java | 85 +
.../tools/docanalyzer/FileSelectorListener.java | 20 +
.../uima/tools/docanalyzer/PrefsMediator.java | 127 +-
.../uima/tools/docanalyzer/TfDocumentListener.java | 12 +
.../tools/docanalyzer/TfFileSelectorListener.java | 10 +
.../uima/tools/docanalyzer/TfFocusListener.java | 11 +
.../java/org/apache/uima/tools/jcasgen/GUI.java | 87 +-
.../apache/uima/tools/jcasgen/GuiErrorImpl.java | 8 +
.../uima/tools/jcasgen/GuiProgressMonitor.java | 40 +
.../java/org/apache/uima/tools/jcasgen/IError.java | 15 +
.../java/org/apache/uima/tools/jcasgen/IMerge.java | 17 +
.../uima/tools/jcasgen/IProgressMonitor.java | 24 +
.../uima/tools/jcasgen/JCasTypeTemplate.java | 313 +-
.../uima/tools/jcasgen/JCas_TypeTemplate.java | 224 -
.../java/org/apache/uima/tools/jcasgen/Jg.java | 701 +-
.../uima/tools/jcasgen/LogThrowErrorImpl.java | 7 +
.../java/org/apache/uima/tools/jcasgen/Prefs.java | 16 +
.../org/apache/uima/tools/jcasgen/TypeInfo.java | 23 +
.../tools/jcasgen/UimaLoggerProgressMonitor.java | 40 +
.../java/org/apache/uima/tools/jcasgen/Waiter.java | 13 +
.../org/apache/uima/tools/jcasgen/package.html | 10 +-
.../uima/tools/migration/IbmUimaToApacheUima.java | 399 --
.../uima/tools/pear/install/InstallPear.java | 66 +-
.../uima/tools/pear/install/InstallPearCli.java | 15 +
.../apache/uima/tools/pear/merger/PMUimaAgent.java | 23 +-
.../apache/uima/tools/stylemap/AnTreeListener.java | 17 +-
.../tools/stylemap/AnnotationFeaturesViewer.java | 46 +
.../apache/uima/tools/stylemap/ColorEditor.java | 25 +
.../apache/uima/tools/stylemap/ColorParser.java | 42 +-
.../apache/uima/tools/stylemap/ColorRenderer.java | 16 +
.../uima/tools/stylemap/LabelCellEditor.java | 13 +
.../apache/uima/tools/stylemap/MyCellRenderer.java | 19 +
.../apache/uima/tools/stylemap/StyleConstants.java | 13 +
.../apache/uima/tools/stylemap/StyleMapEditor.java | 85 +-
.../apache/uima/tools/stylemap/StyleMapEntry.java | 64 +-
.../apache/uima/tools/stylemap/StyleMapTable.java | 16 +
.../uima/tools/stylemap/StyleMapTableModel.java | 70 +
.../uima/tools/stylemap/StyleMapXmlParser.java | 25 +
.../uima/tools/stylemap/TableDropAdapter.java | 17 +
.../uima/tools/stylemap/TableGUIMediator.java | 44 +
.../tools/stylemap/TableSelectionListener.java | 22 +
.../apache/uima/tools/util/gui/AboutDialog.java | 11 +
.../org/apache/uima/tools/util/gui/Caption.java | 8 +
.../tools/util/gui/FileChooserBugWorkarounds.java | 2 +
.../apache/uima/tools/util/gui/FileSelector.java | 54 +
.../uima/tools/util/gui/FileSelectorListener.java | 20 +
.../org/apache/uima/tools/util/gui/FormPanel.java | 37 +
.../apache/uima/tools/util/gui/ImageButton.java | 15 +
.../apache/uima/tools/util/gui/IntegerField.java | 20 +-
.../apache/uima/tools/util/gui/ListSelector.java | 48 +-
.../apache/uima/tools/util/gui/SliderField.java | 44 +-
.../uima/tools/util/gui/SpringUtilities.java | 18 +-
.../tools/util/gui/TransportControlListener.java | 24 +
.../uima/tools/util/gui/TransportControlPanel.java | 72 +
.../apache/uima/tools/util/gui/XMLFileFilter.java | 17 +
.../util/htmlview/AnnotationViewGenerator.java | 29 +-
.../uima/tools/viewer/CasAnnotationViewer.java | 442 +-
.../tools/viewer/CasAnnotationViewerApplet.java | 13 +-
.../apache/uima/tools/viewer/CasTreeViewer.java | 38 +-
.../uima/tools/viewer/CasTreeViewerApplet.java | 12 +-
.../apache/uima/tools/viewer/EntityResolver.java | 1 +
.../includedTemplates/Annotation_Methods.javajet | 31 -
.../includedTemplates/FeatOk_Testing.javajet | 23 -
.../javajet/jcasgen/templates/JCasType.javajet | 130 +-
.../javajet/jcasgen/templates/JCas_Type.javajet | 152 -
.../uima/tools/viewer/CasAnnotationViewerTest.java | 22 +-
.../pearMergerTests/uima.example.DateTime.pear | Bin 38739 -> 23089 bytes
.../pearMergerTests/uima.example.RoomNumber.pear | Bin 35950 -> 10437 bytes
uimaj-v3migration-jcas/pom.xml | 97 +
.../apache/uima/migratev3/jcas/MigrateJCas.java | 3560 +++++++++
... V3 migrate JCas from classes roots test.launch | 32 +
... V3 migrate JCas from sources roots test.launch | 32 +
.../v2_jcas_compiled/example/PersonTitle.class | Bin 0 -> 2220 bytes
.../example/PersonTitle_Type$1.class | Bin 0 -> 1442 bytes
.../example/PersonTitle_Type.class | Bin 0 -> 2867 bytes
.../uima/examples/SourceDocumentInformation.class | Bin 0 -> 3844 bytes
.../uima/examples/SourceDocumentInformation.xml | 58 +
.../SourceDocumentInformation_Type$1.class | Bin 0 -> 1501 bytes
.../examples/SourceDocumentInformation_Type.class | Bin 0 -> 4571 bytes
...vancedFixedFlowController$FixedFlowObject.class | Bin 0 -> 4611 bytes
.../flow/AdvancedFixedFlowController.class | Bin 0 -> 4640 bytes
.../WhiteboardFlowController$WhiteboardFlow.class | Bin 0 -> 4438 bytes
.../examples/flow/WhiteboardFlowController.class | Bin 0 -> 1800 bytes
.../flow/WhiteboardFlowController2$1.class | Bin 0 -> 283 bytes
.../WhiteboardFlowController2$ComponentInfo.class | Bin 0 -> 728 bytes
.../WhiteboardFlowController2$WhiteboardFlow.class | Bin 0 -> 3557 bytes
.../examples/flow/WhiteboardFlowController2.class | Bin 0 -> 4653 bytes
.../apache/uima/examples/tokenizer/Sentence.class | Bin 0 -> 1143 bytes
.../uima/examples/tokenizer/Sentence_Type$1.class | Bin 0 -> 1607 bytes
.../uima/examples/tokenizer/Sentence_Type.class | Bin 0 -> 2079 bytes
.../SimpleTokenAndSentenceAnnotator$1.class | Bin 0 -> 933 bytes
.../SimpleTokenAndSentenceAnnotator$2.class | Bin 0 -> 930 bytes
.../SimpleTokenAndSentenceAnnotator$Maker.class | Bin 0 -> 607 bytes
.../SimpleTokenAndSentenceAnnotator.class | Bin 0 -> 2673 bytes
.../org/apache/uima/examples/tokenizer/Token.class | Bin 0 -> 1134 bytes
.../uima/examples/tokenizer/Token_Type$1.class | Bin 0 -> 1583 bytes
.../uima/examples/tokenizer/Token_Type.class | Bin 0 -> 2055 bytes
.../org/apache/uima/jcas/cas/AnnotationBase.class | Bin 0 -> 2241 bytes
.../apache/uima/jcas/cas/AnnotationBase_Type.class | Bin 0 -> 2489 bytes
.../org/apache/uima/jcas/cas/TOP.class | Bin 0 -> 3864 bytes
.../org/apache/uima/jcas/cas/TOP_Type.class | Bin 0 -> 3193 bytes
.../org/apache/uima/tutorial/DateAnnot.class | Bin 0 -> 1285 bytes
.../apache/uima/tutorial/DateAnnot_Type$1.class | Bin 0 -> 1545 bytes
.../org/apache/uima/tutorial/DateAnnot_Type.class | Bin 0 -> 1792 bytes
.../org/apache/uima/tutorial/DateTimeAnnot.class | Bin 0 -> 2377 bytes
.../uima/tutorial/DateTimeAnnot_Type$1.class | Bin 0 -> 1577 bytes
.../apache/uima/tutorial/DateTimeAnnot_Type.class | Bin 0 -> 3057 bytes
.../org/apache/uima/tutorial/Meeting.class | Bin 0 -> 4951 bytes
.../org/apache/uima/tutorial/Meeting_Type$1.class | Bin 0 -> 1529 bytes
.../org/apache/uima/tutorial/Meeting_Type.class | Bin 0 -> 4361 bytes
.../org/apache/uima/tutorial/RoomNumber.class | Bin 0 -> 2311 bytes
.../apache/uima/tutorial/RoomNumber_Type$1.class | Bin 0 -> 1553 bytes
.../org/apache/uima/tutorial/RoomNumber_Type.class | Bin 0 -> 2990 bytes
.../org/apache/uima/tutorial/SentenceAnnot.class | Bin 0 -> 1295 bytes
.../uima/tutorial/SentenceAnnot_Type$1.class | Bin 0 -> 1577 bytes
.../apache/uima/tutorial/SentenceAnnot_Type.class | Bin 0 -> 1822 bytes
.../org/apache/uima/tutorial/TimeAnnot.class | Bin 0 -> 1285 bytes
.../apache/uima/tutorial/TimeAnnot_Type$1.class | Bin 0 -> 1545 bytes
.../org/apache/uima/tutorial/TimeAnnot_Type.class | Bin 0 -> 1792 bytes
.../org/apache/uima/tutorial/UimaAcronym.class | Bin 0 -> 2543 bytes
.../apache/uima/tutorial/UimaAcronym_Type$1.class | Bin 0 -> 1561 bytes
.../apache/uima/tutorial/UimaAcronym_Type.class | Bin 0 -> 3026 bytes
.../org/apache/uima/tutorial/UimaMeeting.class | Bin 0 -> 1783 bytes
.../apache/uima/tutorial/UimaMeeting_Type$1.class | Bin 0 -> 1561 bytes
.../apache/uima/tutorial/UimaMeeting_Type.class | Bin 0 -> 1802 bytes
.../org/apache/uima/tutorial/WordAnnot.class | Bin 0 -> 1283 bytes
.../apache/uima/tutorial/WordAnnot_Type$1.class | Bin 0 -> 1545 bytes
.../org/apache/uima/tutorial/WordAnnot_Type.class | Bin 0 -> 1790 bytes
.../test/v2_jcas_sources}/example/PersonTitle.java | 0
.../v2_jcas_sources}/example/PersonTitle_Type.java | 0
.../apache/uima/examples/tokenizer/Sentence.java | 0
.../uima/examples/tokenizer/Sentence_Type.java | 0
.../tokenizer/SimpleTokenAndSentenceAnnotator.java | 0
.../org/apache/uima/examples/tokenizer/Token.java | 0
.../apache/uima/examples/tokenizer/Token_Type.java | 0
.../org/apache/uima/tutorial/DateAnnot.java | 89 +
.../org/apache/uima/tutorial/DateAnnot_Type.java | 0
.../org/apache/uima/tutorial/DateTimeAnnot.java | 118 +
.../apache/uima/tutorial/DateTimeAnnot_Type.java | 0
.../org/apache/uima/tutorial/Meeting.java | 213 +
.../org/apache/uima/tutorial/Meeting_Type.java | 0
.../org/apache/uima/tutorial/RoomNumber.java | 115 +
.../org/apache/uima/tutorial/RoomNumber_Type.java | 0
.../org/apache/uima/tutorial/SentenceAnnot.java | 90 +
.../apache/uima/tutorial/SentenceAnnot_Type.java | 0
.../org/apache/uima/tutorial/TimeAnnot.java | 89 +
.../org/apache/uima/tutorial/TimeAnnot_Type.java | 0
.../org/apache/uima/tutorial/UimaAcronym.java | 122 +
.../org/apache/uima/tutorial/UimaAcronym_Type.java | 0
.../org/apache/uima/tutorial/UimaMeeting.java | 94 +
.../org/apache/uima/tutorial/UimaMeeting_Type.java | 0
.../org/apache/uima/tutorial/WordAnnot.java | 90 +
.../org/apache/uima/tutorial/WordAnnot_Type.java | 0
unused-saved/README.txt | 3 +
.../apache/uima/cas/impl/AnnotationIndexImpl.java | 221 +
.../cas/impl/FSIteratorWrapperDoubleCheck.java | 156 +
.../apache/uima/cas/impl/FSListIteratorImpl.java | 161 +
.../src/org/apache/uima/cas/impl/FSRBTIndex.java | 151 +
.../org/apache/uima/cas/impl/FeatureArrayImpl.java | 59 +
.../apache/uima/cas/impl/FeatureGetter_int.java | 26 +
.../apache/uima/cas/impl/FeatureGetter_ref.java | 26 +
.../apache/uima/cas/impl/FeatureSetter_int.java | 25 +
.../apache/uima/cas/impl/FeatureSetter_ref.java | 25 +
.../uima/cas/impl/FeatureStructureClassGen.java | 489 ++
.../src/org/apache/uima/cas/impl/FsIndex_aggr.java | 233 +
.../uima/cas/impl/FsIterator_set_sorted.java | 264 +
.../impl/FsIterator_set_sorted_navset_version.java | 270 +
.../apache/uima/cas/impl/FsIterator_subtypes.java | 58 +
.../cas/impl/FsIterator_subtypes_list_unused.java | 34 +
.../uima/cas/impl/JCasCoverClassFactoryTest.java | 61 +
.../src/org/apache/uima/cas/impl/TypeImplList.java | 36 +
.../src/org/apache/uima/cas/impl/TypeImplMap.java | 45 +
.../impl/XXXdont_use_JCasCoverClassFactory.java | 505 ++
.../impl/JCasCoverClassFactoryTest.java | 64 +
.../util/ComparableIntPointerIterator.java | 47 +
.../apache/uima/internal/util/Int2IntHashMap.java | 517 ++
.../uima/internal/util/Int2IntHashMapTest.java | 87 +
.../apache/uima/internal/util/Int2IntPerfTest.java | 153 +
.../internal/util/UIMATypeSystemClassLoader.java | 154 +
.../util/UIMATypeSystemClassLoaderInjector.java | 120 +
.../org/apache/uima/jcas/cas/JavaObjectArray.java | 193 +
.../src/org/apache/uima/jcas/impl/CASMetadata.java | 41 +
.../uima/jcas/impl/JCasCoverClassFactory.java | 352 +
.../uima/jcas/impl/JCasCoverClassFactoryTest.java | 61 +
.../src/org/apache/uima/jcas/impl/JCasHashMap.java | 444 ++
.../uima/jcas/impl/JCasHashMapCompareTest.java | 198 +
.../apache/uima/jcas/impl/JCasHashMapSubMap.java | 0
.../org/apache/uima/jcas/impl/JCasHashMapTest.java | 468 ++
.../apache/uima/jcasgen/JCasClassDefinition.java | 67 +
.../uima/jcasgen/impl/JCasClassConversion.java | 254 +
.../src/org/apache/uima/jcasgen/impl/package.html | 36 +
.../src/org/apache/uima/jcasgen/package.html | 38 +
.../uima/tools/jcas/internal/AnalyzeContent.java | 345 +
.../uima/tools/jcasgen/DecompiledFilter.java | 156 +
.../src/study/asm/decompiled/AnnotationDumpV3.java | 284 +
1535 files changed, 110070 insertions(+), 55019 deletions(-)
diff --cc uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java
index 20c49d5,33ece45..a4497e7
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java
@@@ -144,11 -166,13 +168,14 @@@ public class VinciAnalysisEngineService
/**
+ * Call get meta data.
+ *
+ * @return the resource meta data
+ * @throws ResourceServiceException the resource service exception
* @see ResourceServiceStub#callGetMetaData()
- * @return -
*/
- public ResourceMetaData callGetMetaData() throws ResourceServiceException {
+ @Override
+public ResourceMetaData callGetMetaData() throws ResourceServiceException {
try {
// create Vinci Frame
VinciFrame queryFrame = new VinciFrame();
@@@ -196,12 -220,13 +223,14 @@@
}
/**
- * @see AnalysisEngineServiceStub#callProcess(CAS)
- * @param aCAS theCAS
+ * Call process.
+ *
+ * @param aCAS the a CAS
* @throws ResourceServiceException the resource service exception
+ * @see AnalysisEngineServiceStub#callProcess(CAS)
*/
- public void callProcess(CAS aCAS) throws ResourceServiceException {
+ @Override
+public void callProcess(CAS aCAS) throws ResourceServiceException {
doProcess(aCAS);
}
@@@ -247,18 -276,21 +281,23 @@@
}
/**
+ * Destroy.
+ *
* @see ResourceServiceStub#destroy()
*/
- public void destroy() {
+ @Override
+public void destroy() {
mVinciClient.close();
}
/**
+ * Call batch process complete.
+ *
+ * @throws ResourceServiceException the resource service exception
* @see CasObjectProcessor#batchProcessComplete(org.apache.uima.util.ProcessTrace)
*/
- public void callBatchProcessComplete() throws ResourceServiceException {
+ @Override
+public void callBatchProcessComplete() throws ResourceServiceException {
try {
// create Vinci Frame ( Data Cargo)
AFrame queryFrame = new AFrame();
@@@ -272,10 -304,12 +311,13 @@@
}
/**
+ * Call collection process complete.
+ *
+ * @throws ResourceServiceException the resource service exception
* @see CasObjectProcessor#collectionProcessComplete(org.apache.uima.util.ProcessTrace)
*/
- public void callCollectionProcessComplete() throws ResourceServiceException {
+ @Override
+public void callCollectionProcessComplete() throws ResourceServiceException {
try {
// create Vinci Frame ( Data Cargo)
AFrame queryFrame = new AFrame();
diff --cc uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java
index fb81e09,6ea13d3..d6302bf
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java
@@@ -214,10 -223,10 +223,11 @@@ public class VinciAnalysisEngineService
* a VinciFrame containing client request
* @return {@link org.apache.vinci.transport.Transportable} - a VinciFrame containg result of
* performing the service
+ * @throws ServiceException the service exception
*/
- public Transportable eval(Transportable doc) throws ServiceException {
+ @Override
+public Transportable eval(Transportable doc) throws ServiceException {
try {
CASTransportable ct = (CASTransportable) doc;
String op = ct.getCommand();
@@@ -404,11 -428,13 +429,13 @@@
}
/**
+ * Make transportable.
+ *
+ * @return the transportable
* @see org.apache.vinci.transport.TransportableFactory#makeTransportable()
*/
+ @Override
- public synchronized Transportable makeTransportable() {
+ public synchronized Transportable makeTransportable() {
return new CASTransportable(mCasPool, new OutOfTypeSystemData(), null, false);
}
--
}
diff --cc uimaj-core/pom.xml
index 5c0a75a,3f88dfe..a721186
--- a/uimaj-core/pom.xml
+++ b/uimaj-core/pom.xml
@@@ -112,24 -178,53 +178,47 @@@
<version>8.7</version>
<scope>test</scope>
</dependency>
+ -->
+
+ <!-- For decompiling recompiling jcas experiments -->
+ <!--
+ <dependency>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>4.4.2</version>
+ </dependency>
+ -->
+
+ <!-- needed for UimaDecompiler class-->
+ <dependency> <!-- Apache v2 license 2016 checked -->
+ <groupId>org.bitbucket.mstrobel</groupId>
+ <artifactId>procyon-compilertools</artifactId>
+ <version>0.5.32</version>
+ </dependency>
+
+ <!-- Apache v2 license 2016 checked. Also transitive include from above,
+ listed here so that binary assembly for distribution includes the jar -->
+ <dependency>
+ <groupId>org.bitbucket.mstrobel</groupId>
+ <artifactId>procyon-core</artifactId>
+ <version>0.5.32</version>
+ </dependency>
+
+ <!-- for reading / transforming / generating JCas cover classes -->
+ <!-- <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>5.0.4</version>
+ </dependency>
- <dependency> jackson stuff moved to uimaj-json project
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.4.2</version>
- </dependency>
- -->
- <!-- This next dependency is used to enable findbug rule suppression annotations
- Currently commented out - till more thought given to this.
- For instance, we don't want to accidentally distribute this dependency in builds
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>annotations</artifactId>
- <version>2.0.0</version>
- <scope>compile</scope>
- </dependency>
- -->
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>5.0.4</version>
+ </dependency>
+ -->
-
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
+
<build>
<finalName>uima-core</finalName>
<pluginManagement>
diff --cc uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java
index 4838f1d,87dab2d..dc6b3cc
--- a/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java
@@@ -52,19 -56,20 +56,19 @@@ import org.apache.uima.jcas.cas.TOP
*
* <p>
* A bag index finally simply stores everything, without any guaranteed order.
- * Note that any operation like find() or
- * FSIterator.moveTo() will not produce useful results on bag indexes, since bag indexes do not
- * honor comparators (except that find is useful for indicating if the FS is in the index).
- * Only use a bag index if you want very fast adding and will have to iterate
- * over the whole index anyway.
+ * Operations that depend on comparison, such as find(FeatureStructure fs) or
+ * FSIterator.moveTo(FeatureStructure fs) only compare for equality using FeatureStructure identity,
+ * since no ordering relationship is possible with bag indexes.
*
* <p>
- * Indexes have a top-most type, either the top of the type hierarchy, or some subtype of that.
- * The top-most type in an index is represented by the generic T.
+ * Indexes have a top-most type; let's call it T. They store only instances of that type or its subtypes.
+ * A given index definition specifies this top-most type. The APIs for obtaining an index
+ * include the ability to specify, in addition, a type T2 which is a subtype of T; indexes obtained
+ * using this will have only instances of type T2 or its subtypes.
*
- * @param T the topmost type in this Index
- *
+ * @param <T> the topmost type in this Index
*/
- public interface FSIndex<T extends FeatureStructure> extends Iterable<T> {
+ public interface FSIndex<T extends FeatureStructure> extends Collection<T> {
/**
* Indexing strategy: sorted index. A sorted index contains all elements, including duplicates.
diff --cc uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
index af97f65,71848eb..dff3e8f
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
@@@ -814,10 -1579,13 +1579,10 @@@ public class CASImpl extends AbstractCa
setSofaIndexRepository(aSofa.getSofaRef(), indxRepos);
}
- void setSofaIndexRepository(int aSofaRef, FSIndexRepository indxRepos) {
- this.svd.sofa2indexMap.put(Integer.valueOf(aSofaRef), indxRepos);
+ void setSofaIndexRepository(int aSofaRef, FSIndexRepositoryImpl indxRepos) {
+ Misc.setWithExpand(this.svd.sofa2indexMap, aSofaRef, indxRepos);
}
- /**
- * @deprecated
- */
@Override
@Deprecated
public SofaFS createSofa(SofaID sofaID, String mimeType) {
diff --cc uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
index 8734b0c,fbbf510..e8bb34b
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
@@@ -84,10 -369,12 +369,12 @@@ public class TypeImpl implements Type,
* particular order.
*
* @return The vector.
- * @deprecated use getFeatures()
++ * @deprecated use {@link #getFeatures()}
*/
+ @Override
@Deprecated
public Vector<Feature> getAppropriateFeatures() {
- return new Vector<Feature>(getFeatures());
+ return new Vector<>(getFeatures());
}
@@@ -192,8 -463,21 +463,21 @@@
void setInheritanceFinal() {
this.isInheritanceFinal = true;
}
-
+
- @Deprecated
+ void setBuiltIn() {
+ this.isBuiltIn = true;
+ }
+
+ public boolean isLongOrDouble() {
+ return this.isLongOrDouble;
+ }
+
+ /**
+ * @deprecated use getFeatureByBaseName instead
+ * @param featureName -
+ * @return -
+ */
+ @Deprecated
public Feature getFeature(String featureName) {
return getFeatureByBaseName(featureName);
}
diff --cc uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
index 8ef9bf3,c196793..5bcc51f
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
@@@ -516,81 -755,31 +755,30 @@@ public class TypeSystemImpl implements
return ((TypeImpl) t).getSuperType();
}
- @Override
- public int ll_getParentType(int typeCode) {
- return this.parents.get(typeCode);
- }
--
- /**
- * Given a component type, return the parent type of the corresponding array type,
- * without needing the corresponding array type to exist (yet).
- * component type -> (member of) array type -> UIMA parent type of that array type.
- *
- * The UIMA Type parent of an array is either
- * ArrayBase (for primitive arrays, plus String[] and TOP[] (see below)
- * FsArray - for XYZ[] reference kinds of arrays
- *
- * The UIMA parent chain goes like this:
- * primitive_array -> ArrayBase -> TOP (primitive: boolean, byte, short, int, long, float, double, String)
- * String[] -> ArrayBase -> TOP
- * TOP[] -> ArrayBase -> TOP
- *
- * XYZ[] -> FSArray -> TOP where XYZ is not a primitive, not String[], not TOP[]
- * It excludes TOP builtin because the creation of the FSArray type requires
- * the creation of TOP[] type, which requires (unless this is done)
- * the recursive creation of FSArray type - which causes a null pointer exception
- *
- * Note that the UIMA super chain is not used very much (mainly for subsumption,
- * and for this there is special case code anyways), so this doesn't really matter. (2015 Sept)
- *
- * Note: the super type chain of the Java impl classes varies from the UIMA super type chain.
- * It is used to factor out common behavior among classes of arrays.
- *
- * For non-JCas:
- * CommonArrayFSImpl [ for arrays stored on the main heap ]
- * ArrayFSImpl (for arrays of FS)
- * FloatArrayFSImpl
- * IntArrayFSImpl
- * StringArrayFSImpl
- * CommonAuxArrayFSImpl [ for arrays stored in Aux heaps ]
- * BooleanArrayFSImpl
- * ByteArrayFSImpl
- * ShortArrayFSImpl
- * LongArrayFSImpl
- * DoubleArrayFSImpl
- *
- * For JCas: The corresponding types have only TOP as their supertypes
- * but they implement the nonJCas interfaces for each subtype.
- * Those interfaces implement CommonArrayFS interface
- *
- * @param componentType -
- * @return the parent type of the corresponding array type
- */
- int ll_computeArrayParentFromComponentType(int componentType) {
- if (ll_isPrimitiveType(componentType) ||
- // note: not using top - until we can confirm this is set
- // in all cases
- (ll_getTypeForCode(componentType).getName().equals(CAS.TYPE_NAME_TOP))) {
- return arrayBaseTypeCode;
- }
- // is an array of XYZ[] (except for TOP - see above logic).
- // Note: These are put into the UIMA type system as subtypes of FSArray,
- // even though other parts of the impl have marked FSArray as Type-Final.
- // note: not using this.fsArray - until we can confirm this is set in
- // all cases
- return fsArrayTypeCode;
- // return ll_getArrayType(ll_getParentType(componentType));
- }
+ // int ll_computeArrayParentFromComponentType(int componentType) {
+ // if (ll_isPrimitiveType(componentType) ||
+ // // note: not using top - until we can confirm this is set
+ // // in all cases
+ // (ll_getTypeForCode(componentType).getName().equals(TypeSystem.TYPE_NAME_TOP))) {
+ // return arrayBaseTypeCode;
+ // }
+ // // is a subtype of FSArray.
+ // // note: not using this.fsArray - until we can confirm this is set in
+ // // all cases
+ // return fsArrayTypeCode;
+ // // return ll_getArrayType(ll_getParentType(componentType));
+ // }
- /**
- * Check if feature is appropriate for type (i.e., type is subsumed by domain type of feature).
- * @param type -
- * @param feat -
- * @return true if feature is appropriate for type (i.e., type is subsumed by domain type of feature).
- */
- public boolean isApprop(int type, int feat) {
- return subsumes(intro(feat), type);
- }
+ // /**
+ // * Check if feature is appropriate for type (i.e., type is subsumed by domain type of feature).
+ // * @param type -
+ // * @param feat -
+ // * @return true if feature is appropriate for type (i.e., type is subsumed by domain type of feature).
+ // */
+ // public boolean isApprop(int type, int feat) {
+ //
+ // return subsumes(intro(feat), type);
+ // }
public final int getLargestTypeCode() {
return getNumberOfTypes();
@@@ -661,109 -845,89 +844,89 @@@
}
static boolean isArrayTypeNameButNotBuiltIn(String typeName) {
- return typeName.endsWith(arrayTypeSuffix);
+ return typeName.endsWith(ARRAY_TYPE_SUFFIX);
}
- private static final String getBuiltinArrayComponent(String typeName) {
- // if typeName is not contained in the map, the "get" returns null
- // if (arrayTypeComponentNameMap.containsKey(typeName)) {
- return arrayTypeComponentNameMap.get(typeName);
+ // private final TypeImpl getBuiltinArrayComponent(String typeName) {
+ // // if typeName is not contained in the map, the "get" returns null
+ // // if (arrayName2ComponentType.containsKey(typeName)) {
+ // return arrayName2ComponentType.get(typeName);
+ // // }
+ // // return null;
// }
- // return null;
- }
+ void newTypeChecks(String typeName, Type superType) {
+ if (typeName.endsWith(ARRAY_TYPE_SUFFIX)) {
+ checkTypeSyntax(typeName.substring(0, typeName.length() - 2));
+ } else {
+ if (this.locked) {
+ throw new CASAdminException(CASAdminException.TYPE_SYSTEM_LOCKED);
+ }
+
+ if (superType != null && superType.isInheritanceFinal() ) {
+ throw new CASAdminException(CASAdminException.TYPE_IS_INH_FINAL, superType);
+ }
+ checkTypeSyntax(typeName);
+ }
+ }
+
+ void newTypeCheckNoInheritanceFinalCheck(String typeName, Type superType) {
+ if (this.locked) {
+ throw new CASAdminException(CASAdminException.TYPE_SYSTEM_LOCKED);
+ }
+ checkTypeSyntax(typeName);
+ }
+
/**
- * Add a new type to the type system.
+ * Method checkTypeSyntax.
*
-- * @param typeName
- * The name of the new type.
- * @param mother
- * The type node under which the new type should be attached.
- * @return The new type, or <code>null</code> if <code>typeName</code> is already in use.
++ * @param typeName -
*/
- @Override
- public Type addType(String typeName, Type mother) throws CASAdminException {
- if (this.locked) {
- throw new CASAdminException(CASAdminException.TYPE_SYSTEM_LOCKED);
- }
- if (mother.isInheritanceFinal()) {
- CASAdminException e = new CASAdminException(CASAdminException.TYPE_IS_INH_FINAL);
- e.addArgument(mother.getName());
- throw e;
- }
- // Check type name syntax.
- // Handle the built-in array types, like BooleanArray, FSArray, etc.
- String componentTypeName = getBuiltinArrayComponent(typeName);
- if (componentTypeName != null) {
- return getArrayType(getType(componentTypeName));
- }
- checkTypeSyntax(typeName);
- final int typeCode = this.addType(typeName, ((TypeImpl) mother).getCode());
- if (typeCode < this.typeNameST.getStart()) {
- return null;
- private void checkTypeSyntax(String name) throws CASAdminException {
- if (!TypeSystemUtils.isTypeName(name)) {
- throw new CASAdminException(CASAdminException.BAD_TYPE_SYNTAX, name);
++ private void checkTypeSyntax(String typeName) throws CASAdminException {
++ if (!TypeSystemUtils.isTypeName(typeName)) {
++ throw new CASAdminException(CASAdminException.BAD_TYPE_SYNTAX, typeName);
}
- return this.types.get(typeCode);
}
+
+ /**
+ * Add a new type to the type system.
+ * Called to add types for new (not built-in) types,
+ * except for:
+ * arrays
+ * string subtypes
+ * primitives
+ *
+ * All of these have special addType methods
+ * @param typeName
+ * The name of the new type.
+ * @param superType
+ * The type node under which the new type should be attached.
+ * @return The new type, or <code>null</code> if <code>typeName</code> is already in use.
+ */
+ public TypeImpl addType(String typeName, Type superType) throws CASAdminException {
- private void checkTypeSyntax(String name) throws CASAdminException {
- if (!TypeSystemUtils.isTypeName(name)) {
- CASAdminException e = new CASAdminException(CASAdminException.BAD_TYPE_SYNTAX);
- e.addArgument(name);
- throw e;
+ newTypeChecks(typeName, superType);
+
+ if (null != typeName2TypeImpl.get(typeName)) {
+ return null;
}
+
+ final TypeImpl supertypeimpl = (TypeImpl) superType;
+ TypeImpl ti = supertypeimpl.isAnnotationType() ?
+ new TypeImpl_annot (typeName, this, supertypeimpl, Annotation.class) :
+ supertypeimpl.isAnnotationBaseType() ?
+ new TypeImpl_annotBase(typeName, this, supertypeimpl, AnnotationBase.class) :
+ new TypeImpl (typeName, this, supertypeimpl);
+ return ti;
}
- int addType(String name, int superType) {
- return addType(name, superType, false);
- }
- /**
- * Internal code for adding a new type. Warning: no syntax check on type name, must be done by
- * caller. This method is not private because it's used by the serialization code.
- */
- int addType(String name, int superType, boolean isStringType) {
- if (this.typeNameST.contains(name)) {
- return -1;
- }
- // assert (isType(superType)); //: "Supertype is not a known type:
- // "+superType;
- // Add the new type to the symbol table.
- final int type = this.typeNameST.set(name);
- // Create space for new type.
- newType();
- // Add an edge to the tree.
- (this.tree.get(superType)).add(type);
- // Update subsumption relation.
- updateSubsumption(type, superType);
- // Add inherited features.
- final IntVector superApprop = this.approp.get(superType);
- // superApprop.add(0);
- final IntVector typeApprop = this.approp.get(type);
- // typeApprop.add(0);
- final int max = superApprop.size();
- int featCode;
- for (int i = 0; i < max; i++) {
- featCode = superApprop.get(i);
- typeApprop.add(featCode);
- // Add inherited feature names.
- String feat = name + TypeSystem.FEATURE_SEPARATOR + ll_getFeatureForCode(featCode).getShortName();
- // System.out.println("Adding name: " + feat);
- this.featureMap.put(feat, featCode);
- }
- TypeImpl t;
- if (isStringType) {
- final int stringSetCode = this.stringSets.size();
- this.stringSetMap.put(type, stringSetCode);
- t = new StringTypeImpl(name, type, this);
- } else {
- t = new TypeImpl(name, type, this);
- }
- this.types.add(t);
- this.parents.add(superType);
- this.numCommittedTypes = this.types.size();
- return type;
+ public boolean isInInt(Type rangeType) {
+ return (rangeType == null)
+ ? false
+ : (rangeType.isPrimitive() && !subsumes(stringType, rangeType));
}
-
+
@Override
public Feature addFeature(String featureName, Type domainType, Type rangeType)
throws CASAdminException {
diff --cc uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
index 4c0b792,8057640..52a79e6
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
@@@ -671,9 -682,9 +682,9 @@@ public class XmiCasSerializer
* @param sb - where output goes
* @param members string representations of the out of type system ids
* @param isPastFirstElement -
- * @return
+ * @return -
*/
- private StringBuilder writeViewMembers(StringBuilder sb, List<String> members, boolean isPastFirstElement) {
+ private StringBuilder writeViewMembers(StringBuilder sb, Collection<String> members, boolean isPastFirstElement) {
if (members != null) {
for (String member : members) {
if (isPastFirstElement) {
@@@ -1050,14 -1070,15 +1069,14 @@@
}
/**
-- * Create a string to represent array values, embedded format
- * @param addr -
+ * Not called for StringArray
- * @param addr
- * @param arrayType
- * @return
- * @throws SAXException
++ * @param fsIn -
+ * @param arrayType -
+ * @return -
+ * @throws SAXException -
*/
- private String arrayToString(int addr, int arrayType) throws SAXException {
- if (addr == CASImpl.NULL) {
+ private String arrayToString(TOP fsIn, int arrayType) throws SAXException {
+ if (fsIn == null) {
return null;
}
diff --cc uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
index 050e524,e2afcd9..aed50d7
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
@@@ -251,13 -314,28 +314,29 @@@ public interface JCas extends AbstractC
* avoid creating multiple copies of it. All uses can use the same value because it is not
* updatable (it has no subfields). This is initialized lazily on first reference, and reset when
* the CAS is reset.
+ *
* @return 0-length instance of an IntegerArray
*/
- public abstract IntegerArray getIntegerArray0L();
+ default IntegerArray emptyIntegerArray() {
+ return this.getCas().emptyIntegerArray();
+ }
/**
- * A constant for each cas which holds a 0-length instance. Since this can be a common value, we
+ * Retrieve a lazily-created constant from the cas which holds a 0-length instance.
+ * Since this can be a common value, we
+ * avoid creating multiple copies of it. All uses can use the same value because it is not
+ * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
+ * the CAS is reset.
+ * @return 0-length instance of a FloatArray
+ * @deprecated renamed emptyXXXArray
+ */
+ @Deprecated
+ default FloatArray getFloatArray0L() {
+ return this.getCas().emptyFloatArray();
+ }
+ /**
+ * Retrieve a lazily-created constant from the cas which holds a 0-length instance.
+ * Since this can be a common value, we
* avoid creating multiple copies of it. All uses can use the same value because it is not
* updatable (it has no subfields). This is initialized lazily on first reference, and reset when
* the CAS is reset.
@@@ -271,9 -352,105 +353,106 @@@
* updatable (it has no subfields). This is initialized lazily on first reference, and reset when
* the CAS is reset.
*
+ * See also the CAS API
* @return 0-length instance of a FSArray
+ * @deprecated renamed emptyXXXArray
+ */
+ @Deprecated
+ default FSArray getFSArray0L() {
+ return this.getCas().emptyFSArray();
+ }
++
+ /**
+ * Retrieve a lazily-created constant from the cas which holds a 0-length instance.
+ * Since this can be a common value, we
+ * avoid creating multiple copies of it. All uses can use the same value because it is not
+ * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
+ * the CAS is reset.
+ *
+ * See also the CAS API
+ * @return 0-length instance of a FSArray
+ */
+ default FSArray emptyFSArray() {
+ return this.getCas().emptyFSArray();
+ }
+
+ /**
+ * Retrieve a lazily-created constant from the cas which holds a 0-length instance
+ * of a
+ * subtype of FSArray. Since this can be a common value, we
+ * avoid creating multiple copies of it. All uses can use the same value because it is not
+ * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
+ * the CAS is reset.
+ *
+ * See also the CAS API
+ * @param clazz the class of the component type the array is to contain
+ * @return 0-length instance of a FSArray, which is associated with the element type T
+ * @param <T> the particular FeatureStructure type
+ */
+ default <T extends TOP> FSArray<T> emptyFSArray(Class<T> clazz) {
+ return this.getCas().emptyFSArray(((JCasImpl)this).getCasType(clazz));
+ }
+
+ /**
+ * Retrieve a lazily-created constant from the cas which holds a 0-length instance.
+ * Since this can be a common value, we
+ * avoid creating multiple copies of it. All uses can use the same value because it is not
+ * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
+ * the CAS is reset.
+ * @return 0-length instance of a ByteArray
+ */
+ default ByteArray emptyByteArray() {
+ return this.getCas().emptyByteArray();
+ }
+
+ /**
+ * Retrieve a lazily-created constant from the cas which holds a 0-length instance.
+ * Since this can be a common value, we
+ * avoid creating multiple copies of it. All uses can use the same value because it is not
+ * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
+ * the CAS is reset.
+ * @return 0-length instance of a ShortArray
+ */
+ default ShortArray emptyShortArray() {
+ return this.getCas().emptyShortArray();
+ }
+
+ /**
+ * Retrieve a lazily-created constant from the cas which holds a 0-length instance.
+ * Since this can be a common value, we
+ * avoid creating multiple copies of it. All uses can use the same value because it is not
+ * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
+ * the CAS is reset.
+ * @return 0-length instance of a LongArray
+ */
+ default LongArray emptyLongArray() {
+ return this.getCas().emptyLongArray();
+ }
+
+ /**
+ * Retrieve a lazily-created constant from the cas which holds a 0-length instance.
+ * Since this can be a common value, we
+ * avoid creating multiple copies of it. All uses can use the same value because it is not
+ * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
+ * the CAS is reset.
+ * @return 0-length instance of a DoubleArray
+ */
+ default DoubleArray emptyDoubleArray() {
+ return this.getCas().emptyDoubleArray();
+ }
+
+ /**
+ * Retrieve a lazily-created constant from the cas which holds a 0-length instance.
+ * Since this can be a common value, we
+ * avoid creating multiple copies of it. All uses can use the same value because it is not
+ * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
+ * the CAS is reset.
+ * @return 0-length instance of a DoubleArray
*/
- public abstract FSArray getFSArray0L();
+ default BooleanArray emptyBooleanArray() {
+ return this.getCas().emptyBooleanArray();
+ }
+
/**
* initialize the JCas for new Cas content. Not used, does nothing.
diff --cc uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
index 5b05c3d,a691a46..a59158e
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
@@@ -302,9 -393,11 +393,10 @@@ public class CasTypeSystemMapperTst ext
/**
* Create a type system having all kinds of types
- * @return
*/
private TypeSystemImpl createTs(int types, int feats1, int feats2) {
- return (TypeSystemImpl) CASInitializer.initCas(new CASTestSetup(types, feats1, feats2)).getTypeSystem();
+ CASTestSetup cts = new CASTestSetup(types, feats1, feats2);
+ return (TypeSystemImpl) CASInitializer.initCas(cts, tsi -> cts.reinitTs(tsi)).getTypeSystem();
}
diff --cc uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
index e04cdf4,391d68d..add0a8d
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
@@@ -570,13 -618,14 +618,14 @@@ public class BaseCPMImpl implements Bas
/**
* This method is called by an applications to begin CPM processing with a given Collection. It
* just creates a new thread and starts it.
- *
- * @deprecated {@link BaseCPM#process()}
- * @param aCollectionReader -
- * @throws ResourceInitializationException -
+ *
+ * @param aCollectionReader the a collection reader
+ * @throws ResourceInitializationException the resource initialization exception
+ * @see org.apache.uima.collection.base_cpm.BaseCPM#process()
+ * @deprecated
*/
@Deprecated
--public void process(BaseCollectionReader aCollectionReader)
++ public void process(BaseCollectionReader aCollectionReader)
throws ResourceInitializationException {
// Retrieve number of entities to process from the CPM configuration
try {
@@@ -593,7 -642,10 +642,7 @@@
new Thread(this).start();
}
- /* (non-Javadoc)
- * @see org.apache.uima.collection.base_cpm.BaseCPM#process()
- */
-- /*
++ /**
* This method is called by an application to begin processing given Collection. It creates a new
* thread, adds it to a ThreadGroup and starts it.
*
@@@ -622,17 -674,17 +671,17 @@@
}
/**
- *
* This method is called by an applications to begin CPM processing with a given Collection. It
* just creates a new thread and starts it.
- *
- * @deprecated {@link BaseCPM#process()}
- * @param aCollectionReader -
- * @param aBatchSize -
- * @throws ResourceInitializationException -
+ *
+ * @param aCollectionReader the a collection reader
+ * @param aBatchSize the a batch size
+ * @throws ResourceInitializationException the resource initialization exception
+ * @see org.apache.uima.collection.base_cpm.BaseCPM#process()
+ * @deprecated
*/
@Deprecated
--public void process(BaseCollectionReader aCollectionReader, int aBatchSize)
++ public void process(BaseCollectionReader aCollectionReader, int aBatchSize)
throws ResourceInitializationException {
// Let the application define the size of Collection.
num2Process = aBatchSize;
@@@ -1099,10 -1183,9 +1183,10 @@@
} else if (o instanceof Integer) {
processTrace.addEvent(container.getName(), key, String.valueOf(((Integer) o)
.intValue()), 0, null);
- if (System.getProperty("SHOW_CUSTOM_STATS") != null)
+ if (System.getProperty("SHOW_CUSTOM_STATS") != null) {
UIMAFramework.getLogger(this.getClass()).log(Level.FINEST,
- "Custom Integer Stat-" + key + " Value=" + ((Integer) o).intValue());
- }
+ "Custom Integer Stat-" + key + " Value=" + o);
++ }
} else {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).log(
diff --cc uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
index feb3442,5263036..2d99722
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
@@@ -1100,15 -1150,25 +1150,25 @@@ public class ProcessingContainer_Impl e
return casProcessorCPEConfiguration;
}
+ /**
+ * Start.
+ *
+ * @deprecated
+ */
@Override
@Deprecated
-public void start() {
+ public void start() {
new Thread(this);
}
+ /**
+ * Stop.
+ *
+ * @deprecated
+ */
@Override
@Deprecated
-public void stop() {
+ public void stop() {
}
/**
@@@ -1220,21 -1283,39 +1283,39 @@@
casProcessorStatus = aStatus;
}
+ /**
+ * Checks if is local.
+ *
+ * @return true, if is local
+ * @deprecated
+ */
@Override
@Deprecated
-public boolean isLocal() {
+ public boolean isLocal() {
return isLocal;
}
+ /**
+ * Checks if is remote.
+ *
+ * @return true, if is remote
+ * @deprecated
+ */
@Override
@Deprecated
-public boolean isRemote() {
+ public boolean isRemote() {
return isRemote;
}
+ /**
+ * Checks if is integrated.
+ *
+ * @return true, if is integrated
+ * @deprecated
+ */
@Override
@Deprecated
-public boolean isIntegrated() {
+ public boolean isIntegrated() {
return isIntegrated;
}
diff --cc uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
index 2e369ab,5b50cff..8a3a68a
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
@@@ -591,8 -659,13 +659,13 @@@ public class CPMEngine extends Thread
return hardKill;
}
+ /**
+ * Asynch stop.
+ *
+ * @deprecated
+ */
@Deprecated
-public void asynchStop() {
+ public void asynchStop() {
if (UIMAFramework.getLogger().isLoggable(Level.INFO)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.INFO, this.getClass().getName(),
"process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_terminate_pipelines__INFO",
diff --cc uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java
index 9580852,6a46543..39bb15c
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/Vinci.java
@@@ -33,12 -33,26 +33,26 @@@ import org.apache.vinci.transport.Vinci
import org.apache.vinci.transport.VinciFrame;
import org.apache.vinci.transport.document.AFrame;
+
+ /**
+ * The Class Vinci.
+ */
public class Vinci {
+
+ /** The Constant VNS_HOST. */
public static final String VNS_HOST = "VNS_HOST";
+ /** The Constant VNS_PORT. */
public static final String VNS_PORT = "VNS_PORT";
+ /**
+ * A factory for creating AF objects.
+ */
public static class AFFactory implements TransportableFactory {
-
++
+ /* (non-Javadoc)
+ * @see org.apache.vinci.transport.TransportableFactory#makeTransportable()
+ */
@Override
public Transportable makeTransportable() {
return new AFrame();
@@@ -114,11 -134,16 +134,17 @@@
return query;
}
+ /**
+ * Extract KEYS as string.
+ *
+ * @param frame the frame
+ * @return the string
+ */
public static String extractKEYSAsString(AFrame frame) {
String keys = "";
- if (frame == null)
- return keys;
+ if (frame == null) {
+ return keys;
+ }
String frameAsString = frame.toXML();
if (frameAsString.indexOf("KEYS") > -1 && frameAsString.indexOf("</KEYS>") > -1) {
diff --cc uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
index 4fc4585,9cc56e5..2e278df
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
@@@ -369,9 -391,16 +391,16 @@@ public String getDescriptor()
return name;
}
+ /**
+ * Sets the sofa.
+ *
+ * @param aSoFa the new sofa
+ * @throws CpeDescriptorException tbd
+ * @deprecated
+ */
@Override
@Deprecated
--public void setSOFA(String aSoFa) throws CpeDescriptorException {
++ public void setSOFA(String aSoFa) throws CpeDescriptorException {
// if (casProcessor != null )
// {
// casProcessor.setContentTag(aSoFa);
@@@ -384,7 -416,7 +416,7 @@@
*/
@Override
@Deprecated
--public String getSOFA() {
++ public String getSOFA() {
// if (casProcessor != null )
// {
diff --cc uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCheckpointImpl.java
index 535f3d8,185387c..d276efc
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCheckpointImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCheckpointImpl.java
@@@ -212,5 -259,5 +258,4 @@@ public class CpeCheckpointImpl extends
public void setTime(String i) {
time = i;
}
--
}
diff --cc uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java
index 1d59d15,61dc95a..ba9a234
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java
@@@ -172,9 -217,16 +217,16 @@@ public CpeCollectionReaderCasInitialize
return resourceMgrConfig;
}
+ /**
+ * Sets the input queue size.
+ *
+ * @param aSize the new input queue size
+ * @throws CpeDescriptorException the cpe descriptor exception
+ * @deprecated
+ */
@Override
@Deprecated
-public void setInputQueueSize(int aSize) throws CpeDescriptorException {
+ public void setInputQueueSize(int aSize) throws CpeDescriptorException {
if (casProcessors == null) {
casProcessors = CpeDescriptorFactory.produceCasProcessors();
}
@@@ -189,9 -244,16 +244,16 @@@
casProcessors.setConcurrentPUCount(aSize);
}
+ /**
+ * Sets the output queue size.
+ *
+ * @param aSize the new output queue size
+ * @throws CpeDescriptorException the cpe descriptor exception
+ * @deprecated
+ */
@Override
@Deprecated
-public void setOutputQueueSize(int aSize) throws CpeDescriptorException {
+ public void setOutputQueueSize(int aSize) throws CpeDescriptorException {
if (casProcessors == null) {
casProcessors = CpeDescriptorFactory.produceCasProcessors();
}
@@@ -338,5 -451,5 +451,4 @@@
new PropertyXmlInfo("cpeResourceManagerConfiguration", null),
});
--
}
diff --cc uimaj-cpe/src/test/java/org/apache/uima/cas/impl/CasTestUtil.java
index 7fe1712,1e265e1..6578080
--- a/uimaj-cpe/src/test/java/org/apache/uima/cas/impl/CasTestUtil.java
+++ b/uimaj-cpe/src/test/java/org/apache/uima/cas/impl/CasTestUtil.java
@@@ -24,8 -24,12 +24,8 @@@ import org.apache.uima.cas.CAS
public class CasTestUtil {
- /**
- * @param aCAS -
- * @return -
- */
public static int getHeapSize(CAS aCAS) {
- return ((CASImpl) aCAS).getHeap().heap.length;
+ return ((CASImpl) aCAS).getInitialHeapSize();
}
-
}
+
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/InternalErrorCDE.java
index 7bc0add,26c2b7f..9fb802f
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/InternalErrorCDE.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/InternalErrorCDE.java
@@@ -19,6 -19,10 +19,9 @@@
package org.apache.uima.taeconfigurator;
-
+ /**
+ * The Class InternalErrorCDE.
+ */
public class InternalErrorCDE extends RuntimeException {
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
index dbdd93d,f8cfca5..ab19f02
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
@@@ -611,10 -807,16 +807,15 @@@ public class MultiPageEditor extends Fo
}
}
- /* *************************************************************************/
- /* Expose "protected" methods and methods from Super */
- /* **************************************************************************/
+ // *************************************************************************
+ // Expose "protected" methods and methods from Super
+ // *************************************************************************
+ /**
+ * @param site the site
+ * @param editorInput the editor input
+ * @throws PartInitException the part init exception
+ */
-
public void initSuper(IEditorSite site, IEditorInput editorInput) throws PartInitException {
super.init(site, editorInput);
}
@@@ -757,12 -1028,21 +1029,22 @@@
}
}
+ /**
+ * Do J cas gen chk src.
+ *
+ * @param monitor the monitor
+ */
public void doJCasGenChkSrc(IProgressMonitor monitor) {
- if (isSourceFolderValid())
- doJCasGen(monitor);
+ if (isSourceFolderValid()) {
+ doJCasGen(monitor);
+ }
}
+ /**
+ * Checks if is source folder valid.
+ *
+ * @return true, if is source folder valid
+ */
public boolean isSourceFolderValid() {
IResource folder = getPrimarySourceFolder();
if (folder == null) {
@@@ -885,11 -1181,16 +1183,17 @@@
finishSave(monitor, modelOK);
}
+ /**
+ * Finish save.
+ *
+ * @param monitor the monitor
+ * @param modelOK the model OK
+ */
private void finishSave(IProgressMonitor monitor, boolean modelOK) {
if (modelOK) {
- if (dirtyTypeNameHash.size() > 0)
+ if (dirtyTypeNameHash.size() > 0) {
jcasGen(monitor);
+ }
dirtyTypeNameHash.clear();
}
fileDirty = false;
@@@ -1095,15 -1428,19 +1433,21 @@@
}
}
+ /**
+ * Validate descriptor type.
+ *
+ * @param newDescriptorType the new descriptor type
+ * @throws ResourceInitializationException the resource initialization exception
+ */
private void validateDescriptorType(int newDescriptorType) throws ResourceInitializationException {
- if (0 != descriptorType && !openingContext && ((descriptorType & newDescriptorType) == 0))
- throw new ResourceInitializationException(Messages.getString("MultiPageEditor.12"), //$NON-NLS-1$
- Messages.getString("MultiPageEditor.13"), //$NON-NLS-1$
- new String[] { descriptorTypeString(), descriptorTypeString(newDescriptorType) });
- if (!openingContext)
- descriptorType = newDescriptorType;
+ if (0 != descriptorType && !openingContext && ((descriptorType & newDescriptorType) == 0)) {
+ throw new ResourceInitializationException(Messages.getString("MultiPageEditor.12"), //$NON-NLS-1$
+ Messages.getString("MultiPageEditor.13"), //$NON-NLS-1$
+ new String[] { descriptorTypeString(), descriptorTypeString(newDescriptorType) });
+ }
+ if (!openingContext) {
+ descriptorType = newDescriptorType;
+ }
}
/**
@@@ -1310,10 -1676,14 +1689,15 @@@
return text.substring(i, end);
}
- private boolean validateSource() {
- if (!sourceChanged) {
- return true;
- }
+ /**
+ * Validate source.
+ *
+ * @return true, if successful
+ */
+ private boolean validateSource() {
+ if (!sourceChanged)
+ return true;
++
isBadXML = true; // preset
IDocument doc = sourceTextEditor.getDocumentProvider().getDocument(
sourceTextEditor.getEditorInput());
@@@ -1368,32 -1745,29 +1761,37 @@@
// some day can implement code to see what's affected
// for now, mark everything as stale
// index tests during development - some pages not done
- if (overviewIndex >= 0)
- ((HeaderPage) pages.get(overviewIndex)).markStale();
- if (aggregateIndex >= 0)
- ((HeaderPage) pages.get(aggregateIndex)).markStale();
- if (parameterIndex >= 0)
- ((HeaderPage) pages.get(parameterIndex)).markStale();
- if (settingsIndex >= 0)
- ((HeaderPage) pages.get(settingsIndex)).markStale();
- if (typeIndex >= 0)
- ((HeaderPage) pages.get(typeIndex)).markStale();
- if (capabilityIndex >= 0)
- ((HeaderPage) pages.get(capabilityIndex)).markStale();
- if (indexesIndex >= 0)
- ((HeaderPage) pages.get(indexesIndex)).markStale();
- if (resourcesIndex >= 0)
- ((HeaderPage) pages.get(resourcesIndex)).markStale();
+ if (overviewIndex >= 0) {
+ ((HeaderPage) pages.get(overviewIndex)).markStale();
+ }
+ if (aggregateIndex >= 0) {
+ ((HeaderPage) pages.get(aggregateIndex)).markStale();
+ }
+ if (parameterIndex >= 0) {
+ ((HeaderPage) pages.get(parameterIndex)).markStale();
+ }
+ if (settingsIndex >= 0) {
+ ((HeaderPage) pages.get(settingsIndex)).markStale();
+ }
+ if (typeIndex >= 0) {
+ ((HeaderPage) pages.get(typeIndex)).markStale();
+ }
+ if (capabilityIndex >= 0) {
+ ((HeaderPage) pages.get(capabilityIndex)).markStale();
+ }
+ if (indexesIndex >= 0) {
+ ((HeaderPage) pages.get(indexesIndex)).markStale();
+ }
+ if (resourcesIndex >= 0) {
+ ((HeaderPage) pages.get(resourcesIndex)).markStale();
+ }
}
+ /**
+ * Check for newly dirty types.
+ *
+ * @param oldTsd the old tsd
+ */
private void checkForNewlyDirtyTypes(TypeSystemDescription oldTsd) {
// an array of TypeDescription objects (not CAS), including imported ones
@@@ -1749,11 -2242,15 +2279,16 @@@
private static final long serialVersionUID = 1L;
}
+ /**
+ * Load context.
+ *
+ * @param thing the thing
+ */
private void loadContext(XMLizable thing) {
// try to load a context that has the types
- if (isContextLoaded)
- return;
+ if (isContextLoaded) {
+ return;
+ }
String contextFile = null;
XMLInputSource input = null;
aeDescription = null;
@@@ -1944,12 -2523,16 +2563,17 @@@
return descriptorCAS.get();
}
+ /**
+ * Gets the project.
+ *
+ * @return the project
+ */
public IProject getProject() {
IFile iFile = getFile();
- if (null == iFile) // can be null when just creating the instance of the MPE, before init()
- // call
- return null;
+ if (null == iFile) {
+ // call
+ return null;
+ }
return getFile().getProject();
}
@@@ -2649,11 -3402,15 +3459,16 @@@
}
}
+ /**
+ * Gets the fade color.
+ *
+ * @return the fade color
+ */
public Color getFadeColor() {
- if (null == fadeColor)
- // COLOR_WIDGET_DARK_SHADOW is the same as black on SUSE KDE
- fadeColor = getSite().getShell().getDisplay().getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
+ if (null == fadeColor) {
+ // COLOR_WIDGET_DARK_SHADOW is the same as black on SUSE KDE
+ fadeColor = getSite().getShell().getDisplay().getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
+ }
return fadeColor;
}
@@@ -2681,13 -3453,17 +3511,18 @@@
.mergeTypeSystems(tsdc, createResourceManager());
}
+ /**
+ * Sets the merged type system description.
+ *
+ * @throws ResourceInitializationException the resource initialization exception
+ */
public void setMergedTypeSystemDescription() throws ResourceInitializationException {
mergedTypesAddingFeatures.clear();
- if (isAggregate())
- mergedTypeSystemDescription = mergeDelegateAnalysisEngineTypeSystems(
- (AnalysisEngineDescription) aeDescription.clone(), createResourceManager(),
- mergedTypesAddingFeatures);
+ if (isAggregate()) {
+ mergedTypeSystemDescription = mergeDelegateAnalysisEngineTypeSystems(
+ (AnalysisEngineDescription) aeDescription.clone(), createResourceManager(),
+ mergedTypesAddingFeatures);
+ }
else {
if (null == typeSystemDescription) {
mergedTypeSystemDescription = null;
@@@ -2747,12 -3568,15 +3627,17 @@@
if (null != fcDecl) {
resolvedFlowControllerDeclaration = (FlowControllerDeclaration) fcDecl.clone();
resolvedFlowControllerDeclaration.resolveImports(createResourceManager());
- } else
- resolvedFlowControllerDeclaration = null;
+ }
+ else {
+ resolvedFlowControllerDeclaration = null;
+ }
}
+ /**
+ * Gets the resolved flow controller declaration.
+ *
+ * @return the resolved flow controller declaration
+ */
public FlowControllerDeclaration getResolvedFlowControllerDeclaration() {
return resolvedFlowControllerDeclaration;
}
@@@ -2830,14 -3688,18 +3750,20 @@@
public ITextEditor getSourcePageEditor() {
if (getCurrentPage() == sourceIndex) {
return sourceTextEditor;
- } else
- return null;
+ }
+ else {
+ return null;
+ }
}
+ /** The java project. */
private IJavaProject javaProject = null;
+ /**
+ * Gets the java project.
+ *
+ * @return the java project
+ */
public IJavaProject getJavaProject() {
if (null == javaProject && null != file) {
javaProject = JavaCore.create(file.getProject());
@@@ -2860,57 -3727,87 +3791,93 @@@
return null;
}
+ /** The analysis component I type. */
private IType analysisComponentIType = null;
+ /** The base annotator I type. */
private IType baseAnnotatorIType = null;
+ /** The collection reader I type. */
private IType collectionReaderIType = null;
+ /** The cas initializer I type. */
private IType casInitializerIType = null;
+ /** The cas consumer I type. */
private IType casConsumerIType = null;
+ /** The flow controller I type. */
private IType flowControllerIType = null;
+ /**
+ * Gets the analysis component I type.
+ *
+ * @return the analysis component I type
+ */
public IType getAnalysisComponentIType() {
- if (null == analysisComponentIType)
- analysisComponentIType = getTypeFromProject("org.apache.uima.analysis_component.AnalysisComponent");
+ if (null == analysisComponentIType) {
+ analysisComponentIType = getTypeFromProject("org.apache.uima.analysis_component.AnalysisComponent");
+ }
return analysisComponentIType;
}
+ /**
+ * Gets the base annotator I type.
+ *
+ * @return the base annotator I type
+ */
public IType getBaseAnnotatorIType() {
- if (null == baseAnnotatorIType)
- baseAnnotatorIType = getTypeFromProject("org.apache.uima.analysis_engine.annotator.BaseAnnotator");
+ if (null == baseAnnotatorIType) {
+ baseAnnotatorIType = getTypeFromProject("org.apache.uima.analysis_engine.annotator.BaseAnnotator");
+ }
return baseAnnotatorIType;
}
+ /**
+ * Gets the collection reader I type.
+ *
+ * @return the collection reader I type
+ */
public IType getCollectionReaderIType() {
- if (null == collectionReaderIType)
- collectionReaderIType = getTypeFromProject("org.apache.uima.collection.CollectionReader");
+ if (null == collectionReaderIType) {
+ collectionReaderIType = getTypeFromProject("org.apache.uima.collection.CollectionReader");
+ }
return collectionReaderIType;
}
+ /**
+ * Gets the cas initializer I type.
+ *
+ * @return the cas initializer I type
+ */
public IType getCasInitializerIType() {
- if (null == casInitializerIType)
- casInitializerIType = getTypeFromProject("org.apache.uima.collection.CasInitializer");
+ if (null == casInitializerIType) {
+ casInitializerIType = getTypeFromProject("org.apache.uima.collection.CasInitializer");
+ }
return casInitializerIType;
}
+ /**
+ * Gets the cas consumer I type.
+ *
+ * @return the cas consumer I type
+ */
public IType getCasConsumerIType() {
- if (null == casConsumerIType)
- casConsumerIType = getTypeFromProject("org.apache.uima.collection.CasConsumer");
+ if (null == casConsumerIType) {
+ casConsumerIType = getTypeFromProject("org.apache.uima.collection.CasConsumer");
+ }
return casConsumerIType;
}
+ /**
+ * Gets the flow controller I type.
+ *
+ * @return the flow controller I type
+ */
public IType getFlowControllerIType() {
- if (null == flowControllerIType)
- flowControllerIType = getTypeFromProject("org.apache.uima.flow.FlowController");
+ if (null == flowControllerIType) {
+ flowControllerIType = getTypeFromProject("org.apache.uima.flow.FlowController");
+ }
return flowControllerIType;
}
@@@ -3075,18 -4051,18 +4125,21 @@@
Iterator it = mdList.iterator();
while (it.hasNext()) {
ProcessingResourceMetaData md = (ProcessingResourceMetaData) it.next();
- if (md.getTypeSystem() != null)
+ if (md.getTypeSystem() != null) {
typeSystemsToMerge.add(md.getTypeSystem());
- if (md.getTypePriorities() != null)
+ }
+ if (md.getTypePriorities() != null) {
typePrioritiesToMerge.add(md.getTypePriorities());
- if (md.getFsIndexCollection() != null)
+ }
+ if (md.getFsIndexCollection() != null) {
fsIndexesToMerge.add(md.getFsIndexCollection());
}
+ }
}
+ /**
+ * Maybe show remote failure.
+ */
private void maybeShowRemoteFailure() {
if (failedRemotes.size() == 0) {
return;
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java
index 80adc9c,1b49434..fd7541b
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java
@@@ -86,19 -100,20 +100,17 @@@ public class MultiPageEditorContributo
return (editor == null ? null : editor.getAction(actionID));
}
-- /*
-- * (non-JavaDoc) Method declared in AbstractMultiPageEditorActionBarContributor.
- */
-
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.part.MultiPageEditorActionBarContributor#setActiveEditor(org.eclipse.ui.IEditorPart)
*/
-
@Override
- public void setActiveEditor(IEditorPart part) {
- if (activeEditorPart == part) {
- return;
- }
+ public void setActiveEditor(IEditorPart part) {
+ if (activeEditorPart == part)
+ return;
- if (null == part)
- return;
+ if (null == part) {
+ return;
+ }
activeEditorPart = part;
IActionBars actionBars = getActionBars();
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java
index 3f4c47d,9ae65d7..3f780b8
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java
@@@ -136,7 -176,7 +176,8 @@@ public abstract class AbstractSectionPa
* @see org.apache.uima.taeconfigurator.editors.ui.AbstractSection#enable()
*/
@Override
- public void enable() {
++
+ public void enable() {
}
/*
@@@ -145,17 -185,17 +186,16 @@@
* @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
*/
@Override
- public abstract void handleEvent(Event event);
-
- // *********************************************************************************
- // methods shared with multiple param pages
- // *********************************************************************************
+ public abstract void handleEvent(Event event);
+ /* ***********************************************************************************************
+ * methods shared with multiple param pages
+ *************************************************************************************************/
+
/**
- *
* Two modes: settingsDisplayMode - if true, shows groups one name at a time, and puts all
- * <common> parameters in other groups
- *
- * @param usingGroups -
+ * <common> parms in other groups
+ * @param usingGroups the using groups
*/
protected void clearAndRefillTree(boolean usingGroups) {
cpd = getConfigurationParameterDeclarations();
@@@ -282,16 -327,14 +335,15 @@@
}
/**
- * called by refresh() when no groups, just plain parm sets, also for group case
- *
- * @param parms -
- * @param group
- * <Not in any group> if not in a group, otherwise the group tree item
+ * called by refresh() when no groups, just plain parm sets, also for group case.
+ *
+ * @param parms the parms
+ * @param group <Not in any group> if not in a group, otherwise the group tree item
*/
protected void fill(ConfigurationParameter[] parms, TreeItem group) {
- if (parms == null)
- return;
+ if (parms == null) {
+ return;
+ }
for (int i = 0; i < parms.length; i++) {
addNewConfigurationParameterToGUI(parms[i], group);
}
@@@ -309,10 -356,15 +367,16 @@@
return b.toString();
}
+ /**
+ * Group names to array.
+ *
+ * @param names the names
+ * @return the string[]
+ */
protected String[] groupNamesToArray(String names) {
- if (names.equals(NOT_IN_ANY_GROUP))
- return new String[] { names };
+ if (names.equals(NOT_IN_ANY_GROUP)) {
+ return new String[] { names };
+ }
AbstractList items = new ArrayList();
int start = 0;
@@@ -359,23 -415,33 +429,36 @@@
+ ((parm.isMandatory()) ? REQUIRED_INDICATOR : OPTIONAL_INDICATOR)
+ typeNamesW.get(parm.getType())
+ ((parm.getExternalOverrideName()==null) ? NO_EXTERNAL_OVERRIDE_INDICATOR : EXTERNAL_OVERRIDE_INDICATOR)
- + nameHeader + parm.getName(); //$NON-NLS-1$
+ + nameHeader + parm.getName();
}
+ /**
+ * Sets the group text.
+ *
+ * @param groupItem the group item
+ * @param names the names
+ */
protected void setGroupText(TreeItem groupItem, String names) {
- if (names.equals(COMMON_GROUP))
- groupItem.setText(COMMON_GROUP_HEADER);
- else if (names.equals(NOT_IN_ANY_GROUP))
- groupItem.setText(NOT_IN_ANY_GROUP_HEADER);
- else
- // next line formats the names with the right number of spaces and makes it
- // possible to do future equal compares
- groupItem.setText(GROUP_HEADER + groupNameArrayToString(groupNamesToArray(names)));
+ if (names.equals(COMMON_GROUP)) {
+ groupItem.setText(COMMON_GROUP_HEADER);
+ }
+ else if (names.equals(NOT_IN_ANY_GROUP)) {
+ groupItem.setText(NOT_IN_ANY_GROUP_HEADER);
+ }
+ else {
+ // next line formats the names with the right number of spaces and makes it
+ // possible to do future equal compares
+ groupItem.setText(GROUP_HEADER + groupNameArrayToString(groupNamesToArray(names)));
+ }
}
+ /**
+ * Adds the group to GUI.
+ *
+ * @param names the names
+ * @param cg the cg
+ * @return the tree item
+ */
protected TreeItem addGroupToGUI(String names, ConfigurationGroup cg) {
TreeItem groupItem = new TreeItem(tree, SWT.NONE);
setGroupText(groupItem, names);
@@@ -405,12 -468,18 +488,19 @@@
return groupItem;
}
+ /**
+ * Contains group.
+ *
+ * @param groupName the group name
+ * @param settingsItems the settings items
+ * @return true, if successful
+ */
private boolean containsGroup(String groupName, final TreeItem[] settingsItems) {
for (int i = 0; i < settingsItems.length; i++) {
- if (groupName.equals(getName(settingsItems[i])))
+ if (groupName.equals(getName(settingsItems[i]))) {
return true;
}
+ }
return false;
}
@@@ -507,21 -643,23 +666,27 @@@
return getName(item.getText());
}
+ /**
+ * Gets the name.
+ *
+ * @param s the s
+ * @return the name
+ */
protected String getName(String s) {
- if (s.startsWith(NOT_IN_ANY_GROUP_HEADER))
- return NOT_IN_ANY_GROUP;
- if (s.startsWith(COMMON_GROUP_HEADER))
- return COMMON_GROUP;
+ if (s.startsWith(NOT_IN_ANY_GROUP_HEADER)) {
+ return NOT_IN_ANY_GROUP;
+ }
+ if (s.startsWith(COMMON_GROUP_HEADER)) {
+ return COMMON_GROUP;
+ }
- if (s.startsWith(GROUP_HEADER))
- return s.substring(GROUP_HEADER.length());
- if (s.startsWith(OVERRIDE_HEADER))
- return s.substring(OVERRIDE_HEADER.length());
+ if (s.startsWith(GROUP_HEADER)) {
+ return s.substring(GROUP_HEADER.length());
+ }
+ if (s.startsWith(OVERRIDE_HEADER)) {
+ return s.substring(OVERRIDE_HEADER.length());
+ }
// parameter
return s.substring(s.indexOf(nameHeader) + nameHeader.length());
}
@@@ -535,23 -687,19 +714,21 @@@
}
/**
- * Works between parameter tree and settings tree We don't use any relative index offsets.
+ * Works between parameter tree and settings tree. We don't use any relative index offsets.
* Instead, we search for the item with the same parameter name.
- *
- * @param containingGroup
- * in parm section; if null = means all groups (common parms)
- * @param sourceItemName
- * -
- * @return -
+ *
+ * @param containingGroup in parm section; if null = means all groups (common parms)
+ * @param sourceItemName the source item name
+ * @return the settings parameter
*/
protected TreeItem[] getSettingsParameter(TreeItem containingGroup, String sourceItemName) {
- if (null == settingsTree)
- return null;
+ if (null == settingsTree) {
+ return null;
+ }
- if (null != containingGroup && isNOT_IN_ANY_GROUP(containingGroup))
- return new TreeItem[] { findMatchingParm(settingsTree.getItems()[0], sourceItemName) };
+ if (null != containingGroup && isNOT_IN_ANY_GROUP(containingGroup)) {
+ return new TreeItem[] { findMatchingParm(settingsTree.getItems()[0], sourceItemName) };
+ }
TreeItem[] groups = getSettingsGroups((null == containingGroup) ? tree.getItems()[1] // use
// common
@@@ -636,19 -786,27 +820,31 @@@
throw new InternalErrorCDE("invalid state"); //$NON-NLS-1$
}
+ /**
+ * Gets the corresponding model parm.
+ *
+ * @param item the item
+ * @return the corresponding model parm
+ */
protected ConfigurationParameter getCorrespondingModelParm(TreeItem item) {
if (!isParameter(item))
- throw new InternalErrorCDE("invalid argument"); //$NON-NLS-1$
+ {
+ throw new InternalErrorCDE("invalid argument"); //$NON-NLS-1$
+ }
return (ConfigurationParameter) item.getData();
}
+ /**
+ * Gets the corresponding model group.
+ *
+ * @param item the item
+ * @return the corresponding model group
+ */
protected ConfigGroup getCorrespondingModelGroup(TreeItem item) {
if (!isGroup(item))
- throw new InternalErrorCDE("invalid argument"); //$NON-NLS-1$
+ {
+ throw new InternalErrorCDE("invalid argument"); //$NON-NLS-1$
+ }
return (ConfigGroup) item.getData();
}
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java
index 4021057,4d52ee4..2939913
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java
@@@ -164,7 -232,7 +234,8 @@@ public abstract class HeaderPage extend
rightPanel.addControlListener(new ControlAdapter() {
@Override
- public void controlResized(ControlEvent e) {
++
+ public void controlResized(ControlEvent e) {
setSashFormWidths();
}
});
@@@ -181,16 -252,28 +255,30 @@@
rightPanelWidth = (int) (((float) ws[1] / (float) (ws[0] + ws[1])) * sashFormWidth);
}
+ /**
+ * Sash impl.
+ *
+ * @param managedForm the managed form
+ * @param equalWidth the equal width
+ * @return the form 2 panel
+ */
public Form2Panel setup2ColumnLayout(IManagedForm managedForm, boolean equalWidth) {
- if (equalWidth)
- return setup2ColumnLayout(managedForm, 50, 50);
- else
- // a hack - based on first column more likely being wider
- return setup2ColumnLayout(managedForm, 60, 40);
+ if (equalWidth) {
+ return setup2ColumnLayout(managedForm, 50, 50);
+ }
+ else {
+ // a hack - based on first column more likely being wider
+ return setup2ColumnLayout(managedForm, 60, 40);
+ }
}
+ /**
+ * Setup 2 column layout not sash.
+ *
+ * @param managedForm the managed form
+ * @param equalWidth the equal width
+ * @return the form 2 panel
+ */
public Form2Panel setup2ColumnLayoutNotSash(IManagedForm managedForm, boolean equalWidth) {
final ScrolledForm sform = managedForm.getForm();
final Composite form = sform.getBody();
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java
index a8f61f8,4d77c0d..4e8c23c
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java
@@@ -25,12 -27,25 +26,24 @@@ import org.eclipse.swt.SWT
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.widgets.ScrolledForm;
-
+ /**
+ * The Class HeaderPageWithSash.
+ */
public class HeaderPageWithSash extends HeaderPage {
+ /** The haction. */
protected Action haction;
+ /** The vaction. */
protected Action vaction;
+ /**
+ * Instantiates a new header page with sash.
+ *
+ * @param formEditor the form editor
+ * @param id the id
+ * @param keyPageTitle the key page title
+ */
public HeaderPageWithSash(MultiPageEditor formEditor, String id, String keyPageTitle) {
super(formEditor, id, keyPageTitle);
}
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java
index e9a68c4,6a50ad2..f643a34
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java
@@@ -108,14 -156,16 +158,15 @@@ public class Utility extends MessageDia
public static int popMessage(Widget w, String title, String message, int type, String[] buttons) {
return popMessage(w.getDisplay().getActiveShell(), title, message, type, buttons);
}
+
/**
- * remove element(s) (must be present) using == test
- *
- * @param source -
- * @param element -
- * @param componentClass -
+ * remove element(s) (must be present) using == test.
+ *
+ * @param source the source
+ * @param element the element
+ * @param componentClass the component class
* @return a copy of the array with == element(s) removed
*/
-
public static Object[] removeElementFromArray(Object[] source, Object element,
Class componentClass) {
Object[] result = (Object[]) Array.newInstance(componentClass, source.length - 1);
@@@ -128,13 -177,14 +179,13 @@@
}
/**
- * remove element(s) (must be present) using equals test
- *
- * @param source -
- * @param element -
- * @param componentClass -
+ * remove element(s) (must be present) using equals test.
+ *
+ * @param source the source
+ * @param element the element
+ * @param componentClass the component class
* @return a copy of the array with equal element(s) removed
*/
-
public static Object[] removeEqualElementFromArray(Object[] source, Object element,
Class componentClass) {
Object[] result = (Object[]) Array.newInstance(componentClass, source.length - 1);
@@@ -150,20 -198,25 +201,28 @@@
return result;
}
+ /**
+ * Removes the elements from array.
+ *
+ * @param source the source
+ * @param element the element
+ * @param componentClass the component class
+ * @return the object[]
+ */
public static Object[] removeElementsFromArray(Object[] source, Object element,
Class componentClass) {
- if (null == source)
- return null;
+ if (null == source) {
+ return null;
+ }
int count = 0;
for (int i = 0; i < source.length; i++) {
- if (!element.equals(source[i]))
+ if (!element.equals(source[i])) {
count++;
}
- if (count == source.length)
- return source;
+ }
+ if (count == source.length) {
+ return source;
+ }
Object[] result = (Object[]) Array.newInstance(componentClass, count);
for (int i = 0, j = 0; i < source.length; i++) {
@@@ -174,20 -226,26 +233,29 @@@
return result;
}
+ /**
+ * Removes the elements from array.
+ *
+ * @param source the source
+ * @param element the element
+ * @param componentClass the component class
+ * @param comp the comp
+ * @return the object[]
+ */
public static Object[] removeElementsFromArray(Object[] source, Object element,
Class componentClass, Comparator comp) {
- if (null == source)
- return null;
+ if (null == source) {
+ return null;
+ }
int count = 0;
for (int i = 0; i < source.length; i++) {
- if (0 != comp.compare(element, source[i]))
+ if (0 != comp.compare(element, source[i])) {
count++;
}
- if (count == source.length)
- return source;
+ }
+ if (count == source.length) {
+ return source;
+ }
Object[] result = (Object[]) Array.newInstance(componentClass, count);
for (int i = 0, j = 0; i < source.length; i++) {
@@@ -206,21 -271,24 +282,28 @@@
return result;
}
+ /**
+ * Array contains.
+ *
+ * @param array the array
+ * @param element the element
+ * @return true, if successful
+ */
public static boolean arrayContains(Object[] array, Object element) {
- if (null == element)
- throw new InternalErrorCDE("null not allowed as an argument");
- if (null == array)
- return false;
+ if (null == element) {
+ throw new InternalErrorCDE("null not allowed as an argument");
+ }
+ if (null == array) {
+ return false;
+ }
for (int i = 0; i < array.length; i++) {
- if (null == array[i])
+ if (null == array[i]) {
continue;
- if (array[i].equals(element))
+ }
+ if (array[i].equals(element)) {
return true;
}
+ }
return false;
}
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerifyJavaNames.java
index d5c1fe9,df1d91f..8a42bb5
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerifyJavaNames.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AbstractDialogKeyVerifyJavaNames.java
@@@ -62,15 -81,16 +81,18 @@@ public abstract class AbstractDialogKey
}
/**
+ * Verify text.
+ *
- * @param event the text change event.
- * <ul>
- * <li>event.start - the replace start offset</li>
- * <li>event.end - the replace end offset</li>
- * <li>event.text - the new text</li>
- * </ul>
+ * <ul>
+ * <li>event.start - the replace start offset</li>
+ * <li>event.end - the replace end offset</li>
+ * <li>event.text - the new text</li>
+ * </ul>
+ *
+ * @param event
+ * the text change event.
*/
+ @Override
public void verifyText(VerifyEvent event) {
event.doit = true;
String oldStr = ((StyledText) event.widget).getText();
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java
index 9d5aab4,6a45540..4ee1ac5
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java
@@@ -155,16 -192,21 +192,22 @@@ public class AddFeatureDialog extends A
+ /* (non-Javadoc)
+ * @see org.apache.uima.taeconfigurator.editors.ui.dialogs.AbstractDialog#handleEvent(org.eclipse.swt.widgets.Event)
+ */
@Override
- public void handleEvent(Event event) {
+ public void handleEvent(Event event) {
super.handleEvent(event);
- if (event.type == SWT.Modify && event.widget == featureRangeNameUI)
- manageVisibleFields();
+ if (event.type == SWT.Modify && event.widget == featureRangeNameUI) {
+ manageVisibleFields();
+ }
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.taeconfigurator.editors.ui.dialogs.AbstractDialog#getTypeSystemInfoList()
+ */
@Override
- public TypesWithNameSpaces getTypeSystemInfoList() {
+ public TypesWithNameSpaces getTypeSystemInfoList() {
TypesWithNameSpaces result = super.getTypeSystemInfoList();
Type[] allTypes = (Type[]) editor.allTypes.get().values().toArray(new Type[0]);
/* Arrays.sort(allTypes, new Comparator() {
@@@ -223,12 -267,14 +269,14 @@@
return false;
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.taeconfigurator.editors.ui.dialogs.AbstractDialog#isValid()
+ */
@Override
- public boolean isValid() {
-
+ public boolean isValid() {
-
- if (featureName.length() == 0 || featureRangeName.length() == 0)
- return false;
+ if (featureName.length() == 0 || featureRangeName.length() == 0) {
+ return false;
+ }
if (!featureName.equals(originalFeatureName)) {
String errMsg = typeSection.checkFeature(this, td, existingFd);
if (null != errMsg) {
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexDialog.java
index f0bc94b,1bd2e71..17b8200
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexDialog.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexDialog.java
@@@ -185,18 -221,27 +221,29 @@@ public class AddIndexDialog extends Abs
return result;
}
+ /**
+ * Adds the key.
+ *
+ * @param key the key
+ */
private void addKey(FsIndexKeyDescription key) {
- if (null == key)
- return;
+ if (null == key) {
+ return;
+ }
TableItem item = new TableItem(table, SWT.NONE);
updateKey(item, key);
}
+ /**
+ * Update key.
+ *
+ * @param item the item
+ * @param key the key
+ */
private void updateKey(TableItem item, FsIndexKeyDescription key) {
- if (null == key)
- return;
+ if (null == key) {
+ return;
+ }
if (key.isTypePriority()) {
item.setText(0, S_);
item.setText(1, TYPE_PRIORITY);
@@@ -241,11 -290,16 +292,17 @@@
super.handleEvent(event);
}
+ /**
+ * Already defined.
+ *
+ * @param items the items
+ * @return the list
+ */
public List alreadyDefined(TableItem[] items) {
List result = new ArrayList();
- if (null == items)
- return result;
+ if (null == items) {
+ return result;
+ }
for (int i = 0; i < items.length; i++) {
result.add(items[i].getText(0));
}
@@@ -263,12 -320,16 +323,18 @@@
for (int i = 0; i < items.length; i++) {
keys[i] = makeKey(items[i]);
}
- } else
- keys = null;
+ }
+ else {
+ keys = null;
+ }
}
+ /**
+ * Make key.
+ *
+ * @param item the item
+ * @return the fs index key description
+ */
private FsIndexKeyDescription makeKey(TableItem item) {
FsIndexKeyDescription key = UIMAFramework.getResourceSpecifierFactory()
.createFsIndexKeyDescription();
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddSofaDialog.java
index ce8ab2c,ffeb8c6..b73055e
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddSofaDialog.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddSofaDialog.java
@@@ -190,28 -229,34 +234,38 @@@ public class AddSofaDialog extends Abst
return null;
}
+ /**
+ * Check dupl sofa name 1.
+ *
+ * @param name the name
+ * @param names the names
+ * @return true, if successful
+ */
private boolean checkDuplSofaName1(String name, String[] names) {
- if (null == names)
- return false;
+ if (null == names) {
+ return false;
+ }
for (int i = 0; i < names.length; i++) {
- if (name.equals(names[i]))
+ if (name.equals(names[i])) {
return true;
}
+ }
return false;
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.taeconfigurator.editors.ui.dialogs.AbstractDialogKeyVerify#verifyKeyChecks(org.eclipse.swt.events.VerifyEvent)
+ */
@Override
public boolean verifyKeyChecks(VerifyEvent event) {
- if (event.keyCode == SWT.CR || event.keyCode == SWT.TAB)
- return true;
+ if (event.keyCode == SWT.CR || event.keyCode == SWT.TAB) {
+ return true;
+ }
if (Character.isJavaIdentifierPart(event.character) ||
event.character == '*' ||
- event.character == '.')
- return true;
+ event.character == '.') {
+ return true;
+ }
return false;
}
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/PickTaeForTypesDialog.java
index d95ddd0,586e7ba..f06f393
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/PickTaeForTypesDialog.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/PickTaeForTypesDialog.java
@@@ -56,13 -69,29 +69,29 @@@ public class PickTaeForTypesDialog exte
// private Button autoAddToFlowButton;
private DialogSelectionListener dialogSelectionListener = new DialogSelectionListener();
+ /** The import by name UI. */
private Button importByNameUI;
+ /** The import by location UI. */
private Button importByLocationUI;
+ /** The is import by name. */
public boolean isImportByName;
+ /**
+ * The listener interface for receiving dialogSelection events.
+ * The class that is interested in processing a dialogSelection
+ * event implements this interface, and the object created
+ * with that class is registered with a component using the
+ * component's <code>addDialogSelectionListener</code> method. When
+ * the dialogSelection event occurs, that object's appropriate
+ * method is invoked.
+ */
public class DialogSelectionListener implements SelectionListener {
-
++
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+ */
@Override
public void widgetSelected(SelectionEvent e) {
if (e.widget == delegateComponentListGUI) {
@@@ -74,12 -102,23 +103,26 @@@
}
}
++
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
+ */
++
@Override
public void widgetDefaultSelected(SelectionEvent e) {
// nothing to do in this case
}
}
++
+ /**
+ * Instantiates a new pick tae for types dialog.
+ *
+ * @param aSection the a section
+ * @param aggregateFileName the aggregate file name
+ * @param delegateComponentDescriptors the delegate component descriptors
+ * @param delegateComponentDescriptions the delegate component descriptions
+ */
public PickTaeForTypesDialog(AbstractSection aSection, String aggregateFileName,
java.util.List delegateComponentDescriptors, java.util.List delegateComponentDescriptions) {
@@@ -90,6 -129,9 +133,10 @@@
m_delegateComponentDescriptions = delegateComponentDescriptions;
}
++
+ /* (non-Javadoc)
+ * @see org.apache.uima.taeconfigurator.editors.ui.dialogs.AbstractDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+ */
@Override
protected Control createDialogArea(Composite parent) {
Composite composite = (Composite) super.createDialogArea(parent);
@@@ -197,11 -242,13 +247,14 @@@
}
}
}
- if (okButton != null)
- enableOK();
+ if (okButton != null) {
+ enableOK();
+ }
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.taeconfigurator.editors.ui.dialogs.AbstractDialog#enableOK()
+ */
@Override
public void enableOK() {
boolean bEnableOk = false;
diff --cc uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SelectTypeDialog.java
index 0f419f3,b93d3a5..373396e
--- a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SelectTypeDialog.java
+++ b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/SelectTypeDialog.java
@@@ -33,15 -33,36 +33,37 @@@ import org.eclipse.swt.widgets.Table
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
+
+ /**
+ * The Class SelectTypeDialog.
+ */
public class SelectTypeDialog extends AbstractDialog {
+ /** The type name UI. */
private Text typeNameUI;
+
+ /** The matching types UI. */
private Table matchingTypesUI;
+
+ /** The name spaces UI. */
private Table nameSpacesUI;
+
+ /** The type name. */
public String typeName = "error-TypeName-never-set";
+
+ /** The name space name. */
public String nameSpaceName = "error-NameSpaceName-never-set";
+
+ /** The types. */
private TypesWithNameSpaces types;
-
+
+ /**
+ * Instantiates a new select type dialog.
+ *
+ * @param section the section
+ * @param types the types
+ */
++
public SelectTypeDialog(AbstractSection section, TypesWithNameSpaces types) {
super(section, "Select Type Name", "Select an Existing CAS Type name from the set of defined types");
this.types = types;
diff --cc uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/LauncherPlugin.java
index e413bf5,ce3d32a..eff2182
--- a/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/LauncherPlugin.java
+++ b/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/LauncherPlugin.java
@@@ -69,12 -90,17 +92,18 @@@ public class LauncherPlugin extends Plu
return null;
}
+ /**
+ * Gets the bundle.
+ *
+ * @param bundleName the bundle name
+ * @return the bundle
+ */
public Bundle getBundle(String bundleName) {
Bundle[] bundles = getBundles(bundleName, null);
- if (bundles != null && bundles.length > 0)
- // return fist bundle, if multiple
- return bundles[0];
+ if (bundles != null && bundles.length > 0) {
+ // return fist bundle, if multiple
+ return bundles[0];
+ }
return null;
}
diff --cc uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java
index a05374e,36f6a41..5d79a59
--- a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java
+++ b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java
@@@ -59,16 -86,19 +86,22 @@@ public class PearException extends Exce
Object[] o = getCustomStackTrace(getCause()).toArray();
if (o != null) {
IStatus[] sa = new IStatus[o.length];
- for (int i = 0; i < o.length; i++)
+ for (int i = 0; i < o.length; i++) {
sa[i] = (IStatus) o[i];
+ }
return sa;
- } else
- return new IStatus[0];
+ }
+ else {
+ return new IStatus[0];
+ }
}
+ /**
+ * Gets the custom stack trace.
+ *
+ * @param e the e
+ * @return the custom stack trace
+ */
synchronized ArrayList getCustomStackTrace(Throwable e) {
ArrayList a = new ArrayList();
if (e != null) {
diff --cc uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java
index a86646b,368f008..a821c32
--- a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java
+++ b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java
@@@ -27,12 -27,21 +27,20 @@@ import org.eclipse.core.runtime.Status
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.swt.widgets.Shell;
-
+ /**
+ * The Class PearProjectCustomizationException.
+ */
public class PearProjectCustomizationException extends Exception {
+ /** The Constant PLUGIN_ID. */
public static final String PLUGIN_ID = "org.apache.uima.pear";
+ /** The Constant serialVersionUID. */
private static final long serialVersionUID = 1L;
+ /**
+ * Instantiates a new pear project customization exception.
+ */
public PearProjectCustomizationException() {
super();
}
@@@ -53,16 -83,19 +82,22 @@@
Object[] o = getCustomStackTrace(getCause()).toArray();
if (o != null) {
IStatus[] sa = new IStatus[o.length];
- for (int i = 0; i < o.length; i++)
+ for (int i = 0; i < o.length; i++) {
sa[i] = (IStatus) o[i];
+ }
return sa;
- } else
- return new IStatus[0];
+ }
+ else {
+ return new IStatus[0];
+ }
}
+ /**
+ * Gets the custom stack trace.
+ *
+ * @param e the e
+ * @return the custom stack trace
+ */
synchronized ArrayList getCustomStackTrace(Throwable e) {
ArrayList a = new ArrayList();
if (e != null) {
diff --cc uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java
index d352cd5,5fbe318..6ca0e4b
--- a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java
+++ b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java
@@@ -224,12 -252,13 +256,15 @@@ public class INSDComponentPage extends
setPageComplete(false);
setErrorMessage(null);
- } else
- updateStatus(null);
+ }
+ else {
+ updateStatus(null);
+ }
}
+ /**
+ * Save wizard data.
+ */
void saveWizardData() {
wizardData.put(COMP_DESCRIPTOR_PATH, compDescriptorPath);
}
@@@ -358,14 -388,16 +397,14 @@@
return button;
}
- /*
- * see @DialogPage.setVisible(boolean)
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
*/
- /*
- * see @DialogPage.setVisible(boolean)
- */
@Override
- public void setVisible(boolean visible) {
+ public void setVisible(boolean visible) {
super.setVisible(visible);
- if (visible)
- compIDText.setFocus();
+ if (visible) {
+ compIDText.setFocus();
+ }
}
}
diff --cc uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java
index 1b585c7,6d8e72c..2e60855
--- a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java
+++ b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java
@@@ -29,24 -29,45 +29,44 @@@ import org.eclipse.swt.layout.GridData
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
-
+ /**
+ * The Class AbstractVarValViewerHandler.
+ */
abstract class AbstractVarValViewerHandler {
+ /** The table. */
public Table table;
+ /** The table viewer. */
public TableViewer tableViewer;
+ /** The add. */
public Button add;
+ /** The delete. */
public Button delete;
+ /** The close button. */
protected Button closeButton;
+ /** The label provider. */
protected ITableLabelProvider labelProvider;
+ /** The table row list. */
protected VarValList tableRowList = new VarValList();
+ /** The column names. */
protected String[] columnNames;
+ /**
+ * Instantiates a new abstract var val viewer handler.
+ *
+ * @param parent the parent
+ * @param columnNames the column names
+ * @param numParentColumns the num parent columns
+ * @param tableRowList the table row list
+ * @param labelProvider the label provider
+ */
public AbstractVarValViewerHandler(Composite parent, String[] columnNames, int numParentColumns,
VarValList tableRowList, ITableLabelProvider labelProvider) {
this.tableRowList = tableRowList;
@@@ -157,16 -198,20 +198,22 @@@
*/
class ExampleContentProvider implements IStructuredContentProvider, IVarValListViewer {
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+ */
@Override
public void inputChanged(Viewer v, Object oldInput, Object newInput) {
- if (newInput != null)
+ if (newInput != null) {
((VarValList) newInput).addChangeListener(this);
- if (oldInput != null)
+ }
+ if (oldInput != null) {
((VarValList) oldInput).removeChangeListener(this);
}
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+ */
@Override
public void dispose() {
tableRowList.removeChangeListener(this);
diff --cc uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java
index 26a5667,592ee77..cd3811a
--- a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java
+++ b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java
@@@ -19,8 -19,13 +19,9 @@@
package org.apache.uima.pear.insd.edit.vars;
+
/**
- *
- * Represents a table row in a two column table (of environment varibles).
- *
- *
- *
+ * Represents a table row in a two column table (of environment variables).
*/
public class VarVal {
diff --cc uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java
index 681562c,50fb1d8..dac9f9e
--- a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java
+++ b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java
@@@ -78,16 -86,19 +88,22 @@@ public class VarValList
if (!isDuplicate(tableRow)) {
tableRows.add(tableRows.size(), tableRow);
Iterator iterator = changeListeners.iterator();
- while (iterator.hasNext())
+ while (iterator.hasNext()) {
((IVarValListViewer) iterator.next()).addTableRow(tableRow);
+ }
return true;
- } else
- return false;
+ }
+ else {
+ return false;
+ }
}
+ /**
+ * Checks if is duplicate.
+ *
+ * @param tableRow the table row
+ * @return true, if is duplicate
+ */
private boolean isDuplicate(VarVal tableRow) {
boolean duplicate = false;
String varName = tableRow.getVarName();
diff --cc uimaj-examples/pom.xml
index 28f0a06,c26ba18..6a53de1
--- a/uimaj-examples/pom.xml
+++ b/uimaj-examples/pom.xml
@@@ -56,57 -57,74 +57,75 @@@
<properties>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<postNoticeText>${ibmNoticeText}</postNoticeText>
+ <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
- <version>${project.parent.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-cpe</artifactId>
- <version>${project.parent.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-document-annotation</artifactId>
- <version>${project.parent.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-tools</artifactId>
- <version>${project.parent.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>common</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>ecore</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>ecore-xmi</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <finalName>uima-examples</finalName>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-cpe</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-document-annotation</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-tools</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency> <!-- needed for run config to find Migrate tool -->
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-v3migration-jcas</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>common</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>ecore</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>ecore-xmi</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>uima-examples</finalName>
<pluginManagement>
<plugins>
+ <!--
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgs>
+ <arg>-Xlint:deprecation</arg>
+ <arg>-Xlint:unchecked</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
diff --cc uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java
index 8b7f3e2,6c03875..4938f6e
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java
@@@ -61,10 -61,9 +61,10 @@@ public class AdvancedFixedFlowControlle
private int mActionAfterCasMultiplier;
- private Set mAEsAllowingContinueOnFailure = new HashSet();
+ private Set<String> mAEsAllowingContinueOnFailure = new HashSet<>();
- public void initialize(FlowControllerContext aContext) throws ResourceInitializationException {
+ @Override
+public void initialize(FlowControllerContext aContext) throws ResourceInitializationException {
super.initialize(aContext);
String[] flow = (String[])aContext.getConfigParameterValue(PARAM_FLOW);
@@@ -280,12 -279,11 +278,12 @@@ public Flow computeFlow(CAS aCAS) throw
return ((SimpleStep)step).getAnalysisEngineKey().equals(producedBy);
}
else if (step instanceof ParallelStep) {
- Iterator iter = ((ParallelStep)step).getAnalysisEngineKeys().iterator();
+ Iterator<String> iter = ((ParallelStep)step).getAnalysisEngineKeys().iterator();
while (iter.hasNext()) {
String key = (String)iter.next();
- if (key.equals(producedBy))
+ if (key.equals(producedBy)) {
return true;
+ }
}
return false;
}
diff --cc uimaj-tools/src/main/java/org/apache/uima/tools/RunAE.java
index 40c5cc1,af0f966..47aef16
--- a/uimaj-tools/src/main/java/org/apache/uima/tools/RunAE.java
+++ b/uimaj-tools/src/main/java/org/apache/uima/tools/RunAE.java
@@@ -277,9 -296,9 +296,8 @@@ public class RunAE implements StatusCal
* @see org.apache.uima.collection.base_cpm.BaseStatusCallbackListener#aborted()
*/
@Override
- public void aborted() {
+ public void aborted() {
System.out.println("Processing Aborted");
--
}
/**
diff --cc uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/FeatureTableModel.java
index 425ba55,fd6f2a1..283769c
--- a/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/FeatureTableModel.java
+++ b/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/tsview/FeatureTableModel.java
@@@ -26,14 -26,26 +26,23 @@@ import javax.swing.table.AbstractTableM
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
-
+ /**
+ * Insert comment for enclosing_type here.
- *
- *
+ */
public class FeatureTableModel extends AbstractTableModel {
+ /** The Constant serialVersionUID. */
private static final long serialVersionUID = -6010925680514336742L;
+ /** The Constant columnHeaders. */
static final String[] columnHeaders = { "Feature", "Value Type", "Defined On" };
+ /** The type. */
private Type type = null;
+ /**
+ * Instantiates a new feature table model.
+ */
public FeatureTableModel() {
super();
}