Merge pull request #4605 from inception-project/bugfix/4603-Bulk-acti…

…ons-in-search-sidebar-should-not-be-greyed-out-when-in-sidebar-curation-mode #4603 - Bulk actions in search sidebar should not be greyed-out when in sidebar curation mode
inception-project · Mar 7, 2024 · 66f3083 · 66f3083
2 parents c8eca75 + 79667a1
commit 66f3083
Show file tree

Hide file tree

Showing 4 changed files with 151 additions and 163 deletions.
diff --git a/...ion/src/main/java/de/tudarmstadt/ukp/inception/annotation/events/BulkAnnotationEvent.java b/...ion/src/main/java/de/tudarmstadt/ukp/inception/annotation/events/BulkAnnotationEvent.java
@@ -34,21 +34,21 @@ public class BulkAnnotationEvent
 {
     private static final long serialVersionUID = -1187536069360130349L;
 
-    public BulkAnnotationEvent(Object aSource, Project aProject, String aDocumentOwner,
+    public BulkAnnotationEvent(Object aSource, Project aProject, String aDataOwner,
             AnnotationLayer aLayer)
     {
-        super(aSource, aProject, aDocumentOwner, aLayer);
+        super(aSource, aProject, aDataOwner, aLayer);
     }
 
-    public BulkAnnotationEvent(Object aSource, SourceDocument aDocument, String aDocumentOwner,
+    public BulkAnnotationEvent(Object aSource, SourceDocument aDocument, String aDataOwner,
             AnnotationLayer aLayer)
     {
-        super(aSource, aDocument, aDocumentOwner, aLayer);
+        super(aSource, aDocument, aDataOwner, aLayer);
     }
 
-    public BulkAnnotationEvent(Object aSource, SourceDocument aDocument, String aDocumentOwner)
+    public BulkAnnotationEvent(Object aSource, SourceDocument aDocument, String aDataOwner)
     {
-        super(aSource, aDocument, aDocumentOwner);
+        super(aSource, aDocument, aDataOwner);
     }
 
     @Override

diff --git a/...otation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java b/...otation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanAdapter.java
@@ -83,7 +83,7 @@ public SpanAdapter(LayerSupportRegistry aLayerSupportRegistry,
      *
      * @param aDocument
      *            the document to which the CAS belongs
-     * @param aDocumentOwner
+     * @param aDataOwner
      *            the user to which the CAS belongs
      * @param aCas
      *            the CAS.
@@ -95,12 +95,12 @@ public SpanAdapter(LayerSupportRegistry aLayerSupportRegistry,
      * @throws AnnotationException
      *             if the annotation cannot be created/updated.
      */
-    public AnnotationFS add(SourceDocument aDocument, String aDocumentOwner, CAS aCas, int aBegin,
+    public AnnotationFS add(SourceDocument aDocument, String aDataOwner, CAS aCas, int aBegin,
             int aEnd)
         throws AnnotationException
     {
         return handle(
-                new CreateSpanAnnotationRequest(aDocument, aDocumentOwner, aCas, aBegin, aEnd));
+                new CreateSpanAnnotationRequest(aDocument, aDataOwner, aCas, aBegin, aEnd));
     }
 
     public AnnotationFS handle(CreateSpanAnnotationRequest aRequest) throws AnnotationException

diff --git a/...otation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java b/...otation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java
@@ -403,7 +403,7 @@ public CAS getEditorCas() throws IOException
     public void writeEditorCas(CAS aCas) throws IOException, AnnotationException
     {
         ensureIsEditable();
-        AnnotatorState state = getModelObject();
+        var state = getModelObject();
         documentService.writeAnnotationCas(aCas, state.getDocument(), state.getUser(), true);
 
         bumpAnnotationCasTimestamp(state);