Skip to content

Commit ee1d1c6

Browse files
author
Stefan Hahmann
committed
Move adding the command finder to the GrapherInitializer
* Add the command finder to Grapher Branch View
1 parent fcac59c commit ee1d1c6

3 files changed

Lines changed: 20 additions & 14 deletions

File tree

src/main/java/org/mastodon/mamut/views/grapher/GrapherInitializer.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
import org.mastodon.ui.coloring.ColorBarOverlay;
7272
import org.mastodon.ui.coloring.ColoringModel;
7373
import org.mastodon.ui.coloring.GraphColorGeneratorAdapter;
74+
import org.mastodon.ui.commandfinder.CommandFinder;
7475
import org.mastodon.views.context.ContextChooser;
7576
import org.mastodon.views.grapher.datagraph.DataContextListener;
7677
import org.mastodon.views.grapher.datagraph.DataEdge;
@@ -275,6 +276,23 @@ void addSearchPanel( final Actions viewActions )
275276
frame.getSettingsPanel().add( searchPanel );
276277
}
277278

279+
void addCommandFinder(final Actions viewActions, final String[] keyConfigContexts)
280+
{
281+
final CommandFinder cf = CommandFinder.build()
282+
.context( appModel.getContext() )
283+
.inputTriggerConfig( appModel.getKeymap().getConfig() )
284+
.keyConfigContexts( keyConfigContexts )
285+
.descriptionProvider( appModel.getWindowManager().getViewFactories().getCommandDescriptions() )
286+
.register( viewActions )
287+
.register( appModel.getModelActions() )
288+
.register( appModel.getProjectActions() )
289+
.register( appModel.getPlugins().getPluginActions() )
290+
.modificationListeners( appModel.getKeymap().updateListeners() )
291+
.parent( frame )
292+
.installOn( viewActions );
293+
cf.getDialog().setTitle( cf.getDialog().getTitle() + " - " + frame.getTitle() );
294+
}
295+
278296
private void
279297
registerColoring(
280298
final TriFunction< ViewMenuBuilder.JMenuHandle, GraphColorGeneratorAdapter< V, E, DataVertex, DataEdge >,

src/main/java/org/mastodon/mamut/views/grapher/MamutBranchViewGrapher.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public class MamutBranchViewGrapher extends MamutBranchView< DataGraph< BranchSp
8282
setFrame( grapherInitializer.getFrame() ); // this creates viewActions and viewBehaviours thus must be called before installActions
8383
grapherInitializer.installActions( viewActions, viewBehaviours );
8484
grapherInitializer.addSearchPanel( viewActions );
85+
grapherInitializer.addCommandFinder( viewActions, keyConfigContexts );
8586

8687
TriFunction< JMenuHandle, GraphColorGeneratorAdapter< BranchSpot, BranchLink, DataVertex, DataEdge >,
8788
DataDisplayPanel< BranchSpot, BranchLink >, ColoringModel > colorModelRegistration =

src/main/java/org/mastodon/mamut/views/grapher/MamutViewGrapher.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public class MamutViewGrapher extends MamutView< DataGraph< Spot, Link >, DataVe
8383
setFrame( grapherInitializer.getFrame() ); // this creates viewActions and viewBehaviours thus must be called before installActions
8484
grapherInitializer.installActions( viewActions, viewBehaviours );
8585
grapherInitializer.addSearchPanel( viewActions );
86+
grapherInitializer.addCommandFinder( viewActions, keyConfigContexts );
8687

8788
final TriFunction< ViewMenuBuilder.JMenuHandle, GraphColorGeneratorAdapter< Spot, Link, DataVertex, DataEdge >,
8889
DataDisplayPanel< Spot, Link >, ColoringModel > colorModelRegistration = ( menuHandle, coloringAdaptor,
@@ -95,20 +96,6 @@ public class MamutViewGrapher extends MamutView< DataGraph< Spot, Link >, DataVe
9596
grapherInitializer.addMenusAndRegisterColors( colorModelRegistration, colorBarRegistration, tagSetMenuRegistration,
9697
keyConfigContexts );
9798
grapherInitializer.layout();
98-
99-
final CommandFinder cf = CommandFinder.build()
100-
.context( appModel.getContext() )
101-
.inputTriggerConfig( appModel.getKeymap().getConfig() )
102-
.keyConfigContexts( keyConfigContexts )
103-
.descriptionProvider( appModel.getWindowManager().getViewFactories().getCommandDescriptions() )
104-
.register( viewActions )
105-
.register( appModel.getModelActions() )
106-
.register( appModel.getProjectActions() )
107-
.register( appModel.getPlugins().getPluginActions() )
108-
.modificationListeners( appModel.getKeymap().updateListeners() )
109-
.parent( frame )
110-
.installOn( viewActions );
111-
cf.getDialog().setTitle( cf.getDialog().getTitle() + " - " + frame.getTitle() );
11299
}
113100

114101
static FeatureGraphConfig getFeatureGraphConfig()

0 commit comments

Comments
 (0)