Rename GroupSelector to GroupSidePane

Author: tobiasdiez

src/main/java/org/jabref/gui/JabRefFrame.java

@@ -90,7 +90,7 @@
 import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.gui.externalfiletype.ExternalFileTypeEditor;
 import org.jabref.gui.groups.EntryTableTransferHandler;
-import org.jabref.gui.groups.GroupSelector;
+import org.jabref.gui.groups.GroupSidePane;
 import org.jabref.gui.help.AboutAction;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.importer.ImportCustomizationDialog;
@@ -459,7 +459,7 @@ public void actionPerformed(ActionEvent e) {
     private PushToApplications pushApplications;
     private GeneralFetcher generalFetcher;
     private OpenOfficePanel openOfficePanel;
-    private GroupSelector groupSelector;
+    private GroupSidePane groupSidePane;
     private int previousTabCount = -1;
     private JMenu newSpec;
 
@@ -629,7 +629,7 @@ public void windowClosing(WindowEvent e) {
 
             currentBasePanel.getPreviewPanel().updateLayout();
 
-            groupSelector.getToggleAction().setSelected(sidePaneManager.isComponentVisible(GroupSelector.class));
+            groupSidePane.getToggleAction().setSelected(sidePaneManager.isComponentVisible(GroupSidePane.class));
             previewToggle.setSelected(Globals.prefs.getPreviewPreferences().isPreviewPanelEnabled());
             generalFetcher.getToggleAction().setSelected(sidePaneManager.isComponentVisible(GeneralFetcher.class));
             openOfficePanel.getToggleAction().setSelected(sidePaneManager.isComponentVisible(OpenOfficeSidePanel.class));
@@ -717,11 +717,11 @@ public void setWindowTitle() {
     private void initSidePane() {
         sidePaneManager = new SidePaneManager(this);
 
-        groupSelector = new GroupSelector(this, sidePaneManager);
+        groupSidePane = new GroupSidePane(this, sidePaneManager);
         openOfficePanel = new OpenOfficePanel(this, sidePaneManager);
         generalFetcher = new GeneralFetcher(this, sidePaneManager);
 
-        sidePaneManager.register(groupSelector);
+        sidePaneManager.register(groupSidePane);
     }
 
     /**
@@ -1150,10 +1150,10 @@ private void fillMenu() {
         }
         mb.add(search);
 
-        groups.add(new JCheckBoxMenuItem(groupSelector.getToggleAction()));
+        groups.add(new JCheckBoxMenuItem(groupSidePane.getToggleAction()));
         if (prefs.getBoolean(JabRefPreferences.GROUP_SIDEPANE_VISIBLE)) {
-            sidePaneManager.register(groupSelector);
-            sidePaneManager.show(GroupSelector.class);
+            sidePaneManager.register(groupSidePane);
+            sidePaneManager.show(GroupSidePane.class);
         }
 
         groups.addSeparator();
@@ -1175,7 +1175,7 @@ private void fillMenu() {
         view.addSeparator();
         view.add(new JCheckBoxMenuItem(toggleToolbar));
         view.add(new JCheckBoxMenuItem(enableToggle(generalFetcher.getToggleAction())));
-        view.add(new JCheckBoxMenuItem(groupSelector.getToggleAction()));
+        view.add(new JCheckBoxMenuItem(groupSidePane.getToggleAction()));
         view.add(new JCheckBoxMenuItem(togglePreview));
         view.add(showPdvViewer);
         view.add(getNextPreviewStyleAction());
@@ -1373,7 +1373,7 @@ private void createToolBar() {
         previewToggle = new JToggleButton(togglePreview);
         tlb.addJToggleButton(previewToggle);
 
-        tlb.addJToggleButton(new JToggleButton(groupSelector.getToggleAction()));
+        tlb.addJToggleButton(new JToggleButton(groupSidePane.getToggleAction()));
 
         tlb.addSeparator();
 
@@ -1400,7 +1400,7 @@ private void initActions() {
         openDatabaseOnlyActions.addAll(Arrays.asList(manageSelectors, mergeDatabaseAction, newSubDatabaseAction, save, copyPreview,
                 saveAs, saveSelectedAs, saveSelectedAsPlain, editModeAction, undo, redo, cut, deleteEntry, copy, paste, mark, markSpecific, unmark,
                 unmarkAll, rankSubMenu, editEntry, selectAll, copyKey, copyCiteKey, copyKeyAndTitle, copyKeyAndLink, editPreamble, editStrings,
-                groupSelector.getToggleAction(), makeKeyAction, normalSearch, generalFetcher.getToggleAction(), mergeEntries, cleanupEntries, exportToClipboard, replaceAll,
+                groupSidePane.getToggleAction(), makeKeyAction, normalSearch, generalFetcher.getToggleAction(), mergeEntries, cleanupEntries, exportToClipboard, replaceAll,
                 sendAsEmail, downloadFullText, lookupIdentifiers, writeXmpAction, openOfficePanel.getToggleAction(), findUnlinkedFiles, addToGroup, removeFromGroup,
                 moveToGroup, autoLinkFile, resolveDuplicateKeys, openUrl, openFolder, openFile, togglePreview,
                 dupliCheck, autoSetFile, newEntryAction, newSpec, customizeAction, plainTextImport, getMassSetField(), getManageKeywords(),

src/main/java/org/jabref/gui/groups/GroupSelector.java src/main/java/org/jabref/gui/groups/GroupSidePane.java

@@ -25,7 +25,7 @@
  * The groups side pane.
  * This class is just a Swing wrapper around the JavaFX implementation {@link GroupTreeView}.
  */
-public class GroupSelector extends SidePaneComponent {
+public class GroupSidePane extends SidePaneComponent {
 
     protected final JabRefFrame frame;
     private final ToggleAction toggleAction;
@@ -34,7 +34,7 @@ public class GroupSelector extends SidePaneComponent {
      * The first element for each group defines which field to use for the quicksearch. The next two define the name and
      * regexp for the group.
      */
-    public GroupSelector(JabRefFrame frame, SidePaneManager manager) {
+    public GroupSidePane(JabRefFrame frame, SidePaneManager manager) {
         super(manager, IconTheme.JabRefIcon.TOGGLE_GROUPS.getIcon(), Localization.lang("Groups"));
 
         Globals.stateManager.activeGroupProperty()
@@ -101,7 +101,7 @@ public void componentClosing() {
     public void setActiveBasePanel(BasePanel panel) {
         super.setActiveBasePanel(panel);
         if (panel == null) { // hide groups
-            frame.getSidePaneManager().hide(GroupSelector.class);
+            frame.getSidePaneManager().hide(GroupSidePane.class);
             return;
         }
 

src/main/java/org/jabref/gui/groups/UndoableModifyGroup.java

@@ -9,7 +9,7 @@
 
 class UndoableModifyGroup extends AbstractUndoableJabRefEdit {
 
-    private final GroupSelector groupSelector;
+    private final GroupSidePane groupSidePane;
     private final AbstractGroup m_oldGroupBackup;
     private final AbstractGroup m_newGroupBackup;
     private final GroupTreeNode m_groupsRootHandle;
@@ -23,9 +23,9 @@ class UndoableModifyGroup extends AbstractUndoableJabRefEdit {
      *            The new group to replace the one currently stored in <b>node
      *            </b>.
      */
-    public UndoableModifyGroup(GroupSelector gs, GroupTreeNodeViewModel groupsRoot,
-            GroupTreeNodeViewModel node, AbstractGroup newGroup) {
-        groupSelector = gs;
+    public UndoableModifyGroup(GroupSidePane gs, GroupTreeNodeViewModel groupsRoot,
+                               GroupTreeNodeViewModel node, AbstractGroup newGroup) {
+        groupSidePane = gs;
         m_oldGroupBackup = node.getNode().getGroup().deepCopy();
         m_newGroupBackup = newGroup.deepCopy();
         m_pathToNode = node.getNode().getIndexedPathFromRoot();