Move JabRefFrame and BasePanel to the gui package

JabRef · Aug 18, 2015 · 5801e56 · 5801e56
1 parent c28758b
commit 5801e56
Show file tree

Hide file tree

Showing 147 changed files with 211 additions and 149 deletions.
diff --git a/src/main/java/net/sf/jabref/DuplicateResolverDialog.java b/src/main/java/net/sf/jabref/DuplicateResolverDialog.java
@@ -24,6 +24,8 @@
 import javax.swing.*;
 
 import net.sf.jabref.export.LatexFieldFormatter;
+import net.sf.jabref.gui.JabRefFrame;
+import net.sf.jabref.gui.PreviewPanel;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.util.Util;
 

diff --git a/src/main/java/net/sf/jabref/FindUnlinkedFilesDialog.java b/src/main/java/net/sf/jabref/FindUnlinkedFilesDialog.java
@@ -61,6 +61,8 @@
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
+import net.sf.jabref.gui.BasePanel;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.util.JabRefDesktop;
 import org.apache.commons.logging.Log;

diff --git a/src/main/java/net/sf/jabref/Globals.java b/src/main/java/net/sf/jabref/Globals.java
@@ -17,6 +17,8 @@
 
 import net.sf.jabref.collab.FileUpdateMonitor;
 import net.sf.jabref.export.AutoSaveManager;
+import net.sf.jabref.gui.JabRefFrame;
+import net.sf.jabref.gui.SidePaneManager;
 import net.sf.jabref.gui.help.HelpDialog;
 import net.sf.jabref.imports.ImportFormatReader;
 import net.sf.jabref.logic.error.StreamEavesdropper;

diff --git a/src/main/java/net/sf/jabref/HandleDuplicateWarnings.java b/src/main/java/net/sf/jabref/HandleDuplicateWarnings.java
@@ -15,6 +15,7 @@
 */
 package net.sf.jabref;
 
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.imports.ParserResult;
 import net.sf.jabref.imports.PostOpenAction;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/JabRef.java b/src/main/java/net/sf/jabref/JabRef.java
@@ -33,7 +33,9 @@
 import javax.swing.*;
 import javax.swing.plaf.FontUIResource;
 
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.GUIGlobals;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.logic.util.OS;
 import org.apache.commons.logging.Log;

diff --git a/src/main/java/net/sf/jabref/UrlDragDrop.java b/src/main/java/net/sf/jabref/UrlDragDrop.java
@@ -41,6 +41,7 @@
 
 import javax.swing.JOptionPane;
 
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.gui.entryeditor.EntryEditor;
 import net.sf.jabref.gui.fieldeditors.FieldEditor;
 import net.sf.jabref.gui.net.MonitoredURLDownload;

diff --git a/src/main/java/net/sf/jabref/collab/Change.java b/src/main/java/net/sf/jabref/collab/Change.java
@@ -15,7 +15,7 @@
 */
 package net.sf.jabref.collab;
 
-import net.sf.jabref.BasePanel;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.BibtexDatabase;
 
 import javax.swing.tree.DefaultMutableTreeNode;

diff --git a/src/main/java/net/sf/jabref/collab/ChangeDisplayDialog.java b/src/main/java/net/sf/jabref/collab/ChangeDisplayDialog.java
@@ -26,7 +26,7 @@
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 import java.util.Enumeration;
-import net.sf.jabref.BasePanel;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.BibtexDatabase;
 import net.sf.jabref.gui.undo.NamedCompound;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/collab/ChangeScanner.java b/src/main/java/net/sf/jabref/collab/ChangeScanner.java
@@ -31,6 +31,8 @@
 import net.sf.jabref.export.SaveException;
 import net.sf.jabref.export.SaveSession;
 import net.sf.jabref.groups.GroupTreeNode;
+import net.sf.jabref.gui.BasePanel;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.imports.OpenDatabaseAction;
 import net.sf.jabref.imports.ParserResult;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/collab/EntryAddChange.java b/src/main/java/net/sf/jabref/collab/EntryAddChange.java
@@ -19,6 +19,8 @@
 import javax.swing.JScrollPane;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.BasePanel;
+import net.sf.jabref.gui.PreviewPanel;
 import net.sf.jabref.gui.undo.NamedCompound;
 import net.sf.jabref.gui.undo.UndoableInsertEntry;
 

