Skip to content

Commit

Permalink
Switch to disposable internal frames
Browse files Browse the repository at this point in the history
Disposable frames work with the desktop manager to set focus when a
frame is closed. Reusable frames don't appear to actually be reused.
  • Loading branch information
cseppan committed Mar 18, 2021
1 parent 5219e01 commit f76c567
Show file tree
Hide file tree
Showing 27 changed files with 54 additions and 54 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package gov.epa.emissions.framework.client.admin;

import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;

public class RegisterUserInternalFrame extends ReusableInteralFrame implements RegisterUserDesktopView {
public class RegisterUserInternalFrame extends DisposableInteralFrame implements RegisterUserDesktopView {

private RegisterUserPanel view;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import gov.epa.emissions.commons.gui.buttons.CloseButton;
import gov.epa.emissions.commons.gui.buttons.NewButton;
import gov.epa.emissions.commons.security.User;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.client.util.ComponentUtility;
Expand All @@ -34,7 +34,7 @@
import javax.swing.JPanel;
import javax.swing.SwingWorker;

public class UsersManager extends ReusableInteralFrame implements UsersManagerView, RefreshObserver {
public class UsersManager extends DisposableInteralFrame implements UsersManagerView, RefreshObserver {

private UsersManagerPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import gov.epa.emissions.commons.gui.buttons.NewButton;
import gov.epa.emissions.commons.gui.buttons.RemoveButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.casemanagement.editor.CaseEditor;
import gov.epa.emissions.framework.client.casemanagement.editor.CaseViewer;
import gov.epa.emissions.framework.client.casemanagement.sensitivity.SensitivityWindow;
Expand Down Expand Up @@ -51,7 +51,7 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;

public class CaseManagerWindow extends ReusableInteralFrame implements CaseManagerView, RefreshObserver {
public class CaseManagerWindow extends DisposableInteralFrame implements CaseManagerView, RefreshObserver {

private CaseManagerPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import gov.epa.emissions.commons.gui.Button;
import gov.epa.emissions.commons.gui.buttons.ImportButton;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.services.data.DataCommonsService;
Expand All @@ -20,7 +20,7 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;

public class ImportCaseWindow extends ReusableInteralFrame implements ImportCaseView {
public class ImportCaseWindow extends DisposableInteralFrame implements ImportCaseView {

private ImportCasePresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import gov.epa.emissions.commons.gui.buttons.ImportButton;
import gov.epa.emissions.commons.gui.buttons.NewButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.SpringLayoutGenerator;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
Expand Down Expand Up @@ -53,7 +53,7 @@
import javax.swing.JPanel;
import javax.swing.SpringLayout;

public class ControlMeasuresManagerWindow extends ReusableInteralFrame implements ControlMeasuresManagerView,
public class ControlMeasuresManagerWindow extends DisposableInteralFrame implements ControlMeasuresManagerView,
RefreshObserver, Runnable {

// private SortFilterSelectModel selectModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import gov.epa.emissions.commons.gui.Button;
import gov.epa.emissions.commons.gui.buttons.ImportButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.services.EmfException;
Expand All @@ -26,7 +26,7 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;

public class CMImportWindow extends ReusableInteralFrame implements CMImportView, RefreshObserver {
public class CMImportWindow extends DisposableInteralFrame implements CMImportView, RefreshObserver {

private CMImportPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import gov.epa.emissions.commons.gui.buttons.NewButton;
import gov.epa.emissions.commons.gui.buttons.RemoveButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.client.cost.controlprogram.editor.ControlProgramView;
Expand All @@ -35,7 +35,7 @@

import javax.swing.*;

public class ControlProgramManagerWindow extends ReusableInteralFrame implements ControlProgramManagerView,
public class ControlProgramManagerWindow extends DisposableInteralFrame implements ControlProgramManagerView,
RefreshObserver, Runnable {

private ControlProgramManagerPresenter presenter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import gov.epa.emissions.commons.gui.buttons.NewButton;
import gov.epa.emissions.commons.gui.buttons.RemoveButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.client.cost.controlstrategy.editor.EditControlStrategyView;
Expand Down Expand Up @@ -45,7 +45,7 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;

public class ControlStrategyManagerWindow extends ReusableInteralFrame implements ControlStrategyManagerView,
public class ControlStrategyManagerWindow extends DisposableInteralFrame implements ControlStrategyManagerView,
RefreshObserver, Runnable {

private ControlStrategiesManagerPresenter presenter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import gov.epa.emissions.commons.gui.buttons.NewButton;
import gov.epa.emissions.commons.gui.buttons.RemoveButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.services.EmfException;
Expand All @@ -31,7 +31,7 @@
import gov.epa.emissions.framework.ui.SingleLineMessagePanel;
import gov.epa.mims.analysisengine.table.sort.SortCriteria;

public class StrategyGroupManagerWindow extends ReusableInteralFrame implements StrategyGroupManagerView,
public class StrategyGroupManagerWindow extends DisposableInteralFrame implements StrategyGroupManagerView,
RefreshObserver {

private StrategyGroupManagerPresenter presenter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import gov.epa.emissions.commons.gui.buttons.CloseButton;
import gov.epa.emissions.commons.gui.buttons.OKButton;
import gov.epa.emissions.commons.security.User;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.SpringLayoutGenerator;
import gov.epa.emissions.framework.client.casemanagement.CaseSearchPresenter;
import gov.epa.emissions.framework.client.casemanagement.CaseSearchWindow;
Expand Down Expand Up @@ -46,7 +46,7 @@
import javax.swing.JTextArea;
import javax.swing.SpringLayout;

public class DatasetSearchWindow extends ReusableInteralFrame {
public class DatasetSearchWindow extends DisposableInteralFrame {

private DatasetsBrowserPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import gov.epa.emissions.commons.gui.buttons.ImportButton;
import gov.epa.emissions.commons.gui.buttons.RemoveButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.client.exim.DatasetsBrowserAwareImportPresenter;
Expand Down Expand Up @@ -56,7 +56,7 @@
import javax.swing.SwingWorker;
import javax.swing.UIManager;

public class DatasetsBrowserWindow extends ReusableInteralFrame implements DatasetsBrowserView, RefreshObserver {
public class DatasetsBrowserWindow extends DisposableInteralFrame implements DatasetsBrowserView, RefreshObserver {

private MessagePanel messagePanel;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import gov.epa.emissions.commons.gui.buttons.NewButton;
import gov.epa.emissions.commons.gui.buttons.RemoveButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.client.util.ComponentUtility;
Expand All @@ -32,7 +32,7 @@

import javax.swing.*;

public class DatasetTypesManagerWindow extends ReusableInteralFrame implements DatasetTypesManagerView, RefreshObserver {
public class DatasetTypesManagerWindow extends DisposableInteralFrame implements DatasetTypesManagerView, RefreshObserver {

private DatasetTypesManagerPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import gov.epa.emissions.commons.db.version.Version;
import gov.epa.emissions.commons.gui.Button;
import gov.epa.emissions.commons.gui.ManageChangeables;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.services.EmfException;
import gov.epa.emissions.framework.ui.SingleLineMessagePanel;
Expand All @@ -21,7 +21,7 @@
import javax.swing.JTabbedPane;
import javax.swing.JTextArea;

public class DataFindReplaceWindow extends ReusableInteralFrame implements FindReplaceWindowView {
public class DataFindReplaceWindow extends DisposableInteralFrame implements FindReplaceWindowView {

private String[] cols = new String[0];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import gov.epa.emissions.commons.gui.Button;
import gov.epa.emissions.commons.gui.ConfirmDialog;
import gov.epa.emissions.commons.gui.SelectAwareButton;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.services.EmfException;
Expand All @@ -28,7 +28,7 @@
import javax.swing.JPanel;

//FIXME: look at the common design b/w this and UserManagerWindow. Refactor ?
public class SectorsManagerWindow extends ReusableInteralFrame implements SectorsManagerView, RefreshObserver {
public class SectorsManagerWindow extends DisposableInteralFrame implements SectorsManagerView, RefreshObserver {

private SectorsManagerPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import gov.epa.emissions.commons.gui.Button;
import gov.epa.emissions.commons.security.User;
import gov.epa.emissions.commons.util.CustomDateFormat;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.client.cost.controlstrategy.AnalysisEngineTableApp;
Expand Down Expand Up @@ -71,7 +71,7 @@
import org.apache.http.params.CoreConnectionPNames;

public class FileDownloadWindow
extends ReusableInteralFrame
extends DisposableInteralFrame
implements FileDownloadView, RefreshObserver {

private MessagePanel messagePanel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import gov.epa.emissions.commons.gui.Button;
import gov.epa.emissions.commons.gui.buttons.ImportButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.services.EmfException;
Expand All @@ -22,7 +22,7 @@
import javax.swing.JButton;
import javax.swing.JPanel;

public class ImportWindow extends ReusableInteralFrame implements ImportView {
public class ImportWindow extends DisposableInteralFrame implements ImportView {

private ImportPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gov.epa.emissions.framework.client.fast;

import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.client.fast.analyzer.FastAnalysisManagerPresenter;
Expand Down Expand Up @@ -29,7 +29,7 @@
import javax.swing.JPanel;

@SuppressWarnings("serial")
public class MPSDTManagerWindow extends ReusableInteralFrame implements MPSDTManagerView {
public class MPSDTManagerWindow extends DisposableInteralFrame implements MPSDTManagerView {

private MPSDTManagerPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import gov.epa.emissions.commons.gui.ComboBox;
import gov.epa.emissions.commons.gui.ScrollableComponent;
import gov.epa.emissions.commons.gui.TextArea;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.SpringLayoutGenerator;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
Expand Down Expand Up @@ -41,7 +41,7 @@
import javax.swing.JTextField;
import javax.swing.SpringLayout;

public class AppendDataWindow extends ReusableInteralFrame implements AppendDataWindowView {
public class AppendDataWindow extends DisposableInteralFrame implements AppendDataWindowView {

private AppendDataViewPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gov.epa.emissions.framework.client.meta.versions;

import gov.epa.emissions.commons.gui.Button;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
import gov.epa.emissions.framework.client.meta.DatasetPropertiesEditor;
Expand Down Expand Up @@ -29,7 +29,7 @@
import javax.swing.JPanel;
import javax.swing.SwingWorker;

public class VersionedDataWindow extends ReusableInteralFrame implements VersionedDataView {
public class VersionedDataWindow extends DisposableInteralFrame implements VersionedDataView {

private EmfConsole parentConsole;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import gov.epa.emissions.commons.gui.buttons.NewButton;
import gov.epa.emissions.commons.gui.buttons.RemoveButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.ViewMode;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
Expand Down Expand Up @@ -38,7 +38,7 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;

public class ModuleComparisonWindow extends ReusableInteralFrame implements ModuleComparisonView, RefreshObserver {
public class ModuleComparisonWindow extends DisposableInteralFrame implements ModuleComparisonView, RefreshObserver {

private ModuleComparisonPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import gov.epa.emissions.commons.security.User;
import gov.epa.emissions.commons.util.CustomDateFormat;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.ViewMode;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
Expand Down Expand Up @@ -50,7 +50,7 @@

import javax.swing.*;

public class ModulesManagerWindow extends ReusableInteralFrame implements ModulesManagerView, RefreshObserver {
public class ModulesManagerWindow extends DisposableInteralFrame implements ModulesManagerView, RefreshObserver {

private ModulesManagerPresenter presenter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import gov.epa.emissions.commons.gui.buttons.NewButton;
import gov.epa.emissions.commons.gui.buttons.RemoveButton;
import gov.epa.emissions.framework.client.EmfSession;
import gov.epa.emissions.framework.client.ReusableInteralFrame;
import gov.epa.emissions.framework.client.DisposableInteralFrame;
import gov.epa.emissions.framework.client.ViewMode;
import gov.epa.emissions.framework.client.console.DesktopManager;
import gov.epa.emissions.framework.client.console.EmfConsole;
Expand All @@ -32,7 +32,7 @@
import javax.swing.Action;
import javax.swing.JPanel;

public class RelatedModulesWindow extends ReusableInteralFrame implements RelatedModulesView, RefreshObserver {
public class RelatedModulesWindow extends DisposableInteralFrame implements RelatedModulesView, RefreshObserver {

private EmfSession session;

Expand Down
Loading

0 comments on commit f76c567

Please sign in to comment.