Skip to content

Commit

Permalink
Merge branch 'main' into feature/3411-Resize-sidebars-using-mouse
Browse files Browse the repository at this point in the history 
* main: (91 commits)
  #34 - Update dependencies
  #4150 - Upgrade dependencies
  #4321 - Organize packages
  #4321 - Organize packages
  #4321 - Organize packages
  #4321 - Organize packages
  #4321 - Organize packages
  #4321 - Organize packages
  #4321 - Organize packages
  #4321 - Organize packages
  #4321 - Organize packages
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-30.0-rc-1
  #4229 - Better project template selection
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-30.0-rc-1
  No issue. Fix test.
  No issue: Set version to 31.0-SNAPSHOT
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-29.9
  ...

% Conflicts:
%	inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/AnnotationPage.java
  • Loading branch information
@reckart
reckart committed Nov 25, 2023
2 parents b403030 + c40ddb0 commit 2037dc2
Show file tree
Hide file tree
Showing 1,401 changed files with 19,590 additions and 9,024 deletions.
9 changes: 6 additions & 3 deletions inception/inception-active-learning/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-app</artifactId>
<version>30.0-SNAPSHOT</version>
<version>31.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>inception-active-learning</artifactId>
Expand All @@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-api-schema</artifactId>
<artifactId>inception-schema-api</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
Expand All @@ -66,7 +66,10 @@
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-support</artifactId>
</dependency>

<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-support-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-recommendation</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...ing/src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/de/tudarmstadt/ukp/inception/active/learning/ActiveLearningServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
* <p>
Expand Down
4 changes: 2 additions & 2 deletions .../de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .../tudarmstadt/ukp/inception/active/learning/event/ActiveLearningSessionCompletedEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.springframework.context.ApplicationEvent;

import de.tudarmstadt.ukp.clarin.webanno.model.Project;
import de.tudarmstadt.ukp.clarin.webanno.support.wicket.event.HybridApplicationUIEvent;
import de.tudarmstadt.ukp.inception.support.wicket.event.HybridApplicationUIEvent;

public class ActiveLearningSessionCompletedEvent
extends ApplicationEvent
Expand Down
2 changes: 1 addition & 1 deletion ...de/tudarmstadt/ukp/inception/active/learning/event/ActiveLearningSessionStartedEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.springframework.context.ApplicationEvent;

import de.tudarmstadt.ukp.clarin.webanno.model.Project;
import de.tudarmstadt.ukp.clarin.webanno.support.wicket.event.HybridApplicationUIEvent;
import de.tudarmstadt.ukp.inception.support.wicket.event.HybridApplicationUIEvent;

public class ActiveLearningSessionStartedEvent
extends ApplicationEvent
Expand Down
2 changes: 1 addition & 1 deletion ...darmstadt/ukp/inception/active/learning/log/ActiveLearningRecommendationEventAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
import java.util.List;
import java.util.stream.Collectors;

import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil;
import de.tudarmstadt.ukp.inception.active.learning.config.ActiveLearningAutoConfiguration;
import de.tudarmstadt.ukp.inception.active.learning.event.ActiveLearningRecommendationEvent;
import de.tudarmstadt.ukp.inception.log.adapter.EventLoggingAdapter;
import de.tudarmstadt.ukp.inception.log.model.AnnotationDetails;
import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordType;
import de.tudarmstadt.ukp.inception.support.json.JSONUtil;

