Properly refresh after updating tags with the edit tag menu.

Before this commit, the 'refresh' runnable provided in the registerTagSetMenu() methods was not used.
mastodon-sc · Oct 18, 2024 · 5618c0f · 5618c0f
1 parent 6ab6ce4
commit 5618c0f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/main/java/org/mastodon/mamut/views/MamutBranchView.java b/src/main/java/org/mastodon/mamut/views/MamutBranchView.java
@@ -324,7 +324,9 @@ protected void registerTagSetMenu(
 				menuHandle.getMenu(),
 				model.getTagSetModel(),
 				appModel.getSelectionModel(),
-				model.getGraph().getLock(), model );
+				model.getGraph().getLock(),
+				model,
+				refresh );
 		tagSetModel.listeners().add( tagSetMenu );
 		onClose( () -> tagSetModel.listeners().remove( tagSetMenu ) );
 	}

diff --git a/src/main/java/org/mastodon/mamut/views/MamutView.java b/src/main/java/org/mastodon/mamut/views/MamutView.java
@@ -246,7 +246,7 @@ protected void registerTagSetMenu(
 		final Model model = appModel.getModel();
 		final TagSetModel< Spot, Link > tagSetModel = model.getTagSetModel();
 		final TagSetMenu< Spot, Link > tagSetMenu = new TagSetMenu<>( menuHandle.getMenu(), tagSetModel, selectionModel,
-				model.getGraph().getLock(), model );
+				model.getGraph().getLock(), model, refresh );
 		tagSetModel.listeners().add( tagSetMenu );
 		onClose( () -> tagSetModel.listeners().remove( tagSetMenu ) );
 	}

diff --git a/src/main/java/org/mastodon/ui/TagSetMenu.java b/src/main/java/org/mastodon/ui/TagSetMenu.java
@@ -64,14 +64,17 @@ public class TagSetMenu< V extends Vertex< E >, E extends Edge< V > > implements
 
 	private final ReentrantReadWriteLock lock;
 
+	private final Runnable refresh;
+
 	public TagSetMenu( final JMenu menu, final TagSetModel< V, E > tagSetModel,
-			final SelectionModel< V, E > selectionModel, final ReentrantReadWriteLock lock, final UndoPointMarker undo )
+			final SelectionModel< V, E > selectionModel, final ReentrantReadWriteLock lock, final UndoPointMarker undo, final Runnable refresh )
 	{
 		this.menu = menu;
 		this.tagSetModel = tagSetModel;
 		this.selectionModel = selectionModel;
 		this.lock = lock;
 		this.undo = undo;
+		this.refresh = refresh;
 		rebuild();
 	}
 
@@ -91,15 +94,15 @@ public void rebuild()
 			for ( final Tag tag : ts.getTags() )
 			{
 				final JMenuItem menuItem =
-						new JMenuItem( new SetTagAction<>( tagSetModel, ts, tag, selectionModel, lock, undo ) );
+						new JMenuItem( new SetTagAction<>( tagSetModel, ts, tag, selectionModel, lock, undo, refresh ) );
 				subMenuMnemo.add( menuItem );
 				tsMenu.add( menuItem );
 			}
 
 			tsMenu.add( new JSeparator() );
 
 			final JMenuItem clearTagMenuItem =
-					new JMenuItem( new ClearTagAction<>( tagSetModel, ts, selectionModel, lock, undo ) );
+					new JMenuItem( new ClearTagAction<>( tagSetModel, ts, selectionModel, lock, undo, refresh ) );
 			subMenuMnemo.add( clearTagMenuItem );
 			tsMenu.add( clearTagMenuItem );
 			menu.add( tsMenu );
@@ -131,9 +134,11 @@ private static class SetTagAction< V extends Vertex< E >, E extends Edge< V > >
 
 		private final ReentrantReadWriteLock lock;
 
+		private final Runnable refresh;
+
 		public SetTagAction( final TagSetModel< V, E > tagSetModel, final TagSet tagSet, final Tag tag,
 				final SelectionModel< V, E > selectionModel, final ReentrantReadWriteLock lock,
-				final UndoPointMarker undo )
+				final UndoPointMarker undo, final Runnable refresh )
 		{
 			super( tag.label(), new ColorIcon( new Color( tag.color(), true ) ) );
 			this.tagSetModel = tagSetModel;
@@ -142,6 +147,7 @@ public SetTagAction( final TagSetModel< V, E > tagSetModel, final TagSet tagSet,
 			this.selectionModel = selectionModel;
 			this.lock = lock;
 			this.undo = undo;
+			this.refresh = refresh;
 		}
 
 		@Override
@@ -159,6 +165,7 @@ public void actionPerformed( final ActionEvent evtt )
 			{
 				lock.readLock().unlock();
 			}
+			refresh.run();
 			undo.setUndoPoint();
 		}
 	}
@@ -178,16 +185,19 @@ private static class ClearTagAction< V extends Vertex< E >, E extends Edge< V >
 
 		private final ReentrantReadWriteLock lock;
 
+		private final Runnable refresh;
+
 		public ClearTagAction( final TagSetModel< V, E > tagSetModel, final TagSet tagSet,
 				final SelectionModel< V, E > selectionModel, final ReentrantReadWriteLock lock,
-				final UndoPointMarker undo )
+				final UndoPointMarker undo, final Runnable refresh )
 		{
 			super( "Clear tags for " + tagSet.getName() );
 			this.tagSetModel = tagSetModel;
 			this.tagSet = tagSet;
 			this.selectionModel = selectionModel;
 			this.lock = lock;
 			this.undo = undo;
+			this.refresh = refresh;
 		}
 
 		@Override
@@ -205,6 +215,7 @@ public void actionPerformed( final ActionEvent evtt )
 			{
 				lock.readLock().unlock();
 			}
+			refresh.run();
 			undo.setUndoPoint();
 		}
 	}