From 194a1f3e615cb543a30cf96147c62e85ac4cde3b Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Tue, 26 Jan 2016 11:58:17 +0100 Subject: [PATCH] Remove session actions --- .../java/net/sf/jabref/gui/JabRefFrame.java | 101 ------------------ 1 file changed, 101 deletions(-) diff --git a/src/main/java/net/sf/jabref/gui/JabRefFrame.java b/src/main/java/net/sf/jabref/gui/JabRefFrame.java index 7320539e249..d7085858889 100644 --- a/src/main/java/net/sf/jabref/gui/JabRefFrame.java +++ b/src/main/java/net/sf/jabref/gui/JabRefFrame.java @@ -318,8 +318,6 @@ void addJToogleButton(JToggleButton button) { IconTheme.JabRefIcon.PRINTED.getIcon()); private final AbstractAction manageSelectors = new GeneralAction(Actions.MANAGE_SELECTORS, Localization.menuTitle("Manage content selectors")); - private final AbstractAction saveSessionAction = new SaveSessionAction(); - public final AbstractAction loadSessionAction = new LoadSessionAction(); private final AbstractAction normalSearch = new GeneralAction(Actions.SEARCH, Localization.menuTitle("Search"), Localization.lang("Search"), Globals.getKeyPrefs().getKey(KeyBinding.SEARCH), IconTheme.JabRefIcon.SEARCH.getIcon()); @@ -1867,105 +1865,6 @@ public void run() { } - - class SaveSessionAction - extends MnemonicAwareAction { - - public SaveSessionAction() { - super(); - putValue(Action.NAME, Localization.menuTitle("Save session")); - putValue(Action.ACCELERATOR_KEY, Globals.getKeyPrefs().getKey(KeyBinding.SAVE_SESSION)); - } - - @Override - public void actionPerformed(ActionEvent e) { - // Here we store the names of all current files. If - // there is no current file, we remove any - // previously stored filename. - List filenames = new ArrayList<>(); - if (tabbedPane.getTabCount() > 0) { - for (int i = 0; i < tabbedPane.getTabCount(); i++) { - if (tabbedPane.getTitleAt(i).equals(GUIGlobals.untitledTitle)) { - tabbedPane.setSelectedIndex(i); - int answer = JOptionPane.showConfirmDialog - (JabRefFrame.this, Localization.lang - ("This untitled database must be saved first to be " - + "included in the saved session. Save now?"), - Localization.lang("Save database"), - JOptionPane.YES_NO_OPTION); - if (answer == JOptionPane.YES_OPTION) { - // The user wants to save. - try { - getCurrentBasePanel().runCommand(Actions.SAVE); - } catch (Throwable ignored) { - // Ignored - } - } - } - if (getBasePanelAt(i).getDatabaseFile() != null) { - filenames.add(getBasePanelAt(i).getDatabaseFile().getPath()); - } - } - } - - if (filenames.isEmpty()) { - output(Localization.lang("Not saved (empty session)") + '.'); - } else { - prefs.putStringList(JabRefPreferences.SAVED_SESSION, filenames); - output(Localization.lang("Saved session") + '.'); - } - - } - } - - public class LoadSessionAction extends MnemonicAwareAction { - - private volatile boolean running; - - public LoadSessionAction() { - super(); - putValue(Action.NAME, Localization.menuTitle("Load session")); - putValue(Action.ACCELERATOR_KEY, Globals.getKeyPrefs().getKey(KeyBinding.LOAD_SESSION)); - } - - @Override - public void actionPerformed(ActionEvent e) { - if (prefs.get(JabRefPreferences.SAVED_SESSION) == null) { - output(Localization.lang("No saved session found.")); - return; - } - if (running) { - return; - } else { - running = true; - } - - output(Localization.lang("Loading session...")); - JabRefExecutorService.INSTANCE.execute(new Runnable() { - - @Override - public void run() { - HashSet currentFiles = new HashSet<>(); - if (tabbedPane.getTabCount() > 0) { - for (int i = 0; i < tabbedPane.getTabCount(); i++) { - if (getBasePanelAt(i).getDatabaseFile() != null) { - currentFiles.add(getBasePanelAt(i).getDatabaseFile().getPath()); - } - } - } - List names = prefs.getStringList(JabRefPreferences.SAVED_SESSION); - ArrayList filesToOpen = new ArrayList<>(); - for (String name : names) { - filesToOpen.add(new File(name)); - } - open.openFiles(filesToOpen, true); - running = false; - } - }); - - } - } - class ChangeTabAction extends MnemonicAwareAction { private final boolean next;