Skip to content

Commit d6548a0

Browse files
chewiebugchewiebug
committed
use StayOpenCheckBoxMenuItem only, where needed (#174)
1 parent c0a3e90 commit d6548a0

File tree

8 files changed

+44
-52
lines changed

8 files changed

+44
-52
lines changed

‎src/main/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelLoaderControllerImpl.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
package com.tagtraum.perf.gcviewer.ctrl.impl;
22

3-
import com.tagtraum.perf.gcviewer.ctrl.GCModelLoader;
4-
import com.tagtraum.perf.gcviewer.ctrl.GCModelLoaderController;
5-
import com.tagtraum.perf.gcviewer.ctrl.GCModelLoaderGroupTracker;
6-
import com.tagtraum.perf.gcviewer.ctrl.impl.FileDropTargetListener.DropFlavor;
7-
import com.tagtraum.perf.gcviewer.model.GCResource;
8-
import com.tagtraum.perf.gcviewer.view.GCDocument;
9-
import com.tagtraum.perf.gcviewer.view.GCViewerGui;
10-
import com.tagtraum.perf.gcviewer.view.GCViewerGuiMenuBar;
11-
import com.tagtraum.perf.gcviewer.view.model.RecentGCResourcesModel;
12-
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
13-
143
import java.awt.dnd.DnDConstants;
154
import java.awt.dnd.DropTarget;
165
import java.awt.event.ActionListener;
@@ -20,6 +9,17 @@
209
import java.util.Arrays;
2110
import java.util.List;
2211
import java.util.Map;
12+
import javax.swing.JCheckBoxMenuItem;
13+
14+
import com.tagtraum.perf.gcviewer.ctrl.GCModelLoader;
15+
import com.tagtraum.perf.gcviewer.ctrl.GCModelLoaderController;
16+
import com.tagtraum.perf.gcviewer.ctrl.GCModelLoaderGroupTracker;
17+
import com.tagtraum.perf.gcviewer.ctrl.impl.FileDropTargetListener.DropFlavor;
18+
import com.tagtraum.perf.gcviewer.model.GCResource;
19+
import com.tagtraum.perf.gcviewer.view.GCDocument;
20+
import com.tagtraum.perf.gcviewer.view.GCViewerGui;
21+
import com.tagtraum.perf.gcviewer.view.GCViewerGuiMenuBar;
22+
import com.tagtraum.perf.gcviewer.view.model.RecentGCResourcesModel;
2323

2424
/**
2525
* Controller class for {@link GCModelLoader}.
@@ -98,12 +98,12 @@ private RecentGCResourcesModel getRecentGCResourcesModel() {
9898
}
9999

100100
private ViewMenuController getViewMenuController() {
101-
Map<String, StayOpenCheckBoxMenuItem> viewMenuItems
101+
Map<String, JCheckBoxMenuItem> viewMenuItems
102102
= ((GCViewerGuiMenuBar) this.gcViewerGui.getJMenuBar()).getViewMenuItems();
103103

104104
assert viewMenuItems.size() > 0 : "viewMenuItems is not initialised!!";
105-
106-
StayOpenCheckBoxMenuItem menuItem = viewMenuItems.values().iterator().next();
105+
106+
JCheckBoxMenuItem menuItem = viewMenuItems.values().iterator().next();
107107
for (ActionListener actionListener : menuItem.getActionListeners()) {
108108
if (actionListener instanceof ViewMenuController) {
109109
return (ViewMenuController) actionListener;

‎src/main/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCViewerGuiBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.awt.dnd.DropTarget;
66
import java.util.Map;
77
import java.util.TreeMap;
8-
98
import javax.swing.Action;
9+
import javax.swing.JCheckBoxMenuItem;
1010
import javax.swing.JComboBox;
1111
import javax.swing.JDesktopPane;
1212
import javax.swing.JToggleButton;
@@ -33,7 +33,7 @@
3333
import com.tagtraum.perf.gcviewer.view.GCViewerGuiToolBar;
3434
import com.tagtraum.perf.gcviewer.view.RecentGCResourcesMenu;
3535
import com.tagtraum.perf.gcviewer.view.model.GCPreferences;
36-
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
36+
import com.tagtraum.perf.gcviewer.view.StayOpenCheckBoxMenuItem;
3737
import com.tagtraum.perf.gcviewer.view.renderer.ConcurrentGcBegionEndRenderer;
3838
import com.tagtraum.perf.gcviewer.view.renderer.FullGCLineRenderer;
3939
import com.tagtraum.perf.gcviewer.view.renderer.GCRectanglesRenderer;
@@ -134,7 +134,7 @@ private GCViewerGuiMenuBar initMenuBar(Map<String, Action> actions,
134134
menuBar.addToFileMenu(recentResourceNamesMenu);
135135
menuBar.addToFileMenu(actions.get(ActionCommands.EXPORT.toString()));
136136
menuBar.addToFileMenu(actions.get(ActionCommands.REFRESH.toString()));
137-
menuBar.addToFileMenu(new StayOpenCheckBoxMenuItem(actions.get(ActionCommands.WATCH.toString())));
137+
menuBar.addToFileMenu(new JCheckBoxMenuItem(actions.get(ActionCommands.WATCH.toString())));
138138
if ( ! OSXSupport.isOSX()) {
139139
menuBar.addToFileMenu(actions.get(ActionCommands.EXIT.toString()));
140140
}

‎src/main/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCViewerGuiController.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
import java.util.LinkedList;
88
import java.util.List;
99
import java.util.Map.Entry;
10-
11-
10+
import javax.swing.JCheckBoxMenuItem;
1211
import javax.swing.JInternalFrame;
1312
import javax.swing.SwingUtilities;
1413

@@ -21,7 +20,6 @@
2120
import com.tagtraum.perf.gcviewer.view.GCViewerGuiMenuBar;
2221
import com.tagtraum.perf.gcviewer.view.model.GCPreferences;
2322
import com.tagtraum.perf.gcviewer.view.model.GCResourceGroup;
24-
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
2523

2624
/**
2725
* Main controller class of GCViewer.
@@ -35,8 +33,8 @@ void applyPreferences(GCViewerGui gui, GCPreferences preferences) {
3533
// default visibility to be able to access it from unittests
3634
gui.setPreferences(preferences);
3735
if (preferences.isPropertiesLoaded()) {
38-
for (Entry<String, StayOpenCheckBoxMenuItem> menuEntry : ((GCViewerGuiMenuBar)gui.getJMenuBar()).getViewMenuItems().entrySet()) {
39-
StayOpenCheckBoxMenuItem item = menuEntry.getValue();
36+
for (Entry<String, JCheckBoxMenuItem> menuEntry : ((GCViewerGuiMenuBar)gui.getJMenuBar()).getViewMenuItems().entrySet()) {
37+
JCheckBoxMenuItem item = menuEntry.getValue();
4038
item.setState(preferences.getGcLineProperty(menuEntry.getKey()));
4139

4240
// TODO necessary? state is set above; no GCDocument open at this moment
@@ -85,8 +83,8 @@ private void closeAllButSelectedDocument(GCViewerGui gui) {
8583
*/
8684
private GCPreferences copyPreferencesFromGui(GCViewerGui gui) {
8785
GCPreferences preferences = gui.getPreferences();
88-
for (Entry<String, StayOpenCheckBoxMenuItem> menuEntry : ((GCViewerGuiMenuBar)gui.getJMenuBar()).getViewMenuItems().entrySet()) {
89-
StayOpenCheckBoxMenuItem item = menuEntry.getValue();
86+
for (Entry<String, JCheckBoxMenuItem> menuEntry : ((GCViewerGuiMenuBar)gui.getJMenuBar()).getViewMenuItems().entrySet()) {
87+
JCheckBoxMenuItem item = menuEntry.getValue();
9088
preferences.setGcLineProperty(item.getActionCommand(), item.getState());
9189
}
9290
preferences.setWindowWidth(gui.getWidth());

‎src/main/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCViewerGuiInternalFrameController.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
import java.util.Map;
44
import java.util.Map.Entry;
5-
65
import javax.swing.Action;
7-
6+
import javax.swing.JCheckBoxMenuItem;
87
import javax.swing.JInternalFrame;
98
import javax.swing.JMenu;
109
import javax.swing.JMenuItem;
@@ -18,7 +17,6 @@
1817
import com.tagtraum.perf.gcviewer.view.GCViewerGuiMenuBar;
1918
import com.tagtraum.perf.gcviewer.view.GCViewerGuiToolBar;
2019
import com.tagtraum.perf.gcviewer.view.model.GCPreferences;
21-
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
2220

2321
/**
2422
* Controller class for internal frames of {@link GCViewerGui}.
@@ -30,7 +28,7 @@ public class GCViewerGuiInternalFrameController extends InternalFrameAdapter {
3028

3129
@Override
3230
public void internalFrameOpened(InternalFrameEvent e) {
33-
StayOpenCheckBoxMenuItem menuItem = new StayOpenCheckBoxMenuItem(new WindowMenuItemAction(e));
31+
JCheckBoxMenuItem menuItem = new JCheckBoxMenuItem(new WindowMenuItemAction(e));
3432

3533
getMenuBar(e).addToWindowMenuGroup(menuItem);
3634
}
@@ -127,8 +125,8 @@ private void updateMenuItemState(InternalFrameEvent e) {
127125
getToolBar(e).getZoomComboBox().setSelectedItem(
128126
(int) (getSelectedGCDocument(e).getModelChart().getScaleFactor() * 1000.0) + "%");
129127
GCPreferences preferences = getSelectedGCDocument(e).getPreferences();
130-
for (Entry<String, StayOpenCheckBoxMenuItem> menuEntry : getMenuBar(e).getViewMenuItems().entrySet()) {
131-
StayOpenCheckBoxMenuItem item = menuEntry.getValue();
128+
for (Entry<String, JCheckBoxMenuItem> menuEntry : getMenuBar(e).getViewMenuItems().entrySet()) {
129+
JCheckBoxMenuItem item = menuEntry.getValue();
132130
item.setState(preferences.getGcLineProperty(menuEntry.getKey()));
133131
}
134132
}

‎src/main/java/com/tagtraum/perf/gcviewer/ctrl/impl/ViewMenuController.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
import java.beans.PropertyChangeEvent;
66
import java.beans.PropertyChangeListener;
77
import java.util.logging.Logger;
8-
8+
import javax.swing.JCheckBoxMenuItem;
99

1010
import com.tagtraum.perf.gcviewer.view.GCViewerGui;
1111
import com.tagtraum.perf.gcviewer.view.GCViewerGuiMenuBar;
1212
import com.tagtraum.perf.gcviewer.view.model.GCPreferences;
1313
import com.tagtraum.perf.gcviewer.view.model.PropertyChangeEventConsts;
14-
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
1514

1615
/**
1716
* Deals with all actions for the "view".
@@ -40,7 +39,7 @@ public void actionPerformed(ActionEvent e) {
4039
return;
4140
}
4241

43-
boolean state = ((StayOpenCheckBoxMenuItem)e.getSource()).getState();
42+
boolean state = ((JCheckBoxMenuItem)e.getSource()).getState();
4443
if (GCPreferences.SHOW_MODEL_METRICS_PANEL.equals(e.getActionCommand())) {
4544
gui.getSelectedGCDocument().setShowModelMetricsPanel(state);
4645
}

‎src/main/java/com/tagtraum/perf/gcviewer/ctrl/impl/WatchStateController.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.tagtraum.perf.gcviewer.ctrl.impl;
22

3-
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
4-
53
import java.awt.event.ActionEvent;
64
import java.awt.event.ActionListener;
7-
5+
import javax.swing.JCheckBoxMenuItem;
86
import javax.swing.JToggleButton;
97

108
/**
@@ -15,10 +13,10 @@
1513
*/
1614
public class WatchStateController implements ActionListener {
1715

18-
private StayOpenCheckBoxMenuItem menuItemWatch;
16+
private JCheckBoxMenuItem menuItemWatch;
1917
private JToggleButton watchToggle;
2018

21-
public WatchStateController(StayOpenCheckBoxMenuItem menuItemWatch, JToggleButton watchToggle) {
19+
public WatchStateController(JCheckBoxMenuItem menuItemWatch, JToggleButton watchToggle) {
2220
super();
2321

2422
this.menuItemWatch = menuItemWatch;

‎src/main/java/com/tagtraum/perf/gcviewer/view/GCViewerGuiMenuBar.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
import java.util.Collections;
55
import java.util.HashMap;
66
import java.util.Map;
7-
87
import javax.swing.Action;
98
import javax.swing.ButtonGroup;
9+
import javax.swing.JCheckBoxMenuItem;
1010
import javax.swing.JMenu;
1111
import javax.swing.JMenuBar;
1212
import javax.swing.JMenuItem;
1313

1414
import com.tagtraum.perf.gcviewer.util.LocalisationHelper;
1515
import com.tagtraum.perf.gcviewer.view.model.RecentGCResourcesModel;
16-
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
1716
import com.tagtraum.perf.gcviewer.view.util.OSXSupport;
1817

1918
/**
@@ -23,7 +22,7 @@
2322
* <p>created on: 07.02.2014</p>
2423
*/
2524
public class GCViewerGuiMenuBar extends JMenuBar {
26-
private Map<String, StayOpenCheckBoxMenuItem> viewMenuItemMap;
25+
private Map<String, JCheckBoxMenuItem> viewMenuItemMap;
2726
private JMenu fileMenu;
2827
private RecentGCResourcesModel recentResourceNamesModel;
2928
private JMenu viewMenu;
@@ -35,7 +34,7 @@ public class GCViewerGuiMenuBar extends JMenuBar {
3534
public GCViewerGuiMenuBar() {
3635
super();
3736

38-
viewMenuItemMap = new HashMap<String, StayOpenCheckBoxMenuItem>();
37+
viewMenuItemMap = new HashMap<>();
3938

4039
fileMenu = new JMenu(LocalisationHelper.getString("main_frame_menu_file"));
4140
fileMenu.setMnemonic(LocalisationHelper.getString("main_frame_menu_mnemonic_file").charAt(0));
@@ -82,7 +81,7 @@ public void addToHelpMenu(Action action) {
8281
helpMenu.add(action);
8382
}
8483

85-
public void addToViewMenu(String key, StayOpenCheckBoxMenuItem menuItem) {
84+
public void addToViewMenu(String key, JCheckBoxMenuItem menuItem) {
8685
viewMenu.add(menuItem);
8786
viewMenuItemMap.put(key, menuItem);
8887
}
@@ -98,7 +97,7 @@ public void addToViewMenu(Action action) {
9897
* @param key unique key for storage of this <code>menuItem</code> in the internal map
9998
* @param menuItem item to be stored in the map
10099
*/
101-
public void addToViewMenuInvisible(String key, StayOpenCheckBoxMenuItem menuItem) {
100+
public void addToViewMenuInvisible(String key, JCheckBoxMenuItem menuItem) {
102101
viewMenuItemMap.put(key, menuItem);
103102
}
104103

@@ -114,7 +113,7 @@ public void addToWindowMenu(Action action) {
114113
* Add checkbox item to window menu group (only one of these items can be active at a time).
115114
* @param menuItem checkbox item to be added
116115
*/
117-
public void addToWindowMenuGroup(StayOpenCheckBoxMenuItem menuItem) {
116+
public void addToWindowMenuGroup(JCheckBoxMenuItem menuItem) {
118117
windowMenu.add(menuItem);
119118
windowMenuCheckBoxGroup.add(menuItem);
120119
}
@@ -141,7 +140,7 @@ public JMenu getViewMenu() {
141140
return viewMenu;
142141
}
143142

144-
public Map<String, StayOpenCheckBoxMenuItem> getViewMenuItems() {
143+
public Map<String, JCheckBoxMenuItem> getViewMenuItems() {
145144
return Collections.unmodifiableMap(viewMenuItemMap);
146145
}
147146

@@ -150,16 +149,16 @@ public JMenu getWindowMenu() {
150149
}
151150

152151
/**
153-
* Returns StayOpenCheckBoxMenuItem, which is associated with "WATCH" action command.
152+
* Returns MenuItem, which is associated with "WATCH" action command.
154153
*
155154
* @return "WATCH" menu item
156155
*/
157-
public StayOpenCheckBoxMenuItem getWatchMenuItem() {
156+
public JCheckBoxMenuItem getWatchMenuItem() {
158157
for (Component component : fileMenu.getMenuComponents()) {
159-
if (component instanceof StayOpenCheckBoxMenuItem
160-
&& ((StayOpenCheckBoxMenuItem) component).getActionCommand().equals(ActionCommands.WATCH.toString())) {
158+
if (component instanceof JCheckBoxMenuItem
159+
&& ((JCheckBoxMenuItem) component).getActionCommand().equals(ActionCommands.WATCH.toString())) {
161160

162-
return (StayOpenCheckBoxMenuItem) component;
161+
return (JCheckBoxMenuItem) component;
163162
}
164163
}
165164

‎src/main/java/com/tagtraum/perf/gcviewer/view/model/StayOpenCheckBoxMenuItem.java‎ renamed to ‎src/main/java/com/tagtraum/perf/gcviewer/view/StayOpenCheckBoxMenuItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tagtraum.perf.gcviewer.view.model;
1+
package com.tagtraum.perf.gcviewer.view;
22

33
import javax.swing.Action;
44
import javax.swing.Icon;

0 commit comments

Comments
 (0)