Skip to content

Commit ed32666

Browse files
chewiebugchewiebug
committed
Merge branch 'feature/Prevent_MenuItem_From_Closing_Upon_Click' into develop
2 parents 601cd68 + 919ce3d commit ed32666

File tree

8 files changed

+142
-47
lines changed

8 files changed

+142
-47
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import com.tagtraum.perf.gcviewer.view.GCViewerGui;
1010
import com.tagtraum.perf.gcviewer.view.GCViewerGuiMenuBar;
1111
import com.tagtraum.perf.gcviewer.view.model.RecentGCResourcesModel;
12+
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
1213

13-
import javax.swing.*;
1414
import java.awt.dnd.DnDConstants;
1515
import java.awt.dnd.DropTarget;
1616
import java.awt.event.ActionListener;
@@ -98,12 +98,12 @@ private RecentGCResourcesModel getRecentGCResourcesModel() {
9898
}
9999

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

104104
assert viewMenuItems.size() > 0 : "viewMenuItems is not initialised!!";
105105

106-
JCheckBoxMenuItem menuItem = viewMenuItems.values().iterator().next();
106+
StayOpenCheckBoxMenuItem 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: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.util.TreeMap;
88

99
import javax.swing.Action;
10-
import javax.swing.JCheckBoxMenuItem;
1110
import javax.swing.JComboBox;
1211
import javax.swing.JDesktopPane;
1312
import javax.swing.JToggleButton;
@@ -34,6 +33,7 @@
3433
import com.tagtraum.perf.gcviewer.view.GCViewerGuiToolBar;
3534
import com.tagtraum.perf.gcviewer.view.RecentGCResourcesMenu;
3635
import com.tagtraum.perf.gcviewer.view.model.GCPreferences;
36+
import com.tagtraum.perf.gcviewer.view.model.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 JCheckBoxMenuItem(actions.get(ActionCommands.WATCH.toString())));
137+
menuBar.addToFileMenu(new StayOpenCheckBoxMenuItem(actions.get(ActionCommands.WATCH.toString())));
138138
if ( ! OSXSupport.isOSX()) {
139139
menuBar.addToFileMenu(actions.get(ActionCommands.EXIT.toString()));
140140
}
@@ -144,7 +144,7 @@ private GCViewerGuiMenuBar initMenuBar(Map<String, Action> actions,
144144
recentResourceNamesMenu.getRecentResourceNamesModel().addRecentResourceNamesListener(recentResourceNamesMenuController);
145145

146146
// view menu
147-
JCheckBoxMenuItem menuItemShowModelMetricsPanel = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_show_data_panel"), true);
147+
StayOpenCheckBoxMenuItem menuItemShowModelMetricsPanel = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_show_data_panel"), true);
148148
menuItemShowModelMetricsPanel.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_show_data_panel").charAt(0));
149149
menuItemShowModelMetricsPanel.setIcon(ImageHelper.createEmptyImageIcon(20, 20));
150150
menuItemShowModelMetricsPanel.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_show_data_panel"));
@@ -153,7 +153,7 @@ private GCViewerGuiMenuBar initMenuBar(Map<String, Action> actions,
153153
menuBar.addToViewMenu(GCPreferences.SHOW_MODEL_METRICS_PANEL, menuItemShowModelMetricsPanel);
154154
menuBar.addSeparatorToViewMenu();
155155

156-
JCheckBoxMenuItem menuItemShowDateStamp = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_show_date_stamp"), true);
156+
StayOpenCheckBoxMenuItem menuItemShowDateStamp = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_show_date_stamp"), true);
157157
menuItemShowDateStamp.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_show_date_stamp").charAt(0));
158158
menuItemShowDateStamp.setIcon(ImageHelper.createEmptyImageIcon(20, 20));
159159
menuItemShowDateStamp.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_show_date_stamp"));
@@ -162,7 +162,7 @@ private GCViewerGuiMenuBar initMenuBar(Map<String, Action> actions,
162162
menuBar.addToViewMenu(GCPreferences.SHOW_DATE_STAMP, menuItemShowDateStamp);
163163
menuBar.addSeparatorToViewMenu();
164164

165-
JCheckBoxMenuItem menuItemAntiAlias = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_antialias"), true);
165+
StayOpenCheckBoxMenuItem menuItemAntiAlias = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_antialias"), true);
166166
menuItemAntiAlias.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_antialias").charAt(0));
167167
menuItemAntiAlias.setIcon(ImageHelper.createEmptyImageIcon(20, 20));
168168
menuItemAntiAlias.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_antialias"));
@@ -171,95 +171,95 @@ private GCViewerGuiMenuBar initMenuBar(Map<String, Action> actions,
171171
menuBar.addToViewMenu(GCPreferences.ANTI_ALIAS, menuItemAntiAlias);
172172
menuBar.addSeparatorToViewMenu();
173173

174-
JCheckBoxMenuItem menuItemFullGCLines = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_full_gc_lines"), true);
174+
StayOpenCheckBoxMenuItem menuItemFullGCLines = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_full_gc_lines"), true);
175175
menuItemFullGCLines.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_full_gc_lines").charAt(0));
176176
menuItemFullGCLines.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_full_gc_lines"));
177177
menuItemFullGCLines.setIcon(ImageHelper.createMonoColoredImageIcon(FullGCLineRenderer.DEFAULT_LINEPAINT, 20, 20));
178178
menuItemFullGCLines.setActionCommand(GCPreferences.FULL_GC_LINES);
179179
menuItemFullGCLines.addActionListener(viewMenuController);
180180
menuBar.addToViewMenu(GCPreferences.FULL_GC_LINES, menuItemFullGCLines);
181181

182-
JCheckBoxMenuItem menuItemIncGCLines = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_inc_gc_lines"), true);
182+
StayOpenCheckBoxMenuItem menuItemIncGCLines = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_inc_gc_lines"), true);
183183
menuItemIncGCLines.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_inc_gc_lines").charAt(0));
184184
menuItemIncGCLines.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_inc_gc_lines"));
185185
menuItemIncGCLines.setIcon(ImageHelper.createMonoColoredImageIcon(IncLineRenderer.DEFAULT_LINEPAINT, 20, 20));
186186
menuItemIncGCLines.setActionCommand(GCPreferences.INC_GC_LINES);
187187
menuItemIncGCLines.addActionListener(viewMenuController);
188188
menuBar.addToViewMenu(GCPreferences.INC_GC_LINES, menuItemIncGCLines);
189189

190-
JCheckBoxMenuItem menuItemGcTimesLine = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_gc_times_line"), true);
190+
StayOpenCheckBoxMenuItem menuItemGcTimesLine = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_gc_times_line"), true);
191191
menuItemGcTimesLine.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_gc_times_line").charAt(0));
192192
menuItemGcTimesLine.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_gc_times_line"));
193193
menuItemGcTimesLine.setIcon(ImageHelper.createMonoColoredImageIcon(GCTimesRenderer.DEFAULT_LINEPAINT, 20, 20));
194194
menuItemGcTimesLine.setActionCommand(GCPreferences.GC_TIMES_LINE);
195195
menuItemGcTimesLine.addActionListener(viewMenuController);
196196
menuBar.addToViewMenu(GCPreferences.GC_TIMES_LINE, menuItemGcTimesLine);
197197

198-
JCheckBoxMenuItem menuItemGcTimesRectangle = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_gc_times_rectangles"), true);
198+
StayOpenCheckBoxMenuItem menuItemGcTimesRectangle = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_gc_times_rectangles"), true);
199199
menuItemGcTimesRectangle.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_gc_times_rectangles").charAt(0));
200200
menuItemGcTimesRectangle.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_gc_times_rectangles"));
201201
menuItemGcTimesRectangle.setIcon(ImageHelper.createMonoColoredImageIcon(GCRectanglesRenderer.DEFAULT_LINEPAINT, 20, 20));
202202
menuItemGcTimesRectangle.setActionCommand(GCPreferences.GC_TIMES_RECTANGLES);
203203
menuItemGcTimesRectangle.addActionListener(viewMenuController);
204204
menuBar.addToViewMenu(GCPreferences.GC_TIMES_RECTANGLES, menuItemGcTimesRectangle);
205205

206-
JCheckBoxMenuItem menuItemTotalMemory = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_total_memory"), true);
206+
StayOpenCheckBoxMenuItem menuItemTotalMemory = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_total_memory"), true);
207207
menuItemTotalMemory.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_total_memory").charAt(0));
208208
menuItemTotalMemory.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_total_memory"));
209209
menuItemTotalMemory.setIcon(ImageHelper.createMonoColoredImageIcon(TotalHeapRenderer.DEFAULT_LINEPAINT, 20, 20));
210210
menuItemTotalMemory.setActionCommand(GCPreferences.TOTAL_MEMORY);
211211
menuItemTotalMemory.addActionListener(viewMenuController);
212212
menuBar.addToViewMenu(GCPreferences.TOTAL_MEMORY, menuItemTotalMemory);
213213

214-
JCheckBoxMenuItem menuItemTenuredMemory = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_tenured_memory"), true);
214+
StayOpenCheckBoxMenuItem menuItemTenuredMemory = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_tenured_memory"), true);
215215
menuItemTenuredMemory.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_tenured_memory").charAt(0));
216216
menuItemTenuredMemory.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_tenured_memory"));
217217
menuItemTenuredMemory.setIcon(ImageHelper.createMonoColoredImageIcon(TotalTenuredRenderer.DEFAULT_LINEPAINT, 20, 20));
218218
menuItemTenuredMemory.setActionCommand(GCPreferences.TENURED_MEMORY);
219219
menuItemTenuredMemory.addActionListener(viewMenuController);
220220
menuBar.addToViewMenu(GCPreferences.TENURED_MEMORY, menuItemTenuredMemory);
221221

222-
JCheckBoxMenuItem menuItemYoungMemory = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_young_memory"), true);
222+
StayOpenCheckBoxMenuItem menuItemYoungMemory = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_young_memory"), true);
223223
menuItemYoungMemory.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_young_memory").charAt(0));
224224
menuItemYoungMemory.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_young_memory"));
225225
menuItemYoungMemory.setIcon(ImageHelper.createMonoColoredImageIcon(TotalYoungRenderer.DEFAULT_LINEPAINT, 20, 20));
226226
menuItemYoungMemory.setActionCommand(GCPreferences.YOUNG_MEMORY);
227227
menuItemYoungMemory.addActionListener(viewMenuController);
228228
menuBar.addToViewMenu(GCPreferences.YOUNG_MEMORY, menuItemYoungMemory);
229229

230-
JCheckBoxMenuItem menuItemUsedMemory = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_used_memory"), true);
230+
StayOpenCheckBoxMenuItem menuItemUsedMemory = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_used_memory"), true);
231231
menuItemUsedMemory.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_used_memory").charAt(0));
232232
menuItemUsedMemory.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_used_memory"));
233233
menuItemUsedMemory.setIcon(ImageHelper.createMonoColoredImageIcon(UsedHeapRenderer.DEFAULT_LINEPAINT, 20, 20));
234234
menuItemUsedMemory.setActionCommand(GCPreferences.USED_MEMORY);
235235
menuItemUsedMemory.addActionListener(viewMenuController);
236236
menuBar.addToViewMenu(GCPreferences.USED_MEMORY, menuItemUsedMemory);
237237

238-
JCheckBoxMenuItem menuItemUsedTenuredMemory = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_used_tenured_memory"), true);
238+
StayOpenCheckBoxMenuItem menuItemUsedTenuredMemory = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_used_tenured_memory"), true);
239239
menuItemUsedTenuredMemory.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_used_tenured_memory").charAt(0));
240240
menuItemUsedTenuredMemory.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_used_tenured_memory"));
241241
menuItemUsedTenuredMemory.setIcon(ImageHelper.createMonoColoredImageIcon(UsedTenuredRenderer.DEFAULT_LINEPAINT, 20, 20));
242242
menuItemUsedTenuredMemory.setActionCommand(GCPreferences.USED_TENURED_MEMORY);
243243
menuItemUsedTenuredMemory.addActionListener(viewMenuController);
244244
menuBar.addToViewMenu(GCPreferences.USED_TENURED_MEMORY, menuItemUsedTenuredMemory);
245245

246-
JCheckBoxMenuItem menuItemUsedYoungMemory = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_used_young_memory"), true);
246+
StayOpenCheckBoxMenuItem menuItemUsedYoungMemory = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_used_young_memory"), true);
247247
menuItemUsedYoungMemory.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_used_young_memory").charAt(0));
248248
menuItemUsedYoungMemory.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_used_young_memory"));
249249
menuItemUsedYoungMemory.setIcon(ImageHelper.createMonoColoredImageIcon(UsedYoungRenderer.DEFAULT_LINEPAINT, 20, 20));
250250
menuItemUsedYoungMemory.setActionCommand(GCPreferences.USED_YOUNG_MEMORY);
251251
menuItemUsedYoungMemory.addActionListener(viewMenuController);
252252
menuBar.addToViewMenu(GCPreferences.USED_YOUNG_MEMORY, menuItemUsedYoungMemory);
253253

254-
JCheckBoxMenuItem menuItemInitialMarkLevel = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_initial_mark_level"), true);
254+
StayOpenCheckBoxMenuItem menuItemInitialMarkLevel = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_initial_mark_level"), true);
255255
menuItemInitialMarkLevel.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_initial_mark_level").charAt(0));
256256
menuItemInitialMarkLevel.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_initial_mark_level"));
257257
menuItemInitialMarkLevel.setIcon(ImageHelper.createMonoColoredImageIcon(InitialMarkLevelRenderer.DEFAULT_LINEPAINT, 20, 20));
258258
menuItemInitialMarkLevel.setActionCommand(GCPreferences.INITIAL_MARK_LEVEL);
259259
menuItemInitialMarkLevel.addActionListener(viewMenuController);
260260
menuBar.addToViewMenu(GCPreferences.INITIAL_MARK_LEVEL, menuItemInitialMarkLevel);
261261

262-
JCheckBoxMenuItem menuItemConcurrentGcBeginEnd = new JCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_concurrent_collection_begin_end"), true);
262+
StayOpenCheckBoxMenuItem menuItemConcurrentGcBeginEnd = new StayOpenCheckBoxMenuItem(LocalisationHelper.getString("main_frame_menuitem_concurrent_collection_begin_end"), true);
263263
menuItemConcurrentGcBeginEnd.setMnemonic(LocalisationHelper.getString("main_frame_menuitem_mnemonic_concurrent_collection_begin_end").charAt(0));
264264
menuItemConcurrentGcBeginEnd.setToolTipText(LocalisationHelper.getString("main_frame_menuitem_hint_concurrent_collection_begin_end"));
265265
menuItemConcurrentGcBeginEnd.setIcon(ImageHelper.createMonoColoredImageIcon(ConcurrentGcBegionEndRenderer.CONCURRENT_COLLECTION_BEGIN, 20, 20));

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.List;
99
import java.util.Map.Entry;
1010

11-
import javax.swing.JCheckBoxMenuItem;
11+
1212
import javax.swing.JInternalFrame;
1313
import javax.swing.SwingUtilities;
1414

@@ -21,6 +21,7 @@
2121
import com.tagtraum.perf.gcviewer.view.GCViewerGuiMenuBar;
2222
import com.tagtraum.perf.gcviewer.view.model.GCPreferences;
2323
import com.tagtraum.perf.gcviewer.view.model.GCResourceGroup;
24+
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
2425

2526
/**
2627
* Main controller class of GCViewer.
@@ -34,8 +35,8 @@ void applyPreferences(GCViewerGui gui, GCPreferences preferences) {
3435
// default visibility to be able to access it from unittests
3536
gui.setPreferences(preferences);
3637
if (preferences.isPropertiesLoaded()) {
37-
for (Entry<String, JCheckBoxMenuItem> menuEntry : ((GCViewerGuiMenuBar)gui.getJMenuBar()).getViewMenuItems().entrySet()) {
38-
JCheckBoxMenuItem item = menuEntry.getValue();
38+
for (Entry<String, StayOpenCheckBoxMenuItem> menuEntry : ((GCViewerGuiMenuBar)gui.getJMenuBar()).getViewMenuItems().entrySet()) {
39+
StayOpenCheckBoxMenuItem item = menuEntry.getValue();
3940
item.setState(preferences.getGcLineProperty(menuEntry.getKey()));
4041

4142
// TODO necessary? state is set above; no GCDocument open at this moment
@@ -84,8 +85,8 @@ private void closeAllButSelectedDocument(GCViewerGui gui) {
8485
*/
8586
private GCPreferences copyPreferencesFromGui(GCViewerGui gui) {
8687
GCPreferences preferences = gui.getPreferences();
87-
for (Entry<String, JCheckBoxMenuItem> menuEntry : ((GCViewerGuiMenuBar)gui.getJMenuBar()).getViewMenuItems().entrySet()) {
88-
JCheckBoxMenuItem item = menuEntry.getValue();
88+
for (Entry<String, StayOpenCheckBoxMenuItem> menuEntry : ((GCViewerGuiMenuBar)gui.getJMenuBar()).getViewMenuItems().entrySet()) {
89+
StayOpenCheckBoxMenuItem item = menuEntry.getValue();
8990
preferences.setGcLineProperty(item.getActionCommand(), item.getState());
9091
}
9192
preferences.setWindowWidth(gui.getWidth());

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Map.Entry;
55

66
import javax.swing.Action;
7-
import javax.swing.JCheckBoxMenuItem;
7+
88
import javax.swing.JInternalFrame;
99
import javax.swing.JMenu;
1010
import javax.swing.JMenuItem;
@@ -18,6 +18,7 @@
1818
import com.tagtraum.perf.gcviewer.view.GCViewerGuiMenuBar;
1919
import com.tagtraum.perf.gcviewer.view.GCViewerGuiToolBar;
2020
import com.tagtraum.perf.gcviewer.view.model.GCPreferences;
21+
import com.tagtraum.perf.gcviewer.view.model.StayOpenCheckBoxMenuItem;
2122

2223
/**
2324
* Controller class for internal frames of {@link GCViewerGui}.
@@ -29,7 +30,7 @@ public class GCViewerGuiInternalFrameController extends InternalFrameAdapter {
2930

3031
@Override
3132
public void internalFrameOpened(InternalFrameEvent e) {
32-
JCheckBoxMenuItem menuItem = new JCheckBoxMenuItem(new WindowMenuItemAction(e));
33+
StayOpenCheckBoxMenuItem menuItem = new StayOpenCheckBoxMenuItem(new WindowMenuItemAction(e));
3334

3435
getMenuBar(e).addToWindowMenuGroup(menuItem);
3536
}
@@ -126,8 +127,8 @@ private void updateMenuItemState(InternalFrameEvent e) {
126127
getToolBar(e).getZoomComboBox().setSelectedItem(
127128
(int) (getSelectedGCDocument(e).getModelChart().getScaleFactor() * 1000.0) + "%");
128129
GCPreferences preferences = getSelectedGCDocument(e).getPreferences();
129-
for (Entry<String, JCheckBoxMenuItem> menuEntry : getMenuBar(e).getViewMenuItems().entrySet()) {
130-
JCheckBoxMenuItem item = menuEntry.getValue();
130+
for (Entry<String, StayOpenCheckBoxMenuItem> menuEntry : getMenuBar(e).getViewMenuItems().entrySet()) {
131+
StayOpenCheckBoxMenuItem item = menuEntry.getValue();
131132
item.setState(preferences.getGcLineProperty(menuEntry.getKey()));
132133
}
133134
}

0 commit comments

Comments
 (0)