diff --git a/src/main/java/net/sf/jabref/collab/EntryChange.java b/src/main/java/net/sf/jabref/collab/EntryChange.java
@@ -23,6 +23,7 @@
 import javax.swing.JScrollPane;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.undo.NamedCompound;
 import net.sf.jabref.gui.undo.UndoableFieldChange;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/collab/EntryDeleteChange.java b/src/main/java/net/sf/jabref/collab/EntryDeleteChange.java
@@ -19,6 +19,8 @@
 import javax.swing.JScrollPane;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.BasePanel;
+import net.sf.jabref.gui.PreviewPanel;
 import net.sf.jabref.gui.undo.NamedCompound;
 import net.sf.jabref.gui.undo.UndoableRemoveEntry;
 

diff --git a/src/main/java/net/sf/jabref/collab/FileUpdatePanel.java b/src/main/java/net/sf/jabref/collab/FileUpdatePanel.java
@@ -22,8 +22,7 @@
 
 import javax.swing.*;
 
-import net.sf.jabref.*;
-import net.sf.jabref.gui.GUIGlobals;
+import net.sf.jabref.gui.*;
 import net.sf.jabref.logic.l10n.Localization;
 
 public class FileUpdatePanel extends SidePaneComponent implements ActionListener,

diff --git a/src/main/java/net/sf/jabref/collab/GroupChange.java b/src/main/java/net/sf/jabref/collab/GroupChange.java
@@ -18,7 +18,7 @@
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 
-import net.sf.jabref.BasePanel;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.BibtexDatabase;
 import net.sf.jabref.groups.structure.AllEntriesGroup;
 import net.sf.jabref.groups.GroupTreeNode;

diff --git a/src/main/java/net/sf/jabref/collab/MetaDataChange.java b/src/main/java/net/sf/jabref/collab/MetaDataChange.java
@@ -15,7 +15,7 @@
 */
 package net.sf.jabref.collab;
 
-import net.sf.jabref.BasePanel;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.BibtexDatabase;
 import net.sf.jabref.MetaData;
 import net.sf.jabref.gui.undo.NamedCompound;

diff --git a/src/main/java/net/sf/jabref/collab/PreambleChange.java b/src/main/java/net/sf/jabref/collab/PreambleChange.java
@@ -18,7 +18,7 @@
 import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 
-import net.sf.jabref.BasePanel;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.BibtexDatabase;
 import net.sf.jabref.gui.undo.NamedCompound;
 import net.sf.jabref.gui.undo.UndoablePreambleChange;

diff --git a/src/main/java/net/sf/jabref/collab/StringAddChange.java b/src/main/java/net/sf/jabref/collab/StringAddChange.java
@@ -18,6 +18,7 @@
 import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.logic.l10n.Localization;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

diff --git a/src/main/java/net/sf/jabref/collab/StringChange.java b/src/main/java/net/sf/jabref/collab/StringChange.java
@@ -18,6 +18,7 @@
 import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.logic.l10n.Localization;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

diff --git a/src/main/java/net/sf/jabref/collab/StringNameChange.java b/src/main/java/net/sf/jabref/collab/StringNameChange.java
@@ -18,6 +18,7 @@
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.logic.l10n.Localization;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

diff --git a/src/main/java/net/sf/jabref/collab/StringRemoveChange.java b/src/main/java/net/sf/jabref/collab/StringRemoveChange.java
@@ -22,7 +22,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import net.sf.jabref.BasePanel;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.BibtexString;
 import net.sf.jabref.BibtexDatabase;
 import net.sf.jabref.gui.undo.NamedCompound;

diff --git a/src/main/java/net/sf/jabref/export/AutoSaveManager.java b/src/main/java/net/sf/jabref/export/AutoSaveManager.java
@@ -15,8 +15,8 @@
 */
 package net.sf.jabref.export;
 
-import net.sf.jabref.JabRefFrame;
-import net.sf.jabref.BasePanel;
+import net.sf.jabref.gui.JabRefFrame;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.Globals;
 import net.sf.jabref.JabRefPreferences;
 

diff --git a/src/main/java/net/sf/jabref/export/CustomExportDialog.java b/src/main/java/net/sf/jabref/export/CustomExportDialog.java
@@ -26,7 +26,7 @@
 import javax.swing.*;
 
 import net.sf.jabref.Globals;
-import net.sf.jabref.JabRefFrame;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.JabRefPreferences;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.util.Util;

diff --git a/src/main/java/net/sf/jabref/export/ExpandEndnoteFilters.java b/src/main/java/net/sf/jabref/export/ExpandEndnoteFilters.java
@@ -22,7 +22,7 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
-import net.sf.jabref.JabRefFrame;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.MnemonicAwareAction;
 import net.sf.jabref.Worker;
 import net.sf.jabref.gui.FileDialogs;