/**
* <p>
Expand Down
2 changes: 1 addition & 1 deletion ...tudarmstadt/ukp/inception/active/learning/log/ActiveLearningSuggestionOfferedAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
import java.util.List;
import java.util.stream.Collectors;

import de.tudarmstadt.ukp.clarin.webanno.support.JSONUtil;
import de.tudarmstadt.ukp.inception.active.learning.config.ActiveLearningAutoConfiguration;
import de.tudarmstadt.ukp.inception.active.learning.event.ActiveLearningRecommendationEvent;
import de.tudarmstadt.ukp.inception.active.learning.event.ActiveLearningSuggestionOfferedEvent;
import de.tudarmstadt.ukp.inception.log.adapter.EventLoggingAdapter;
import de.tudarmstadt.ukp.inception.log.model.AnnotationDetails;
import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordType;
import de.tudarmstadt.ukp.inception.support.json.JSONUtil;

/**
* <p>
Expand Down
54 changes: 27 additions & 27 deletions ...main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.SHARED_READ_ONLY_ACCESS;
import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasUpgradeMode.AUTO_CAS_UPGRADE;
import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.SPAN_TYPE;
import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.visibleWhen;
import static de.tudarmstadt.ukp.inception.active.learning.sidebar.ActiveLearningUserStateMetaData.CURRENT_AL_USER_STATE;
import static de.tudarmstadt.ukp.inception.recommendation.api.model.AnnotationSuggestion.FLAG_REJECTED;
import static de.tudarmstadt.ukp.inception.recommendation.api.model.AnnotationSuggestion.FLAG_SKIPPED;
import static de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordType.ACCEPTED;
import static de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordType.CORRECTED;
import static de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecordType.REJECTED;
import static de.tudarmstadt.ukp.inception.support.WebAnnoConst.SPAN_TYPE;
import static de.tudarmstadt.ukp.inception.support.lambda.LambdaBehavior.visibleWhen;
import static java.lang.String.format;
import static java.util.Arrays.asList;
import static java.util.stream.Collectors.toList;
Expand Down Expand Up @@ -74,15 +74,6 @@
import de.tudarmstadt.ukp.clarin.webanno.model.ReorderableTag;
import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument;
import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
import de.tudarmstadt.ukp.clarin.webanno.support.bootstrap.BootstrapModalDialog;
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.LambdaAjaxSubmitLink;
import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior;
import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaChoiceRenderer;
import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaModelAdapter;
import de.tudarmstadt.ukp.clarin.webanno.support.spring.ApplicationEventPublisherHolder;
import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil;
import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPage;
import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.sidebar.AnnotationSidebar_ImplBase;
import de.tudarmstadt.ukp.inception.active.learning.ActiveLearningService;
Expand All @@ -98,6 +89,7 @@
import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationCreatedEvent;
import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanCreatedEvent;
import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanDeletedEvent;
import de.tudarmstadt.ukp.inception.bootstrap.BootstrapModalDialog;
import de.tudarmstadt.ukp.inception.documents.api.DocumentService;
import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler;
import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService;
Expand All @@ -122,11 +114,19 @@
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;
import de.tudarmstadt.ukp.inception.support.lambda.LambdaAjaxButton;
import de.tudarmstadt.ukp.inception.support.lambda.LambdaAjaxLink;
import de.tudarmstadt.ukp.inception.support.lambda.LambdaAjaxSubmitLink;
import de.tudarmstadt.ukp.inception.support.lambda.LambdaBehavior;
import de.tudarmstadt.ukp.inception.support.lambda.LambdaChoiceRenderer;
import de.tudarmstadt.ukp.inception.support.lambda.LambdaModelAdapter;
import de.tudarmstadt.ukp.inception.support.spring.ApplicationEventPublisherHolder;
import de.tudarmstadt.ukp.inception.support.uima.ICasUtil;

public class ActiveLearningSidebar
extends AnnotationSidebar_ImplBase
Expand Down Expand Up @@ -1103,8 +1103,8 @@ public void onSpanCreated(SpanCreatedEvent aEvent)
return;
}

reactToAnnotationsBeingCreatedOrDeleted(aEvent.getRequestTarget(), aEvent.getLayer(),
aEvent.getDocument());
reactToAnnotationsBeingCreatedOrDeleted(aEvent.getRequestTarget().orElse(null),
aEvent.getLayer(), aEvent.getDocument());
}

@OnEvent
Expand All @@ -1122,7 +1122,7 @@ public void onRelationCreated(RelationCreatedEvent aEvent)
return;
}

reactToAnnotationsBeingCreatedOrDeleted(aEvent.getRequestTarget(), aEvent.getLayer(),
reactToAnnotationsBeingCreatedOrDeleted(aEvent.getRequestTarget().get(), aEvent.getLayer(),
aEvent.getDocument());
}

Expand Down Expand Up @@ -1153,7 +1153,7 @@ public void onFeatureValueUpdated(FeatureValueUpdatedEvent aEvent)
return;
}

reactToAnnotationsBeingCreatedOrDeleted(aEvent.getRequestTarget(),
reactToAnnotationsBeingCreatedOrDeleted(aEvent.getRequestTarget().get(),
aEvent.getFeature().getLayer(), aEvent.getDocument());
}

Expand All @@ -1180,7 +1180,7 @@ public void onAnnotationDeleted(SpanDeletedEvent aEvent)
return;
}

reactToAnnotationsBeingCreatedOrDeleted(aEvent.getRequestTarget(), aEvent.getLayer(),
reactToAnnotationsBeingCreatedOrDeleted(aEvent.getRequestTarget().get(), aEvent.getLayer(),
aEvent.getDocument());
}

Expand Down Expand Up @@ -1381,7 +1381,7 @@ public void onDocumentOpenedEvent(DocumentOpenedEvent aEvent)
// If active learning is not active, update the sidebar in case the session auto-terminated
ActiveLearningUserState alState = alStateModel.getObject();
if (!alState.isSessionActive()) {
aEvent.getRequestTarget().add(alMainContainer);
aEvent.getRequestTarget().ifPresent(target -> target.add(alMainContainer));
return;
}

Expand All @@ -1390,11 +1390,11 @@ public void onDocumentOpenedEvent(DocumentOpenedEvent aEvent)

// Maybe the prediction switch has made a new suggestion available for us to go to
if (alState.getSuggestion().isEmpty()) {
moveToNextSuggestion(aEvent.getRequestTarget());
moveToNextSuggestion(aEvent.getRequestTarget().get());
return;
}

refreshCurrentSuggestionOrMoveToNextSuggestion(aEvent.getRequestTarget());
refreshCurrentSuggestionOrMoveToNextSuggestion(aEvent.getRequestTarget().get());
}

@OnEvent
Expand All @@ -1405,7 +1405,7 @@ public void onPredictionsSwitched(PredictionsSwitchedEvent aEvent)
// If active learning is not active, update the sidebar in case the session auto-terminated
ActiveLearningUserState alState = alStateModel.getObject();
if (!alState.isSessionActive()) {
aEvent.getRequestTarget().add(alMainContainer);
aEvent.getRequestTarget().ifPresent(target -> target.add(alMainContainer));
return;
}

Expand All @@ -1414,11 +1414,11 @@ public void onPredictionsSwitched(PredictionsSwitchedEvent aEvent)

// Maybe the prediction switch has made a new suggestion available for us to go to
if (alState.getSuggestion().isEmpty()) {
moveToNextSuggestion(aEvent.getRequestTarget());
moveToNextSuggestion(aEvent.getRequestTarget().get());
return;
}

refreshCurrentSuggestionOrMoveToNextSuggestion(aEvent.getRequestTarget());
refreshCurrentSuggestionOrMoveToNextSuggestion(aEvent.getRequestTarget().get());
}

private void refreshCurrentSuggestionOrMoveToNextSuggestion(AjaxRequestTarget aTarget)
Expand Down
4 changes: 2 additions & 2 deletions .../java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebarIcon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ private IconType getStateIcon()
@OnEvent
public void sessionStarted(ActiveLearningSessionStartedEvent aEvent)
{
aEvent.getRequestTarget().add(this);
aEvent.getRequestTarget().ifPresent(target -> target.add(this));
}

@OnEvent
public void sessionStarted(ActiveLearningSessionCompletedEvent aEvent)
{
aEvent.getRequestTarget().add(this);
aEvent.getRequestTarget().ifPresent(target -> target.add(this));
}
}
2 changes: 1 addition & 1 deletion ...stadt/ukp/inception/active/learning/sidebar/HistoryItemDeleteConfirmationDialogPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package de.tudarmstadt.ukp.inception.active.learning.sidebar;

import de.tudarmstadt.ukp.clarin.webanno.support.dialog.ConfirmationDialogContentPanel_ImplBase;
import de.tudarmstadt.ukp.inception.bootstrap.dialog.ConfirmationDialogContentPanel_ImplBase;

public class HistoryItemDeleteConfirmationDialogPanel
extends ConfirmationDialogContentPanel_ImplBase
Expand Down
10 changes: 7 additions & 3 deletions inception/inception-agreement/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-app</artifactId>
<version>30.0-SNAPSHOT</version>
<version>31.0-SNAPSHOT</version>
</parent>
<artifactId>inception-agreement</artifactId>
<name>INCEpTION - Core - Agreement</name>
Expand Down Expand Up @@ -62,16 +62,20 @@
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-api</artifactId>
<artifactId>inception-project-api</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-api-schema</artifactId>
<artifactId>inception-schema-api</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-api-annotation</artifactId>
</dependency>
<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-support-bootstrap</artifactId>
</dependency>

<dependency>
<groupId>org.dkpro.statistics</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...udarmstadt/ukp/clarin/webanno/agreement/measures/AgreementMeasureSupportRegistryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.springframework.stereotype.Component;

import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature;
import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers;
import de.tudarmstadt.ukp.inception.support.logging.BaseLoggers;

@Component
public class AgreementMeasureSupportRegistryImpl
Expand Down
2 changes: 1 addition & 1 deletion ...va/de/tudarmstadt/ukp/clarin/webanno/agreement/measures/DefaultAgreementTraitsEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package de.tudarmstadt.ukp.clarin.webanno.agreement.measures;

import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.visibleWhen;
import static de.tudarmstadt.ukp.inception.support.lambda.LambdaBehavior.visibleWhen;
import static java.util.Arrays.asList;

import org.apache.wicket.markup.html.form.CheckBox;
Expand Down
2 changes: 1 addition & 1 deletion ...armstadt/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasure.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<DefaultAgreementTraits>
Expand Down
2 changes: 1 addition & 1 deletion ...t/ukp/clarin/webanno/agreement/measures/cohenkappa/CohenKappaAgreementMeasureSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...mstadt/ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasure.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<DefaultAgreementTraits>
Expand Down
2 changes: 1 addition & 1 deletion ...ukp/clarin/webanno/agreement/measures/fleisskappa/FleissKappaAgreementMeasureSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...larin/webanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasure.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<KrippendorffAlphaAgreementTraits>
Expand Down
2 changes: 1 addition & 1 deletion ...ebanno/agreement/measures/krippendorffalpha/KrippendorffAlphaAgreementMeasureSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ement/measures/krippendorffalphaunitizing/KrippendorffAlphaUnitizingAgreementMeasure.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<//
Expand Down
Loading

0 comments on commit 2037dc2

Please sign in to comment.