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.

Sign up for GitHub

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

Jump to bottom

Feature/2642 extensible merge strategies for curation #2659

Merged
merged 7 commits into from Oct 19, 2021
Merged

Feature/2642 extensible merge strategies for curation #2659

merged 7 commits into from Oct 19, 2021

Conversation

reckart
Copy link
Member

@reckart reckart commented Oct 18, 2021

What's in the PR

  • Load SentenceLayerInitializer via auto-config instead of component scanning
  • Allow returning messages collected during merging
  • Allow better access to the initial CAS e.g. for the purpose of loading it as part of a merge operation
  • No need to merge tokens and sentences in CasMerge since they are preserved anyway

How to test manually

  • No specific test procedure

Automatic testing

  • PR includes unit tests

Documentation

  • PR updates documentation

@reckart
#1778 - Make tokenization editable
60d867e 
- No need to merge tokens and sentences in CasMerge since they are preserved anyway
@reckart
#2642 - Extensible merge strategies for curation
e9e78af 
- Allow returning messages collected during merging
- Allow better access to the initial CAS e.g. for the purpose of loading it as part of a merge operation
@reckart
#1778 - Make tokenization editable
091db81 
- Load SentenceLayerInitializer via auto-config instead of component scanning
@reckart reckart added this to the 22.0 milestone Oct 18, 2021
@reckart reckart self-assigned this Oct 18, 2021
@reckart reckart added this to 🏃‍♀️ In progress in Kanban via automation Oct 18, 2021
@reckart
Merge branch 'main' into feature/2642-Extensible-merge-strategies-for…
2a2fa6c 
…-curation

* main:
  #2653 - ReferenceError: fragment is not defined
  #2655 - Curated CASes are exported to the wrong spot
  #2654 - Programmatically created AnnotationLayers are not curatable
@reckart
#2642 - Extensible merge strategies for curation
2971b12 
- Disable token and sentence layer diffing based on whether editing them is enabled or not - at least for the purpose of merging and not for unit tests which rely on it
- Fixes unit test
@reckart
#2642 - Extensible merge strategies for curation
d474d69 
- Move AnnotationEditorPropertiesImpl to auto-configuration
- Fixes tests
@reckart
Merge branch 'main' into feature/2642-Extensible-merge-strategies-for…
19f4488 
…-curation
@reckart reckart merged commit 7298e8e into main Oct 19, 2021
@reckart reckart deleted the feature/2642-Extensible-merge-strategies-for-curation branch October 19, 2021 18:57
Kanban automation moved this from 🏃‍♀️ In progress to 🍹 Done Oct 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@reckart reckart

Labels
⚙️ Refactoring
Projects
Kanban
  
🍹 Done
Milestone
22.0
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@reckart