From e667086f58e674a9e74d90d46c6d72e4e19686b5 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 20 Nov 2023 22:16:05 +0100 Subject: [PATCH] #4316 - Dissolve generic API module - Finally dissolve the module --- .../learning/ActiveLearningService.java | 2 +- .../learning/ActiveLearningServiceImpl.java | 6 +- .../ActiveLearningAutoConfiguration.java | 4 +- .../sidebar/ActiveLearningSidebar.java | 10 +- .../CohenKappaAgreementMeasure.java | 2 +- .../CohenKappaAgreementMeasureSupport.java | 2 +- .../FleissKappaAgreementMeasure.java | 2 +- .../FleissKappaAgreementMeasureSupport.java | 2 +- .../KrippendorffAlphaAgreementMeasure.java | 2 +- ...ppendorffAlphaAgreementMeasureSupport.java | 2 +- ...endorffAlphaUnitizingAgreementMeasure.java | 2 +- ...AlphaUnitizingAgreementMeasureSupport.java | 2 +- .../coding/PairwiseCodingAgreementTable.java | 2 +- .../PairwiseUnitizingAgreementTable.java | 2 +- .../AgreementMeasureTestSuite_ImplBase.java | 2 +- .../storage/CasStorageServiceImpl.java | 4 +- .../CasStorageServiceAutoConfiguration.java | 2 +- .../storage/CasStorageServiceImplTest.java | 2 +- inception/inception-api-annotation/pom.xml | 4 - .../ColoringRulesConfigurationPanel.java | 4 +- .../coloring/ColoringServiceImpl.java | 4 +- .../config/AnnotationAutoConfiguration.java | 6 +- .../exception/IllegalPlacementException.java | 2 +- .../exception/NotEditableException.java | 2 +- .../KeyBindingsConfigurationPanel.java | 8 +- .../keybindings/KeyBindingsPanel.java | 6 +- .../annotation/page/AnnotationPageBase.java | 8 +- .../AnnotationPreferencesDialogContent.java | 6 +- .../UserPreferencesServiceImpl.java | 6 +- .../annotation/rendering/ColorRenderer.java | 4 +- .../annotation/rendering/LabelRenderer.java | 2 +- .../api/annotation/rendering/NopRenderer.java | 6 +- .../annotation/rendering/PreRendererImpl.java | 8 +- .../rendering/Renderer_ImplBase.java | 6 +- .../feature/bool/BooleanFeatureEditor.java | 2 +- .../feature/bool/BooleanFeatureSupport.java | 4 +- .../feature/link/LinkFeatureDeletedEvent.java | 4 +- .../feature/link/LinkFeatureEditor.java | 20 +- .../feature/link/LinkFeatureEvent.java | 6 +- .../feature/link/LinkFeatureSupport.java | 12 +- .../feature/link/LinkFeatureTraitsEditor.java | 4 +- .../UimaPrimitiveFeatureSupport_ImplBase.java | 2 +- .../MultiSelectTextFeatureEditor.java | 8 +- .../MultiValueStringFeatureSupport.java | 8 +- .../MultiValueStringFeatureTraitsEditor.java | 4 +- .../feature/number/NumberFeatureEditor.java | 4 +- .../feature/number/NumberFeatureSupport.java | 4 +- .../number/NumberFeatureTraitsEditor.java | 4 +- .../feature/number/RatingFeatureEditor.java | 4 +- .../KendoComboboxTextFeatureEditor.java | 2 +- .../string/RadioGroupStringFeatureEditor.java | 2 +- .../feature/string/StringFeatureSupport.java | 8 +- .../string/StringFeatureTraitsEditor.java | 4 +- .../feature/string/TextFeatureEditorBase.java | 6 +- .../layer/LayerTraitsEditor_ImplBase.java | 4 +- .../layer/TypeAdapter_ImplBase.java | 12 +- .../layer/behaviors/LayerBehavior.java | 4 +- .../behaviors/LayerBehaviorRegistry.java | 2 +- .../behaviors/LayerBehaviorRegistryImpl.java | 2 +- .../behaviors/LayerSupportRegistryImpl.java | 6 +- .../annotation/layer/chain/ChainAdapter.java | 10 +- .../layer/chain/ChainLayerSupport.java | 6 +- .../layer/chain/ChainLayerTraitsEditor.java | 2 +- .../annotation/layer/chain/ChainRenderer.java | 6 +- .../layer/relation/RelationAdapter.java | 8 +- .../RelationCrossSentenceBehavior.java | 4 +- .../layer/relation/RelationLayerBehavior.java | 6 +- .../layer/relation/RelationLayerSupport.java | 6 +- .../relation/RelationLayerTraitsEditor.java | 2 +- .../relation/RelationOverlapBehavior.java | 6 +- .../layer/relation/RelationRenderer.java | 4 +- .../annotation/layer/span/SpanAdapter.java | 6 +- .../layer/span/SpanAnchoringModeBehavior.java | 6 +- .../layer/span/SpanCrossSentenceBehavior.java | 6 +- .../layer/span/SpanLayerBehavior.java | 6 +- .../layer/span/SpanLayerSupport.java | 6 +- .../layer/span/SpanLayerTraitsEditor.java | 2 +- .../layer/span/SpanOverlapBehavior.java | 8 +- .../annotation/layer/span/SpanRenderer.java | 6 +- .../editor/state/AnnotatorStateImpl.java | 6 +- .../feature/link/LinkFeatureSupportTest.java | 4 +- .../MultiValueStringFeatureSupportTest.java | 2 +- .../string/StringFeatureSupportTest.java | 2 +- .../layer/chain/ChainAdapterTest.java | 6 +- .../layer/relation/RelationAdapterTest.java | 6 +- .../layer/relation/RelationRendererTest.java | 2 +- .../layer/span/SpanAdapterTest.java | 6 +- .../layer/span/SpanRendererTest.java | 4 +- inception/inception-api-editor/pom.xml | 4 - .../editor/AnnotationEditorBase.java | 4 +- .../editor/AnnotationEditorExtension.java | 2 +- .../AnnotationEditorExtensionRegistry.java | 2 +- ...AnnotationEditorExtensionRegistryImpl.java | 2 +- inception/inception-api-render/pom.xml | 4 - .../editorstate/LayerSelectionState.java | 4 +- inception/inception-api-schema/pom.xml | 5 + .../action/AnnotationActionHandler.java | 2 +- .../ukp/inception/rendering/Renderer.java | 6 +- .../{ => api}/AnnotationSchemaService.java | 14 +- .../schema/{ => api}/AttachedAnnotation.java | 2 +- .../adapter/AnnotationComparator.java | 2 +- .../adapter/AnnotationComparisonUtils.java | 2 +- .../adapter/AnnotationException.java | 2 +- .../{ => api}/adapter/FeatureFilter.java | 2 +- .../adapter/IllegalFeatureValueException.java | 2 +- .../schema/{ => api}/adapter/TypeAdapter.java | 8 +- .../config/AnnotationSchemaProperties.java | 2 +- .../event/LayerConfigurationChangedEvent.java | 2 +- .../{ => api}/event/TagCreatedEvent.java | 2 +- .../{ => api}/event/TagDeletedEvent.java | 2 +- .../schema/{ => api}/event/TagEvent.java | 2 +- .../{ => api}/event/TagUpdatedEvent.java | 2 +- .../{ => api}/feature/FeatureEditor.java | 2 +- .../{ => api}/feature/FeatureEditorEvent.java | 2 +- .../FeatureEditorValueChangedEvent.java | 2 +- .../{ => api}/feature/FeatureSupport.java | 8 +- .../feature/FeatureSupportRegistry.java | 2 +- .../schema/{ => api}/feature/FeatureType.java | 2 +- .../schema/{ => api}/feature/FeatureUtil.java | 2 +- .../{ => api}/feature/LinkWithRoleModel.java | 2 +- .../schema/{ => api}/feature/TypeUtil.java | 4 +- .../schema/{ => api}/layer/LayerSupport.java | 6 +- .../{ => api}/layer/LayerSupportRegistry.java | 2 +- .../layer/LayerSupport_ImplBase.java | 6 +- .../schema/{ => api}/layer/LayerType.java | 2 +- .../{ => api}/validation/ValidationUtils.java | 2 +- inception/inception-api/LICENSE.txt | 202 ------------------ inception/inception-api/pom.xml | 48 ----- .../AnnotationSchemaAutoConfiguration.java | 28 --- .../main/resources/META-INF/spring.factories | 2 - inception/inception-bom/pom.xml | 5 - ...ntenceOrientedAnnotationEditorFactory.java | 2 +- ...BratAnnotationEditorAutoConfiguration.java | 2 +- .../brat/schema/BratSchemaGeneratorImpl.java | 2 +- .../brat/render/BratSerializerImplTest.java | 2 +- ...EntityLinkingServiceAutoConfiguration.java | 2 +- .../recommender/NamedEntityLinker.java | 2 +- .../recommender/NamedEntityLinkerFactory.java | 2 +- .../conceptlinking/NamedEntityLinkerTest.java | 4 +- .../webanno/curation/casdiff/CasDiff.java | 2 +- .../casdiff/api/CasDiffException.java | 2 +- inception/inception-curation/pom.xml | 4 - ...ationDocumentServiceAutoConfiguration.java | 2 +- .../CurationServiceAutoConfiguration.java | 4 +- .../merge/AlreadyMergedException.java | 2 +- .../inception/curation/merge/CasMerge.java | 14 +- .../curation/merge/CasMergeException.java | 2 +- .../merge/MergeConflictException.java | 2 +- .../UnfulfilledPrerequisitesException.java | 2 +- .../service/CurationDocumentServiceImpl.java | 2 +- .../service/CurationMergeServiceImpl.java | 2 +- .../export/CuratedDocumentsExporterTest.java | 2 +- .../merge/CasDiffLinkFeaturesTest.java | 2 +- .../curation/merge/CasMergeLinkTest.java | 2 +- .../curation/merge/CasMergeRelationTest.java | 2 +- .../curation/merge/CasMergeRemergeTest.java | 2 +- .../curation/merge/CasMergeSpanTest.java | 4 +- .../curation/merge/CasMergeTestBase.java | 2 +- .../CurationDocumentServiceImplTest.java | 4 +- ...ationsStartAndEndWithinSentencesCheck.java | 2 +- .../diag/checks/DanglingRelationsCheck.java | 2 +- ...chedSpanAnnotationsTrulyAttachedCheck.java | 2 +- .../LinksReachableThroughChainsCheck.java | 2 +- .../NoMultipleIncomingRelationsCheck.java | 2 +- .../diag/checks/RelationOffsetsCheck.java | 2 +- .../config/CasDoctorAutoConfiguration.java | 2 +- ...dSpanAnnotationsAndDeleteExtrasRepair.java | 2 +- ...hFeatureAttachedSpanAnnotationsRepair.java | 2 +- ...xFeatureAttachedSpanAnnotationsRepair.java | 2 +- .../diag/repairs/RelationOffsetsRepair.java | 2 +- .../RemoveDanglingChainLinksRepair.java | 2 +- ...gFeatureAttachedSpanAnnotationsRepair.java | 2 +- .../RemoveDanglingRelationsRepair.java | 2 +- .../diag/repairs/UpgradeCasRepair.java | 2 +- ...nsStartAndEndWithinSentencesCheckTest.java | 2 +- .../NoMultipleIncomingRelationsCheckTest.java | 2 +- inception/inception-diam-compactv2/pom.xml | 2 +- .../compactv2/CompactSerializerV2Impl.java | 2 +- .../config/DiamCompactV2AutoConfig.java | 2 +- .../CompactSerializerV2ImplTest.java | 10 +- inception/inception-diam/pom.xml | 4 - .../CreateRelationAnnotationHandler.java | 2 +- .../actions/DeleteAnnotationHandler.java | 4 +- .../actions/EditorAjaxRequestHandlerBase.java | 2 +- .../FillSlotWithNewAnnotationHandler.java | 2 +- .../actions/MoveSpanAnnotationHandler.java | 4 +- .../actions/SelectAnnotationHandler.java | 4 +- .../diam/editor/config/DiamAutoConfig.java | 8 +- .../lazydetails/LazyDetailsLookupService.java | 2 +- .../LazyDetailsLookupServiceImpl.java | 8 +- .../inception/diam/messages/MAnnotation.java | 2 +- .../model/compact/CompactSerializerImpl.java | 2 +- .../diam/service/DiamWebsocketController.java | 2 +- .../DocumentImportExportServiceImpl.java | 2 +- .../ukp/inception/export/JsonImportUtil.java | 2 +- .../export/LayerImportExportUtils.java | 2 +- .../export/TagsetImportExportUtils.java | 2 +- ...tImportExportServiceAutoConfiguration.java | 2 +- .../DocumentImportExportServiceImplTest.java | 2 +- .../ExternalAnnotationEditorBase.java | 2 +- .../pubmed/PubMedCentralProvider.java | 2 +- .../pubmed/PubMedCentralProviderFactory.java | 2 +- ...edDocumentRepositoryAutoConfiguration.java | 2 +- .../pubmed/PubMedProviderTest.java | 2 +- .../feature/lookup/LookupFeatureEditor.java | 8 +- .../feature/lookup/LookupFeatureSupport.java | 6 +- .../lookup/LookupFeatureTraitsEditor.java | 4 +- .../config/ImageSupportAutoConfiguration.java | 2 +- .../image/feature/ImageFeatureEditor.java | 2 +- .../image/feature/ImageFeatureSupport.java | 6 +- .../inception/image/sidebar/ImageSidebar.java | 2 +- .../image/sidebar/ImageSidebarFactory.java | 2 +- ...tchingRelationRecommenderTraitsEditor.java | 2 +- .../config/FactLinkingAutoConfiguration.java | 2 +- .../feature/FactLinkingServiceImpl.java | 6 +- .../feature/PropertyFeatureEditor.java | 8 +- .../feature/PropertyFeatureSupport.java | 6 +- .../feature/QualifierFeatureEditor.java | 14 +- .../feature/SubjectObjectFeatureEditor.java | 14 +- .../feature/SubjectObjectFeatureSupport.java | 8 +- .../initializers/FactLayerInitializer.java | 2 +- .../SubjectObjectFeatureSupportTest.java | 2 +- ...KnowledgeBaseServiceAutoConfiguration.java | 2 +- .../kb/exporter/KnowledgeBaseExporter.java | 2 +- .../kb/KnowledgeBaseExporterTest.java | 2 +- ...MetadataLayerSupportAutoConfiguration.java | 8 +- ...reateDocumentMetadataAnnotationAction.java | 4 +- ...eleteDocumentMetadataAnnotationAction.java | 4 +- .../layer/DocumentMetadataLayerAdapter.java | 6 +- ...MetadataLayerSingletonCreatingWatcher.java | 6 +- .../layer/DocumentMetadataLayerSupport.java | 6 +- ...DocumentMetadataAnnotationDetailPanel.java | 14 +- ...umentMetadataAnnotationSelectionPanel.java | 12 +- .../DocumentMetadataSidebarFactory.java | 2 +- inception/inception-log/pom.xml | 5 - ...LayerConfigurationChangedEventAdapter.java | 2 +- .../log/adapter/TagEventAdapter.java | 2 +- .../EventRepositoryImplIntegrationTest.java | 4 +- .../pdfeditor/PdfAnnotationEditor.java | 4 +- .../pdfanno/PdfDocumentIFrameView.java | 2 +- .../pdfanno/model/PdfAnnoRendererTest.java | 4 +- .../pdfeditor2/PdfAnnotationEditor.java | 2 +- .../view/PdfDocumentIFrameView.java | 2 +- .../legacy/LegacyProjectExportPanel.java | 2 +- .../AnnotationDocumentsExporterTest.java | 2 +- .../basic/BasicRelationLayerInitializer.java | 2 +- .../BasicRelationRecommenderInitializer.java | 2 +- .../basic/BasicRelationTagSetInitializer.java | 2 +- .../basic/BasicSpanLayerInitializer.java | 2 +- .../BasicSpanRecommenderInitializer.java | 2 +- .../basic/BasicSpanTagSetInitializer.java | 2 +- ...cProjectInitializersAutoConfiguration.java | 2 +- .../BasicDocumentLabelLayerInitializer.java | 2 +- .../BasicDocumentLabelTagSetInitializer.java | 2 +- ...gProjectInitializersAutoConfiguration.java | 2 +- .../SentenceLabelLayerInitializer.java | 2 +- .../SentenceLabelRecommenderInitializer.java | 2 +- .../SentenceLabelTagSetInitializer.java | 2 +- ...gProjectInitializersAutoConfiguration.java | 2 +- .../EntityLinkingProjectInitializer.java | 2 +- ...dentifierStringRecommenderInitializer.java | 2 +- ...gProjectInitializersAutoConfiguration.java | 2 +- .../initializers/ChunkLayerInitializer.java | 2 +- .../CoreferenceLayerInitializer.java | 2 +- .../CoreferenceRelationTagSetInitializer.java | 2 +- .../CoreferenceTypeTagSetInitializer.java | 2 +- .../DependencyFlavorTagSetInitializer.java | 2 +- .../DependencyLayerInitializer.java | 2 +- .../DependencyTypeTagSetInitializer.java | 2 +- .../initializers/LemmaLayerInitializer.java | 2 +- ...MorphologicalFeaturesLayerInitializer.java | 2 +- .../NamedEntityLayerInitializer.java | 2 +- .../NamedEntityTagSetInitializer.java | 2 +- .../OrthographyLayerInitializer.java | 2 +- .../PartOfSpeechLayerInitializer.java | 2 +- .../PartOfSpeechTagSetInitializer.java | 2 +- .../SemPredArgLayerInitializer.java | 2 +- .../SentenceLayerInitializer.java | 2 +- .../SofaChangeOperationTagSetInitializer.java | 2 +- .../SurfaceFormLayerInitializer.java | 2 +- .../initializers/TokenLayerInitializer.java | 2 +- .../ProjectInitializersAutoConfiguration.java | 2 +- .../api/RecommendationService.java | 2 +- inception/inception-recommendation/pom.xml | 4 - .../RecommendationEditorExtension.java | 6 +- .../RecommenderServiceAutoConfiguration.java | 4 +- .../exporter/LearningRecordExporter.java | 2 +- .../exporter/RecommenderExporter.java | 2 +- .../project/RecommenderEditorPanel.java | 2 +- .../RecommendationRelationRenderer.java | 6 +- .../render/RecommendationRenderer.java | 2 +- .../render/RecommendationSpanRenderer.java | 4 +- .../render/RecommendationTypeRenderer.java | 2 +- .../service/RecommendationServiceImpl.java | 8 +- .../sidebar/RecommendationSidebar.java | 2 +- .../sidebar/RecommenderInfoPanel.java | 4 +- ...NonTrainableRecommenderActivationTask.java | 2 +- .../recommendation/tasks/SelectionTask.java | 2 +- .../recommendation/tasks/TrainingTask.java | 2 +- .../exporter/LearningRecordExporterTest.java | 2 +- .../exporter/RecommenderExporterTest.java | 2 +- ...ommendationServiceImplIntegrationTest.java | 2 +- ...onSuggestionVisibilityCalculationTest.java | 2 +- ...anSuggestionVisibilityCalculationTest.java | 2 +- .../revieweditor/AnnotationPanel.java | 10 +- .../revieweditor/DocumentAnnotationPanel.java | 10 +- .../inception/revieweditor/ReviewEditor.java | 2 +- .../revieweditor/SpanAnnotationPanel.java | 6 +- inception/inception-schema/pom.xml | 4 - .../AnnotationSchemaPropertiesImpl.java | 6 +- ...otationSchemaServiceAutoConfiguration.java | 13 +- .../schema/exporters/LayerExporter.java | 2 +- .../exporters/LegacyProjectInitializer.java | 2 +- .../schema/exporters/TagSetExporter.java | 2 +- .../AnnotationSchemaServiceEventAdapter.java | 2 +- .../service/AnnotationSchemaServiceImpl.java | 30 +-- .../service/FeatureSupportRegistryImpl.java | 6 +- .../DocumentServiceImplDatabaseTest.java | 4 +- .../schema/exporters/LayerExporterTest.java | 2 +- .../AnnotationSchemaServiceImplTest.java | 6 +- .../search/PrimitiveUimaIndexingSupport.java | 4 +- .../inception/search/SearchServiceImpl.java | 4 +- .../SearchServiceAutoConfiguration.java | 4 +- .../search/model/BulkIndexingContext.java | 2 +- inception/inception-search-mtas/pom.xml | 5 - .../search/index/mtas/MtasDocumentIndex.java | 2 +- .../index/mtas/MtasDocumentIndexFactory.java | 2 +- .../search/index/mtas/MtasUimaParser.java | 2 +- .../MtasDocumentIndexAutoConfiguration.java | 2 +- .../index/mtas/MtasDocumentIndexTest.java | 2 - .../search/index/mtas/MtasUimaParserTest.java | 2 +- .../search/index/mtas/MtasUpgradeTest.java | 6 +- .../recommendation/RecommenderTestHelper.java | 2 +- .../ui/agreement/page/AgreementPage.java | 2 +- inception/inception-ui-annotation/pom.xml | 4 - .../webanno/ui/annotation/AnnotationPage.java | 4 +- .../actionbar/undo/ActionFactory.java | 2 +- .../undo/PostActionScrollToAndHighlight.java | 2 +- .../undo/PostActionScrollToAndSelect.java | 2 +- .../annotation/actionbar/undo/UndoPanel.java | 4 +- .../CreateChainLinkAnnotationAction.java | 4 +- .../CreateChainSpanAnnotationAction.java | 4 +- .../CreateRelationAnnotationAction.java | 4 +- .../actions/CreateSpanAnnotationAction.java | 4 +- .../DeleteRelationAnnotationAction.java | 4 +- .../actions/DeleteSpanAnnotationAction.java | 4 +- .../actions/MoveSpanAnnotationAction.java | 4 +- .../actions/RedoableAnnotationAction.java | 4 +- .../actions/UndoableAnnotationAction.java | 4 +- .../UpdateFeatureValueAnnotationAction.java | 4 +- .../detail/AnnotationDetailEditorPanel.java | 16 +- .../detail/AnnotationTextPanel.java | 4 +- .../detail/AttachedAnnotationListPanel.java | 14 +- .../detail/FeatureEditorListPanel.java | 10 +- .../detail/LayerSelectionPanel.java | 6 +- inception/inception-ui-curation/pom.xml | 4 - .../CuratorWorkflowActionBarItemGroup.java | 2 +- .../curation/component/AnnotatorsPanel.java | 10 +- .../component/BratSuggestionVisualizer.java | 2 +- .../render/CurationRendererImpl.java | 4 +- .../ui/curation/page/CurationPage.java | 4 +- .../sidebar/CurationEditorExtension.java | 8 +- .../ui/curation/sidebar/CurationSidebar.java | 2 +- .../CurationSidebarAutoConfiguration.java | 6 +- .../render/CurationSidebarRenderer.java | 6 +- .../DocumentRepositoryEditorPanel.java | 2 +- .../ExternalSearchAnnotationSidebar.java | 2 +- ...owledgeBaseServiceUIAutoConfiguration.java | 4 +- ...BrowseKnowledgeBaseDialogContentPanel.java | 2 +- .../ui/kb/feature/ConceptFeatureEditor.java | 6 +- .../ConceptFeatureEditor_ImplBase.java | 4 +- .../ui/kb/feature/ConceptFeatureSupport.java | 6 +- .../feature/ConceptFeatureTraitsEditor.java | 4 +- .../ui/kb/feature/DisabledKBWarning.java | 2 +- .../MultiValueConceptFeatureEditor.java | 4 +- .../MultiValueConceptFeatureSupport.java | 8 +- .../MultiValueConceptFeatureTraitsEditor.java | 4 +- ...medEntityIdentifierFeatureInitializer.java | 2 +- .../search/ConceptFeatureIndexingSupport.java | 4 +- .../ConceptFeatureIndexingSupportTest.java | 2 +- inception/inception-ui-project/pom.xml | 4 - .../ui/project/detail/ProjectDetailPanel.java | 2 +- .../documents/ImportDocumentsPanel.java | 2 +- ...teLayerConfirmationDialogContentPanel.java | 2 +- .../ui/project/layers/FeatureDetailForm.java | 10 +- .../ui/project/layers/LayerDetailForm.java | 12 +- .../ui/project/layers/ProjectLayersPanel.java | 10 +- .../sidebar/SearchAnnotationSidebar.java | 4 +- .../sidebar/StatisticsAnnotationSidebar.java | 2 +- .../webanno/ui/tagsets/TagEditorPanel.java | 2 +- .../webanno/ui/tagsets/TagSelectionPanel.java | 2 +- .../webanno/ui/tagsets/TagSetEditorPanel.java | 2 +- .../webanno/ui/tagsets/TagSetImportPanel.java | 2 +- .../ui/tagsets/TagSetSelectionPanel.java | 2 +- inception/inception-versioning/pom.xml | 5 - .../versioning/VersioningServiceImpl.java | 2 +- .../VersioningServiceAutoConfiguration.java | 2 +- .../versioning/VersioningServiceImplTest.java | 2 - inception/inception-workload-dynamic/pom.xml | 5 - ...icAnnotatorWorkflowActionBarItemGroup.java | 2 +- .../DynamicWorkloadExtensionImpl2Test.java | 4 +- .../DynamicWorkloadExtensionImplTest.java | 4 +- inception/inception-workload-matrix/pom.xml | 5 - .../MatrixWorkflowActionBarItemGroup.java | 2 +- .../MatrixWorkloadExtensionImplTest.java | 4 +- inception/installEclipseSettings.sh | 2 +- inception/pom.xml | 1 - 407 files changed, 732 insertions(+), 1087 deletions(-) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/AnnotationSchemaService.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/AttachedAnnotation.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/AnnotationComparator.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/AnnotationComparisonUtils.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/AnnotationException.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/FeatureFilter.java (94%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/IllegalFeatureValueException.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/adapter/TypeAdapter.java (96%) rename inception/{inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno => inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema}/api/config/AnnotationSchemaProperties.java (96%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/LayerConfigurationChangedEvent.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/TagCreatedEvent.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/TagDeletedEvent.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/TagEvent.java (96%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/event/TagUpdatedEvent.java (95%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureEditor.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureEditorEvent.java (96%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureEditorValueChangedEvent.java (94%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureSupport.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureSupportRegistry.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureType.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/FeatureUtil.java (99%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/LinkWithRoleModel.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/feature/TypeUtil.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/layer/LayerSupport.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/layer/LayerSupportRegistry.java (97%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/layer/LayerSupport_ImplBase.java (94%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/layer/LayerType.java (98%) rename inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/{ => api}/validation/ValidationUtils.java (96%) delete mode 100644 inception/inception-api/LICENSE.txt delete mode 100644 inception/inception-api/pom.xml delete mode 100644 inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java delete mode 100644 inception/inception-api/src/main/resources/META-INF/spring.factories rename inception/{inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api => inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema}/config/AnnotationSchemaPropertiesImpl.java (91%) diff --git a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningService.java b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningService.java index 2549de5f2a4..f8792655ec4 100644 --- a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningService.java +++ b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningService.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.SpanSuggestion; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionGroup; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionGroup.Delta; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface ActiveLearningService { diff --git a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningServiceImpl.java b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningServiceImpl.java index 9703be05e73..b39a93977a8 100644 --- a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningServiceImpl.java +++ b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningServiceImpl.java @@ -52,9 +52,9 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.SpanSuggestion; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionGroup; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionGroup.Delta; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

