Skip to content

Commit

Permalink
updated webanno master
Browse files Browse the repository at this point in the history
  • Loading branch information
remstef committed Jun 12, 2017
1 parent 4b53bbf commit 9489ce5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion webanno
Submodule webanno updated 66 files
+12 −1 pom.xml
+29 −0 ...o-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/FeatureSupport.java
+25 −0 ...notation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/FeatureSupportRegistry.java
+78 −0 ...tion/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/FeatureSupportRegistryImpl.java
+41 −0 ...ion/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/PrimitiveUimaFeatureSupport.java
+57 −0 ...i-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/feature/SlotFeatureSupport.java
+202 −0 webanno-api-automation/LICENSE.txt
+50 −0 webanno-api-automation/pom.xml
+0 −0 webanno-api-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/model/AutomationStatus.java
+0 −0 webanno-api-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/model/MiraTemplate.java
+56 −0 ...omation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/AutomationCasStorageService.java
+59 −6 ...no-api-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/AutomationService.java
+21 −0 webanno-api-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/package-info.java
+4 −0 webanno-api-dao/pom.xml
+207 −194 webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/CasStorageServiceImpl.java
+1 −0 webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/CorrectionDocumentServiceImpl.java
+5 −2 webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/DocumentServiceImpl.java
+16 −6 webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/ImportExportServiceImpl.java
+3 −2 webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/CasStorageService.java
+2 −1 webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/ImportExportService.java
+4 −0 webanno-api/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/WebAnnoConst.java
+21 −12 webanno-automation/pom.xml
+266 −0 ...ion/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/AutomationCasStorageServiceImpl.java
+71 −0 webanno-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/CasPersistenceUtils.java
+240 −31 ...utomation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/automation/service/MiraAutomationServiceImpl.java
+8 −4 webanno-brat/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratAnnotationEditor.java
+44 −5 webanno-brat/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/OnClickActionParser.java
+9 −10 webanno-brat/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/render/BratRenderer.java
+28 −5 webanno-doc/src/main/asciidoc/user-guide/curation.adoc
+12 −1 webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/Project.java
+1 −39 webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/SourceDocument.java
+133 −0 webanno-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/TrainingDocument.java
+26 −13 webanno-model/src/main/java/de/tudarmstadt/ukp/clarin/webanno/model/AnnotationDocumentState.java
+11 −33 webanno-model/src/main/java/de/tudarmstadt/ukp/clarin/webanno/model/SourceDocument.java
+22 −15 webanno-model/src/main/java/de/tudarmstadt/ukp/clarin/webanno/model/SourceDocumentState.java
+61 −0 webanno-model/src/main/java/de/tudarmstadt/ukp/clarin/webanno/model/TrainDocumentState.java
+32 −0 webanno-model/src/main/java/de/tudarmstadt/ukp/clarin/webanno/model/TrainDocumentStateType.java
+209 −0 webanno-model/src/main/java/de/tudarmstadt/ukp/clarin/webanno/model/TrainingDocument.java
+72 −0 webanno-support/src/main/java/de/tudarmstadt/ukp/clarin/webanno/support/wicket/DecoratedObject.java
+6 −6 webanno-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java
+1 −0 ...-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationFeatureForm.java
+4 −6 ...-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/dialog/OpenDocumentDialog.java
+0 −0 ...nnotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/dialog/OpenDocumentDialogPanel.html
+51 −59 ...nnotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/dialog/OpenDocumentDialogPanel.java
+1 −1 webanno-ui-automation/pom.xml
+6 −6 webanno-ui-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/automation/page/AutomationPage.java
+20 −31 ...omation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/automation/project/ProjectMiraTemplatePanel.java
+4 −1 ...n/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/automation/project/ProjectMiraTemplatePanel.properties
+18 −34 ...on/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/automation/project/ProjectTrainingDocumentsPanel.java
+133 −184 webanno-ui-automation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/automation/util/AutomationUtil.java
+6 −6 webanno-ui-correction/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/correction/CorrectionPage.java
+28 −16 ...-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/SuggestionViewPanel.java
+12 −10 webanno-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java
+1 −1 webanno-ui-monitoring/pom.xml
+0 −0 webanno-ui-monitoring/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/monitoring/page/AgreementPage.html
+0 −12 webanno-ui-monitoring/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/monitoring/page/AgreementPage.java
+0 −0 ...o-ui-monitoring/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/monitoring/page/AgreementPage.properties
+0 −22 webanno-ui-monitoring/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/monitoring/page/MonitoringPage.java
+5 −1 webanno-ui-project/pom.xml
+64 −12 webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ExportUtil.java
+65 −24 webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ImportUtil.java
+1 −3 webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectDocumentsPanel.java
+7 −6 webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectExportPanel.java
+16 −26 webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectLayersPanel.java
+8 −2 webanno-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/ProjectPage.java
+6 −1 webanno-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private void createTranscriptLayer(Project aProject)
playbuttonSegmentLayer.setReadonly(false);
playbuttonSegmentLayer.setMultipleTokens(false);
// playbuttonSegmentLayer.setZeroWidthOnly(true);
playbuttonSegmentLayer.setOnClickJavascriptAction("window.open('partitur/${PID}/${DOCID}#${AnchorID}', 'partitur')");
playbuttonSegmentLayer.setOnClickJavascriptAction("window.open(`partitur/${params.PID}/${params.DOCID}#${params.AnchorID}`, 'partitur');");
annotationService.createLayer(playbuttonSegmentLayer);

