Skip to content

Commit f110482

Browse files
committed
"EnrichmentMap" menu item always brings up create dialog.
Fixes #453
1 parent 975ae4b commit f110482

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/actions/OpenEnrichmentMapAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.awt.event.ActionEvent;
44

55
import org.baderlab.csplugins.enrichmentmap.view.control.ControlPanelMediator;
6+
import org.baderlab.csplugins.enrichmentmap.view.creation.CreationDialogShowAction;
67
import org.baderlab.csplugins.enrichmentmap.view.heatmap.HeatMapMediator;
78
import org.cytoscape.application.swing.AbstractCyAction;
89
import org.cytoscape.work.Task;
@@ -20,6 +21,7 @@ public class OpenEnrichmentMapAction extends AbstractCyAction implements Task {
2021

2122
@Inject private Provider<ControlPanelMediator> controlPanelMediatorProvider;
2223
@Inject private Provider<HeatMapMediator> heatMapMediatorProvider;
24+
@Inject private CreationDialogShowAction masterMapDialogAction;
2325

2426
public OpenEnrichmentMapAction() {
2527
super(NAME);
@@ -29,6 +31,7 @@ public OpenEnrichmentMapAction() {
2931
public synchronized void showPanels() {
3032
controlPanelMediatorProvider.get().showControlPanel();
3133
heatMapMediatorProvider.get().showHeatMapPanel();
34+
masterMapDialogAction.showDialog();
3235
}
3336

3437
@Override

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/control/ControlPanelMediator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ public void showControlPanel() {
169169

170170
if (firstTime && emManager.getAllEnrichmentMaps().isEmpty()) {
171171
firstTime = false;
172-
controlPanelProvider.get().getCreateEmButton().doClick();
173172
} else {
174173
setCurrentNetworkView(applicationManager.getCurrentNetworkView());
175174
}
@@ -178,7 +177,6 @@ public void showControlPanel() {
178177
// Select the panel
179178
CytoPanel cytoPanel = swingApplication.getCytoPanel(panel.getCytoPanelName());
180179
int index = cytoPanel.indexOfComponent(ControlPanel.ID);
181-
182180
if (index >= 0)
183181
cytoPanel.setSelectedIndex(index);
184182
}

0 commit comments

Comments
 (0)