Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Logical definition with filtered tree #85

Merged
merged 99 commits into from
Oct 28, 2024

Conversation

alexsilaghi
Copy link
Collaborator

Logical definitions + postcoordination UI changes + adding the filtered tree to postcoordination custom scales and logical definitions values

matthewhorridge and others added 30 commits July 30, 2024 11:22
This change is necessary because the spotify docker plugin does not work on Apple Silicon and the plugin itself is no longer maintained.
Replace spotify docker plugin with maven-exec plugin
Apply correct property name for source
Allow non-prefixed names for types
alexsilaghi and others added 20 commits October 9, 2024 16:19
# Conflicts:
#	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/inject/ClientProjectModule.java
#	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/postcoordination/PostCoordinationSpecification.java
#	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/postcoordination/WhoficEntityPostCoordinationSpecification.java
- Changed all hierarchy related actions to use hierarchy descriptors
…e-logical-definition

# Conflicts:
#	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/Messages.java
#	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/ClassHierarchyPortletPresenter.java
#	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/EntityHierarchyContextMenuPresenter.java
#	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/EntityHierarchyDropHandler.java
#	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/HierarchyPopupPresenter.java
#	webprotege-gwt-ui-server-core/src/test/java/edu/stanford/bmir/protege/web/shared/event/EventsSerializationTestCase.java
#	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/dispatch/Action.java
#	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/dispatch/Result.java
#	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/dispatch/RpcWhiteList.java
added filtered tree to value cards.
…-tree' into logical-definition-with-filtered-tree
matthewhorridge and others added 5 commits October 28, 2024 10:09
* Changes to implement hierarchy filtering

- Changed all hierarchy related actions to use hierarchy descriptors

* Changes to support named hierarchies

- Added NamedHierarchy and tests
- Added HierarchyId tests and JSON serialization
- Removed AddNamedHierarchyAction and result
- Added SetNamedHierarchiesAction and result

* Bumped version to 7.0.0-SNAPSHOT
…-gwt-ui into logical-definition-with-filtered-tree

� Conflicts:
�	pom.xml
�	webprotege-gwt-ui-client/pom.xml
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/Messages.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/EntityHierarchyContextMenuPresenter.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/EntityHierarchyDropHandler.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/HierarchyPopupPresenter.java
�	webprotege-gwt-ui-server-core/pom.xml
�	webprotege-gwt-ui-server/pom.xml
�	webprotege-gwt-ui-shared-core/pom.xml
�	webprotege-gwt-ui-shared/pom.xml
�	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/dispatch/Action.java
�	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/dispatch/Result.java
�	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/dispatch/RpcWhiteList.java
…tege-gwt-ui into logical-definition-with-filtered-tree

� Conflicts:
�	pom.xml
�	webprotege-gwt-ui-client/pom.xml
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/inject/ClientProjectModule.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinition.css
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionPortletPresenter.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionPortletView.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionPortletViewImpl.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionPortletViewImpl.ui.xml
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionResourceBundle.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionTable.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionTableBuilder.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionTableConfig.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionTableRow.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionTableWrapper.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionTableWrapperImpl.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/logicaldefinition/LogicalDefinitionTableWrapperImpl.ui.xml
�	webprotege-gwt-ui-server-core/pom.xml
�	webprotege-gwt-ui-server/pom.xml
�	webprotege-gwt-ui-shared-core/pom.xml
�	webprotege-gwt-ui-shared/pom.xml
�	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/dispatch/Action.java
�	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/dispatch/Result.java
�	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/dispatch/RpcWhiteList.java
@soimugeoWB soimugeoWB merged commit 3ddce97 into master-who Oct 28, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update repos with latest versions for postcoordination and logical definitions
4 participants