diff --git a/src/main/java/net/sf/jabref/export/ExportCustomizationDialog.java b/src/main/java/net/sf/jabref/export/ExportCustomizationDialog.java
@@ -26,6 +26,7 @@
 
 import net.sf.jabref.*;
 import net.sf.jabref.gui.GUIGlobals;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.gui.help.HelpAction;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;

diff --git a/src/main/java/net/sf/jabref/export/ExportFormats.java b/src/main/java/net/sf/jabref/export/ExportFormats.java
@@ -26,6 +26,7 @@
 import javax.swing.filechooser.FileFilter;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.gui.worker.AbstractWorker;
 import net.sf.jabref.gui.GUIGlobals;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/export/ExportToClipboardAction.java b/src/main/java/net/sf/jabref/export/ExportToClipboardAction.java
@@ -33,12 +33,12 @@
 import javax.swing.ListSelectionModel;
 
 import net.sf.jabref.gui.worker.AbstractWorker;
-import net.sf.jabref.BasePanel;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.BibtexDatabase;
 import net.sf.jabref.BibtexEntry;
 import net.sf.jabref.gui.GUIGlobals;
 import net.sf.jabref.Globals;
-import net.sf.jabref.JabRefFrame;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.logic.l10n.Localization;
 
 /**

diff --git a/src/main/java/net/sf/jabref/export/SaveAllAction.java b/src/main/java/net/sf/jabref/export/SaveAllAction.java
@@ -20,7 +20,9 @@
 import javax.swing.Action;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.GUIGlobals;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.logic.l10n.Localization;
 import spin.Spin;
 

diff --git a/src/main/java/net/sf/jabref/export/SaveDatabaseAction.java b/src/main/java/net/sf/jabref/export/SaveDatabaseAction.java
@@ -18,6 +18,8 @@
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
 import net.sf.jabref.*;
+import net.sf.jabref.gui.BasePanel;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.gui.worker.AbstractWorker;
 import net.sf.jabref.gui.FileDialogs;
 import net.sf.jabref.collab.ChangeScanner;

diff --git a/src/main/java/net/sf/jabref/external/AttachFileAction.java b/src/main/java/net/sf/jabref/external/AttachFileAction.java
@@ -1,10 +1,7 @@
 package net.sf.jabref.external;
 
 import net.sf.jabref.*;
-import net.sf.jabref.gui.FileListEntry;
-import net.sf.jabref.gui.FileListEntryEditor;
-import net.sf.jabref.gui.FileListTableModel;
-import net.sf.jabref.gui.GUIGlobals;
+import net.sf.jabref.gui.*;
 import net.sf.jabref.gui.undo.UndoableFieldChange;
 
 /**

diff --git a/src/main/java/net/sf/jabref/external/AutoSetExternalFileForEntries.java b/src/main/java/net/sf/jabref/external/AutoSetExternalFileForEntries.java
@@ -23,6 +23,7 @@
 
 import javax.swing.*;
 
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.worker.AbstractWorker;
 import net.sf.jabref.gui.fieldeditors.FieldTextField;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/external/DownloadExternalFile.java b/src/main/java/net/sf/jabref/external/DownloadExternalFile.java
@@ -19,6 +19,7 @@
 import net.sf.jabref.gui.FileListEntry;
 import net.sf.jabref.gui.FileListEntryEditor;
 import net.sf.jabref.gui.GUIGlobals;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.gui.net.MonitoredURLDownload;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.logic.net.URLDownload;

diff --git a/src/main/java/net/sf/jabref/external/DroppedFileHandler.java b/src/main/java/net/sf/jabref/external/DroppedFileHandler.java
@@ -25,10 +25,7 @@
 
 import com.jgoodies.forms.factories.Borders;
 import net.sf.jabref.*;
-import net.sf.jabref.gui.GUIGlobals;
-import net.sf.jabref.gui.MainTable;
-import net.sf.jabref.gui.FileListTableModel;
-import net.sf.jabref.gui.FileListEntry;
+import net.sf.jabref.gui.*;
 import net.sf.jabref.gui.undo.NamedCompound;
 import net.sf.jabref.gui.undo.UndoableFieldChange;
 import net.sf.jabref.gui.undo.UndoableInsertEntry;

diff --git a/src/main/java/net/sf/jabref/external/ExternalFileMenuItem.java b/src/main/java/net/sf/jabref/external/ExternalFileMenuItem.java
@@ -23,6 +23,7 @@
 import javax.swing.*;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.util.JabRefDesktop;
 

diff --git a/src/main/java/net/sf/jabref/external/ExternalFilePanel.java b/src/main/java/net/sf/jabref/external/ExternalFilePanel.java
@@ -36,6 +36,7 @@
 import javax.swing.SwingUtilities;
 import javax.xml.transform.TransformerException;
 
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.gui.entryeditor.EntryEditor;
 import net.sf.jabref.gui.fieldeditors.FieldEditor;
 import net.sf.jabref.gui.net.MonitoredURLDownload;

diff --git a/src/main/java/net/sf/jabref/external/ExternalFileTypeEditor.java b/src/main/java/net/sf/jabref/external/ExternalFileTypeEditor.java
@@ -30,7 +30,7 @@
 
 import net.sf.jabref.gui.GUIGlobals;
 import net.sf.jabref.Globals;
-import net.sf.jabref.JabRefFrame;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.MnemonicAwareAction;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;

diff --git a/src/main/java/net/sf/jabref/external/FileLinksUpgradeWarning.java b/src/main/java/net/sf/jabref/external/FileLinksUpgradeWarning.java
@@ -20,6 +20,7 @@
 import javax.swing.*;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.GUIGlobals;
 import net.sf.jabref.gui.action.BrowseAction;
 import net.sf.jabref.gui.entryeditor.EntryEditorTabList;

diff --git a/src/main/java/net/sf/jabref/external/FindFullTextAction.java b/src/main/java/net/sf/jabref/external/FindFullTextAction.java
@@ -16,6 +16,7 @@
 package net.sf.jabref.external;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.worker.AbstractWorker;
 import net.sf.jabref.gui.GUIGlobals;
 import net.sf.jabref.gui.undo.UndoableFieldChange;

diff --git a/src/main/java/net/sf/jabref/external/MoveFileAction.java b/src/main/java/net/sf/jabref/external/MoveFileAction.java
@@ -17,6 +17,7 @@
 
 import net.sf.jabref.*;
 import net.sf.jabref.gui.GUIGlobals;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.gui.entryeditor.EntryEditor;
 import net.sf.jabref.gui.fieldeditors.FileListEditor;
 import net.sf.jabref.gui.FileListEntry;

diff --git a/src/main/java/net/sf/jabref/external/PushToApplication.java b/src/main/java/net/sf/jabref/external/PushToApplication.java
@@ -15,7 +15,7 @@
 */
 package net.sf.jabref.external;
 
