Lose FileView.ACTION_SET_PROJECT_ACTIVE call MainWindow action directly

Author: jeremypw

src/FolderManager/FileView.vala

@@ -36,7 +36,6 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
     public const string ACTION_CHECKOUT_REMOTE_BRANCH = "checkout-remote-branch";
     public const string ACTION_CLOSE_FOLDER = "close-folder";
     public const string ACTION_CLOSE_OTHER_FOLDERS = "close-other-folders";
-    public const string ACTION_SET_PROJECT_ACTIVE = "set-project-active";
 
     private const ActionEntry[] ACTION_ENTRIES = {
         { ACTION_LAUNCH_APP_WITH_FILE_PATH, action_launch_app_with_file_path, "as" },
@@ -48,8 +47,7 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         { ACTION_NEW_FILE, add_new_file, "s" },
         { ACTION_NEW_FOLDER, add_new_folder, "s"},
         { ACTION_CLOSE_FOLDER, action_close_folder, "s"},
-        { ACTION_CLOSE_OTHER_FOLDERS, action_close_other_folders, "s"},
-        { ACTION_SET_PROJECT_ACTIVE, action_set_project_active, "s"}
+        { ACTION_CLOSE_OTHER_FOLDERS, action_close_other_folders, "s"}
     };
 
     private GLib.Settings settings;
@@ -127,27 +125,11 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         set_project_active (path);
     }
 
-    private void action_set_project_active (SimpleAction action, GLib.Variant? parameter) {
-        var path = parameter.get_string ();
-        if (path == null || path == "") {
-            return;
-        }
-
-        var folder_root = find_path (root, path) as ProjectFolderItem;
-        if (folder_root == null) {
-            return;
-        }
-
-        set_project_active (path);
-    }
-
     private void set_project_active (string path) {
         toplevel_action_group.activate_action (
             MainWindow.ACTION_SET_ACTIVE_PROJECT,
             new Variant.string (path)
         );
-
-        write_settings ();
     }
 
     public async void restore_saved_state () {
@@ -254,6 +236,10 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         return null;
     }
 
+    public bool project_is_open (string project_path) {
+        return get_project_for_file (GLib.File.new_for_path (project_path)) != null;
+    }
+
     public ProjectFolderItem? get_project_for_file (GLib.File file) {
         foreach (var item in root.children) {
             if (item is ProjectFolderItem) {
@@ -588,10 +574,10 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
                     }
                 }
                 Scratch.Services.GitManager.get_instance ().remove_project (folder_root);
-                write_settings ();
+                save_opened_folders ();
             });
 
-            write_settings ();
+            save_opened_folders ();
             add_folder.callback ();
             return Source.REMOVE;
         });
@@ -606,7 +592,7 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         return false;
     }
 
-    private void write_settings () {
+    private void save_opened_folders () {
         string[] to_save = {};
 
         foreach (var main_folder in root.children) {

src/FolderManager/FolderItem.vala

@@ -61,7 +61,6 @@ namespace Scratch.FolderManager {
             }
         }
 
-
         public void load_children () {
             if (loading_required) {
                 foreach (var child in file.children) {

src/FolderManager/ProjectFolderItem.vala

@@ -146,7 +146,7 @@ namespace Scratch.FolderManager {
                 set_active_folder_item = new GLib.MenuItem (
                     _("Set as Active Project"),
                     GLib.Action.print_detailed_name (
-                        FileView.ACTION_PREFIX + FileView.ACTION_SET_PROJECT_ACTIVE,
+                        MainWindow.ACTION_PREFIX + MainWindow.ACTION_SET_ACTIVE_PROJECT,
                         new Variant.string (file.path)
                     )
                 );

src/MainWindow.vala

@@ -1452,8 +1452,14 @@ namespace Scratch {
 
         private void action_set_active_project (SimpleAction action, Variant? param) {
             var project_path = param.get_string ();
-            git_manager.active_project_path = project_path;
-            folder_manager_view.collapse_other_projects ();
+            if (folder_manager_view.project_is_open (project_path)) {
+                git_manager.active_project_path = project_path;
+                folder_manager_view.collapse_other_projects ();
+                //The opened folders are not changed so no need to update "opened-folders" setting
+            } else {
+                warning ("Attempt to set folder path %s which is not opened as active project ignored", project_path);
+                //TODO Handle this by opening the folder
+            }
 
             var new_build_dir = Services.GitManager.get_instance ().get_default_build_dir (null);
             terminal.change_location (new_build_dir);