Merge pull request #4757 from inception-project/bugfix/4756-Annotatio…

…n-can-almost-be-resized-despite-document-being-finished #4756 - Annotation can almost be resized despite document being finished
inception-project · Apr 23, 2024 · c1946d2 · c1946d2
2 parents 454376c + 4dcd130
commit c1946d2
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 10 deletions.
diff --git a/...ava/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java b/...ava/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateRelationAnnotationHandler.java
@@ -67,6 +67,8 @@ private void actionArc(AjaxRequestTarget aTarget, IRequestParameters aParams)
     {
         var page = getPage();
 
+        page.ensureIsEditable();
+
         var origin = VID.parse(aParams.getParameterValue(PARAM_ORIGIN_SPAN_ID).toString());
         var target = VID.parse(aParams.getParameterValue(PARAM_TARGET_SPAN_ID).toString());
 

diff --git a/...in/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateSpanAnnotationHandler.java b/...in/java/de/tudarmstadt/ukp/inception/diam/editor/actions/CreateSpanAnnotationHandler.java
@@ -57,6 +57,9 @@ public DefaultAjaxResponse handle(AjaxRequestTarget aTarget, Request aRequest)
     {
         try {
             var page = getPage();
+
+            page.ensureIsEditable();
+
             var cas = page.getEditorCas();
             var state = getAnnotatorState();
             var range = getRangeFromRequest(state, aRequest.getRequestParameters(), cas);

diff --git a/...c/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java b/...c/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/DeleteAnnotationHandler.java
@@ -63,6 +63,8 @@ public DefaultAjaxResponse handle(AjaxRequestTarget aTarget, Request aRequest)
         try {
             var page = getPage();
 
+            page.ensureIsEditable();
+
             var vid = VID.parseOptional(
                     aRequest.getRequestParameters().getParameterValue(PARAM_ID).toOptionalString());
 

diff --git a/...rc/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/ExtensionActionHandler.java b/...rc/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/ExtensionActionHandler.java
@@ -17,16 +17,13 @@
  */
 package de.tudarmstadt.ukp.inception.diam.editor.actions;
 
-import org.apache.uima.cas.CAS;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.request.Request;
 import org.springframework.core.annotation.Order;
 
-import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase;
 import de.tudarmstadt.ukp.inception.diam.editor.config.DiamAutoConfig;
 import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse;
 import de.tudarmstadt.ukp.inception.editor.AnnotationEditorExtensionRegistry;
-import de.tudarmstadt.ukp.inception.rendering.vmodel.VID;
 
 /**
  * <p>
@@ -62,10 +59,12 @@ public boolean accepts(Request aRequest)
     public DefaultAjaxResponse handle(AjaxRequestTarget aTarget, Request aRequest)
     {
         try {
-            AnnotationPageBase page = getPage();
-            String action = getAction(aRequest);
-            VID paramId = getVid(aRequest);
-            CAS cas = page.getEditorCas();
+            var page = getPage();
+            page.ensureIsEditable();
+
+            var action = getAction(aRequest);
+            var paramId = getVid(aRequest);
+            var cas = page.getEditorCas();
 
             extensionRegistry.fireAction(page.getAnnotationActionHandler(), page.getModelObject(),
                     aTarget, cas, paramId, action);

diff --git a/.../tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithExistingAnnotationHandler.java b/.../tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithExistingAnnotationHandler.java
@@ -47,6 +47,8 @@ public DefaultAjaxResponse handle(AjaxRequestTarget aTarget, Request aRequest)
     {
         try {
             var page = getPage();
+            page.ensureIsEditable();
+
             var cas = page.getEditorCas();
             var slotFillerId = getVid(aRequest);
             // When filling a slot, the current selection is *NOT* changed. The Span annotation

diff --git a/...va/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java b/...va/de/tudarmstadt/ukp/inception/diam/editor/actions/FillSlotWithNewAnnotationHandler.java
@@ -25,7 +25,6 @@
 import org.apache.wicket.request.Request;
 import org.springframework.core.annotation.Order;
 
-import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase;
 import de.tudarmstadt.ukp.inception.diam.editor.config.DiamAutoConfig;
 import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse;
 import de.tudarmstadt.ukp.inception.diam.model.compact.CompactRange;
@@ -55,8 +54,10 @@ public String getCommand()
     public DefaultAjaxResponse handle(AjaxRequestTarget aTarget, Request aRequest)
     {
         try {
-            AnnotationPageBase page = getPage();
-            CAS cas = page.getEditorCas();
+            var page = getPage();
+            page.ensureIsEditable();
+
+            var cas = page.getEditorCas();
             actionSpan(aTarget, aRequest.getRequestParameters(), cas);
             return new DefaultAjaxResponse(getAction(aRequest));
         }

diff --git a/...main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java b/...main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java
@@ -64,6 +64,9 @@ public DefaultAjaxResponse handle(AjaxRequestTarget aTarget, Request aRequest)
     {
         try {
             var page = getPage();
+
+            page.ensureIsEditable();
+
             var cas = page.getEditorCas();
             var vid = getVid(aRequest);
             var state = getAnnotatorState();

diff --git a/...rc/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/ShowContextMenuHandler.java b/...rc/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/ShowContextMenuHandler.java
@@ -104,6 +104,9 @@ public AjaxResponse handle(AjaxRequestTarget aTarget, Request aRequest)
     private void actionLinkTo(AjaxRequestTarget aTarget, VID paramId)
         throws IOException, AnnotationException
     {
+        var page = getPage();
+        page.ensureIsEditable();
+
         var state = model.getObject();
 
         if (!state.getSelection().isSpan()) {