From ff8f5e36d2e6dd05da14a49c6868ea0a09baf4d5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2019 04:20:04 +0000 Subject: [PATCH 01/19] Bump guava from 28.1-jre to 28.2-jre Bumps [guava](https://github.com/google/guava) from 28.1-jre to 28.2-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e71fac39..90b7929a 100644 --- a/pom.xml +++ b/pom.xml @@ -499,7 +499,7 @@ com.google.guava guava - 28.1-jre + 28.2-jre From 60ec0b429eb1c1037398cf09c69ef0268cac52bf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2020 04:20:26 +0000 Subject: [PATCH 02/19] Bump reflections from 0.9.11 to 0.9.12 Bumps [reflections](https://github.com/ronmamo/reflections) from 0.9.11 to 0.9.12. - [Release notes](https://github.com/ronmamo/reflections/releases) - [Commits](https://github.com/ronmamo/reflections/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e71fac39..790b5926 100644 --- a/pom.xml +++ b/pom.xml @@ -525,7 +525,7 @@ org.reflections reflections - 0.9.11 + 0.9.12 org.apache.commons From 4ecf5aa57f78b90fe030cb2942959247584d189b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 04:20:15 +0000 Subject: [PATCH 03/19] Bump version.javafx from 13.0.1 to 13.0.2 Bumps `version.javafx` from 13.0.1 to 13.0.2. Updates `javafx-controls` from 13.0.1 to 13.0.2 Updates `javafx-swing` from 13.0.1 to 13.0.2 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e71fac39..209555b9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 9.2.0 1.8 1.8 - 13.0.1 + 13.0.2 From 8b8661dcae15d852fcc6a4e97f8e79c511bf82e1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 04:19:23 +0000 Subject: [PATCH 04/19] Bump plexus-archiver from 4.1.0 to 4.2.2 Bumps [plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 4.1.0 to 4.2.2. - [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-4.1.0...plexus-archiver-4.2.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e71fac39..a0fdd94e 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ org.codehaus.plexus plexus-archiver - 4.1.0 + 4.2.2 org.apache.velocity From 8dc982a90a10686d1ad41652c0905221cc3a8c36 Mon Sep 17 00:00:00 2001 From: Nils Reiter Date: Fri, 17 Apr 2020 17:25:09 +0200 Subject: [PATCH 05/19] 1.15.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7d6f980..0b71ba69 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.unistuttgart.ims coref.annotator - 1.14.0 + 1.14.1-SNAPSHOT jar CorefAnnotator https://github.com/nilsreiter/CorefAnnotator/ From 573b2df0f85e7290ecf0d831502481a763024190 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2020 04:19:12 +0000 Subject: [PATCH 06/19] Bump mockito-core from 3.1.0 to 3.4.4 Bumps [mockito-core](https://github.com/mockito/mockito) from 3.1.0 to 3.4.4. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.1.0...v3.4.4) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b71ba69..9746b870 100644 --- a/pom.xml +++ b/pom.xml @@ -594,7 +594,7 @@ org.mockito mockito-core - 3.1.0 + 3.4.4 test From afb23176854d28a2241bbdf7e73fa7264ddd41cf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2020 04:18:10 +0000 Subject: [PATCH 07/19] Bump maven-shade-plugin from 3.2.1 to 3.2.4 Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.1 to 3.2.4. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.1...maven-shade-plugin-3.2.4) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c994abd..b08d48fe 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.2.4 Date: Tue, 21 Jul 2020 04:19:49 +0000 Subject: [PATCH 08/19] Bump maven-antrun-plugin from 1.8 to 3.0.0 Bumps [maven-antrun-plugin](https://github.com/apache/maven-antrun-plugin) from 1.8 to 3.0.0. - [Release notes](https://github.com/apache/maven-antrun-plugin/releases) - [Commits](https://github.com/apache/maven-antrun-plugin/compare/maven-antrun-plugin-1.8...maven-antrun-plugin-3.0.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c994abd..e1a83978 100644 --- a/pom.xml +++ b/pom.xml @@ -189,7 +189,7 @@ maven-antrun-plugin - 1.8 + 3.0.0 duplicate build directory From 22364e9298894e95ff9c1bddf12566ef6cab8c20 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 04:16:42 +0000 Subject: [PATCH 09/19] Bump build-helper-maven-plugin from 3.0.0 to 3.2.0 Bumps [build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 3.0.0 to 3.2.0. - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/build-helper-maven-plugin-3.0.0...build-helper-maven-plugin-3.2.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2c994abd..9a4b3f4e 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.2.0 quadrama-add-source @@ -317,7 +317,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.2.0 creta-add-source @@ -365,7 +365,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.2.0 sfb1391-add-source From 48cd8fe60de610b076a948a01ff86c92bd647331 Mon Sep 17 00:00:00 2001 From: Andreas van Cranenburgh Date: Fri, 5 Mar 2021 17:25:41 +0100 Subject: [PATCH 10/19] replacing now also works from context menu; fixes #345; related to #149 --- .../unistuttgart/ims/coref/annotator/DocumentWindow.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/unistuttgart/ims/coref/annotator/DocumentWindow.java b/src/main/java/de/unistuttgart/ims/coref/annotator/DocumentWindow.java index 6c366b73..ef666384 100644 --- a/src/main/java/de/unistuttgart/ims/coref/annotator/DocumentWindow.java +++ b/src/main/java/de/unistuttgart/ims/coref/annotator/DocumentWindow.java @@ -1607,7 +1607,13 @@ else if (anno instanceof DetachedMentionPart) mi.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - getDocumentModel().edit(new AddMentionsToEntity(entity, getSelection())); + if (Annotator.app.getPreferences().getBoolean(Constants.CFG_REPLACE_MENTION, false) + && getSelectedAnnotations(Mention.class).size() == 1) { + getDocumentModel().edit(new MoveMentionsToEntity(entity, + getSelectedAnnotations(Mention.class))); + } else { + getDocumentModel().edit(new AddMentionsToEntity(entity, getSelection())); + } } }); mi.setIcon(FontIcon.of(MaterialDesign.MDI_ACCOUNT, new Color(entity.getColor()))); From ec9a278dbfaeece95213b2c6014e17b86f97541c Mon Sep 17 00:00:00 2001 From: Andreas van Cranenburgh Date: Fri, 5 Mar 2021 23:03:07 +0100 Subject: [PATCH 11/19] enable pretty print when serializing .xmi; related to #339 --- .../unistuttgart/ims/coref/annotator/worker/SaveJCasWorker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/unistuttgart/ims/coref/annotator/worker/SaveJCasWorker.java b/src/main/java/de/unistuttgart/ims/coref/annotator/worker/SaveJCasWorker.java index f557cc7d..5dda435c 100644 --- a/src/main/java/de/unistuttgart/ims/coref/annotator/worker/SaveJCasWorker.java +++ b/src/main/java/de/unistuttgart/ims/coref/annotator/worker/SaveJCasWorker.java @@ -37,7 +37,7 @@ protected Object doInBackground() throws Exception { os = new GZIPOutputStream(new FileOutputStream(file)); } if (os != null) - XmiCasSerializer.serialize(jcas.getCas(), os); + XmiCasSerializer.serialize(jcas.getCas(), null, os, true, null); } finally { if (os != null) os.close(); From 09b5d15de755d0742201a12f85f71867b7c07a0e Mon Sep 17 00:00:00 2001 From: Nils Reiter Date: Sat, 20 Mar 2021 08:30:42 +0100 Subject: [PATCH 12/19] fixes #347 --- .../annotator/document/CoreferenceModel.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java b/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java index f2d75290..6fd43124 100644 --- a/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java +++ b/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java @@ -320,6 +320,13 @@ protected synchronized void edit(CoreferenceModelOperation operation) { return addTo(op.getEntity(), sp); })); fireEvent(Event.get(this, Event.Type.Add, op.getEntity(), op.getMentions())); + int newNumberOfMentions = getSize(op.getEntity()); + // may trigger underlining in gray if singleton + if (getSpecialHandlingForSingletons() && newNumberOfMentions - op.getMentions().size() == 1 + && newNumberOfMentions > 1) { + fireEvent(Event.get(this, Event.Type.Update, op.getEntity())); + fireEvent(Event.get(this, Event.Type.Update, get(op.getEntity()))); + } } else if (operation instanceof AttachPart) { AttachPart op = (AttachPart) operation; op.setPart(addTo(op.getMention(), op.getSpan())); @@ -328,6 +335,21 @@ protected synchronized void edit(CoreferenceModelOperation operation) { MoveMentionsToEntity op = (MoveMentionsToEntity) operation; op.getMentions().forEach(m -> moveTo(op.getTarget(), m)); fireEvent(Event.get(this, Event.Type.Move, op.getSource(), op.getTarget(), op.getMentions())); + // may trigger underlining in gray if singleton + if (getSpecialHandlingForSingletons()) { + int numberOfMentionsMoved = op.getMentions().size(); + // handle the source + if (getSize(op.getSource()) == 1) { + fireEvent(Event.get(this, Event.Type.Update, op.getSource())); + fireEvent(Event.get(this, Event.Type.Update, get(op.getSource()))); + } + // target + if (getSize(op.getTarget()) - numberOfMentionsMoved == 1) { + fireEvent(Event.get(this, Event.Type.Update, op.getTarget())); + fireEvent(Event.get(this, Event.Type.Update, get(op.getTarget()))); + } + } + } else if (operation instanceof MoveMentionPartToMention) { MoveMentionPartToMention op = (MoveMentionPartToMention) operation; op.getObjects().forEach(d -> { @@ -465,6 +487,14 @@ protected void edit(RemoveMention op) { } }); fireEvent(Event.get(this, Event.Type.Remove, op.getEntity(), op.getFeatureStructures())); + // may trigger underlining in gray if singleton + if (getSpecialHandlingForSingletons()) { + if (getSize(op.getEntity()) == 1) { + fireEvent(Event.get(this, Event.Type.Update, op.getEntity())); + fireEvent(Event.get(this, Event.Type.Update, get(op.getEntity()))); + } + + } registerEdit(op); } @@ -560,6 +590,10 @@ public ImmutableList getSingletons() { .select(e -> getMentions(e).size() == 1).toList().toImmutable(); } + protected int getSize(Entity e) { + return get(e).size(); + } + public ImmutableList getEntities(final EntitySorter entitySorter) { MutableSet eset = Sets.mutable.withAll(JCasUtil.select(documentModel.getJcas(), Entity.class)); @@ -650,6 +684,11 @@ public Preferences getPreferences() { return documentModel.getPreferences(); } + private boolean getSpecialHandlingForSingletons() { + return Annotator.app.getPreferences().getBoolean(Constants.CFG_UNDERLINE_SINGLETONS_IN_GRAY, + Defaults.CFG_UNDERLINE_SINGLETONS_IN_GRAY); + } + public String getToolTipText(FeatureStructure featureStructure) { if (featureStructure instanceof EntityGroup) { StringBuilder b = new StringBuilder(); From 0dfa8a7673403f72a73d2a2f9b6186e5bf35970d Mon Sep 17 00:00:00 2001 From: Nils Reiter Date: Sat, 20 Mar 2021 09:01:06 +0100 Subject: [PATCH 13/19] fixes #350 --- .../ims/coref/annotator/DocumentWindow.java | 74 +++++++++++-------- 1 file changed, 45 insertions(+), 29 deletions(-) diff --git a/src/main/java/de/unistuttgart/ims/coref/annotator/DocumentWindow.java b/src/main/java/de/unistuttgart/ims/coref/annotator/DocumentWindow.java index ef666384..51e144e4 100644 --- a/src/main/java/de/unistuttgart/ims/coref/annotator/DocumentWindow.java +++ b/src/main/java/de/unistuttgart/ims/coref/annotator/DocumentWindow.java @@ -760,6 +760,18 @@ public void showSearch() { searchPanel.setVisible(true); } + @Override + protected void entityEventAdd(FeatureStructureEvent event) { + super.entityEventAdd(event); + updateStatusBar(); + } + + @Override + protected void entityEventRemove(FeatureStructureEvent event) { + super.entityEventRemove(event); + updateStatusBar(); + } + @Override protected void entityEventMove(FeatureStructureEvent event) { for (FeatureStructure fs : event) @@ -767,6 +779,7 @@ protected void entityEventMove(FeatureStructureEvent event) { highlightManager.unUnderline((Annotation) fs); highlightManager.underline((Mention) fs, new Color(((Entity) event.getArgument2()).getColor())); } + updateStatusBar(); } @Override @@ -910,6 +923,33 @@ public void updateStyle(Object constant, Object value) { switchStyle(currentStyle); } + protected void updateStatusBar() { + int low = Math.min(textPane.getSelectionStart(), textPane.getSelectionEnd()); + int high = Math.max(textPane.getSelectionStart(), textPane.getSelectionEnd()); + + MutableSet mentions = Sets.mutable.empty(); + if (getDocumentModel() != null && getDocumentModel().getCoreferenceModel() != null) { + + // nothing is selected: show all mentions cursor is part of + MutableSet annotations = Sets.mutable + .withAll(getDocumentModel().getCoreferenceModel().getMentions(low)); + mentions = annotations.selectInstancesOf(Mention.class); + + // something is selected + if (low != high) { + ImmutableSet ms = getDocumentModel().getCoreferenceModel().getMentionsBetween(low, high) + .selectInstancesOf(Mention.class); + mentions.addAllIterable(ms); + } + setCollectionPanel(mentions.collect(m -> { + EntityPanel ep = new EntityPanel(getDocumentModel(), m.getEntity()); + Annotator.app.getPreferences().addPreferenceChangeListener(ep); + getDocumentModel().getCoreferenceModel().addCoreferenceModelListener(ep); + return ep; + })); + } + } + @Override public void switchStyle(StylePlugin sv) { switchStyle(sv, sv.getBaseStyle()); @@ -1480,34 +1520,10 @@ class TextCaretListener implements CaretListener { @Override public void caretUpdate(CaretEvent e) { - int dot = e.getDot(); - int mark = e.getMark(); - int low = Math.min(dot, mark); - int high = Math.max(dot, mark); - - MutableSet mentions = Sets.mutable.empty(); - if (getDocumentModel() != null && getDocumentModel().getCoreferenceModel() != null) { - - // nothing is selected: show all mentions cursor is part of - MutableSet annotations = Sets.mutable - .withAll(getDocumentModel().getCoreferenceModel().getMentions(low)); - mentions = annotations.selectInstancesOf(Mention.class); - - // something is selected - if (dot != mark) { - ImmutableSet ms = getDocumentModel().getCoreferenceModel().getMentionsBetween(low, high) - .selectInstancesOf(Mention.class); - mentions.addAllIterable(ms); - } - setCollectionPanel(mentions.collect(m -> { - EntityPanel ep = new EntityPanel(getDocumentModel(), m.getEntity()); - Annotator.app.getPreferences().addPreferenceChangeListener(ep); - getDocumentModel().getCoreferenceModel().addCoreferenceModelListener(ep); - return ep; - })); - } + + updateStatusBar(); if (getDocumentModel() != null) - highlightSegmentInTOC(dot); + highlightSegmentInTOC(e.getDot()); } @@ -1609,8 +1625,8 @@ else if (anno instanceof DetachedMentionPart) public void actionPerformed(ActionEvent e) { if (Annotator.app.getPreferences().getBoolean(Constants.CFG_REPLACE_MENTION, false) && getSelectedAnnotations(Mention.class).size() == 1) { - getDocumentModel().edit(new MoveMentionsToEntity(entity, - getSelectedAnnotations(Mention.class))); + getDocumentModel().edit( + new MoveMentionsToEntity(entity, getSelectedAnnotations(Mention.class))); } else { getDocumentModel().edit(new AddMentionsToEntity(entity, getSelection())); } From 9d90dc9a96cc8eb387c71ea5f9eeed17d23961ed Mon Sep 17 00:00:00 2001 From: Nils Reiter Date: Sat, 20 Mar 2021 09:52:48 +0100 Subject: [PATCH 14/19] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbf9e93d..d84038d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ Issue numbers (e.g., #43) refer to GitHub issues: https://github.com/nilsreiter/CorefAnnotator/issues +## 1.14.5 + +- Fixed behaviour of de-emphasising singletons #347 +- Fixed upating of status bar if selection changes #350 + ## 1.14.4 - Fixed a bug caused by old flags no longer being generated From 2c0bf0823ea140446a088226812ad5a197baaa21 Mon Sep 17 00:00:00 2001 From: Nils Reiter Date: Sat, 20 Mar 2021 10:14:35 +0100 Subject: [PATCH 15/19] fixes #352 --- .../annotator/document/CoreferenceModel.java | 11 +++++++++++ .../annotator/document/op/RemoveMention.java | 15 +++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java b/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java index f2d75290..731a01c6 100644 --- a/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java +++ b/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java @@ -465,6 +465,12 @@ protected void edit(RemoveMention op) { } }); fireEvent(Event.get(this, Event.Type.Remove, op.getEntity(), op.getFeatureStructures())); + Entity e = op.getEntity(); + if (entityMentionMap.get(e).isEmpty() && getPreferences().getBoolean(Constants.CFG_DELETE_EMPTY_ENTITIES, + Defaults.CFG_DELETE_EMPTY_ENTITIES)) { + remove(e); + op.setEntityAutoDeleted(true); + } registerEdit(op); } @@ -969,6 +975,11 @@ private void undo(DuplicateMentions op) { } private void undo(RemoveMention op) { + if (op.isEntityAutoDeleted()) { + op.getEntity().addToIndexes(); + fireEvent(Event.get(this, Event.Type.Add, null, op.getEntity())); + } + // re-create all mentions and set them to the op op.getFeatureStructures().forEach(m -> { m.addToIndexes(); diff --git a/src/main/java/de/unistuttgart/ims/coref/annotator/document/op/RemoveMention.java b/src/main/java/de/unistuttgart/ims/coref/annotator/document/op/RemoveMention.java index 5b38056b..3a78a85f 100644 --- a/src/main/java/de/unistuttgart/ims/coref/annotator/document/op/RemoveMention.java +++ b/src/main/java/de/unistuttgart/ims/coref/annotator/document/op/RemoveMention.java @@ -9,6 +9,7 @@ public class RemoveMention extends AbstractRemoveOperation implements CoreferenceModelOperation { Entity entity; ImmutableList spans; + boolean entityAutoDeleted = false; public RemoveMention(Mention... mention) { super(mention); @@ -51,4 +52,18 @@ public void setMentions(ImmutableList mention) { public ImmutableList getMentions() { return getFeatureStructures(); } + + /** + * @return the entityAutoDeleted + */ + public boolean isEntityAutoDeleted() { + return entityAutoDeleted; + } + + /** + * @param entityAutoDeleted the entityAutoDeleted to set + */ + public void setEntityAutoDeleted(boolean entityAutoDeleted) { + this.entityAutoDeleted = entityAutoDeleted; + } } \ No newline at end of file From 10b809a22c5e96aec2ea00fb296a9162a1d1aa5c Mon Sep 17 00:00:00 2001 From: Nils Reiter Date: Sat, 20 Mar 2021 10:19:38 +0100 Subject: [PATCH 16/19] Updated changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d84038d0..ecf99211 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,9 @@ https://github.com/nilsreiter/CorefAnnotator/issues ## 1.14.5 -- Fixed behaviour of de-emphasising singletons #347 +- Fixed behaviour of de-emphasising singletons. Thanks @andreasvc #347 - Fixed upating of status bar if selection changes #350 +- Fixed the bug that prevented automatically removing empty entities #352 ## 1.14.4 From 6782d47b90dbc59459dcb589ded93ffb2b398576 Mon Sep 17 00:00:00 2001 From: Nils Reiter Date: Sat, 20 Mar 2021 10:24:48 +0100 Subject: [PATCH 17/19] fixed test issue --- .../ims/coref/annotator/document/CoreferenceModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java b/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java index 7a623e3b..0bc5002f 100644 --- a/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java +++ b/src/main/java/de/unistuttgart/ims/coref/annotator/document/CoreferenceModel.java @@ -693,7 +693,7 @@ public Preferences getPreferences() { } private boolean getSpecialHandlingForSingletons() { - return Annotator.app.getPreferences().getBoolean(Constants.CFG_UNDERLINE_SINGLETONS_IN_GRAY, + return getPreferences().getBoolean(Constants.CFG_UNDERLINE_SINGLETONS_IN_GRAY, Defaults.CFG_UNDERLINE_SINGLETONS_IN_GRAY); } From 95ccb4fcae61d9d7e570a715c0e7796a800b669c Mon Sep 17 00:00:00 2001 From: Nils Reiter Date: Sat, 20 Mar 2021 10:35:04 +0100 Subject: [PATCH 18/19] 1.14.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8674e27..b4ba4e9e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.unistuttgart.ims coref.annotator - 1.14.5-SNAPSHOT + 1.14.5 jar CorefAnnotator https://github.com/nilsreiter/CorefAnnotator/ From 1990e97c17ddc5145d030e20e71998feaee0e5cb Mon Sep 17 00:00:00 2001 From: Nils Reiter Date: Sat, 20 Mar 2021 10:42:46 +0100 Subject: [PATCH 19/19] changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf99211..4035c370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ https://github.com/nilsreiter/CorefAnnotator/issues - Fixed behaviour of de-emphasising singletons. Thanks @andreasvc #347 - Fixed upating of status bar if selection changes #350 - Fixed the bug that prevented automatically removing empty entities #352 +- XMI files are now pretty printed, making them more git-friendly. + Thanks @andreasvc #339 ## 1.14.4