Clean up chart section of main panel.

Author: mikekucera

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

@@ -458,10 +458,7 @@ JScrollPane getScrollPane() {
 
 		protected JButton getResetStyleButton() {
 			if (resetStyleButton == null) {
-				resetStyleButton = new JButton(ICON_REFRESH);
-				resetStyleButton.setFont(serviceRegistrar.getService(IconManager.class).getIconFont(13.0f));
-				resetStyleButton.setToolTipText("Reset Style");
-				
+				resetStyleButton = new JButton("Reset Style");
 				if (isAquaLAF())
 					resetStyleButton.putClientProperty("JButton.buttonType", "gradient");
 			}
@@ -496,10 +493,8 @@ class EMViewControlPanel extends AbstractViewControlPanel {
 
 		private DataSetSelector dataSetSelector;
 		private JCheckBox publicationReadyCheck;
-		private JButton setEdgeWidthButton;
 		private JButton showLegendButton;
 
-		private JLabel aaLink;
 		private JComboBox<ChartData> chartDataCombo;
 		private JComboBox<ChartType> chartTypeCombo;
 		private JComboBox<ColorScheme> chartColorsCombo;
@@ -718,8 +713,8 @@ private JPanel createFilterPanel() {
 
 		private JPanel createStylePanel() {
 			makeSmall(chartDataLabel, chartTypeLabel, chartColorsLabel);
-			makeSmall(getAutoAnnotateOpenLink(), getChartDataCombo(), getChartTypeCombo(), getChartColorsCombo(), getShowChartLabelsCheck());
-			makeSmall(getPublicationReadyCheck(), getShowLegendButton(), getSetEdgeWidthButton(), getResetStyleButton());
+			makeSmall(getChartDataCombo(), getChartTypeCombo(), getChartColorsCombo(), getShowChartLabelsCheck());
+			makeSmall(getPublicationReadyCheck(), getShowLegendButton(), getResetStyleButton());
 
 			final JPanel panel = new JPanel();
 			panel.setBorder(LookAndFeelUtil.createTitledBorder("Style"));
@@ -738,7 +733,6 @@ private JPanel createStylePanel() {
 							)
 							.addPreferredGap(ComponentPlacement.RELATED)
 							.addGroup(layout.createParallelGroup(LEADING, true)
-									.addComponent(getAutoAnnotateOpenLink(), DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
 									.addComponent(getChartDataCombo(), DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
 									.addComponent(getChartTypeCombo(), DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
 									.addComponent(getChartColorsCombo(), DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
@@ -747,16 +741,13 @@ private JPanel createStylePanel() {
 							)
 					)
 					.addGroup(layout.createSequentialGroup()
-							.addComponent(getSetEdgeWidthButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
-							.addPreferredGap(ComponentPlacement.UNRELATED)
 							.addComponent(getShowLegendButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
 							.addPreferredGap(ComponentPlacement.UNRELATED)
 							.addComponent(getResetStyleButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
 					)
 			);
 
 			layout.setVerticalGroup(layout.createSequentialGroup()
-					.addComponent(getAutoAnnotateOpenLink())
 					.addGroup(layout.createParallelGroup(CENTER, false)
 							.addComponent(chartDataLabel)
 							.addComponent(getChartDataCombo(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
@@ -773,7 +764,6 @@ private JPanel createStylePanel() {
 					.addComponent(getPublicationReadyCheck(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
 					.addPreferredGap(ComponentPlacement.UNRELATED)
 					.addGroup(layout.createParallelGroup(CENTER, false)
-							.addComponent(getSetEdgeWidthButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
 							.addComponent(getShowLegendButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
 							.addComponent(getResetStyleButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
 					)
@@ -892,15 +882,6 @@ DataSetSelector getDataSetSelector() {
 			}
 			return dataSetSelector;
 		}
-
-		JLabel getAutoAnnotateOpenLink() {
-			if (aaLink == null) {
-				aaLink = SwingUtil.createLinkLabel("Use AutoAnnotate to find clusters of similar gene-sets");
-				aaLink.setVisible(dependencyChecker.isCommandAvailable("autoannotate", "open"));
-				aaLink.setBorder(BorderFactory.createEmptyBorder(0, 8, 4, 0));
-			}
-			return aaLink;
-		}
 
 
 		JComboBox<ChartData> getChartDataCombo() {
@@ -1019,15 +1000,7 @@ JCheckBox getPublicationReadyCheck() {
 			return publicationReadyCheck;
 		}
 
-		JButton getSetEdgeWidthButton() {
-			if (setEdgeWidthButton == null) {
-				setEdgeWidthButton = new JButton("Set Signature Edge Width...");
-				if (isAquaLAF())
-					setEdgeWidthButton.putClientProperty("JButton.buttonType", "gradient");
-			}
-			return setEdgeWidthButton;
-		}
-		
+
 		JButton getShowLegendButton() {
 			if (showLegendButton == null) {
 				showLegendButton = new JButton("Show Legend...");

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

@@ -13,7 +13,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
-import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -585,14 +584,6 @@ private void addListeners(EMViewControlPanel viewPanel, EnrichmentMap map) {
 				map.getParams().getCreateDistinctEdges()
 			);
 		});
-		
-		viewPanel.getAutoAnnotateOpenLink().addMouseListener(new MouseAdapter() {
-			@Override public void mouseClicked(MouseEvent e) {
-				var task = autoAnnotateOpenTaskProvider.get();
-				syncTaskManager.execute(new TaskIterator(task));
-			}
-		});
-		
 		viewPanel.getChartDataCombo().addItemListener(evt -> {
 			if (!updating && evt.getStateChange() == ItemEvent.SELECTED) {
 				updating = true;
@@ -631,7 +622,7 @@ private void addListeners(EMViewControlPanel viewPanel, EnrichmentMap map) {
 
 		// MKTODO we should have a warning dialog when resetting the entire style
 		viewPanel.getResetStyleButton().addActionListener(evt -> resetStyle(map, viewPanel));
-		viewPanel.getSetEdgeWidthButton().addActionListener(evt -> showEdgeWidthDialog());
+//		viewPanel.getSetEdgeWidthButton().addActionListener(evt -> showEdgeWidthDialog());
 		viewPanel.getShowLegendButton().addActionListener(evt -> showLegendDialog());
 
 		viewPanel.updateChartDataCombo();
@@ -1006,6 +997,11 @@ private JPopupMenu getOptionsMenu() {
 
 		menu.addSeparator();
 
+		
+		JMenuItem setEdgeWidthItem = new JMenuItem("Set Signature  Edge Width...");
+		setEdgeWidthItem.addActionListener(evt -> showEdgeWidthDialog());
+		menu.add(setEdgeWidthItem);
+		
 		menu.add(new JMenuItem(showAboutDialogActionProvider.get()));
 
 		return menu;