set old teiReader to deprecated

webanno · Mar 19, 2018 · 0e45999 · 0e45999
1 parent d374642
commit 0e45999
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 20 deletions.
diff --git a/...main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/ProjectInitializationServiceImpl.java b/...main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/ProjectInitializationServiceImpl.java
@@ -1,8 +1,6 @@
 package de.tudarmstadt.ukp.clarin.webanno.api.dao;
 
 
-import static de.tudarmstadt.ukp.clarin.webanno.api.WebAnnoConst.SPAN_TYPE;
-
 import java.io.IOException;
 
 import javax.annotation.Resource;
@@ -25,6 +23,8 @@
 import de.uhh.lt.webanno.exmaralda.type.TEIspanK;
 import de.uhh.lt.webanno.exmaralda.type.TEIspanSup;
 
+import static de.tudarmstadt.ukp.clarin.webanno.api.WebAnnoConst.SPAN_TYPE;
+
 /**
  * 
  */
@@ -60,7 +60,7 @@ private void createTranscriptLayer(Project aProject)
     	/* BEGIN: add play buttons */
         AnnotationLayer playbuttonSegmentLayer = new AnnotationLayer(
         		PlayableSegmentAnchor.class.getName(),
-                "Play Segment", 
+                "TEI Play Segment", 
                 SPAN_TYPE, 
                 aProject, 
                 true);
@@ -96,8 +96,8 @@ private void createTranscriptLayer(Project aProject)
         annotationService.createFeature(playbuttonSegmentFeature);
 
         AnnotationLayer playbuttonLayer = new AnnotationLayer(
-        		PlayableAnchor.class.getName(),
-                "Play", 
+                PlayableAnchor.class.getName(),
+                "TEI Play", 
                 SPAN_TYPE, 
                 aProject, 
                 true);
@@ -137,33 +137,33 @@ private void createTranscriptLayer(Project aProject)
         addSpanAnnotationLayer(
                 aProject, 
                 TEIspanGeneric.class,
-                "Generic TEI Span Annotation",
+                "TEI Span (generic)",
                 "This Layer is used to create generic TEI span annotations which occur also in the partitur view.",
-        		false);
+                false);
         addSpanAnnotationLayer(
                 aProject, 
                 TEIspanEn.class,
-                "'en'",
+                "TEI Span 'en'",
                 "This Layer is used to create 'en'-type TEI span annotations which occur also in the partitur view.",
-        		true);
+                true);
         addSpanAnnotationLayer(
                 aProject, 
                 TEIspanAkz.class,
-                "'akz'",
+                "TEI Span 'akz'",
                 "This Layer is used to create 'akz'-type TEI span annotations which occur also in the partitur view.",
-        		false);
+                false);
         addSpanAnnotationLayer(
                 aProject, 
                 TEIspanK.class,
-                "'k'",
+                "TEI Span 'k'",
                 "This Layer is used to create 'k'-type TEI span annotations which occur also in the partitur view.",
-        		false);
+                false);
         addSpanAnnotationLayer(
                 aProject, 
                 TEIspanSup.class,
-                "'sup'",
+                "TEI Span 'sup'",
                 "This Layer is used to create 'sup'-type TEI span annotations which occur also in the partitur view.",
-        		false);
+                false);
         /* END: add span annotations*/
 
         /* BEGIN: add incident annotations */

diff --git a/webanno-plugin-exmaralda/src/main/java/de/uhh/lt/webanno/exmaralda/io/HiatTeiReader.java b/webanno-plugin-exmaralda/src/main/java/de/uhh/lt/webanno/exmaralda/io/HiatTeiReader.java
@@ -78,8 +78,9 @@
 
 /**
  * Reader for the EXMARaLDA TEI format
- *
+ * @deprecated consider using HiatTeiReaderExt
  */
+@Deprecated
 public class HiatTeiReader extends JCasResourceCollectionReader_ImplBase {
 
     private static final Logger LOG = LoggerFactory.getLogger(HiatTeiReader.class);

diff --git a/webanno-plugin-exmaralda/src/test/java/de/uhh/lt/webanno/exmaralda/io/HiatTeiReaderTest.java b/webanno-plugin-exmaralda/src/test/java/de/uhh/lt/webanno/exmaralda/io/HiatTeiReaderTest.java
@@ -42,6 +42,12 @@
 import de.tudarmstadt.ukp.dkpro.core.api.io.JCasResourceCollectionReader_ImplBase;
 import de.uhh.lt.webanno.exmaralda.io.TestUtils.TeiExpectation;
 
+@Deprecated
+/**
+ * 
+ * @deprecated consider using HiatTeiReaderExtTest
+ *
+ */
 public class HiatTeiReaderTest{
 
     @BeforeClass

diff --git a/webanno-webapp-exm/src/main/resources/META-INF/formats.properties b/webanno-webapp-exm/src/main/resources/META-INF/formats.properties
@@ -69,11 +69,11 @@ xmi.writer=de.tudarmstadt.ukp.clarin.webanno.xmi.XmiWriter
 # HIAT TEI formats
 #
 
-hiattei1.label=HIAT Tei
+hiattei3.label=HIAT Tei
+hiattei3.reader=de.uhh.lt.webanno.exmaralda.io.HiatTeiReaderExt
+
+hiattei1.label=HIAT Tei - General Span Annotaions (deprecated)
 hiattei1.reader=de.uhh.lt.webanno.exmaralda.io.HiatTeiReader
 
 hiattei2.label=HIAT Tei - Reorder segments (experimental)
 hiattei2.reader=de.uhh.lt.webanno.exmaralda.io.HiatTeiReaderReorderSegments
-
-hiattei3.label=HIAT Tei - Extended Layers (experimental)
-hiattei3.reader=de.uhh.lt.webanno.exmaralda.io.HiatTeiReaderExt