diff --git a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java index 147b858bfa7..60e555498ea 100644 --- a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java +++ b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java @@ -34,8 +34,8 @@ import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; @Configuration @AutoConfigureAfter(RecommenderServiceAutoConfiguration.class) diff --git a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.java b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.java index 314011781a6..63262a4212d 100644 --- a/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.java +++ b/inception/inception-active-learning/src/main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.java @@ -122,11 +122,11 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VMarker; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class ActiveLearningSidebar extends AnnotationSidebar_ImplBase diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasure.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasure.java index f941f9046c3..aefe94f6ff1 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasure.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasure.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api.DiffAdapter; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class CohenKappaAgreementMeasure extends CodingAgreementMeasure_ImplBase diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasureSupport.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasureSupport.java index 5af080b15f2..413c889ce37 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasureSupport.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasureSupport.java @@ -25,7 +25,7 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.AbstractCodingAgreementMeasureSupport; import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.CodingAgreementResult; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Component public class CohenKappaAgreementMeasureSupport diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasure.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasure.java index 13592f21f97..27c67518e3a 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasure.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasure.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api.DiffAdapter; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class FleissKappaAgreementMeasure extends CodingAgreementMeasure_ImplBase diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasureSupport.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasureSupport.java index 6a93cce6a5e..857d3857dfa 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasureSupport.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasureSupport.java @@ -25,7 +25,7 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.AbstractCodingAgreementMeasureSupport; import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.CodingAgreementResult; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Component public class FleissKappaAgreementMeasureSupport diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasure.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasure.java index c88b1a10d79..55c551d4a73 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasure.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasure.java @@ -41,7 +41,7 @@ import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api.DiffAdapter; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class KrippendorffAlphaAgreementMeasure extends CodingAgreementMeasure_ImplBase diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasureSupport.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasureSupport.java index b9fd433e0d4..7aa167dd7da 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasureSupport.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasureSupport.java @@ -26,7 +26,7 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.AbstractCodingAgreementMeasureSupport; import de.tudarmstadt.ukp.clarin.webanno.agreement.results.coding.CodingAgreementResult; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Component public class KrippendorffAlphaAgreementMeasureSupport diff --git a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalphaunitizing/KrippendorffAlphaUnitizingAgreementMeasure.java b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalphaunitizing/KrippendorffAlphaUnitizingAgreementMeasure.java index 2d666f96072..408968e24cc 100644 --- a/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalphaunitizing/KrippendorffAlphaUnitizingAgreementMeasure.java +++ b/inception/inception-agreement/src/main/java/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/krippendorffalphaunitizing/KrippendorffAlphaUnitizingAgreementMeasure.java @@ -38,7 +38,7 @@ import de.tudarmstadt.ukp.clarin.webanno.agreement.measures.AgreementMeasure_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.agreement.results.unitizing.UnitizingAgreementResult; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class KrippendorffAlphaUnitizingAgreementMeasure extends AgreementMeasure_ImplBase diff --git a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/config/CasStorageServiceAutoConfiguration.java b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/config/CasStorageServiceAutoConfiguration.java index 4a4ab40163e..bc02f16958c 100644 --- a/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/config/CasStorageServiceAutoConfiguration.java +++ b/inception/inception-annotation-storage/src/main/java/de/tudarmstadt/ukp/inception/annotation/storage/config/CasStorageServiceAutoConfiguration.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.inception.annotation.storage.driver.CasStorageDriver; import de.tudarmstadt.ukp.inception.annotation.storage.driver.filesystem.FileSystemCasStorageDriver; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @EnableConfigurationProperties({ CasStorageCachePropertiesImpl.class, diff --git a/inception/inception-annotation-storage/src/test/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImplTest.java b/inception/inception-annotation-storage/src/test/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImplTest.java index a786546b5ce..2828a225ca4 100644 --- a/inception/inception-annotation-storage/src/test/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImplTest.java +++ b/inception/inception-annotation-storage/src/test/java/de/tudarmstadt/ukp/inception/annotation/storage/CasStorageServiceImplTest.java @@ -71,7 +71,7 @@ import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStoragePropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.storage.driver.filesystem.FileSystemCasStorageDriver; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; public class CasStorageServiceImplTest { diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index 211db3e053d..d195a350c5b 100644 --- a/inception/inception-api-annotation/pom.xml +++ b/inception/inception-api-annotation/pom.xml @@ -43,10 +43,6 @@ commons-text - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-export-api diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.java index d04e2f70043..f5190746ea2 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringRulesConfigurationPanel.java @@ -47,8 +47,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxSubmitLink; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringRule; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Can be added to a feature support traits editor to configure coloring rules. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java index 35a5b99c6e5..3c61c08b15c 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/coloring/ColoringServiceImpl.java @@ -52,8 +52,8 @@ import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringStrategyType; import de.tudarmstadt.ukp.inception.rendering.coloring.ReadonlyColoringBehaviour; import de.tudarmstadt.ukp.inception.rendering.editorstate.ColoringPreferences; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.support.findbugs.SuppressFBWarnings; /** diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/config/AnnotationAutoConfiguration.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/config/AnnotationAutoConfiguration.java index 6dba82dd4e2..fd5d784a812 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/config/AnnotationAutoConfiguration.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/config/AnnotationAutoConfiguration.java @@ -33,12 +33,12 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.PreRenderer; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.PreRendererImpl; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.RenderNotificationRenderStep; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @Configuration @EnableConfigurationProperties(AnnotationEditorDefaultPreferencesPropertiesImpl.class) diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/IllegalPlacementException.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/IllegalPlacementException.java index f33b8ba7536..ed4f4c2ffb1 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/IllegalPlacementException.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/IllegalPlacementException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that an attempt to place an annotation at a given position failed because the diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/NotEditableException.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/NotEditableException.java index 449d1504fd0..528cb32e464 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/NotEditableException.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/exception/NotEditableException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that an attempt edit a read-only document or value failed. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.java index 13318a1087c..fa1f3f4ce25 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsConfigurationPanel.java @@ -42,10 +42,10 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxSubmitLink; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Can be added to a feature support traits editor to configure key bindings. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsPanel.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsPanel.java index e10b124b848..4a437f2f515 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsPanel.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/keybindings/KeyBindingsPanel.java @@ -40,9 +40,9 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.input.InputBehavior; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import wicket.contrib.input.events.EventType; import wicket.contrib.input.events.key.KeyType; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java index 0fb354f331e..e541028ed8f 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java @@ -70,10 +70,10 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.validation.ValidationUtils; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.validation.ValidationUtils; public abstract class AnnotationPageBase extends ProjectPageBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.java index e46c2e3b6ae..e79bc4fb44e 100755 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/AnnotationPreferencesDialogContent.java @@ -55,7 +55,6 @@ import org.slf4j.Logger; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationEditorState; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.AjaxCallback; @@ -70,7 +69,8 @@ import de.tudarmstadt.ukp.inception.rendering.coloring.ReadonlyColoringBehaviour; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotationPreference; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; /** * Modal Window to configure layers, window size, etc. @@ -201,7 +201,7 @@ private void actionSave(AjaxRequestTarget aTarget, Form aForm) // Make sure the visibility logic of the right sidebar sees if there are selectable // layers - state.refreshSelectableLayers(annotationEditorProperties); + state.refreshSelectableLayers(annotationEditorProperties::isLayerBlocked); userPreferencesService.savePreference(state, userDao.getCurrentUsername()); } diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java index 407d0bad8e3..3a34fb5923f 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java @@ -49,7 +49,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.config.AnnotationAutoConfiguration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Mode; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -61,7 +60,8 @@ import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringStrategyType; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotationPreference; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; /** *

@@ -129,7 +129,7 @@ public void loadPreferences(AnnotatorState aState, String aUsername) } // Make sure the visibility logic of the right sidebar sees if there are selectable layers - aState.refreshSelectableLayers(annotationEditorProperties); + aState.refreshSelectableLayers(annotationEditorProperties::isLayerBlocked); } @Override diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/ColorRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/ColorRenderer.java index 93e65117cb1..27913bcaab8 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/ColorRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/ColorRenderer.java @@ -46,8 +46,8 @@ import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/LabelRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/LabelRenderer.java index 3317ca7e52d..47f598f4333 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/LabelRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/LabelRenderer.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering; -import static de.tudarmstadt.ukp.inception.schema.feature.TypeUtil.getUiLabelText; +import static de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil.getUiLabelText; import org.springframework.core.annotation.Order; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/NopRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/NopRenderer.java index 11c5bf85f10..89c6616662b 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/NopRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/NopRenderer.java @@ -27,9 +27,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class NopRenderer extends Renderer_ImplBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java index 583ad8d3ee4..b6df88442da 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/PreRendererImpl.java @@ -43,10 +43,10 @@ import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderStep; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/Renderer_ImplBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/Renderer_ImplBase.java index 63186cedcfb..27c709390f2 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/Renderer_ImplBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/rendering/Renderer_ImplBase.java @@ -29,9 +29,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public abstract class Renderer_ImplBase implements Renderer diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureEditor.java index 89ef70f3b97..602ecf243bb 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureEditor.java @@ -27,7 +27,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstrapcheckbox.BootstrapCheckBoxPicker; import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstrapcheckbox.BootstrapCheckBoxPickerConfig; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; public class BooleanFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureSupport.java index bd9cf8ea43c..04188e061d4 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/bool/BooleanFeatureSupport.java @@ -33,8 +33,8 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureDeletedEvent.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureDeletedEvent.java index 0df7cbae3b6..fd97c59c30e 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureDeletedEvent.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureDeletedEvent.java @@ -23,8 +23,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; public class LinkFeatureDeletedEvent extends LinkFeatureEvent diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java index c15f261cf70..12804ff6195 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java @@ -87,16 +87,16 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderSlotsEvent; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; -import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class LinkFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEvent.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEvent.java index df0d796a1bb..b4d651c640c 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEvent.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEvent.java @@ -23,9 +23,9 @@ import org.apache.wicket.ajax.AjaxRequestTarget; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorEvent; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; public abstract class LinkFeatureEvent extends FeatureEditorEvent diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupport.java index 4f6360a1310..7d4fb04e24b 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupport.java @@ -51,12 +51,12 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java index c7510d564aa..4327b50e48d 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java @@ -44,8 +44,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class LinkFeatureTraitsEditor extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/UimaPrimitiveFeatureSupport_ImplBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/UimaPrimitiveFeatureSupport_ImplBase.java index 446926db7ff..674a2496556 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/UimaPrimitiveFeatureSupport_ImplBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/UimaPrimitiveFeatureSupport_ImplBase.java @@ -25,7 +25,7 @@ import org.springframework.beans.factory.InitializingBean; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; public abstract class UimaPrimitiveFeatureSupport_ImplBase implements FeatureSupport, InitializingBean diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java index e69e12a5369..85bb06f7e52 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java @@ -46,10 +46,10 @@ import de.tudarmstadt.ukp.inception.annotation.feature.string.StringFeatureSupportProperties; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class MultiSelectTextFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java index d40b76021c1..55d70643dc7 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java @@ -50,10 +50,10 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java index b03f4cc1492..bb18f104132 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.inception.annotation.feature.misc.UimaPrimitiveFeatureSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class MultiValueStringFeatureTraitsEditor extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java index 384cc6d5486..a914128342a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java @@ -27,8 +27,8 @@ import com.googlecode.wicket.kendo.ui.form.NumberTextField; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class NumberFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureSupport.java index 3856c75a2d8..4a4cf967efe 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureSupport.java @@ -40,8 +40,8 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java index b1ce1cde831..b2ed771799f 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java @@ -40,8 +40,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.inception.annotation.feature.misc.UimaPrimitiveFeatureSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class NumberFeatureTraitsEditor extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/RatingFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/RatingFeatureEditor.java index 4bbb127d7c9..aef405cc4d2 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/RatingFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/RatingFeatureEditor.java @@ -35,8 +35,8 @@ import org.apache.wicket.model.PropertyModel; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; public class RatingFeatureEditor extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java index 0fad3311cef..6fe22844c3b 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java @@ -44,7 +44,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.event.TagEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.TagEvent; /** * String feature editor using a Kendo ComboBox field. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/RadioGroupStringFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/RadioGroupStringFeatureEditor.java index 7e4e749bb86..58c560d86b6 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/RadioGroupStringFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/RadioGroupStringFeatureEditor.java @@ -49,7 +49,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; public class RadioGroupStringFeatureEditor extends TextFeatureEditorBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java index bc59cd25bb0..a820ecdedb7 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java @@ -46,10 +46,10 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java index 7005e99bcd4..3cc0fbd03e7 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java @@ -42,8 +42,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.inception.annotation.feature.misc.UimaPrimitiveFeatureSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class StringFeatureTraitsEditor extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/TextFeatureEditorBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/TextFeatureEditorBase.java index d8992d280b9..e736ca22525 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/TextFeatureEditorBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/TextFeatureEditorBase.java @@ -28,9 +28,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.annotation.feature.misc.ConstraintsInUseIndicator; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public abstract class TextFeatureEditorBase extends FeatureEditor diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/LayerTraitsEditor_ImplBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/LayerTraitsEditor_ImplBase.java index fc17afe45e9..221e70f03e6 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/LayerTraitsEditor_ImplBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/LayerTraitsEditor_ImplBase.java @@ -26,8 +26,8 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public abstract class LayerTraitsEditor_ImplBase> extends Panel diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/TypeAdapter_ImplBase.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/TypeAdapter_ImplBase.java index ec626f5ad44..33859fddbc9 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/TypeAdapter_ImplBase.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/TypeAdapter_ImplBase.java @@ -37,12 +37,12 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.annotation.events.FeatureValueUpdatedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public abstract class TypeAdapter_ImplBase implements TypeAdapter diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehavior.java index d8282be7ead..3fc60901bf0 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehavior.java @@ -26,8 +26,8 @@ import org.apache.uima.cas.text.AnnotationFS; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; public interface LayerBehavior { diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistry.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistry.java index 35544b15eb0..133b68b7dfd 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistry.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistry.java @@ -19,7 +19,7 @@ import java.util.List; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; public interface LayerBehaviorRegistry { diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistryImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistryImpl.java index 363362bb1fc..0fd4209ed07 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistryImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerBehaviorRegistryImpl.java @@ -33,7 +33,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerSupportRegistryImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerSupportRegistryImpl.java index 0380d400252..915f0a952b5 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerSupportRegistryImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/behaviors/LayerSupportRegistryImpl.java @@ -39,9 +39,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapter.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapter.java index 32678a161e5..80af2dc7e00 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapter.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapter.java @@ -50,11 +50,11 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerBehavior; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparator; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparator; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Manage interactions with annotations on a chain layer. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerSupport.java index f0bb0ced175..09e4ad28734 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerSupport.java @@ -41,9 +41,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehaviorRegistry; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerBehavior; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport_ImplBase; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.java index 22a01cb47cf..bada5ddcf27 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainLayerTraitsEditor.java @@ -26,12 +26,12 @@ import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.annotation.layer.LayerTraitsEditor_ImplBase; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.AnchoringModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.OverlapModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.ValidationModeSelect; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; public class ChainLayerTraitsEditor extends LayerTraitsEditor_ImplBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainRenderer.java index e8fff42592c..be2de86cd32 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainRenderer.java @@ -19,7 +19,7 @@ import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.COREFERENCE_RELATION_FEATURE; import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.COREFERENCE_TYPE_FEATURE; -import static de.tudarmstadt.ukp.inception.schema.feature.TypeUtil.getUiLabelText; +import static de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil.getUiLabelText; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; @@ -49,8 +49,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class ChainRenderer extends Renderer_ImplBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapter.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapter.java index cb8db6b656a..349f8e5c9f7 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapter.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapter.java @@ -48,10 +48,10 @@ import de.tudarmstadt.ukp.inception.annotation.layer.TypeAdapter_ImplBase; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.FeatureFilter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.FeatureFilter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Manage interactions with annotations on a relation layer. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationCrossSentenceBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationCrossSentenceBehavior.java index f342ba3ebd1..63cace4c086 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationCrossSentenceBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationCrossSentenceBehavior.java @@ -47,8 +47,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VComment; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerBehavior.java index aaf23f76025..b533bec774a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerBehavior.java @@ -30,9 +30,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehavior; import de.tudarmstadt.ukp.inception.rendering.vmodel.VArc; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; public abstract class RelationLayerBehavior implements LayerBehavior diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerSupport.java index add700cc7ab..3fb8c61df0a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerSupport.java @@ -40,9 +40,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehaviorRegistry; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport_ImplBase; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.java index 8b42520ec4a..915a69957ee 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationLayerTraitsEditor.java @@ -26,11 +26,11 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.coloring.ColoringRulesConfigurationPanel; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.annotation.layer.LayerTraitsEditor_ImplBase; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.OverlapModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.ValidationModeSelect; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; public class RelationLayerTraitsEditor extends LayerTraitsEditor_ImplBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationOverlapBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationOverlapBehavior.java index 87f60785089..bfe51ca1d20 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationOverlapBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationOverlapBehavior.java @@ -47,9 +47,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VComment; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparator; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparator; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * Handles the {@link OverlapMode} setting for {@link WebAnnoConst#RELATION_TYPE relation layers}. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRenderer.java index 7feb26c508e..cd8c4a89048 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRenderer.java @@ -64,8 +64,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * A class that is used to create Brat Arc to CAS relations and vice-versa diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java index 351e9e8da6d..a69325b4214 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java @@ -47,9 +47,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.TypeAdapter_ImplBase; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Manage interactions with annotations on a span layer. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAnchoringModeBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAnchoringModeBehavior.java index 953e5702099..0275fd91b89 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAnchoringModeBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAnchoringModeBehavior.java @@ -33,9 +33,9 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.annotation.layer.chain.ChainLayerSupport; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanCrossSentenceBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanCrossSentenceBehavior.java index bb2656a8104..794b07bff0a 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanCrossSentenceBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanCrossSentenceBehavior.java @@ -46,9 +46,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; /** * Ensure that annotations do not cross sentence boundaries. For chain layers, this check applies diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerBehavior.java index bda40f9363e..44b3d9949f0 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerBehavior.java @@ -24,9 +24,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehavior; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; public abstract class SpanLayerBehavior implements LayerBehavior diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerSupport.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerSupport.java index add470f9253..1eb54b36e6f 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerSupport.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerSupport.java @@ -36,9 +36,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerBehaviorRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport_ImplBase; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; /** *

diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.java index 8cd38168453..3917add820f 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanLayerTraitsEditor.java @@ -27,7 +27,6 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.coloring.ColoringRulesConfigurationPanel; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.SurfaceForm; @@ -36,6 +35,7 @@ import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.AnchoringModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.OverlapModeSelect; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.ValidationModeSelect; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; public class SpanLayerTraitsEditor extends LayerTraitsEditor_ImplBase diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanOverlapBehavior.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanOverlapBehavior.java index 9c3aad5247b..8680dc83fc6 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanOverlapBehavior.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanOverlapBehavior.java @@ -45,10 +45,10 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparator; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparator; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; /** * Handles the {@link OverlapMode} setting for {@link WebAnnoConst#SPAN_TYPE span layers}. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java index 4b085d9ff89..06591845691 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java @@ -50,9 +50,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * Render spans. diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/editor/state/AnnotatorStateImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/editor/state/AnnotatorStateImpl.java index 847038a4fdb..2f1cb7a41e8 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/editor/state/AnnotatorStateImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/editor/state/AnnotatorStateImpl.java @@ -30,6 +30,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.function.Predicate; import org.apache.uima.cas.CAS; import org.apache.uima.cas.text.AnnotationFS; @@ -39,7 +40,6 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.request.cycle.RequestCycle; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.constraints.model.ParsedConstraints; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; @@ -416,12 +416,12 @@ public List getSelectableLayers() } @Override - public void refreshSelectableLayers(AnnotationSchemaProperties aProperties) + public void refreshSelectableLayers(Predicate isLayerBlocked) { selectableLayers.clear(); for (AnnotationLayer layer : getAnnotationLayers()) { - if (!layer.isEnabled() || layer.isReadonly() || aProperties.isLayerBlocked(layer)) { + if (!layer.isEnabled() || layer.isReadonly() || isLayerBlocked.test(layer)) { continue; } diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupportTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupportTest.java index 7158acaa27a..481b4c296a8 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupportTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureSupportTest.java @@ -47,8 +47,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; @ExtendWith(MockitoExtension.class) public class LinkFeatureSupportTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupportTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupportTest.java index f3aea005c1e..e6ad5d5599e 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupportTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupportTest.java @@ -40,7 +40,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; import de.tudarmstadt.ukp.inception.annotation.feature.string.StringFeatureSupportPropertiesImpl; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class MultiValueStringFeatureSupportTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupportTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupportTest.java index d93a5baf9ad..613af4d71cd 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupportTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupportTest.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class StringFeatureSupportTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapterTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapterTest.java index 528be39fdbd..6264bb1ede0 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapterTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/chain/ChainAdapterTest.java @@ -51,9 +51,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanCrossSentenceBehavior; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerBehavior; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanOverlapBehavior; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @ExtendWith(MockitoExtension.class) public class ChainAdapterTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapterTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapterTest.java index 248f00be259..947736d9a23 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapterTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationAdapterTest.java @@ -59,9 +59,9 @@ import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerSupportRegistryImpl; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @ExtendWith(MockitoExtension.class) public class RelationAdapterTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRendererTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRendererTest.java index 3dd47983abc..459f057ff1f 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRendererTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/relation/RelationRendererTest.java @@ -59,7 +59,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VComment; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; @ExtendWith(MockitoExtension.class) public class RelationRendererTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapterTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapterTest.java index 3ebe3ae23a8..95b027a5c84 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapterTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapterTest.java @@ -49,9 +49,9 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerSupportRegistryImpl; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @ExtendWith(MockitoExtension.class) public class SpanAdapterTest diff --git a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRendererTest.java b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRendererTest.java index e6d02091d4a..7282aa5a4cc 100644 --- a/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRendererTest.java +++ b/inception/inception-api-annotation/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRendererTest.java @@ -43,8 +43,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VComment; import de.tudarmstadt.ukp.inception.rendering.vmodel.VCommentType; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @ExtendWith(MockitoExtension.class) public class SpanRendererTest diff --git a/inception/inception-api-editor/pom.xml b/inception/inception-api-editor/pom.xml index fc88931bfbd..e8f8353aa1d 100644 --- a/inception/inception-api-editor/pom.xml +++ b/inception/inception-api-editor/pom.xml @@ -31,10 +31,6 @@ uimaj-core - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-annotation-storage-api diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorBase.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorBase.java index 0df22cd19bb..dcd1c1a648f 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorBase.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorBase.java @@ -40,7 +40,6 @@ import org.slf4j.Logger; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.AjaxComponentRespondListener; @@ -53,7 +52,8 @@ import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.serialization.VDocumentSerializer; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; public abstract class AnnotationEditorBase extends Panel diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java index e29dc15afef..c96b308ec4d 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface AnnotationEditorExtension { diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java index 30e6321161c..b7b3eb0a755 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface AnnotationEditorExtensionRegistry { diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java index b4a0f10ddea..864ef97fe20 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java @@ -41,7 +41,7 @@ import de.tudarmstadt.ukp.inception.editor.config.AnnotationEditorAutoConfiguration; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** *

diff --git a/inception/inception-api-render/pom.xml b/inception/inception-api-render/pom.xml index 2fe2dd6788b..79e1fcb9bb9 100644 --- a/inception/inception-api-render/pom.xml +++ b/inception/inception-api-render/pom.xml @@ -26,10 +26,6 @@ INCEpTION - Core - Annotation rendering API - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-model diff --git a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/editorstate/LayerSelectionState.java b/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/editorstate/LayerSelectionState.java index a2cffd10a61..a9941c8a842 100644 --- a/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/editorstate/LayerSelectionState.java +++ b/inception/inception-api-render/src/main/java/de/tudarmstadt/ukp/inception/rendering/editorstate/LayerSelectionState.java @@ -18,8 +18,8 @@ package de.tudarmstadt.ukp.inception.rendering.editorstate; import java.util.List; +import java.util.function.Predicate; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; public interface LayerSelectionState @@ -75,7 +75,7 @@ public interface LayerSelectionState */ void setAnnotationLayers(List aAnnotationLayers); - void refreshSelectableLayers(AnnotationSchemaProperties aProperties); + void refreshSelectableLayers(Predicate isLayerBlocked); List getSelectableLayers(); } diff --git a/inception/inception-api-schema/pom.xml b/inception/inception-api-schema/pom.xml index 76428916938..186b07c2fe1 100644 --- a/inception/inception-api-schema/pom.xml +++ b/inception/inception-api-schema/pom.xml @@ -97,5 +97,10 @@ com.fasterxml.jackson.core jackson-databind + + + org.dkpro.core + dkpro-core-api-segmentation-asl + \ No newline at end of file diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java index d5a7f1d068e..bfc15603db2 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/editor/action/AnnotationActionHandler.java @@ -25,7 +25,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface AnnotationActionHandler { diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java index 375b7fe6635..267b0381e80 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/rendering/Renderer.java @@ -18,7 +18,7 @@ package de.tudarmstadt.ukp.inception.rendering; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectByAddr; -import static de.tudarmstadt.ukp.inception.schema.validation.ValidationUtils.isRequiredFeatureMissing; +import static de.tudarmstadt.ukp.inception.schema.api.validation.ValidationUtils.isRequiredFeatureMissing; import static org.apache.commons.lang3.StringUtils.defaultString; import java.util.ArrayList; @@ -40,8 +40,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Type renderer for span, arc, and chain annotations diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AnnotationSchemaService.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AnnotationSchemaService.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java index ff56e354768..c10d78b8ec2 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AnnotationSchemaService.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema; +package de.tudarmstadt.ukp.inception.schema.api; import java.io.IOException; import java.util.List; @@ -41,12 +41,12 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** * This interface contains methods which are related to TagSet, Tag and Type for the annotation diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AttachedAnnotation.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AttachedAnnotation.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java index 5bef69b3c19..0dd936eca88 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/AttachedAnnotation.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AttachedAnnotation.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema; +package de.tudarmstadt.ukp.inception.schema.api; import org.apache.uima.cas.text.AnnotationFS; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparator.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparator.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java index 3585a5e5450..1796a10548c 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparator.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparator.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.adapter; +package de.tudarmstadt.ukp.inception.schema.api.adapter; import java.util.Comparator; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparisonUtils.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparisonUtils.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java index 5fd695c059e..d937e431177 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationComparisonUtils.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationComparisonUtils.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.adapter; +package de.tudarmstadt.ukp.inception.schema.api.adapter; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.getDefaultFeatureValue; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.getFeatureValue; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationException.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationException.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java index ba33bdd1512..ea4c3cf7045 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/AnnotationException.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/AnnotationException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.adapter; +package de.tudarmstadt.ukp.inception.schema.api.adapter; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.CommonException; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/FeatureFilter.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java similarity index 94% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/FeatureFilter.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java index e91824d4a70..b61cb9ea566 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/FeatureFilter.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureFilter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.adapter; +package de.tudarmstadt.ukp.inception.schema.api.adapter; import org.apache.uima.cas.Feature; import org.apache.uima.cas.FeatureStructure; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/IllegalFeatureValueException.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/IllegalFeatureValueException.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java index 721034003c8..ffc9a849d00 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/IllegalFeatureValueException.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/IllegalFeatureValueException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.adapter; +package de.tudarmstadt.ukp.inception.schema.api.adapter; public class IllegalFeatureValueException extends AnnotationException diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/TypeAdapter.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java similarity index 96% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/TypeAdapter.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java index 8d8c0c9e6d4..a43c63bf6a7 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/adapter/TypeAdapter.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.adapter; +package de.tudarmstadt.ukp.inception.schema.api.adapter; -import static de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparisonUtils.isEquivalentSpanAnnotation; +import static de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparisonUtils.isEquivalentSpanAnnotation; import java.util.Collection; import java.util.List; @@ -39,8 +39,8 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; /** * A type adapter encapsulates a specific kind of annotation layer, e.g. spans, relations or chains. diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaProperties.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java similarity index 96% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaProperties.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java index 33281158525..38f48d7eef1 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaProperties.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/config/AnnotationSchemaProperties.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.config; +package de.tudarmstadt.ukp.inception.schema.api.config; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/LayerConfigurationChangedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/LayerConfigurationChangedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java index a7110fac354..ff6c4b00c37 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/LayerConfigurationChangedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/LayerConfigurationChangedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagCreatedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagCreatedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java index 4c2b2c98f5c..82d75689f5a 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagCreatedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagCreatedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagDeletedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagDeletedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java index 508fab050ad..2b5fa9ef91a 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagDeletedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagDeletedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java similarity index 96% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java index 4c1b4a774a4..e6eb3615f75 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import org.springframework.context.ApplicationEvent; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagUpdatedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java similarity index 95% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagUpdatedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java index cbfea640fb6..ff8fd9bdc29 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/event/TagUpdatedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/event/TagUpdatedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.event; +package de.tudarmstadt.ukp.inception.schema.api.event; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditor.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditor.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java index 896cf2d6f94..490e7814451 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditor.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditor.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import static org.apache.wicket.event.Broadcast.BUBBLE; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java similarity index 96% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java index 9cc989aa8d2..7233e0b3718 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import org.apache.wicket.ajax.AjaxRequestTarget; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorValueChangedEvent.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java similarity index 94% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorValueChangedEvent.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java index c142d27c5cf..2ef71168794 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureEditorValueChangedEvent.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureEditorValueChangedEvent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import org.apache.wicket.ajax.AjaxRequestTarget; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupport.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupport.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java index 25b9cf1402c..211412f81ab 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupport.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupport.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectFsByAddr; -import static de.tudarmstadt.ukp.inception.schema.feature.FeatureUtil.setFeature; +import static de.tudarmstadt.ukp.inception.schema.api.feature.FeatureUtil.setFeature; import java.io.Serializable; import java.util.Collections; @@ -44,8 +44,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * Extension point for new types of annotation features. diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupportRegistry.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupportRegistry.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java index 167856c2f79..010cea6ab3b 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureSupportRegistry.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureSupportRegistry.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import java.util.List; import java.util.Optional; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureType.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureType.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java index 9e6bc0b2ec6..21bec203cdb 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureType.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureType.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import java.io.Serializable; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureUtil.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java similarity index 99% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureUtil.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java index b230822aeed..2f8d9483059 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/FeatureUtil.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/FeatureUtil.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectFsByAddr; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/LinkWithRoleModel.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/LinkWithRoleModel.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java index 045e5a25022..f0de33544ef 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/LinkWithRoleModel.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/LinkWithRoleModel.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import java.io.Serializable; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/TypeUtil.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/TypeUtil.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java index aa32681fbdd..10554646648 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/feature/TypeUtil.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/feature/TypeUtil.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.feature; +package de.tudarmstadt.ukp.inception.schema.api.feature; import static java.lang.Long.parseLong; @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.MultiValueMode; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * Utility Class for {@link TypeAdapter} with static methods such as getting {@link TypeAdapter} diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java index 3cf9933a5c8..599d7d6f2d8 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.layer; +package de.tudarmstadt.ukp.inception.schema.api.layer; import static java.util.Arrays.asList; @@ -34,8 +34,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; public interface LayerSupport extends BeanNameAware diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupportRegistry.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java similarity index 97% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupportRegistry.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java index 77edc8fa451..9c022a1d5a0 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupportRegistry.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupportRegistry.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.layer; +package de.tudarmstadt.ukp.inception.schema.api.layer; import static java.util.Comparator.comparing; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport_ImplBase.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java similarity index 94% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport_ImplBase.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java index 768e1226626..121b7b0d029 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerSupport_ImplBase.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerSupport_ImplBase.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.layer; +package de.tudarmstadt.ukp.inception.schema.api.layer; import static de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil.fromJsonString; import static de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil.toJsonString; @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public abstract class LayerSupport_ImplBase implements LayerSupport diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerType.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java similarity index 98% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerType.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java index 39fa3ba36ef..b8aac56a8af 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/layer/LayerType.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/layer/LayerType.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.layer; +package de.tudarmstadt.ukp.inception.schema.api.layer; import java.io.Serializable; diff --git a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/validation/ValidationUtils.java b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java similarity index 96% rename from inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/validation/ValidationUtils.java rename to inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java index 737141d8e79..a793e754971 100644 --- a/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/validation/ValidationUtils.java +++ b/inception/inception-api-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/api/validation/ValidationUtils.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.inception.schema.validation; +package de.tudarmstadt.ukp.inception.schema.api.validation; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.uima.cas.CAS.TYPE_NAME_STRING; diff --git a/inception/inception-api/LICENSE.txt b/inception/inception-api/LICENSE.txt deleted file mode 100644 index d6456956733..00000000000 --- a/inception/inception-api/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/inception/inception-api/pom.xml b/inception/inception-api/pom.xml deleted file mode 100644 index 338d82d9902..00000000000 --- a/inception/inception-api/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - de.tudarmstadt.ukp.inception.app - inception-app - 30.0-SNAPSHOT - - inception-api - INCEpTION - Core - API - - - de.tudarmstadt.ukp.inception.app - inception-model - - - - - org.springframework - spring-context - - - org.springframework.boot - spring-boot - - - - org.dkpro.core - dkpro-core-api-segmentation-asl - - - \ No newline at end of file diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java b/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java deleted file mode 100644 index 48d46746f53..00000000000 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaAutoConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Technische Universität Darmstadt under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The Technische Universität Darmstadt - * licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package de.tudarmstadt.ukp.clarin.webanno.api.config; - -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableConfigurationProperties({ AnnotationSchemaPropertiesImpl.class }) -public class AnnotationSchemaAutoConfiguration -{ - // No Beans -} diff --git a/inception/inception-api/src/main/resources/META-INF/spring.factories b/inception/inception-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 96d6ad8e87e..00000000000 --- a/inception/inception-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration \ No newline at end of file diff --git a/inception/inception-bom/pom.xml b/inception/inception-bom/pom.xml index de125ffc0c8..2cd5204c47d 100644 --- a/inception/inception-bom/pom.xml +++ b/inception/inception-bom/pom.xml @@ -332,11 +332,6 @@ inception-search-mtas 30.0-SNAPSHOT - - de.tudarmstadt.ukp.inception.app - inception-api - 30.0-SNAPSHOT - de.tudarmstadt.ukp.inception.app inception-js-api diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratSentenceOrientedAnnotationEditorFactory.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratSentenceOrientedAnnotationEditorFactory.java index 34ac638b8e7..8e4ae51f45d 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratSentenceOrientedAnnotationEditorFactory.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratSentenceOrientedAnnotationEditorFactory.java @@ -27,7 +27,7 @@ import de.tudarmstadt.ukp.inception.editor.AnnotationEditorFactoryImplBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/config/BratAnnotationEditorAutoConfiguration.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/config/BratAnnotationEditorAutoConfiguration.java index 04458b1f37e..6ca26309a7a 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/config/BratAnnotationEditorAutoConfiguration.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/config/BratAnnotationEditorAutoConfiguration.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.clarin.webanno.brat.schema.BratSchemaGenerator; import de.tudarmstadt.ukp.clarin.webanno.brat.schema.BratSchemaGeneratorImpl; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ConditionalOnWebApplication @Configuration diff --git a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/schema/BratSchemaGeneratorImpl.java b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/schema/BratSchemaGeneratorImpl.java index fcf4d3a8960..c1428ea7c61 100644 --- a/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/schema/BratSchemaGeneratorImpl.java +++ b/inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/schema/BratSchemaGeneratorImpl.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-brat-editor/src/test/java/de/tudarmstadt/ukp/clarin/webanno/brat/render/BratSerializerImplTest.java b/inception/inception-brat-editor/src/test/java/de/tudarmstadt/ukp/clarin/webanno/brat/render/BratSerializerImplTest.java index 436989ad736..23f8c5a7681 100644 --- a/inception/inception-brat-editor/src/test/java/de/tudarmstadt/ukp/clarin/webanno/brat/render/BratSerializerImplTest.java +++ b/inception/inception-brat-editor/src/test/java/de/tudarmstadt/ukp/clarin/webanno/brat/render/BratSerializerImplTest.java @@ -76,7 +76,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; @ExtendWith(MockitoExtension.class) diff --git a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/config/EntityLinkingServiceAutoConfiguration.java b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/config/EntityLinkingServiceAutoConfiguration.java index 537172f6918..26158eb3c35 100644 --- a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/config/EntityLinkingServiceAutoConfiguration.java +++ b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/config/EntityLinkingServiceAutoConfiguration.java @@ -42,7 +42,7 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; @Configuration @AutoConfigureAfter({ KnowledgeBaseServiceAutoConfiguration.class, diff --git a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinker.java b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinker.java index 604b30401b8..0929ad0bde2 100644 --- a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinker.java +++ b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinker.java @@ -49,7 +49,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext.Key; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.TrainingCapability; import de.tudarmstadt.ukp.inception.rendering.model.Range; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class NamedEntityLinker extends RecommendationEngine diff --git a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinkerFactory.java b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinkerFactory.java index 394347bd95f..d235cef4771 100644 --- a/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinkerFactory.java +++ b/inception/inception-concept-linking/src/main/java/de/tudarmstadt/ukp/inception/conceptlinking/recommender/NamedEntityLinkerFactory.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngine; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactoryImplBase; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

diff --git a/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java b/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java index 432043807b2..8f5f49ba4ab 100644 --- a/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java +++ b/inception/inception-concept-linking/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java @@ -66,8 +66,8 @@ import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.support.test.recommendation.DkproTestHelper; import de.tudarmstadt.ukp.inception.support.test.recommendation.RecommenderTestHelper; diff --git a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/CasDiff.java b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/CasDiff.java index 2160402ec42..398a83d8759 100644 --- a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/CasDiff.java +++ b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/CasDiff.java @@ -72,7 +72,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class CasDiff { diff --git a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/api/CasDiffException.java b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/api/CasDiffException.java index 409b308e82b..fc8b5de93a3 100644 --- a/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/api/CasDiffException.java +++ b/inception/inception-curation-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/api/CasDiffException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Thrown if there is a problem during CAS diff computation. diff --git a/inception/inception-curation/pom.xml b/inception/inception-curation/pom.xml index 0ddaa61e389..f0ac41c2167 100644 --- a/inception/inception-curation/pom.xml +++ b/inception/inception-curation/pom.xml @@ -65,10 +65,6 @@ de.tudarmstadt.ukp.inception.app inception-export-api - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-annotation-storage diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationDocumentServiceAutoConfiguration.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationDocumentServiceAutoConfiguration.java index e1e5d837749..0b65b94c6d3 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationDocumentServiceAutoConfiguration.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationDocumentServiceAutoConfiguration.java @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentServiceImpl; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @AutoConfigureAfter(name = { diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java index 8851894f6eb..6e143113d90 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/config/CurationServiceAutoConfiguration.java @@ -28,7 +28,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.inception.curation.export.CuratedDocumentsExporter; import de.tudarmstadt.ukp.inception.curation.export.CurationWorkflowExporter; @@ -46,7 +45,8 @@ import de.tudarmstadt.ukp.inception.curation.settings.CurationProjectSettingsMenuItem; import de.tudarmstadt.ukp.inception.curation.settings.CurationProjectSettingsPanelFactory; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; @Configuration public class CurationServiceAutoConfiguration diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/AlreadyMergedException.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/AlreadyMergedException.java index c07435738bc..18a4b174589 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/AlreadyMergedException.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/AlreadyMergedException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.inception.curation.merge; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that a merge operation could not be performed because the annotation had already been diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java index 28968552f61..cee3130904d 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java @@ -90,13 +90,13 @@ import de.tudarmstadt.ukp.inception.curation.merge.strategy.DefaultMergeStrategy; import de.tudarmstadt.ukp.inception.curation.merge.strategy.MergeStrategy; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparisonUtils; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.FeatureFilter; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparisonUtils; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.FeatureFilter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; /** * Do a merge CAS out of multiple user annotations diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeException.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeException.java index 8c20cc3eb11..79180d3a9a5 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeException.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.inception.curation.merge; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Thrown if there is a problem during CAS merge operation. diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/MergeConflictException.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/MergeConflictException.java index d64229f56bd..63d16c9c966 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/MergeConflictException.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/MergeConflictException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.inception.curation.merge; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that a merge operation could not be performed because there was a conflict, e.g. diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/UnfulfilledPrerequisitesException.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/UnfulfilledPrerequisitesException.java index 05545016eda..108b35fdaa2 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/UnfulfilledPrerequisitesException.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/UnfulfilledPrerequisitesException.java @@ -17,7 +17,7 @@ */ package de.tudarmstadt.ukp.inception.curation.merge; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * Indicates that the prerequisites to perform a merge operation are not fulfilled. E.g. on an diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationDocumentServiceImpl.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationDocumentServiceImpl.java index b53deb5c43d..a1936185a66 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationDocumentServiceImpl.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationDocumentServiceImpl.java @@ -46,7 +46,7 @@ import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.curation.config.CurationDocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationMergeServiceImpl.java b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationMergeServiceImpl.java index 0b6e9a647eb..aba46b075cf 100644 --- a/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationMergeServiceImpl.java +++ b/inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/service/CurationMergeServiceImpl.java @@ -45,7 +45,7 @@ import de.tudarmstadt.ukp.inception.curation.config.CurationServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.curation.merge.CasMerge; import de.tudarmstadt.ukp.inception.curation.merge.strategy.MergeStrategy; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java index 1bcb1bf2c51..ea6ed120d4a 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java @@ -62,7 +62,7 @@ import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsPropertiesImpl.XmiFormatProperties; import de.tudarmstadt.ukp.inception.project.export.ProjectExportServiceImpl; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class CuratedDocumentsExporterTest diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasDiffLinkFeaturesTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasDiffLinkFeaturesTest.java index 0ec4b097b26..a9bdf8f390f 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasDiffLinkFeaturesTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasDiffLinkFeaturesTest.java @@ -23,7 +23,7 @@ import static de.tudarmstadt.ukp.inception.curation.merge.CurationTestUtils.createMultiLinkWithRoleTestTypeSystem; import static de.tudarmstadt.ukp.inception.curation.merge.CurationTestUtils.makeLinkFS; import static de.tudarmstadt.ukp.inception.curation.merge.CurationTestUtils.makeLinkHostFS; -import static de.tudarmstadt.ukp.inception.schema.feature.FeatureUtil.setLinkFeatureValue; +import static de.tudarmstadt.ukp.inception.schema.api.feature.FeatureUtil.setLinkFeatureValue; import static java.util.Arrays.asList; import static org.apache.uima.fit.factory.JCasFactory.createJCas; import static org.assertj.core.api.Assertions.assertThat; diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeLinkTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeLinkTest.java index a660415f651..1eef03fd03c 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeLinkTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeLinkTest.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.annotation.feature.link.LinkFeatureTraits; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; public class CasMergeLinkTest extends CasMergeTestBase diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRelationTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRelationTest.java index b1432e0c1cc..304234cc1bb 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRelationTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRelationTest.java @@ -37,7 +37,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CasMergeRelationTest extends CasMergeTestBase diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRemergeTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRemergeTest.java index 08f037d6771..bcd79c436b5 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRemergeTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeRemergeTest.java @@ -55,7 +55,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.curation.merge.strategy.MergeIncompleteStrategy; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; public class CasMergeRemergeTest extends CasMergeTestBase diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeSpanTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeSpanTest.java index a10ee7ce3b7..93b5944f756 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeSpanTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeSpanTest.java @@ -41,8 +41,8 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; public class CasMergeSpanTest extends CasMergeTestBase diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeTestBase.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeTestBase.java index da0432555dc..9268726c386 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeTestBase.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/CasMergeTestBase.java @@ -66,7 +66,7 @@ import de.tudarmstadt.ukp.inception.annotation.layer.chain.ChainLayerSupport; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationLayerSupport; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerSupport; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; @ExtendWith(MockitoExtension.class) diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java index 1d41dd4d714..022aa3bb8f4 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/merge/service/CurationDocumentServiceImplTest.java @@ -40,7 +40,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -57,7 +56,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @EnableAutoConfiguration @@ -74,7 +73,6 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class, // CurationDocumentServiceAutoConfiguration.class }) public class CurationDocumentServiceImplTest diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java index f17ba3e1434..e9eda9a4984 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheck.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class AllAnnotationsStartAndEndWithinSentencesCheck implements Check diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/DanglingRelationsCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/DanglingRelationsCheck.java index 32dd493f2a5..d35ec8828a9 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/DanglingRelationsCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/DanglingRelationsCheck.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Checks if there are any relations that do not have a source or target. Note that relations diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/FeatureAttachedSpanAnnotationsTrulyAttachedCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/FeatureAttachedSpanAnnotationsTrulyAttachedCheck.java index be7d6bd15fb..f68c509146c 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/FeatureAttachedSpanAnnotationsTrulyAttachedCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/FeatureAttachedSpanAnnotationsTrulyAttachedCheck.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class FeatureAttachedSpanAnnotationsTrulyAttachedCheck implements Check diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/LinksReachableThroughChainsCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/LinksReachableThroughChainsCheck.java index 38a55a9cfcb..115519a3b73 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/LinksReachableThroughChainsCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/LinksReachableThroughChainsCheck.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class LinksReachableThroughChainsCheck implements Check diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheck.java index 3ea30c1a239..2dae4b164a1 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheck.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class NoMultipleIncomingRelationsCheck implements Check diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/RelationOffsetsCheck.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/RelationOffsetsCheck.java index 2c16beab610..9f6ee852096 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/RelationOffsetsCheck.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/RelationOffsetsCheck.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Checks that the offsets of relations match the target of the relation. This mirrors the DKPro diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/config/CasDoctorAutoConfiguration.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/config/CasDoctorAutoConfiguration.java index 81955c278fd..645313efbf8 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/config/CasDoctorAutoConfiguration.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/config/CasDoctorAutoConfiguration.java @@ -56,7 +56,7 @@ import de.tudarmstadt.ukp.clarin.webanno.diag.repairs.Repair; import de.tudarmstadt.ukp.clarin.webanno.diag.repairs.SwitchBeginAndEndOnNegativeSizedAnnotationsRepair; import de.tudarmstadt.ukp.clarin.webanno.diag.repairs.UpgradeCasRepair; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @EnableConfigurationProperties(CasDoctorPropertiesImpl.class) diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair.java index 7972540caad..96daac31525 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Safe(false) public class ReattachFeatureAttachedSpanAnnotationsAndDeleteExtrasRepair diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsRepair.java index 5369dffa92c..fa43af45ec6 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReattachFeatureAttachedSpanAnnotationsRepair.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Safe public class ReattachFeatureAttachedSpanAnnotationsRepair diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReindexFeatureAttachedSpanAnnotationsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReindexFeatureAttachedSpanAnnotationsRepair.java index 7d43872d0e2..b774ae5e308 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReindexFeatureAttachedSpanAnnotationsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/ReindexFeatureAttachedSpanAnnotationsRepair.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Finds annotations that are reachable through an attach-feature but that are not actually indexed diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RelationOffsetsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RelationOffsetsRepair.java index d4e2f0c3a4d..09f4455abc6 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RelationOffsetsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RelationOffsetsRepair.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Ensures that the offsets of relations match the target of the relation. This mirrors the DKPro diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingChainLinksRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingChainLinksRepair.java index dd6ee8cecd3..4c95efa0ba7 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingChainLinksRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingChainLinksRepair.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogLevel; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Safe(false) public class RemoveDanglingChainLinksRepair diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingFeatureAttachedSpanAnnotationsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingFeatureAttachedSpanAnnotationsRepair.java index b3f0902d695..7d80fe5bf56 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingFeatureAttachedSpanAnnotationsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingFeatureAttachedSpanAnnotationsRepair.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Safe(false) public class RemoveDanglingFeatureAttachedSpanAnnotationsRepair diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java index 45f74a4adfd..fa7a282fdab 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Removes relations that were not properly cleaned up after deleting a source/target span. Such diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/UpgradeCasRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/UpgradeCasRepair.java index 45f038c8350..fdf07c6c4b4 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/UpgradeCasRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/UpgradeCasRepair.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.diag.repairs.Repair.Safe; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Ensures that the CAS is up-to-date with the project type system. It performs the same operation diff --git a/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheckTest.java b/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheckTest.java index bf41125030d..b220b4203d2 100644 --- a/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheckTest.java +++ b/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/AllAnnotationsStartAndEndWithinSentencesCheckTest.java @@ -41,7 +41,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(SpringExtension.class) class AllAnnotationsStartAndEndWithinSentencesCheckTest diff --git a/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheckTest.java b/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheckTest.java index e4155a7ce0c..8a089c0e847 100644 --- a/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheckTest.java +++ b/inception/inception-diag/src/test/java/de/tudarmstadt/ukp/clarin/webanno/diag/checks/NoMultipleIncomingRelationsCheckTest.java @@ -42,7 +42,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.coref.type.CoreferenceChain; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(SpringExtension.class) public class NoMultipleIncomingRelationsCheckTest diff --git a/inception/inception-diam-compactv2/pom.xml b/inception/inception-diam-compactv2/pom.xml index b025824232e..388b9f53d60 100644 --- a/inception/inception-diam-compactv2/pom.xml +++ b/inception/inception-diam-compactv2/pom.xml @@ -36,7 +36,7 @@ de.tudarmstadt.ukp.inception.app - inception-api + inception-api-schema de.tudarmstadt.ukp.inception.app diff --git a/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java index 71dbc3c0f31..0a598e9dc4a 100644 --- a/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java +++ b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2Impl.java @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; @@ -40,6 +39,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.inception.support.text.TextUtils; /** diff --git a/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/config/DiamCompactV2AutoConfig.java b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/config/DiamCompactV2AutoConfig.java index 3ae5121e2ce..9f0243039da 100644 --- a/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/config/DiamCompactV2AutoConfig.java +++ b/inception/inception-diam-compactv2/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/config/DiamCompactV2AutoConfig.java @@ -20,9 +20,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.inception.diam.model.compactv2.CompactSerializerV2; import de.tudarmstadt.ukp.inception.diam.model.compactv2.CompactSerializerV2Impl; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; @Configuration public class DiamCompactV2AutoConfig diff --git a/inception/inception-diam-compactv2/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java b/inception/inception-diam-compactv2/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java index 425f4fcc58a..cd69e5c4ae0 100644 --- a/inception/inception-diam-compactv2/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java +++ b/inception/inception-diam-compactv2/src/test/java/de/tudarmstadt/ukp/inception/diam/model/compactv2/CompactSerializerV2ImplTest.java @@ -23,8 +23,10 @@ import java.util.Map; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaPropertiesImpl; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; @@ -39,9 +41,13 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +@ExtendWith(MockitoExtension.class) public class CompactSerializerV2ImplTest { + private @Mock AnnotationSchemaProperties annotationSchemaProperties; + @Test void thatSerializationWorks() throws Exception { @@ -83,7 +89,7 @@ void thatSerializationWorks() throws Exception var req = RenderRequest.builder() // .withWindow(0, Integer.MAX_VALUE) // .build(); - var sut = new CompactSerializerV2Impl(new AnnotationSchemaPropertiesImpl()); + var sut = new CompactSerializerV2Impl(annotationSchemaProperties); var cdoc = sut.render(vdoc, req); var actual = JSONUtil.toPrettyJsonString(cdoc); diff --git a/inception/inception-diam/pom.xml b/inception/inception-diam/pom.xml index 88205d9aaac..143bdc13ff0 100644 --- a/inception/inception-diam/pom.xml +++ b/inception/inception-diam/pom.xml @@ -26,10 +26,6 @@ inception-diam INCEpTION - DIAM - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java index d8b897a1de9..090f481fd8d 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java index df8bc7afd1b..804e38630f5 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java @@ -29,8 +29,8 @@ import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/EditorAjaxRequestHandlerBase.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/EditorAjaxRequestHandlerBase.java index d75f1cd5fab..f04adf23df0 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/EditorAjaxRequestHandlerBase.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/EditorAjaxRequestHandlerBase.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public abstract class EditorAjaxRequestHandlerBase implements EditorAjaxRequestHandler diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java index 89164f24f02..32c247be099 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse; import de.tudarmstadt.ukp.inception.diam.model.compact.CompactRange; import de.tudarmstadt.ukp.inception.diam.model.compact.CompactRangeList; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java index b919788a9f7..cb2c1ec4697 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java @@ -35,8 +35,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.model.Range; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/SelectAnnotationHandler.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/SelectAnnotationHandler.java index 7fdc6acd87c..73de72ef0f6 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/SelectAnnotationHandler.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/SelectAnnotationHandler.java @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/config/DiamAutoConfig.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/config/DiamAutoConfig.java index ba9eecfd6f6..972851baf0f 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/config/DiamAutoConfig.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/config/DiamAutoConfig.java @@ -24,7 +24,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.diam.editor.actions.CreateRelationAnnotationHandler; import de.tudarmstadt.ukp.inception.diam.editor.actions.CreateSpanAnnotationHandler; @@ -52,9 +51,10 @@ import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderingPipeline; import de.tudarmstadt.ukp.inception.rendering.vmodel.serialization.VDocumentSerializerExtensionPoint; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; @Configuration public class DiamAutoConfig diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupService.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupService.java index c3571b7edc8..3bdf35b449d 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupService.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupService.java @@ -26,7 +26,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface LazyDetailsLookupService { diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupServiceImpl.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupServiceImpl.java index 710a8196895..9ccd00f3bd3 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupServiceImpl.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/lazydetails/LazyDetailsLookupServiceImpl.java @@ -44,10 +44,10 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; /** *

diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/messages/MAnnotation.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/messages/MAnnotation.java index 759403544a6..d8cbd7fa046 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/messages/MAnnotation.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/messages/MAnnotation.java @@ -22,7 +22,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; public abstract class MAnnotation { diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compact/CompactSerializerImpl.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compact/CompactSerializerImpl.java index f36ffca358e..9499a795eea 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compact/CompactSerializerImpl.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/model/compact/CompactSerializerImpl.java @@ -22,7 +22,6 @@ import java.util.List; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; @@ -34,6 +33,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.inception.support.text.TextUtils; /** diff --git a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java index 12dccb6b878..0bc6bb598dd 100644 --- a/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java +++ b/inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java @@ -77,7 +77,7 @@ import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderingPipeline; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.serialization.VDocumentSerializerExtensionPoint; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Differential INCEpTION Annotation Messaging (DIAM) protocol controller. diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java index 482b08e090d..73f383eae70 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java @@ -100,7 +100,7 @@ import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties.CasDoctorOnImportPolicy; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import it.unimi.dsi.fastutil.ints.IntArrayList; /** diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/JsonImportUtil.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/JsonImportUtil.java index 17d6c7b2465..60d804876e8 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/JsonImportUtil.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/JsonImportUtil.java @@ -30,7 +30,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class JsonImportUtil { diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/LayerImportExportUtils.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/LayerImportExportUtils.java index c9ad5a6f181..a8fc8571bd0 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/LayerImportExportUtils.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/LayerImportExportUtils.java @@ -51,7 +51,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.morph.MorphologicalFeatures; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * This class contains Utility methods that can be used in Project settings. diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/TagsetImportExportUtils.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/TagsetImportExportUtils.java index 2be7b46652c..79cac102159 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/TagsetImportExportUtils.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/TagsetImportExportUtils.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagsetImportExportUtils { diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java index 5ce21fcf59e..ccc7dec7e1e 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/config/DocumentImportExportServiceAutoConfiguration.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.inception.export.exporters.ProjectSettingsExporter; import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration // @EnableConfigurationProperties({ DocumentImportExportServicePropertiesImpl.class }) diff --git a/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java b/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java index 2bae0b596da..618d2dbed3e 100644 --- a/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java +++ b/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java @@ -87,7 +87,7 @@ import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServicePropertiesImpl; import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsPropertiesImpl.XmiFormatProperties; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; @ExtendWith(MockitoExtension.class) diff --git a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java index 46a8755f797..36b33d61465 100644 --- a/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java +++ b/inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java @@ -75,7 +75,7 @@ import de.tudarmstadt.ukp.inception.rendering.selection.ScrollToEvent; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public abstract class ExternalAnnotationEditorBase extends AnnotationEditorBase diff --git a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProvider.java b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProvider.java index 3c373d21ecf..9b23981cc33 100644 --- a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProvider.java +++ b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProvider.java @@ -45,7 +45,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.pubmed.traits.PubMedProviderTraits; import de.tudarmstadt.ukp.inception.io.bioc.BioCFormatSupport; import de.tudarmstadt.ukp.inception.io.bioc.model.BioCToCas; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class PubMedCentralProvider implements ExternalSearchProvider diff --git a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProviderFactory.java b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProviderFactory.java index 49f6e0d3c29..e23cac15b38 100644 --- a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProviderFactory.java +++ b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedCentralProviderFactory.java @@ -37,7 +37,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.pubmed.pmcoa.PmcOaClient; import de.tudarmstadt.ukp.inception.externalsearch.pubmed.traits.PubMedProviderTraits; import de.tudarmstadt.ukp.inception.externalsearch.pubmed.traits.PubMedProviderTraitsEditor; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * Support for PubAnnotation. diff --git a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/config/PubMedDocumentRepositoryAutoConfiguration.java b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/config/PubMedDocumentRepositoryAutoConfiguration.java index 3af31c28c5a..88b4e07ae83 100644 --- a/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/config/PubMedDocumentRepositoryAutoConfiguration.java +++ b/inception/inception-external-search-pubmed/src/main/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/config/PubMedDocumentRepositoryAutoConfiguration.java @@ -30,7 +30,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.pubmed.pmcoa.PmcOaClient; import de.tudarmstadt.ukp.inception.io.bioc.BioCFormatSupport; import de.tudarmstadt.ukp.inception.io.bioc.config.BioCAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @AutoConfigureAfter({ ExternalSearchAutoConfiguration.class, BioCAutoConfiguration.class, diff --git a/inception/inception-external-search-pubmed/src/test/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedProviderTest.java b/inception/inception-external-search-pubmed/src/test/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedProviderTest.java index 67e17192cff..b2ad5853994 100644 --- a/inception/inception-external-search-pubmed/src/test/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedProviderTest.java +++ b/inception/inception-external-search-pubmed/src/test/java/de/tudarmstadt/ukp/inception/externalsearch/pubmed/PubMedProviderTest.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.pubmed.entrez.EntrezClient; import de.tudarmstadt.ukp.inception.externalsearch.pubmed.pmcoa.PmcOaClient; import de.tudarmstadt.ukp.inception.externalsearch.pubmed.traits.PubMedProviderTraits; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) @Tag("slow") diff --git a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java index 5339e1378cb..a7f66ffc9af 100644 --- a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java +++ b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java @@ -63,10 +63,10 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.support.kendo.KendoStyleUtils; public class LookupFeatureEditor diff --git a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureSupport.java b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureSupport.java index 8fccf5284df..fb38b12c1f5 100644 --- a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureSupport.java +++ b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureSupport.java @@ -44,9 +44,9 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java index fdd18989dac..58e3eaaad4c 100644 --- a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java +++ b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java @@ -40,8 +40,8 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.inception.feature.lookup.config.LookupServiceProperties; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.security.client.auth.AuthenticationTraitsEditor; import de.tudarmstadt.ukp.inception.security.client.auth.AuthenticationType; import de.tudarmstadt.ukp.inception.security.client.auth.NoAuthenticationTraitsEditor; diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/config/ImageSupportAutoConfiguration.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/config/ImageSupportAutoConfiguration.java index 5780e390758..9f8c178b518 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/config/ImageSupportAutoConfiguration.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/config/ImageSupportAutoConfiguration.java @@ -22,7 +22,7 @@ import de.tudarmstadt.ukp.inception.image.feature.ImageFeatureSupport; import de.tudarmstadt.ukp.inception.image.sidebar.ImageSidebarFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration public class ImageSupportAutoConfiguration diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java index a4941b2ed6e..88e13281f7c 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java @@ -33,7 +33,7 @@ import com.googlecode.wicket.kendo.ui.form.TextField; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; public class ImageFeatureEditor extends FeatureEditor diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureSupport.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureSupport.java index 4f8f3c8cd3e..81540f72778 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureSupport.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureSupport.java @@ -46,9 +46,9 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** * Extension providing image-related features for annotations. diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebar.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebar.java index cfa692fcc26..7011360c800 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebar.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebar.java @@ -66,7 +66,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class ImageSidebar extends AnnotationSidebar_ImplBase diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebarFactory.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebarFactory.java index 5a6553e1166..4f1372e59c3 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebarFactory.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/sidebar/ImageSidebarFactory.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.image.config.ImageSupportAutoConfiguration; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/relation/settings/StringMatchingRelationRecommenderTraitsEditor.java b/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/relation/settings/StringMatchingRelationRecommenderTraitsEditor.java index 3561038a24b..d9214f32955 100644 --- a/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/relation/settings/StringMatchingRelationRecommenderTraitsEditor.java +++ b/inception/inception-imls-stringmatch/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/stringmatch/relation/settings/StringMatchingRelationRecommenderTraitsEditor.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.DefaultTrainableRecommenderTraitsEditor; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.relation.StringMatchingRelationRecommenderTraits; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class StringMatchingRelationRecommenderTraitsEditor extends DefaultTrainableRecommenderTraitsEditor diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/config/FactLinkingAutoConfiguration.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/config/FactLinkingAutoConfiguration.java index 4f57801478d..cfc4f207e5e 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/config/FactLinkingAutoConfiguration.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/config/FactLinkingAutoConfiguration.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.inception.kb.factlinking.feature.PropertyFeatureSupport; import de.tudarmstadt.ukp.inception.kb.factlinking.feature.SubjectObjectFeatureSupport; import de.tudarmstadt.ukp.inception.kb.factlinking.initializers.FactLayerInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Deprecated @Configuration diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/FactLinkingServiceImpl.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/FactLinkingServiceImpl.java index b074a13005e..83977531d1a 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/FactLinkingServiceImpl.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/FactLinkingServiceImpl.java @@ -43,9 +43,9 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBInstance; import de.tudarmstadt.ukp.inception.kb.graph.KBProperty; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java index 5dc39d9c366..68300fc9330 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java @@ -54,10 +54,10 @@ import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; import de.tudarmstadt.ukp.inception.ui.kb.feature.DisabledKBWarning; @Deprecated diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureSupport.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureSupport.java index bb21c8dcc90..b04a7d00bb7 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureSupport.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureSupport.java @@ -45,9 +45,9 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBProperty; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java index 42498fe25b9..c95082477c9 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java @@ -74,13 +74,13 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderSlotsEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureUtil; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureUtil; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; @Deprecated public class QualifierFeatureEditor diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java index 3b7a3e6acc1..b127f2b7481 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java @@ -72,13 +72,13 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderSlotsEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureUtil; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureUtil; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; @Deprecated public class SubjectObjectFeatureEditor diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupport.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupport.java index 4c18974bd19..ec8cf88127b 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupport.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupport.java @@ -46,10 +46,10 @@ import de.tudarmstadt.ukp.inception.kb.factlinking.config.FactLinkingAutoConfiguration; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; /** * To create feature support for subject and object of the fact layer diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java index 74f84d7e688..a6117e79b20 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/initializers/FactLayerInitializer.java @@ -43,7 +43,7 @@ import de.tudarmstadt.ukp.inception.kb.factlinking.feature.FactLinkingConstants; import de.tudarmstadt.ukp.inception.kb.factlinking.feature.PropertyFeatureSupport; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-kb-fact-linking/src/test/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupportTest.java b/inception/inception-kb-fact-linking/src/test/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupportTest.java index 80569793b5a..09b530e303a 100644 --- a/inception/inception-kb-fact-linking/src/test/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupportTest.java +++ b/inception/inception-kb-fact-linking/src/test/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureSupportTest.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.LinkMode; import de.tudarmstadt.ukp.clarin.webanno.model.MultiValueMode; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; @Deprecated public class SubjectObjectFeatureSupportTest diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/config/KnowledgeBaseServiceAutoConfiguration.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/config/KnowledgeBaseServiceAutoConfiguration.java index 323c51b75a5..97eee158675 100644 --- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/config/KnowledgeBaseServiceAutoConfiguration.java +++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/config/KnowledgeBaseServiceAutoConfiguration.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseServiceImpl; import de.tudarmstadt.ukp.inception.kb.exporter.KnowledgeBaseExporter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration @ConditionalOnProperty(prefix = "knowledge-base", name = "enabled", havingValue = "true", matchIfMissing = true) diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java index c536e515747..a9847f99bdc 100644 --- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java +++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java @@ -57,7 +57,7 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.kb.reification.Reification; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.exporters.LayerExporter; /** diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseExporterTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseExporterTest.java index 5121118309d..b9981340ace 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseExporterTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseExporterTest.java @@ -60,7 +60,7 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.exporter.KnowledgeBaseExporter; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class KnowledgeBaseExporterTest diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java index b6e40a423dd..1675fa36a15 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java @@ -24,10 +24,10 @@ import org.springframework.context.annotation.Configuration; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; import de.tudarmstadt.ukp.inception.ui.core.docanno.event.DocumentMetadataAnnotationActionUndoSupport; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSingletonCreatingWatcher; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/CreateDocumentMetadataAnnotationAction.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/CreateDocumentMetadataAnnotationAction.java index 2fd2ed29020..3d2b46b3af6 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/CreateDocumentMetadataAnnotationAction.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/CreateDocumentMetadataAnnotationAction.java @@ -28,8 +28,8 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.RedoableAnnotationAction; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.UndoableAnnotationAction; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerAdapter; public class CreateDocumentMetadataAnnotationAction diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/DeleteDocumentMetadataAnnotationAction.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/DeleteDocumentMetadataAnnotationAction.java index 28a9619deb7..a46ae88231d 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/DeleteDocumentMetadataAnnotationAction.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/event/DeleteDocumentMetadataAnnotationAction.java @@ -24,8 +24,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class DeleteDocumentMetadataAnnotationAction extends CreateDocumentMetadataAnnotationAction diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerAdapter.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerAdapter.java index ef86472bc2f..93de62a44df 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerAdapter.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerAdapter.java @@ -38,9 +38,9 @@ import de.tudarmstadt.ukp.inception.annotation.layer.TypeAdapter_ImplBase; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.event.DocumentMetadataCreatedEvent; import de.tudarmstadt.ukp.inception.ui.core.docanno.event.DocumentMetadataDeletedEvent; diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSingletonCreatingWatcher.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSingletonCreatingWatcher.java index 6bdad68f182..e77610f847e 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSingletonCreatingWatcher.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSingletonCreatingWatcher.java @@ -29,9 +29,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.annotation.events.BeforeDocumentOpenedEvent; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportAutoConfiguration; /** diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSupport.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSupport.java index 7a8758d7a6e..a4b2bc33140 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSupport.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/layer/DocumentMetadataLayerSupport.java @@ -37,9 +37,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.inception.rendering.Renderer; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport_ImplBase; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport_ImplBase; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportProperties; diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationDetailPanel.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationDetailPanel.java index f6d10ba2cfc..d2a78b30a10 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationDetailPanel.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationDetailPanel.java @@ -60,13 +60,13 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class DocumentMetadataAnnotationDetailPanel extends Panel diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationSelectionPanel.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationSelectionPanel.java index 5e086be50ce..d0e5b53b76f 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationSelectionPanel.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataAnnotationSelectionPanel.java @@ -68,12 +68,12 @@ import de.tudarmstadt.ukp.inception.rendering.Renderer; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.event.DocumentMetadataEvent; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerAdapter; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebarFactory.java b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebarFactory.java index d5f2e0a7a53..fe532617443 100644 --- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebarFactory.java +++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/ui/core/docanno/sidebar/DocumentMetadataSidebarFactory.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebar_ImplBase; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; diff --git a/inception/inception-log/pom.xml b/inception/inception-log/pom.xml index 1fb941eefbc..9792a09873d 100644 --- a/inception/inception-log/pom.xml +++ b/inception/inception-log/pom.xml @@ -186,11 +186,6 @@ inception-schema test - - de.tudarmstadt.ukp.inception.app - inception-api - test - diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java index 1945ae63130..601d50cfd78 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/LayerConfigurationChangedEventAdapter.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; @Component public class LayerConfigurationChangedEventAdapter diff --git a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java index a880b5d36d0..4a337bc761f 100644 --- a/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java +++ b/inception/inception-log/src/main/java/de/tudarmstadt/ukp/inception/log/adapter/TagEventAdapter.java @@ -25,7 +25,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil; import de.tudarmstadt.ukp.inception.log.model.TagDetails; -import de.tudarmstadt.ukp.inception.schema.event.TagEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.TagEvent; @Component public class TagEventAdapter diff --git a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java index 7ae1aa5fff9..c68c11d383d 100644 --- a/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java +++ b/inception/inception-log/src/test/java/de/tudarmstadt/ukp/inception/log/EventRepositoryImplIntegrationTest.java @@ -45,7 +45,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.config.ProjectServiceAutoConfiguration; @@ -55,7 +54,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.log.model.LoggedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @EnableAutoConfiguration @@ -71,7 +70,6 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class }) public class EventRepositoryImplIntegrationTest { diff --git a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditor.java b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditor.java index d202da88819..ee0b1ed77a1 100644 --- a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditor.java +++ b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/PdfAnnotationEditor.java @@ -63,8 +63,8 @@ import de.tudarmstadt.ukp.inception.pdfeditor.resources.PdfAnnotationEditorJavascriptResourceReference; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * @deprecated Superseded by the new PDF editor diff --git a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/PdfDocumentIFrameView.java b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/PdfDocumentIFrameView.java index 9d6aeb40b61..ca0e7ef3348 100644 --- a/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/PdfDocumentIFrameView.java +++ b/inception/inception-pdf-editor/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/PdfDocumentIFrameView.java @@ -50,7 +50,7 @@ import de.tudarmstadt.ukp.inception.pdfeditor.PdfAnnotationEditor; import de.tudarmstadt.ukp.inception.pdfeditor.pdfanno.model.PdfExtractFile; import de.tudarmstadt.ukp.inception.pdfeditor.pdfextract.PDFExtractor; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * @deprecated Superseded by the new PDF editor diff --git a/inception/inception-pdf-editor/src/test/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/model/PdfAnnoRendererTest.java b/inception/inception-pdf-editor/src/test/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/model/PdfAnnoRendererTest.java index f90aa88b099..d12729604c5 100644 --- a/inception/inception-pdf-editor/src/test/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/model/PdfAnnoRendererTest.java +++ b/inception/inception-pdf-editor/src/test/java/de/tudarmstadt/ukp/inception/pdfeditor/pdfanno/model/PdfAnnoRendererTest.java @@ -72,8 +72,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; /** diff --git a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditor.java b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditor.java index 2a5205cc252..c8762154be7 100644 --- a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditor.java +++ b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/PdfAnnotationEditor.java @@ -40,7 +40,7 @@ import de.tudarmstadt.ukp.inception.pdfeditor2.view.PdfDocumentIFrameView; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class PdfAnnotationEditor extends ExternalAnnotationEditorBase diff --git a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/view/PdfDocumentIFrameView.java b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/view/PdfDocumentIFrameView.java index 1b9cc30b710..c65f30a6397 100644 --- a/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/view/PdfDocumentIFrameView.java +++ b/inception/inception-pdf-editor2/src/main/java/de/tudarmstadt/ukp/inception/pdfeditor2/view/PdfDocumentIFrameView.java @@ -52,7 +52,7 @@ import de.tudarmstadt.ukp.inception.pdfeditor2.view.pdfjs.PdfJsViewerPage; import de.tudarmstadt.ukp.inception.pdfeditor2.visual.VisualPDFTextStripper; import de.tudarmstadt.ukp.inception.pdfeditor2.visual.model.VModel; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class PdfDocumentIFrameView extends WebMarkupContainer diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java index 0be3a007852..67272d57970 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/legacy/LegacyProjectExportPanel.java @@ -56,7 +56,7 @@ import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.project.export.ProjectExportService; import de.tudarmstadt.ukp.inception.project.export.settings.FormatDropdownChoice; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * A Panel used to add Project Guidelines in a selected {@link Project} diff --git a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java index 97ffcb0a5b9..3375de61c77 100644 --- a/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java +++ b/inception/inception-project-export/src/test/java/de/tudarmstadt/ukp/inception/project/export/AnnotationDocumentsExporterTest.java @@ -57,7 +57,7 @@ import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServicePropertiesImpl; import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsPropertiesImpl.XmiFormatProperties; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.exporters.AnnotationDocumentExporter; @ExtendWith(MockitoExtension.class) diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java index f4370ef8457..0d42b2ca1e1 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationLayerInitializer.java @@ -37,7 +37,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java index 8df00967771..24551acebce 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationRecommenderInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.relation.StringMatchingRelationRecommenderFactory; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.relation.StringMatchingRelationRecommenderTraits; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java index d860d42e9f9..982620b4b1e 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicRelationTagSetInitializer.java @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java index 02086b92cdc..1e1357ca0c4 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanLayerInitializer.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java index 6793a227cf4..d8475c954a5 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanRecommenderInitializer.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.StringMatchingRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java index 6477633b596..c101d7f6b36 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/BasicSpanTagSetInitializer.java @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.basic.config.InceptionBasicProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/config/InceptionBasicProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/config/InceptionBasicProjectInitializersAutoConfiguration.java index 72fe33f42c9..d25e7dd02e8 100644 --- a/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/config/InceptionBasicProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers-basic/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/basic/config/InceptionBasicProjectInitializersAutoConfiguration.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.config.StringMatchingRecommenderAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.relation.StringMatchingRelationRecommenderFactory; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.StringMatchingRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @AutoConfigureAfter({ // RecommenderServiceAutoConfiguration.class, // diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java index a5c890ff586..788f2db3bda 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelLayerInitializer.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; /** diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java index ef8bd1ad206..b7a6c14a0b2 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/BasicDocumentLabelTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.config.InceptionDocumentLabelingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/config/InceptionDocumentLabelingProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/config/InceptionDocumentLabelingProjectInitializersAutoConfiguration.java index 0d90f07927a..8cae419ff22 100644 --- a/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/config/InceptionDocumentLabelingProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers-doclabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/doclabeling/config/InceptionDocumentLabelingProjectInitializersAutoConfiguration.java @@ -26,7 +26,7 @@ import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.BasicDocumentLabelLayerInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.BasicDocumentLabelTagSetInitializer; import de.tudarmstadt.ukp.inception.project.initializers.doclabeling.BasicDocumentLabelingProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.core.docanno.config.DocumentMetadataLayerSupportAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; import de.tudarmstadt.ukp.inception.ui.core.docanno.sidebar.DocumentMetadataSidebarFactory; diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java index 1407cc213b9..34c38505b51 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.LayerInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java index 1bc0c6b9a7a..9e6be32d5e3 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelRecommenderInitializer.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.imls.opennlp.doccat.OpenNlpDoccatRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java index 1432fc1d667..d606d6865bd 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/SentenceLabelTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TagSetInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.sentencelabeling.config.InceptionSentenceLabelingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/config/InceptionSentenceLabelingProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/config/InceptionSentenceLabelingProjectInitializersAutoConfiguration.java index ae968a67fea..ae0af444544 100644 --- a/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/config/InceptionSentenceLabelingProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers-sentencelabeling/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/sentencelabeling/config/InceptionSentenceLabelingProjectInitializersAutoConfiguration.java @@ -28,7 +28,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.opennlp.doccat.OpenNlpDoccatRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @AutoConfigureAfter({ // RecommenderServiceAutoConfiguration.class }) diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java index 2d997db5111..1c2198c95db 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/EntityLinkingProjectInitializer.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.initializers.wikidatalinking.config.WikiDataLinkingProjectInitializersAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.kb.initializers.NamedEntityIdentifierFeatureInitializer; /** diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java index 65bccab4020..c9eb9317185 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/NamedEntityIdentifierStringRecommenderInitializer.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.StringMatchingRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.kb.initializers.NamedEntityIdentifierFeatureInitializer; /** diff --git a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/config/WikiDataLinkingProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/config/WikiDataLinkingProjectInitializersAutoConfiguration.java index e0b0b526a6e..6f0387fda1a 100644 --- a/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/config/WikiDataLinkingProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/wikidatalinking/config/WikiDataLinkingProjectInitializersAutoConfiguration.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.config.StringMatchingRecommenderAutoConfiguration; import de.tudarmstadt.ukp.inception.recommendation.imls.stringmatch.span.StringMatchingRecommenderFactory; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @AutoConfigureAfter({ // KnowledgeBaseServiceAutoConfiguration.class, // diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java index aec03a48d2c..739dae8126e 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/ChunkLayerInitializer.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.chunk.Chunk; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java index 82f5d81f2cf..e6f54d4bb50 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceLayerInitializer.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java index bbe76f8e201..2489a844f9f 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java index 9cde9de3480..b33ee901289 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java index 703f8d85f04..166262ca54b 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyFlavorTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java index 1699e4e0e7f..bd6a2afcfde 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyLayerInitializer.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java index 9881b3f4382..7622e09bf08 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java index e1a49e4ef9b..4db666b4865 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/LemmaLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java index 730c98d7460..c137d833f0c 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/MorphologicalFeaturesLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.morph.MorphologicalFeatures; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java index 3ea9a30d83e..04b61a194bd 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java index c026836af72..7ae9e2c1478 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java index b6a3b33b253..1a8dd6edf8e 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/OrthographyLayerInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.transform.type.SofaChangeAnnotation; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java index 18c813ec192..bb0d6356eff 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechLayerInitializer.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java index 0f2aa4e7c67..f24b252e474 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java index 7cae80bcc1c..a46f8ceed3a 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SemPredArgLayerInitializer.java @@ -38,7 +38,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.semantics.type.SemArgLink; import de.tudarmstadt.ukp.dkpro.core.api.semantics.type.SemPred; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java index 9b7c0e1b7f2..dca4157bcfb 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SentenceLayerInitializer.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java index 32bb591b3c3..5c475833f17 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SofaChangeOperationTagSetInitializer.java @@ -26,7 +26,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java index 78025d192af..a1fb1596b7c 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/SurfaceFormLayerInitializer.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.SurfaceForm; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java index ed03e689438..b30cbd4ca8c 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/TokenLayerInitializer.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.config.ProjectInitializersAutoConfiguration; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java index 91721fee3b1..489bc949b50 100644 --- a/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java +++ b/inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/config/ProjectInitializersAutoConfiguration.java @@ -43,7 +43,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.clarin.webanno.project.initializers.empty.EmptyProjectInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @Configuration public class ProjectInitializersAutoConfiguration diff --git a/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/RecommendationService.java b/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/RecommendationService.java index 9462f23a768..98fd8eea3b3 100644 --- a/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/RecommendationService.java +++ b/inception/inception-recommendation-api/src/main/java/de/tudarmstadt/ukp/inception/recommendation/api/RecommendationService.java @@ -48,7 +48,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; import de.tudarmstadt.ukp.inception.scheduling.TaskMonitor; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; /** * The main contact point of the Recommendation module. This interface can be injected in the Wicket diff --git a/inception/inception-recommendation/pom.xml b/inception/inception-recommendation/pom.xml index 015ad993541..10d70d6171b 100644 --- a/inception/inception-recommendation/pom.xml +++ b/inception/inception-recommendation/pom.xml @@ -57,10 +57,6 @@ de.tudarmstadt.ukp.inception.app inception-schema - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/RecommendationEditorExtension.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/RecommendationEditorExtension.java index f0000e0547b..6b8fc15880d 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/RecommendationEditorExtension.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/RecommendationEditorExtension.java @@ -73,9 +73,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * This component hooks into the annotation editor in order to: diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java index 15be093928c..d604f67309e 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java @@ -59,8 +59,8 @@ import de.tudarmstadt.ukp.inception.recommendation.service.RecommenderFactoryRegistryImpl; import de.tudarmstadt.ukp.inception.recommendation.sidebar.RecommendationSidebarFactory; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Provides all back-end Spring beans for the recommendation functionality. diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporter.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporter.java index 9949d7db7b4..21f12c790f3 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporter.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporter.java @@ -42,7 +42,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService; import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecord; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.exporters.AnnotationDocumentExporter; import de.tudarmstadt.ukp.inception.schema.exporters.LayerExporter; diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporter.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporter.java index 28117762c9b..30b3b328bc5 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporter.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporter.java @@ -41,7 +41,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.exporters.LayerExporter; /** diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java index 58c04714214..35c714b0f20 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java @@ -71,7 +71,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.RecommenderFactoryRegistry; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class RecommenderEditorPanel extends Panel diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRelationRenderer.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRelationRenderer.java index 255b7d14748..5d86854c7aa 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRelationRenderer.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRelationRenderer.java @@ -42,9 +42,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VArc; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRenderer.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRenderer.java index feab51f31b0..2ec63682a53 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRenderer.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationRenderer.java @@ -32,7 +32,7 @@ import de.tudarmstadt.ukp.inception.rendering.pipeline.RenderStep; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationSpanRenderer.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationSpanRenderer.java index c471615d4cd..69602bde33c 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationSpanRenderer.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationSpanRenderer.java @@ -35,8 +35,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** *

diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationTypeRenderer.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationTypeRenderer.java index cd332622d39..62d4789b5b2 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationTypeRenderer.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/render/RecommendationTypeRenderer.java @@ -20,7 +20,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.Predictions; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * Type Adapters for span, arc, and chain annotations diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java index 75018cf9495..882c71786f2 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java @@ -191,10 +191,10 @@ import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.scheduling.Task; import de.tudarmstadt.ukp.inception.scheduling.TaskMonitor; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationComparisonUtils; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationComparisonUtils; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; /** * The implementation of the RecommendationService. diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java index 31398acf55d..9bb8b648ac2 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java @@ -58,7 +58,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.support.help.DocLink; public class RecommendationSidebar diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommenderInfoPanel.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommenderInfoPanel.java index bc890eeaa54..c0bcf687ca1 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommenderInfoPanel.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommenderInfoPanel.java @@ -72,8 +72,8 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; import de.tudarmstadt.ukp.inception.recommendation.event.PredictionsSwitchedEvent; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class RecommenderInfoPanel extends Panel diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/NonTrainableRecommenderActivationTask.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/NonTrainableRecommenderActivationTask.java index c9ab6d4ba30..10b9523266d 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/NonTrainableRecommenderActivationTask.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/NonTrainableRecommenderActivationTask.java @@ -45,7 +45,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderEvaluationResultEvent; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderTaskNotificationEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * This task activates all non-trainable recommenders. diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/SelectionTask.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/SelectionTask.java index e8f00da9400..c610f715017 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/SelectionTask.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/SelectionTask.java @@ -54,7 +54,7 @@ import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderEvaluationResultEvent; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderTaskNotificationEvent; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** * This task evaluates all available classification tools for all annotation layers of the current diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java index 3abd0390f9d..b4d02abfb4a 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java @@ -57,7 +57,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommenderContext; import de.tudarmstadt.ukp.inception.recommendation.event.RecommenderTaskNotificationEvent; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TrainingTask extends RecommendationTask_ImplBase diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporterTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporterTest.java index 6bf8c51e20b..8b0fd2e6cc8 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporterTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/LearningRecordExporterTest.java @@ -49,7 +49,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordChangeLocation; import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordType; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionType; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class LearningRecordExporterTest diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporterTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporterTest.java index 41f0dab6890..e252d0608b3 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporterTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/exporter/RecommenderExporterTest.java @@ -52,7 +52,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class RecommenderExporterTest diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImplIntegrationTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImplIntegrationTest.java index e66d8c82a01..277050bab92 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImplIntegrationTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImplIntegrationTest.java @@ -83,7 +83,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.SpanSuggestion; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionType; import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RelationSuggestionVisibilityCalculationTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RelationSuggestionVisibilityCalculationTest.java index be006db09e9..c6db4c9234b 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RelationSuggestionVisibilityCalculationTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/RelationSuggestionVisibilityCalculationTest.java @@ -48,7 +48,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; import de.tudarmstadt.ukp.inception.recommendation.api.model.AnnotationSuggestion; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class RelationSuggestionVisibilityCalculationTest diff --git a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/SpanSuggestionVisibilityCalculationTest.java b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/SpanSuggestionVisibilityCalculationTest.java index 5a7b32ac6fa..fd489c6c1dd 100644 --- a/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/SpanSuggestionVisibilityCalculationTest.java +++ b/inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/service/SpanSuggestionVisibilityCalculationTest.java @@ -53,7 +53,7 @@ import de.tudarmstadt.ukp.inception.recommendation.api.model.Offset; import de.tudarmstadt.ukp.inception.recommendation.api.model.SpanSuggestion; import de.tudarmstadt.ukp.inception.recommendation.api.model.SuggestionDocumentGroup; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class SpanSuggestionVisibilityCalculationTest diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/AnnotationPanel.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/AnnotationPanel.java index 1a0bbd7ee87..0ed9645386b 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/AnnotationPanel.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/AnnotationPanel.java @@ -46,11 +46,11 @@ import de.tudarmstadt.ukp.inception.rendering.Renderer; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; -import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport; public abstract class AnnotationPanel diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/DocumentAnnotationPanel.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/DocumentAnnotationPanel.java index 1976ac215d3..c70c652cdc4 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/DocumentAnnotationPanel.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/DocumentAnnotationPanel.java @@ -51,11 +51,11 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.revieweditor.event.RefreshEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class DocumentAnnotationPanel extends Panel diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditor.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditor.java index 1e5fb02d4cf..fa2c60cbfe3 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditor.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/ReviewEditor.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.revieweditor.event.RefreshEvent; import de.tudarmstadt.ukp.inception.revieweditor.event.SelectAnnotationEvent; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class ReviewEditor extends AnnotationEditorBase diff --git a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/SpanAnnotationPanel.java b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/SpanAnnotationPanel.java index b2cbe63dc2c..e226f47b840 100644 --- a/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/SpanAnnotationPanel.java +++ b/inception/inception-review-editor/src/main/java/de/tudarmstadt/ukp/inception/revieweditor/SpanAnnotationPanel.java @@ -44,9 +44,9 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.revieweditor.event.SelectAnnotationEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class SpanAnnotationPanel extends Panel diff --git a/inception/inception-schema/pom.xml b/inception/inception-schema/pom.xml index 99cb72e7b59..34bd0c0b7fb 100644 --- a/inception/inception-schema/pom.xml +++ b/inception/inception-schema/pom.xml @@ -82,10 +82,6 @@ de.tudarmstadt.ukp.inception.app inception-model - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-api-annotation diff --git a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaPropertiesImpl.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaPropertiesImpl.java similarity index 91% rename from inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaPropertiesImpl.java rename to inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaPropertiesImpl.java index be8f49724e2..44943b75b50 100644 --- a/inception/inception-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/config/AnnotationSchemaPropertiesImpl.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaPropertiesImpl.java @@ -15,15 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.api.config; +package de.tudarmstadt.ukp.inception.schema.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedResource; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; + /** *

- * This class is exposed as a Spring Component via {@link AnnotationSchemaAutoConfiguration}. + * This class is exposed as a Spring Component via {@link AnnotationSchemaServiceAutoConfiguration}. *

*/ @ConfigurationProperties("ui") diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java index c41d802e375..8b3e1872908 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/config/AnnotationSchemaServiceAutoConfiguration.java @@ -29,7 +29,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.annotation.feature.bool.BooleanFeatureSupport; @@ -55,20 +54,22 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanOverlapBehavior; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.schema.exporters.AnnotationDocumentExporter; import de.tudarmstadt.ukp.inception.schema.exporters.LayerExporter; import de.tudarmstadt.ukp.inception.schema.exporters.TagSetExporter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceEventAdapter; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; @Configuration @EnableConfigurationProperties({ // + AnnotationSchemaPropertiesImpl.class, // StringFeatureSupportPropertiesImpl.class, // LinkFeatureSupportPropertiesImpl.class }) public class AnnotationSchemaServiceAutoConfiguration diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporter.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporter.java index e33d9a3304e..e410be22dc5 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporter.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporter.java @@ -56,7 +56,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.morph.MorphologicalFeatures; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; /** diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LegacyProjectInitializer.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LegacyProjectInitializer.java index 02730639a43..1c1d358bf40 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LegacyProjectInitializer.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LegacyProjectInitializer.java @@ -43,7 +43,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.chunk.Chunk; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency; import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.DependencyFlavor; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class LegacyProjectInitializer { diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/TagSetExporter.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/TagSetExporter.java index 765c040b755..2a353f1cf29 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/TagSetExporter.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/TagSetExporter.java @@ -39,7 +39,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; /** diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java index 3f49627f281..0969a2d464b 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceEventAdapter.java @@ -24,7 +24,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; /** diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java index 91a28fee522..86ffa877fd7 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImpl.java @@ -25,9 +25,9 @@ import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.RELATION_TYPE; import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectByAddr; import static de.tudarmstadt.ukp.inception.project.api.ProjectService.withProjectLogger; -import static de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction.INCOMING; -import static de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction.LOOP; -import static de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction.OUTGOING; +import static de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation.Direction.INCOMING; +import static de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation.Direction.LOOP; +import static de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation.Direction.OUTGOING; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Objects.isNull; @@ -83,7 +83,6 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.TypeSystemAnalysis; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.TypeSystemAnalysis.RelationDetails; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature_; @@ -105,18 +104,19 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanAdapter; import de.tudarmstadt.ukp.inception.annotation.storage.CasMetadataUtils; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.AttachedAnnotation; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.event.TagCreatedEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.TagDeletedEvent; +import de.tudarmstadt.ukp.inception.schema.api.event.TagUpdatedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.event.TagCreatedEvent; -import de.tudarmstadt.ukp.inception.schema.event.TagDeletedEvent; -import de.tudarmstadt.ukp.inception.schema.event.TagUpdatedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; /** *

diff --git a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/FeatureSupportRegistryImpl.java b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/FeatureSupportRegistryImpl.java index 40d7e71da17..237e596621b 100644 --- a/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/FeatureSupportRegistryImpl.java +++ b/inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/service/FeatureSupportRegistryImpl.java @@ -30,9 +30,9 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.support.extensionpoint.CachingContextLookupExtensionPoint_ImplBase; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; /** *

diff --git a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java index 09990d44272..f4c245eaaa9 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/documents/service/DocumentServiceImplDatabaseTest.java @@ -43,7 +43,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -61,7 +60,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @EnableAutoConfiguration @@ -79,7 +78,6 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class }) public class DocumentServiceImplDatabaseTest { diff --git a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporterTest.java b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporterTest.java index bfb78653168..d05e8349a79 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporterTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporterTest.java @@ -50,7 +50,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ValidationMode; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @ExtendWith(MockitoExtension.class) public class LayerExporterTest diff --git a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java index eb7473f032f..1d01817de14 100644 --- a/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java +++ b/inception/inception-schema/src/test/java/de/tudarmstadt/ukp/inception/schema/service/AnnotationSchemaServiceImplTest.java @@ -44,7 +44,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -56,8 +55,8 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; @EnableAutoConfiguration @@ -74,7 +73,6 @@ ProjectServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class }) class AnnotationSchemaServiceImplTest { diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/PrimitiveUimaIndexingSupport.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/PrimitiveUimaIndexingSupport.java index f6ff755a0a5..5c07ca666de 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/PrimitiveUimaIndexingSupport.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/PrimitiveUimaIndexingSupport.java @@ -32,8 +32,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; /** diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java index 4378e436653..23da9a0ef66 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java @@ -70,8 +70,8 @@ import de.tudarmstadt.ukp.inception.project.api.event.AfterProjectRemovedEvent; import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.search.config.SearchServiceProperties; import de.tudarmstadt.ukp.inception.search.index.IndexRebuildRequiredException; diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/config/SearchServiceAutoConfiguration.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/config/SearchServiceAutoConfiguration.java index 3c96a70eabf..50b087d44f9 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/config/SearchServiceAutoConfiguration.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/config/SearchServiceAutoConfiguration.java @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistryImpl; diff --git a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/model/BulkIndexingContext.java b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/model/BulkIndexingContext.java index 26760bb76b6..4ed8e61f3fb 100644 --- a/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/model/BulkIndexingContext.java +++ b/inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/model/BulkIndexingContext.java @@ -23,7 +23,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class BulkIndexingContext implements AutoCloseable diff --git a/inception/inception-search-mtas/pom.xml b/inception/inception-search-mtas/pom.xml index 2addae94af9..199d690854c 100644 --- a/inception/inception-search-mtas/pom.xml +++ b/inception/inception-search-mtas/pom.xml @@ -158,11 +158,6 @@ hsqldb test - - de.tudarmstadt.ukp.inception.app - inception-api - test - de.tudarmstadt.ukp.inception.app inception-schema diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java index 6acc0c2e138..9df96cc8c8b 100644 --- a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java +++ b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java @@ -106,7 +106,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.security.model.User; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.ExecutionException; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexFactory.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexFactory.java index 235d2733e8f..2ea5e98fafc 100644 --- a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexFactory.java +++ b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexFactory.java @@ -26,7 +26,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.index.PhysicalIndex; import de.tudarmstadt.ukp.inception.search.index.PhysicalIndexFactoryImplBase; diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java index 5a31f218c47..491023fb82b 100644 --- a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java +++ b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParser.java @@ -67,7 +67,7 @@ import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.model.AnnotationSearchState; diff --git a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/config/MtasDocumentIndexAutoConfiguration.java b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/config/MtasDocumentIndexAutoConfiguration.java index e4140c31141..8567a40d4f8 100644 --- a/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/config/MtasDocumentIndexAutoConfiguration.java +++ b/inception/inception-search-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/config/MtasDocumentIndexAutoConfiguration.java @@ -23,7 +23,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.search.index.PhysicalIndexRegistry; diff --git a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java index 1517db48d16..c1566050d58 100644 --- a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java +++ b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndexTest.java @@ -57,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.conll.config.ConllFormatsAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.diag.config.CasDoctorAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; @@ -117,7 +116,6 @@ @Transactional(propagation = Propagation.NEVER) @Import({ // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // TextFormatsAutoConfiguration.class, // ConllFormatsAutoConfiguration.class, // DocumentImportExportServiceAutoConfiguration.class, // diff --git a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParserTest.java b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParserTest.java index 862bf3fb171..143b94bc803 100644 --- a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParserTest.java +++ b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUimaParserTest.java @@ -58,7 +58,7 @@ import de.tudarmstadt.ukp.inception.annotation.feature.string.StringFeatureSupportPropertiesImpl; import de.tudarmstadt.ukp.inception.annotation.layer.behaviors.LayerSupportRegistryImpl; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationAdapter; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistryImpl; import de.tudarmstadt.ukp.inception.search.PrimitiveUimaIndexingSupport; diff --git a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUpgradeTest.java b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUpgradeTest.java index f55298487b2..d3d7443f14d 100644 --- a/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUpgradeTest.java +++ b/inception/inception-search-mtas/src/test/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasUpgradeTest.java @@ -40,8 +40,6 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.transaction.annotation.Transactional; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaPropertiesImpl; import de.tudarmstadt.ukp.clarin.webanno.diag.config.CasDoctorAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -60,8 +58,10 @@ import de.tudarmstadt.ukp.inception.preferences.config.PreferencesServiceAutoConfig; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaPropertiesImpl; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistry; import de.tudarmstadt.ukp.inception.search.config.SearchServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.search.index.IndexRebuildRequiredException; diff --git a/inception/inception-testing/src/main/java/de/tudarmstadt/ukp/inception/support/test/recommendation/RecommenderTestHelper.java b/inception/inception-testing/src/main/java/de/tudarmstadt/ukp/inception/support/test/recommendation/RecommenderTestHelper.java index 6d90ab9f263..0beae585823 100644 --- a/inception/inception-testing/src/main/java/de/tudarmstadt/ukp/inception/support/test/recommendation/RecommenderTestHelper.java +++ b/inception/inception-testing/src/main/java/de/tudarmstadt/ukp/inception/support/test/recommendation/RecommenderTestHelper.java @@ -40,7 +40,7 @@ import org.apache.uima.resource.metadata.TypeDescription; import org.apache.uima.resource.metadata.TypeSystemDescription; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; public class RecommenderTestHelper diff --git a/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPage.java b/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPage.java index 4b55da85e15..cd434212de4 100644 --- a/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPage.java +++ b/inception/inception-ui-agreement/src/main/java/de/tudarmstadt/ukp/inception/ui/agreement/page/AgreementPage.java @@ -78,7 +78,7 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.support.help.DocLink; @MountPath(NS_PROJECT + "/${" + PAGE_PARAM_PROJECT + "}/agreement") diff --git a/inception/inception-ui-annotation/pom.xml b/inception/inception-ui-annotation/pom.xml index 56e9c42b87a..2bb29a02f54 100644 --- a/inception/inception-ui-annotation/pom.xml +++ b/inception/inception-ui-annotation/pom.xml @@ -88,10 +88,6 @@ de.tudarmstadt.ukp.inception.app inception-model-vdoc - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-documents-api diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java index d6ff4981335..8af95d200f5 100755 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java @@ -98,8 +98,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.selection.AnnotatorViewportChangedEvent; import de.tudarmstadt.ukp.inception.rendering.selection.SelectionChangedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; @MountPath(NS_PROJECT + "/${" + PAGE_PARAM_PROJECT + "}/annotate/#{" + PAGE_PARAM_DOCUMENT + "}") public class AnnotationPage diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/ActionFactory.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/ActionFactory.java index c4b1fbcafd9..3ec246b4b91 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/ActionFactory.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/ActionFactory.java @@ -21,7 +21,7 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.UndoableAnnotationAction; import de.tudarmstadt.ukp.inception.annotation.events.AnnotationEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; @FunctionalInterface public interface ActionFactory diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndHighlight.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndHighlight.java index aae87559a13..37beaf2d27f 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndHighlight.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndHighlight.java @@ -30,7 +30,7 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.inception.rendering.model.Range; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class PostActionScrollToAndHighlight implements PostAction diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndSelect.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndSelect.java index 29758fc6d81..bd2dd888380 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndSelect.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/PostActionScrollToAndSelect.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class PostActionScrollToAndSelect implements PostAction diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/UndoPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/UndoPanel.java index a48267d9013..235f48e1c0c 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/UndoPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/UndoPanel.java @@ -46,8 +46,8 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.UndoableAnnotationAction; import de.tudarmstadt.ukp.inception.annotation.events.AnnotationEvent; import de.tudarmstadt.ukp.inception.annotation.events.DocumentOpenedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import wicket.contrib.input.events.key.KeyType; public class UndoPanel diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainLinkAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainLinkAnnotationAction.java index 54244d252bc..90081558475 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainLinkAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainLinkAnnotationAction.java @@ -28,8 +28,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.chain.ChainEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CreateChainLinkAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainSpanAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainSpanAnnotationAction.java index 10b6445a086..6a7783bf33a 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainSpanAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateChainSpanAnnotationAction.java @@ -28,8 +28,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.chain.ChainEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CreateChainSpanAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateRelationAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateRelationAnnotationAction.java index a830c3008a4..7293dfc627e 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateRelationAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateRelationAnnotationAction.java @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CreateRelationAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateSpanAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateSpanAnnotationAction.java index e97a2e4c49d..eeddd2cf843 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateSpanAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/CreateSpanAnnotationAction.java @@ -30,8 +30,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class CreateSpanAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteRelationAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteRelationAnnotationAction.java index 26cc76ddc64..94a8c8ad18a 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteRelationAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteRelationAnnotationAction.java @@ -25,8 +25,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class DeleteRelationAnnotationAction extends CreateRelationAnnotationAction diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteSpanAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteSpanAnnotationAction.java index e901008c969..ce6a8c7240b 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteSpanAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/DeleteSpanAnnotationAction.java @@ -25,8 +25,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class DeleteSpanAnnotationAction extends CreateSpanAnnotationAction diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/MoveSpanAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/MoveSpanAnnotationAction.java index 1f04114cb83..1b389678a6a 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/MoveSpanAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/MoveSpanAnnotationAction.java @@ -31,8 +31,8 @@ import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanMovedEvent; import de.tudarmstadt.ukp.inception.rendering.model.Range; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class MoveSpanAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/RedoableAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/RedoableAnnotationAction.java index 15feab252f8..b68c586cfe3 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/RedoableAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/RedoableAnnotationAction.java @@ -24,8 +24,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface RedoableAnnotationAction { diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UndoableAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UndoableAnnotationAction.java index bfb8455452c..4f946603252 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UndoableAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UndoableAnnotationAction.java @@ -25,8 +25,8 @@ import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostAction; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public interface UndoableAnnotationAction extends Serializable diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UpdateFeatureValueAnnotationAction.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UpdateFeatureValueAnnotationAction.java index 7cbe3b7b9ad..40c43c96be7 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UpdateFeatureValueAnnotationAction.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/undo/actions/UpdateFeatureValueAnnotationAction.java @@ -29,8 +29,8 @@ import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.PostActionScrollToAndSelect; import de.tudarmstadt.ukp.inception.annotation.events.FeatureValueUpdatedEvent; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class UpdateFeatureValueAnnotationAction extends AnnotationAction_ImplBase diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java index 0e2c723cb77..9f5f932bcbf 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java @@ -81,7 +81,6 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.exception.IllegalPlacementException; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.util.WebAnnoCasUtil; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.constraints.evaluator.PossibleValue; import de.tudarmstadt.ukp.clarin.webanno.constraints.evaluator.RulesIndicator; import de.tudarmstadt.ukp.clarin.webanno.constraints.evaluator.ValuesGenerator; @@ -107,11 +106,12 @@ import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.selection.SelectionChangedEvent; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.AttachedAnnotation; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.LinkWithRoleModel; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.LinkWithRoleModel; import wicket.contrib.input.events.key.KeyType; /** @@ -1057,7 +1057,7 @@ private void loadFeatureEditorModels(AjaxRequestTarget aTarget) // If we reset the layers while doing a relation, we won't be able to complete the // relation - so in this case, we leave the layers alone... if (!selection.isArc()) { - state.refreshSelectableLayers(annotationEditorProperties); + state.refreshSelectableLayers(annotationEditorProperties::isLayerBlocked); } if (selection.getAnnotation().isSet()) { @@ -1383,7 +1383,7 @@ public void reset(AjaxRequestTarget aTarget) state.getSelection().clear(); // Refresh the selectable layers dropdown - state.refreshSelectableLayers(annotationEditorProperties); + state.refreshSelectableLayers(annotationEditorProperties::isLayerBlocked); if (aTarget != null) { aTarget.add(layerSelectionPanel); } diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationTextPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationTextPanel.java index cdf859d7750..5a548069855 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationTextPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationTextPanel.java @@ -33,8 +33,8 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public class AnnotationTextPanel extends Panel diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AttachedAnnotationListPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AttachedAnnotationListPanel.java index a013022760e..16156e3ac62 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AttachedAnnotationListPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AttachedAnnotationListPanel.java @@ -60,13 +60,13 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.selection.Selection; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.AttachedAnnotation; -import de.tudarmstadt.ukp.inception.schema.AttachedAnnotation.Direction; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation; +import de.tudarmstadt.ukp.inception.schema.api.AttachedAnnotation.Direction; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; public class AttachedAnnotationListPanel extends Panel diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java index cbf1cf3289d..4a5961271b8 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java @@ -54,11 +54,11 @@ import de.tudarmstadt.ukp.inception.annotation.feature.link.LinkFeatureEditor; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class FeatureEditorListPanel extends Panel diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/LayerSelectionPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/LayerSelectionPanel.java index f8b35e2d9d1..84eec312cea 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/LayerSelectionPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/LayerSelectionPanel.java @@ -36,15 +36,15 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.preferences.UserPreferencesService; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.event.DefaultLayerChangedEvent; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class LayerSelectionPanel extends Panel diff --git a/inception/inception-ui-curation/pom.xml b/inception/inception-ui-curation/pom.xml index 4031ad602bd..0810216f6d9 100644 --- a/inception/inception-ui-curation/pom.xml +++ b/inception/inception-ui-curation/pom.xml @@ -80,10 +80,6 @@ de.tudarmstadt.ukp.inception.app inception-api-editor - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-security diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java index d0bcef88cd3..2e77af204f9 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/actionbar/CuratorWorkflowActionBarItemGroup.java @@ -55,7 +55,7 @@ import de.tudarmstadt.ukp.inception.curation.service.CurationService; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import wicket.contrib.input.events.key.KeyType; public class CuratorWorkflowActionBarItemGroup diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java index 1e1acb1be02..bc1c74aa9f2 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java @@ -65,7 +65,6 @@ import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.brat.schema.BratSchemaGenerator; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.Configuration; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.ConfigurationSet; @@ -94,10 +93,11 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.TypeUtil; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.feature.TypeUtil; /** * Panel with the annotator's annotations. diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java index 0a8b480b9b5..be2d036bcc7 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java @@ -84,7 +84,7 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; public abstract class BratSuggestionVisualizer extends Panel diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/render/CurationRendererImpl.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/render/CurationRendererImpl.java index f9f891e596f..dbdaf8548c0 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/render/CurationRendererImpl.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/render/CurationRendererImpl.java @@ -28,7 +28,6 @@ import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.ColorRenderer; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.LabelRenderer; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.PreRenderer; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; @@ -38,7 +37,8 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequest; import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; @Component public class CurationRendererImpl diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java index d5742c9d1cc..4ea6e179e42 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java @@ -119,8 +119,8 @@ import de.tudarmstadt.ukp.inception.rendering.paging.Unit; import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent; import de.tudarmstadt.ukp.inception.rendering.selection.SelectionChangedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; /** diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationEditorExtension.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationEditorExtension.java index 92d4c1e7c16..1c268633ada 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationEditorExtension.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationEditorExtension.java @@ -47,10 +47,10 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.config.CurationSidebarAutoConfiguration; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.render.CurationVID; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebar.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebar.java index 008b7ec35fa..c99039f9f6d 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebar.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebar.java @@ -85,7 +85,7 @@ import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class CurationSidebar extends AnnotationSidebar_ImplBase diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java index 431cbdee52c..a531ad29af3 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java @@ -31,9 +31,9 @@ import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.CurationEditorExtension; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.CurationSidebarApplicationInitializer; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.CurationSidebarFactory; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/render/CurationSidebarRenderer.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/render/CurationSidebarRenderer.java index 01bdb4c13bf..baae54032a3 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/render/CurationSidebarRenderer.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/render/CurationSidebarRenderer.java @@ -63,9 +63,9 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument; import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.CurationSidebarService; import de.tudarmstadt.ukp.inception.ui.curation.sidebar.config.CurationSidebarAutoConfiguration; diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/project/DocumentRepositoryEditorPanel.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/project/DocumentRepositoryEditorPanel.java index c74fe651b69..96083f1b906 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/project/DocumentRepositoryEditorPanel.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/project/DocumentRepositoryEditorPanel.java @@ -47,7 +47,7 @@ import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchProviderRegistry; import de.tudarmstadt.ukp.inception.externalsearch.ExternalSearchService; import de.tudarmstadt.ukp.inception.externalsearch.model.DocumentRepository; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class DocumentRepositoryEditorPanel extends Panel diff --git a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java index cd0a7568555..e09050cfe3b 100644 --- a/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java +++ b/inception/inception-ui-external-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/externalsearch/sidebar/ExternalSearchAnnotationSidebar.java @@ -83,7 +83,7 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VMarker; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.support.annotation.OffsetSpan; public class ExternalSearchAnnotationSidebar diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java index 10856dee0fd..f68c2e6a588 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/config/KnowledgeBaseServiceUIAutoConfiguration.java @@ -32,8 +32,8 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseProperties; import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBaseServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.ui.kb.KnowledgeBasePageMenuItem; import de.tudarmstadt.ukp.inception.ui.kb.feature.ConceptFeatureSupport; import de.tudarmstadt.ukp.inception.ui.kb.feature.ConceptLabelCache; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/BrowseKnowledgeBaseDialogContentPanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/BrowseKnowledgeBaseDialogContentPanel.java index 502e89aeb28..ae5d3225799 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/BrowseKnowledgeBaseDialogContentPanel.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/BrowseKnowledgeBaseDialogContentPanel.java @@ -42,7 +42,7 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBObject; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.ui.kb.event.AjaxConceptNavigateEvent; public class BrowseKnowledgeBaseDialogContentPanel diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java index 1ae5ac9deb7..1ccb496d1c7 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java @@ -64,9 +64,9 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBObject; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditorValueChangedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditorValueChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.ui.kb.IriInfoBadge; import de.tudarmstadt.ukp.inception.ui.kb.event.AjaxConceptSelectionEvent; import de.tudarmstadt.ukp.inception.ui.kb.event.AjaxInstanceSelectionEvent; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor_ImplBase.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor_ImplBase.java index b8ffed94170..b48b79c19e2 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor_ImplBase.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor_ImplBase.java @@ -56,8 +56,8 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Component for editing knowledge-base-related features on annotations. diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java index 48c25fe4754..6f749131531 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java @@ -45,9 +45,9 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; /** diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureTraitsEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureTraitsEditor.java index bddcf70e6cd..682dd3783bf 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureTraitsEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureTraitsEditor.java @@ -47,8 +47,8 @@ import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Component for editing the traits of knowledge-base-related features in the feature detail editor diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java index fb609cb2e1f..1532efdac63 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; public class DisabledKBWarning extends Panel diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java index 2aa7da576e3..1a765f4cbcd 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java @@ -37,8 +37,8 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.support.kendo.KendoStyleUtils; public class MultiValueConceptFeatureEditor diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureSupport.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureSupport.java index e759337033d..67d3117dfdc 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureSupport.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureSupport.java @@ -53,10 +53,10 @@ import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail; import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup; -import de.tudarmstadt.ukp.inception.schema.adapter.IllegalFeatureValueException; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureEditor; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.adapter.IllegalFeatureValueException; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; /** diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureTraitsEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureTraitsEditor.java index e154b8b8cac..9385655a380 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureTraitsEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureTraitsEditor.java @@ -46,8 +46,8 @@ import de.tudarmstadt.ukp.inception.kb.MultiValueConceptFeatureTraits; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; /** * Component for editing the traits of knowledge-base-related features in the feature detail editor diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java index 2d90ba63e68..cc5d2fea148 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/initializers/NamedEntityIdentifierFeatureInitializer.java @@ -35,7 +35,7 @@ import de.tudarmstadt.ukp.clarin.webanno.project.initializers.TokenLayerInitializer; import de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; /** diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupport.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupport.java index fdfdd1909b8..d6a4b3e4952 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupport.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupport.java @@ -32,8 +32,8 @@ import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.kb.graph.KBObject; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupport; import de.tudarmstadt.ukp.inception.ui.kb.config.KnowledgeBaseServiceUIAutoConfiguration; diff --git a/inception/inception-ui-kb/src/test/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupportTest.java b/inception/inception-ui-kb/src/test/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupportTest.java index 53d6b0658a3..957f3e3edb6 100644 --- a/inception/inception-ui-kb/src/test/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupportTest.java +++ b/inception/inception-ui-kb/src/test/java/de/tudarmstadt/ukp/inception/ui/kb/search/ConceptFeatureIndexingSupportTest.java @@ -51,7 +51,7 @@ import de.tudarmstadt.ukp.inception.kb.config.KnowledgeBasePropertiesImpl; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.FeatureSupportRegistryImpl; import de.tudarmstadt.ukp.inception.search.FeatureIndexingSupportRegistryImpl; import de.tudarmstadt.ukp.inception.search.PrimitiveUimaIndexingSupport; diff --git a/inception/inception-ui-project/pom.xml b/inception/inception-ui-project/pom.xml index f3694103a27..d2a50460271 100644 --- a/inception/inception-ui-project/pom.xml +++ b/inception/inception-ui-project/pom.xml @@ -55,10 +55,6 @@ de.tudarmstadt.ukp.inception.app inception-io-text - - de.tudarmstadt.ukp.inception.app - inception-api - de.tudarmstadt.ukp.inception.app inception-project-api diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java index 1e354f553f4..b6af7dac417 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/detail/ProjectDetailPanel.java @@ -59,7 +59,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class ProjectDetailPanel extends Panel diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java index 3a6959964b6..9eb56c3ac1e 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/documents/ImportDocumentsPanel.java @@ -55,7 +55,7 @@ import de.tudarmstadt.ukp.clarin.webanno.text.TextFormatSupport; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class ImportDocumentsPanel extends Panel diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/DeleteLayerConfirmationDialogContentPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/DeleteLayerConfirmationDialogContentPanel.java index 689b2918bad..026db410042 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/DeleteLayerConfirmationDialogContentPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/DeleteLayerConfirmationDialogContentPanel.java @@ -33,7 +33,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.support.dialog.ChallengeResponseDialogContentPanel_ImplBase; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class DeleteLayerConfirmationDialogContentPanel extends ChallengeResponseDialogContentPanel_ImplBase diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/FeatureDetailForm.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/FeatureDetailForm.java index c9b5b5e600a..8cc3331df5b 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/FeatureDetailForm.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/FeatureDetailForm.java @@ -65,11 +65,11 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaModelAdapter; import de.tudarmstadt.ukp.clarin.webanno.support.spring.ApplicationEventPublisherHolder; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupport; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureType; public class FeatureDetailForm extends Form diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/LayerDetailForm.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/LayerDetailForm.java index a2b133b2aed..5ee4310b004 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/LayerDetailForm.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/LayerDetailForm.java @@ -71,12 +71,12 @@ import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.export.LayerImportExportUtils; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.TypeAdapter; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupport; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerType; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupport; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerType; import de.tudarmstadt.ukp.inception.support.help.DocLink; public class LayerDetailForm diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java index a2611eb3d02..5066399f660 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/layers/ProjectLayersPanel.java @@ -73,7 +73,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaProperties; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -94,10 +93,11 @@ import de.tudarmstadt.ukp.inception.export.LayerImportExportUtils; import de.tudarmstadt.ukp.inception.project.api.ProjectInitializer; import de.tudarmstadt.ukp.inception.project.api.ProjectService; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.event.LayerConfigurationChangedEvent; -import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry; -import de.tudarmstadt.ukp.inception.schema.layer.LayerSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.config.AnnotationSchemaProperties; +import de.tudarmstadt.ukp.inception.schema.api.event.LayerConfigurationChangedEvent; +import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry; +import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry; import de.tudarmstadt.ukp.inception.support.help.DocLink; /** diff --git a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java index f7b05fb806b..a2b6549cb51 100644 --- a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java +++ b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java @@ -111,8 +111,8 @@ import de.tudarmstadt.ukp.inception.rendering.vmodel.VID; import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange; import de.tudarmstadt.ukp.inception.rendering.vmodel.VTextMarker; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.search.ResultsGroup; import de.tudarmstadt.ukp.inception.search.SearchResult; import de.tudarmstadt.ukp.inception.search.SearchService; diff --git a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebar.java b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebar.java index 24287a40ff8..446dae88379 100644 --- a/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebar.java +++ b/inception/inception-ui-search/src/main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/StatisticsAnnotationSidebar.java @@ -65,7 +65,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.search.ExecutionException; import de.tudarmstadt.ukp.inception.search.Granularities; import de.tudarmstadt.ukp.inception.search.LayerStatistics; diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagEditorPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagEditorPanel.java index 20874ff9b15..bd7c2007443 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagEditorPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagEditorPanel.java @@ -36,7 +36,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaPanel; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagEditorPanel extends LambdaPanel diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSelectionPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSelectionPanel.java index c7bb212d816..71d56957dea 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSelectionPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSelectionPanel.java @@ -34,7 +34,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ListPanel_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.OverviewListChoice; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagSelectionPanel extends ListPanel_ImplBase diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetEditorPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetEditorPanel.java index 87b1b75b1ef..e90ce0f2e0b 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetEditorPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetEditorPanel.java @@ -59,7 +59,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.AjaxDownloadLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.InputStreamResourceStream; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.WicketExceptionUtil; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagSetEditorPanel extends LambdaPanel diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetImportPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetImportPanel.java index 58669fabf3e..a5fe79b2b6e 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetImportPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetImportPanel.java @@ -45,7 +45,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.wicket.WicketExceptionUtil; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; import de.tudarmstadt.ukp.inception.export.TagsetImportExportUtils; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagSetImportPanel extends Panel diff --git a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetSelectionPanel.java b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetSelectionPanel.java index a0ff489b8a1..4e2f8a10da5 100644 --- a/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetSelectionPanel.java +++ b/inception/inception-ui-tagsets/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/tagsets/TagSetSelectionPanel.java @@ -31,7 +31,7 @@ import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.ListPanel_ImplBase; import de.tudarmstadt.ukp.clarin.webanno.support.wicket.OverviewListChoice; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TagSetSelectionPanel extends ListPanel_ImplBase diff --git a/inception/inception-versioning/pom.xml b/inception/inception-versioning/pom.xml index 75e5782ead9..a67cf46a901 100644 --- a/inception/inception-versioning/pom.xml +++ b/inception/inception-versioning/pom.xml @@ -206,11 +206,6 @@ inception-project test - - de.tudarmstadt.ukp.inception.app - inception-api - test - de.tudarmstadt.ukp.inception.app inception-documents diff --git a/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java b/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java index ac1243d60e3..304964b4f8a 100644 --- a/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java +++ b/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImpl.java @@ -63,7 +63,7 @@ import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; import de.tudarmstadt.ukp.inception.export.LayerImportExportUtils; import de.tudarmstadt.ukp.inception.project.api.event.BeforeProjectRemovedEvent; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; /** *

diff --git a/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/config/VersioningServiceAutoConfiguration.java b/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/config/VersioningServiceAutoConfiguration.java index 6dde9884a55..8b52e7f6aa4 100644 --- a/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/config/VersioningServiceAutoConfiguration.java +++ b/inception/inception-versioning/src/main/java/de/tudarmstadt/ukp/inception/versioning/config/VersioningServiceAutoConfiguration.java @@ -29,7 +29,7 @@ import de.tudarmstadt.ukp.inception.curation.service.CurationDocumentService; import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.documents.api.RepositoryProperties; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.versioning.VersioningService; import de.tudarmstadt.ukp.inception.versioning.VersioningServiceImpl; import de.tudarmstadt.ukp.inception.versioning.ui.VersioningMenuItem; diff --git a/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java b/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java index fb241e23782..cf057505693 100644 --- a/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java +++ b/inception/inception-versioning/src/test/java/de/tudarmstadt/ukp/inception/versioning/VersioningServiceImplTest.java @@ -50,7 +50,6 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.diag.config.CasDoctorAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; @@ -85,7 +84,6 @@ "de.tudarmstadt.ukp.clarin.webanno.model", "de.tudarmstadt.ukp.clarin.webanno.security.model" }) @Import({ // - AnnotationSchemaAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // ProjectServiceAutoConfiguration.class, // CasStorageServiceAutoConfiguration.class, // diff --git a/inception/inception-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index f5a563d2402..bbe05cd9787 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -248,11 +248,6 @@ inception-documents test - - de.tudarmstadt.ukp.inception.app - inception-api - test - diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicAnnotatorWorkflowActionBarItemGroup.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicAnnotatorWorkflowActionBarItemGroup.java index 7cbd416c5c1..894637fe0d8 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicAnnotatorWorkflowActionBarItemGroup.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicAnnotatorWorkflowActionBarItemGroup.java @@ -56,7 +56,7 @@ import de.tudarmstadt.ukp.inception.documents.api.DocumentService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.workload.dynamic.DynamicWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.dynamic.trait.DynamicWorkloadTraits; import de.tudarmstadt.ukp.inception.workload.dynamic.workflow.WorkflowExtensionPoint; diff --git a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java index 28cb2e99b7c..7f1ab21e378 100644 --- a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java +++ b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImpl2Test.java @@ -44,7 +44,6 @@ import org.springframework.security.core.session.SessionRegistry; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -63,7 +62,7 @@ import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.config.WorkloadManagementAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.dynamic.config.DynamicWorkloadManagerAutoConfiguration; @@ -87,7 +86,6 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class, // SchedulingServiceAutoConfiguration.class, // WorkloadManagementAutoConfiguration.class, // diff --git a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java index d8945ad00c5..e81d2e2f652 100644 --- a/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java +++ b/inception/inception-workload-dynamic/src/test/java/de/tudarmstadt/ukp/inception/workload/dynamic/DynamicWorkloadExtensionImplTest.java @@ -47,7 +47,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState; @@ -65,7 +64,7 @@ import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.config.WorkloadManagementAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.dynamic.config.DynamicWorkloadManagerAutoConfiguration; @@ -89,7 +88,6 @@ ProjectServiceAutoConfiguration.class, // CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // SecurityAutoConfiguration.class, // SchedulingServiceAutoConfiguration.class, // diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index 19fb7e68df2..a776be45fec 100644 --- a/inception/inception-workload-matrix/pom.xml +++ b/inception/inception-workload-matrix/pom.xml @@ -241,11 +241,6 @@ dkpro-core-api-ner-asl test - - de.tudarmstadt.ukp.inception.app - inception-api - test - diff --git a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowActionBarItemGroup.java b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowActionBarItemGroup.java index a2738fdcad9..d021a2c0591 100644 --- a/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowActionBarItemGroup.java +++ b/inception/inception-workload-matrix/src/main/java/de/tudarmstadt/ukp/inception/workload/matrix/annotation/MatrixWorkflowActionBarItemGroup.java @@ -63,7 +63,7 @@ import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; -import de.tudarmstadt.ukp.inception.schema.adapter.AnnotationException; +import de.tudarmstadt.ukp.inception.schema.api.adapter.AnnotationException; import de.tudarmstadt.ukp.inception.workload.matrix.MatrixWorkloadExtension; import de.tudarmstadt.ukp.inception.workload.matrix.trait.MatrixWorkloadTraits; import de.tudarmstadt.ukp.inception.workload.model.WorkloadManagementService; diff --git a/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java b/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java index 9305b998ee6..e29ef2f3b6b 100644 --- a/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java +++ b/inception/inception-workload-matrix/src/test/java/de/tudarmstadt/ukp/inception/workload/matrix/MatrixWorkloadExtensionImplTest.java @@ -40,7 +40,6 @@ import org.springframework.context.annotation.Import; import org.springframework.util.FileSystemUtils; -import de.tudarmstadt.ukp.clarin.webanno.api.config.AnnotationSchemaAutoConfiguration; import de.tudarmstadt.ukp.clarin.webanno.api.export.DocumentImportExportService; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.Project; @@ -58,7 +57,7 @@ import de.tudarmstadt.ukp.inception.documents.config.DocumentServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.project.api.ProjectService; import de.tudarmstadt.ukp.inception.scheduling.config.SchedulingServiceAutoConfiguration; -import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; +import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.config.AnnotationSchemaServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.config.WorkloadManagementAutoConfiguration; import de.tudarmstadt.ukp.inception.workload.matrix.config.MatrixWorkloadManagerAutoConfiguration; @@ -81,7 +80,6 @@ CasStorageServiceAutoConfiguration.class, // RepositoryAutoConfiguration.class, // AnnotationSchemaServiceAutoConfiguration.class, // - AnnotationSchemaAutoConfiguration.class, // SecurityAutoConfiguration.class, // SchedulingServiceAutoConfiguration.class, // WorkloadManagementAutoConfiguration.class, // diff --git a/inception/installEclipseSettings.sh b/inception/installEclipseSettings.sh index 51ff795d97e..4c2b132d04e 100755 --- a/inception/installEclipseSettings.sh +++ b/inception/installEclipseSettings.sh @@ -15,7 +15,6 @@ function installPrefs { installPrefs inception-active-learning installPrefs inception-agreement installPrefs inception-annotation-storage -installPrefs inception-api installPrefs inception-api-annotation installPrefs inception-api-dao installPrefs inception-api-editor @@ -39,6 +38,7 @@ installPrefs inception-diam-word-alignment-editor installPrefs inception-doc installPrefs inception-docker installPrefs inception-documents +installPrefs inception-documents-api installPrefs inception-editor-api installPrefs inception-example-imls-data-majority installPrefs inception-experimental-editor diff --git a/inception/pom.xml b/inception/pom.xml index 4b9a5403ca1..af4c8ea32ec 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -171,7 +171,6 @@ inception-ui-core inception-log inception-scheduling - inception-api inception-js-api inception-annotation-storage inception-annotation-storage-api