AnnotationFeature playbuttonSegmentLayerInfoFeature = new AnnotationFeature();
Expand All @@ -92,7 +92,7 @@ private void createTranscriptLayer(Project aProject)
playbuttonLayer.setReadonly(true);
playbuttonLayer.setMultipleTokens(false);
// playbuttonLayer.setZeroWidthOnly(true);
playbuttonLayer.setOnClickJavascriptAction("window.open('partitur/${PID}/${DOCID}#${AnchorID}', 'partitur')");
playbuttonLayer.setOnClickJavascriptAction("window.open(`partitur/${params.PID}/${params.DOCID}#${params.AnchorID}`, 'partitur')");
annotationService.createLayer(playbuttonLayer);

AnnotationFeature playbuttonLayerInfoFeature = new AnnotationFeature();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ private List<String> getDocumentList() {
// )
// )
// .collect(Collectors.toList());
return documentService.listSourceDocuments(data.selected_project).stream().filter(d -> !d.isTrainingDocument())
return documentService.listSourceDocuments(data.selected_project).stream()
.map(d -> d.getName()).collect(Collectors.toList());
}

Expand Down
5 changes: 5 additions & 0 deletions webanno-webapp-exm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<name>WebAnno - EXMARaLDA - Application</name>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>de.tudarmstadt.ukp.clarin.webanno</groupId>
<artifactId>webanno-automation</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.clarin.webanno</groupId>
<artifactId>webanno-ui-automation</artifactId>
Expand Down Expand Up @@ -295,6 +299,7 @@
<usedDependency>de.tudarmstadt.ukp.clarin.webanno:webanno-doc</usedDependency>
<!-- WebAnno Remote API - used via Spring -->
<usedDependency> de.tudarmstadt.ukp.clarin.webanno:webanno-remote</usedDependency>
<usedDependency> de.tudarmstadt.ukp.clarin.webanno:webanno-automation</usedDependency>
<!-- WebAnno IO Modules - they are required via the formats.properties file -->
<usedDependency>de.tudarmstadt.ukp.clarin.webanno:webanno-io-tei</usedDependency>
<usedDependency>de.tudarmstadt.ukp.clarin.webanno:webanno-io-tsv</usedDependency>
Expand Down

0 comments on commit 9489ce5

Please sign in to comment.