-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
* main: (212 commits) No issue. Pull CSS out of HTML file and into a separate CSS file. #3831 - Better support a direct-access workflow #3831 - Better support a direct-access workflow #3831 - Better support a direct-access workflow No issue: Avoid hard crash if selection points to a non-existing feature structure. No issue: Formatting No issue: Fix endless recursion. No issue. Make some constants accessible. #3571 - Update dependencies #3571 - Update dependencies #3826 - Update dependencies #3783 - Ability to sort projects by created date #3826 - Update dependencies [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release inception-27.0-beta-4 #3822 - Order of matches found in knowledge base search is not correct #3822 - Order of matches found in knowledge base search is not correct #3822 - Order of matches found in knowledge base search is not correct No issue. Reduce memory usage of test and display memory usage while test is running. #3793 - Ability to trigger sidebar curation mode via URL parameter ... % Conflicts: % inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/app/config/InceptionSecurityWebUIBuiltInAutoConfiguration.java % inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/app/config/InceptionSecurityWebUIPreAuthenticatedAutoConfiguration.java % inception/inception-app-webapp/src/main/java/de/tudarmstadt/ukp/inception/app/config/InceptionServletContextInitializer.java % inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/experimental/editor/diamdebugeditor/DiamDebugEditorComponent.java % inception/inception-html-editor/pom.xml % inception/inception-security/src/main/java/de/tudarmstadt/ukp/clarin/webanno/security/config/SecurityAutoConfiguration.java % inception/inception-security/src/main/java/de/tudarmstadt/ukp/clarin/webanno/security/preauth/ShibbolethRequestHeaderAuthenticationFilter.java % inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/vue/VueBehavior.java % inception/inception-tutorial/src/main/java/de/tudarmstadt/ukp/inception/tutorial/TutorialFooterPanel.java % inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/config/AnnotationUIAutoConfiguration.java % inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java % inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/page/ProjectPageBase.java % inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java % inception/inception-websocket/pom.xml % inception/inception-websocket/src/main/java/de/tudarmstadt/ukp/inception/websocket/footer/LoggedEventFooterPanel.java % inception/pom.xml
- Loading branch information
Showing
623 changed files
with
37,965 additions
and
73,048 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
.../java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebarIcon.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /* | ||
| * Licensed to the Technische Universität Darmstadt under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The Technische Universität Darmstadt | ||
| * licenses this file to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package de.tudarmstadt.ukp.inception.active.learning.sidebar; | ||
|
|
||
| import static de.tudarmstadt.ukp.inception.active.learning.sidebar.ActiveLearningUserStateMetaData.CURRENT_AL_USER_STATE; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| import org.apache.wicket.ClassAttributeModifier; | ||
| import org.apache.wicket.markup.html.panel.Panel; | ||
| import org.apache.wicket.model.IModel; | ||
| import org.apache.wicket.model.LoadableDetachableModel; | ||
| import org.apache.wicket.spring.injection.annot.SpringBean; | ||
| import org.wicketstuff.event.annotation.OnEvent; | ||
|
|
||
| import de.agilecoders.wicket.core.markup.html.bootstrap.image.Icon; | ||
| import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType; | ||
| import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; | ||
| import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; | ||
| import de.tudarmstadt.ukp.inception.active.learning.ActiveLearningService; | ||
| import de.tudarmstadt.ukp.inception.active.learning.event.ActiveLearningSessionCompletedEvent; | ||
| import de.tudarmstadt.ukp.inception.active.learning.event.ActiveLearningSessionStartedEvent; | ||
| import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; | ||
|
|
||
| public class ActiveLearningSidebarIcon | ||
| extends Panel | ||
| { | ||
| private static final long serialVersionUID = -1870047500327624860L; | ||
|
|
||
| private @SpringBean ActiveLearningService activeLearningService; | ||
| private @SpringBean UserDao userService; | ||
|
|
||
| public ActiveLearningSidebarIcon(String aId, IModel<AnnotatorState> aState) | ||
| { | ||
| super(aId, aState); | ||
|
|
||
| setOutputMarkupId(true); | ||
|
|
||
| queue(new Icon("icon", FontAwesome5IconType.robot_s)); | ||
| queue(new Icon("badge", LoadableDetachableModel.of(this::getStateIcon)) | ||
| .add(new ClassAttributeModifier() | ||
| { | ||
| private static final long serialVersionUID = 4534226094224688646L; | ||
|
|
||
| @Override | ||
| protected Set<String> update(Set<String> aClasses) | ||
| { | ||
| if (isSessionActive()) { | ||
| aClasses.add("text-primary"); | ||
| aClasses.remove("text-muted"); | ||
| } | ||
| else { | ||
| aClasses.add("text-muted"); | ||
| aClasses.remove("text-primary"); | ||
| } | ||
|
|
||
| return aClasses; | ||
| } | ||
| })); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| public IModel<AnnotatorState> getModel() | ||
| { | ||
| return (IModel<AnnotatorState>) getDefaultModel(); | ||
| } | ||
|
|
||
| public AnnotatorState getModelObject() | ||
| { | ||
| return (AnnotatorState) getDefaultModelObject(); | ||
| } | ||
|
|
||
| private boolean isSessionActive() | ||
| { | ||
| var alState = getPage().getMetaData(CURRENT_AL_USER_STATE); | ||
| return alState != null && alState.isSessionActive(); | ||
| } | ||
|
|
||
| private IconType getStateIcon() | ||
| { | ||
| if (isSessionActive()) { | ||
| return FontAwesome5IconType.play_circle_s; | ||
| } | ||
|
|
||
| return FontAwesome5IconType.stop_circle_s; | ||
| } | ||
|
|
||
| @OnEvent | ||
| public void sessionStarted(ActiveLearningSessionStartedEvent aEvent) { | ||
| aEvent.getRequestTarget().add(this); | ||
| } | ||
|
|
||
| @OnEvent | ||
| public void sessionStarted(ActiveLearningSessionCompletedEvent aEvent) { | ||
| aEvent.getRequestTarget().add(this); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...stadt/ukp/inception/active/learning/sidebar/HistoryItemDeleteConfirmationDialogPanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Licensed to the Technische Universität Darmstadt under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The Technische Universität Darmstadt | ||
| * licenses this file to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package de.tudarmstadt.ukp.inception.active.learning.sidebar; | ||
|
|
||
| import de.tudarmstadt.ukp.clarin.webanno.support.dialog.ConfirmationDialogContentPanel_ImplBase; | ||
|
|
||
| public class HistoryItemDeleteConfirmationDialogPanel | ||
| extends ConfirmationDialogContentPanel_ImplBase | ||
| { | ||
| private static final long serialVersionUID = 7050666954726883326L; | ||
|
|
||
| public HistoryItemDeleteConfirmationDialogPanel(String aId) | ||
| { | ||
| super(aId); | ||
| } | ||
| } |
Oops, something went wrong.