-import net.sf.jabref.BasePanel;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.BibtexDatabase;
 import net.sf.jabref.BibtexEntry;
 import net.sf.jabref.MetaData;

diff --git a/src/main/java/net/sf/jabref/external/PushToApplicationAction.java b/src/main/java/net/sf/jabref/external/PushToApplicationAction.java
@@ -23,6 +23,8 @@
 import javax.swing.SwingUtilities;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.BasePanel;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.logic.l10n.Localization;
 
 /**

diff --git a/src/main/java/net/sf/jabref/external/PushToApplicationButton.java b/src/main/java/net/sf/jabref/external/PushToApplicationButton.java
@@ -19,7 +19,7 @@
 
 import net.sf.jabref.gui.GUIGlobals;
 import net.sf.jabref.Globals;
-import net.sf.jabref.JabRefFrame;
+import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.MnemonicAwareAction;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.oo.OpenOfficePanel;

diff --git a/src/main/java/net/sf/jabref/external/PushToEmacs.java b/src/main/java/net/sf/jabref/external/PushToEmacs.java
@@ -24,6 +24,7 @@
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.GUIGlobals;
 import net.sf.jabref.gui.action.BrowseAction;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/external/PushToLatexEditor.java b/src/main/java/net/sf/jabref/external/PushToLatexEditor.java
@@ -22,6 +22,7 @@
 import net.sf.jabref.*;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.GUIGlobals;
 import net.sf.jabref.gui.action.BrowseAction;
 import net.sf.jabref.logic.l10n.Localization;

diff --git a/src/main/java/net/sf/jabref/external/PushToLyx.java b/src/main/java/net/sf/jabref/external/PushToLyx.java
@@ -23,6 +23,7 @@
 import javax.swing.*;
 
 import net.sf.jabref.*;
+import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.GUIGlobals;
 import net.sf.jabref.logic.l10n.Localization;