Changed isGroup boolean to enum declaration, added GroupDialogHeader.…

…java to store enum
damassh · May 12, 2021 · c9cdff3 · c9cdff3
1 parent 1cc0946
commit c9cdff3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogHeader.java b/src/main/java/org/jabref/gui/groups/GroupDialogHeader.java
@@ -0,0 +1,5 @@
+package org.jabref.gui.groups;
+
+public enum GroupDialogHeader {
+    GROUP, SUBGROUP
+}
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -67,18 +67,18 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
     private final GroupDialogViewModel viewModel;
 
-    public GroupDialogView(DialogService dialogService, BibDatabaseContext currentDatabase, PreferencesService preferencesService, AbstractGroup editedGroup, boolean isGroup) {
-        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, isGroup);
+    public GroupDialogView(DialogService dialogService, BibDatabaseContext currentDatabase, PreferencesService preferencesService, AbstractGroup editedGroup, GroupDialogHeader groupDialogHeader) {
+        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, groupDialogHeader);
 
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
 
         if (editedGroup == null) {
-            if (isGroup == true) {
-                this.setTitle(Localization.lang("Add group")); // header title
-            } else {
-                this.setTitle(Localization.lang("Add subgroup")); // header title\
+            if (groupDialogHeader == GroupDialogHeader.GROUP) {
+                this.setTitle(Localization.lang("Add group"));
+            } else if (groupDialogHeader == GroupDialogHeader.SUBGROUP) {
+                this.setTitle(Localization.lang("Add subgroup"));
             }
         } else {
             this.setTitle(Localization.lang("Edit group") + " " + editedGroup.getName());

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -107,14 +107,14 @@ public class GroupDialogViewModel {
     private final PreferencesService preferencesService;
     private final BibDatabaseContext currentDatabase;
     private final AbstractGroup editedGroup;
-    private final boolean isGroup;
+    private final GroupDialogHeader isgroup;
 
-    public GroupDialogViewModel(DialogService dialogService, BibDatabaseContext currentDatabase, PreferencesService preferencesService, AbstractGroup editedGroup, boolean isGroup) {
+    public GroupDialogViewModel(DialogService dialogService, BibDatabaseContext currentDatabase, PreferencesService preferencesService, AbstractGroup editedGroup, GroupDialogHeader isgroup) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.currentDatabase = currentDatabase;
         this.editedGroup = editedGroup;
-        this.isGroup = isGroup;
+        this.isgroup = isgroup;
 
         setupValidation();
         setValues();

diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -348,7 +348,7 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
         MenuItem addSubgroup = new MenuItem(Localization.lang("Add subgroup"));
         addSubgroup.setOnAction(event -> {
             menu.hide();
-            viewModel.addNewSubgroup(group, false);
+            viewModel.addNewSubgroup(group, GroupDialogHeader.SUBGROUP);
         });
 
         MenuItem removeSubgroups = new MenuItem(Localization.lang("Remove subgroups"));

diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -111,7 +111,7 @@ private void onSelectedGroupChanged(ObservableList<GroupNodeViewModel> newValue)
      */
     public void addNewGroupToRoot() {
         if (currentDatabase.isPresent()) {
-            addNewSubgroup(rootGroup.get(), true);
+            addNewSubgroup(rootGroup.get(), GroupDialogHeader.GROUP);
         } else {
             dialogService.showWarningDialogAndWait(Localization.lang("Cannot create group"), Localization.lang("Cannot create group. Please create a library first."));
         }
@@ -148,14 +148,14 @@ private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
      * Opens "New Group Dialog" and add the resulting group to the specified group
      */
 
-    public void addNewSubgroup(GroupNodeViewModel parent, boolean isGroup) {
+    public void addNewSubgroup(GroupNodeViewModel parent, GroupDialogHeader groupDialogHeader) {
         currentDatabase.ifPresent(database -> {
             Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialogView(
                     dialogService,
                     database,
                     preferences,
                     null,
-                    isGroup));
+                    groupDialogHeader));
 
             newGroup.ifPresent(group -> {
                 parent.addSubgroup(group);
@@ -187,7 +187,7 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                     database,
                     preferences,
                     oldGroup.getGroupNode().getGroup(),
-                    false));
+                    GroupDialogHeader.SUBGROUP));
 
             newGroup.ifPresent(group -> {
                 // TODO: Keep assignments