Changeset 9a6914c73481a770bff1b5d3aecebdb24db3ee5e

Timestamp:

08/07/10 12:14:01 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

423b3229331c4bfe49071c45954d2a19294b0651

Parents:

f12219a27c07e386a589e6cd32c6a806f3f65319

git-committer:

Matias De la Puente <mfpuente.ar@…> (08/07/10 12:14:01)

Message:

Projects: Improve code when changing project's parameters

File:

• libi4uc/i4ucprojectssidepagepresenter.vala (modified) (13 diffs)

libi4uc/i4ucprojectssidepagepresenter.vala

@@ -26 +26 @@
         private DocumentsPresenter _documents_presenter;
         private ArrayList<Project> _projects = new ArrayList<Project> ();
+        private Project _current_project;
+        private string _current_profile;
 
         public Project current_project
         {
                 set { _view.current_project = value.uri; }
-                owned get { return get_project_from_uri (_view.current_project); }
+                get { return _current_project; }
         }
         
@@ -100 +102 @@
                 _view.clear_profiles_list ();
 
-                var current_project = get_project_from_uri (_view.current_project);
-                if (current_project == null)
+                _current_project = get_project_from_uri (_view.current_project);
+                if (_current_project == null)
                         return;
 
                 //Load files list
-                foreach (var file in current_project.files)
+                foreach (var file in _current_project.files)
                         _view.add_file (file);
 
                 //Load profiles list
-                foreach (var profile in current_project.profiles.values)
+                foreach (var profile in _current_project.profiles.values)
                 {
                         _view.add_profile (profile.name);
@@ -122 +124 @@
                 _view.builders_list.linker_script_visible = false;
 
-                Project current_project;
-                string current_profile;
-                if (!get_current_project_and_profile (out current_project, out current_profile))
-                        return;
-
-                _view.builders_list.current_builder = current_project.profiles[current_profile].builder_id;
-                _view.builders_list.current_device_type = current_project.profiles[current_profile].device_type;
-                _view.builders_list.current_device = current_project.profiles[current_profile].device;
-                
-                var builder = I4uc.Settings.instance.builders[current_project.profiles[current_profile].builder_id];
+                if (_current_project == null)
+                        return;
+                
+                _current_profile = _view.current_profile;
+                if (_current_profile == null)
+                        return;
+
+                var profile = _current_project.profiles[_current_profile];
+                
+                _view.builders_list.current_builder = profile.builder_id;
+                _view.builders_list.current_device_type = profile.device_type;
+                _view.builders_list.current_device = profile.device;
+                
+                var builder = I4uc.Settings.instance.builders[profile.builder_id];
                 if (builder != null)
                 {
-                        var device_type = builder.device_types[current_project.profiles[current_profile].device_type];
+                        var device_type = builder.device_types[profile.device_type];
                         if (device_type != null)
                         {
                                 _view.builders_list.linker_script_visible = device_type.has_linker_script;
                                 if (_view.builders_list.linker_script_visible)
-                                        _view.builders_list.current_linker_script = current_project.profiles[current_profile].linker_script;
+                                        _view.builders_list.current_linker_script = profile.linker_script;
                         }
                 }
@@ -151 +157 @@
                         return;
 
-                var current_project = get_project_from_uri (_view.current_project);
-                if (current_project == null || _view.current_file == null)
+                if (_current_project == null || _view.current_file == null)
                         return;
 
                 if (active)
                 {
-                        current_project.profiles[profile].files.add (_view.current_file);
+                        _current_project.profiles[profile].files.add (_view.current_file);
                         _view.add_profile_file (profile, _view.current_file);
                 }
                 else
                 {
-                        current_project.profiles[profile].files.remove (_view.current_file);
+                        _current_project.profiles[profile].files.remove (_view.current_file);
                         _view.remove_profile_file (profile, _view.current_file);
                 }
-                current_project.save ();
+                _current_project.save ();
         }
 
         private void on_file_activated ()
         {
-                var document_uri = this.current_project.get_file_uri (_view.current_file);
+                var document_uri = _current_project.get_file_uri (_view.current_file);
                 _documents_presenter.open_document (document_uri);
         }
@@ -179 +184 @@
                 _view.uncheck_all_profiles ();
 
-                var current_project = get_project_from_uri (_view.current_project);
-                if (current_project == null || _view.current_file == null)
-                        return;
-
-                foreach (var profile in current_project.profiles.values)
+                if (_current_project == null || _view.current_file == null)
+                        return;
+
+                foreach (var profile in _current_project.profiles.values)
                         _view.check_profile (profile.name, _view.current_file in profile.files);
                 _view.profiles_check_list_sensitive = true;
@@ -192 +196 @@
                 _view.builders_list.clear_device_types_list ();
 
-                Project current_project;
-                string current_profile;
-                if (!get_current_project_and_profile (out current_project, out current_profile))
+                if (_current_project == null || _current_profile == null)
                         return;
                 
@@ -200 +202 @@
                 if (_view.builders_list_sensitive)
                 {
-                        current_project.profiles[current_profile].builder_id = current_builder == null ? "" : current_builder;
-                        current_project.save ();
+                        _current_project.profiles[_current_profile].builder_id = current_builder == null ? "" : current_builder;
+                        _current_project.save ();
                 }
 
@@ -217 +219 @@
                 _view.builders_list.linker_script_visible = false;
 
-                Project current_project;
-                string current_profile;
-                if (!get_current_project_and_profile (out current_project, out current_profile))
+                if (_current_project == null || _current_profile == null)
                         return;
                 
@@ -225 +225 @@
                 if (_view.builders_list_sensitive)
                 {
-                        current_project.profiles[current_profile].device_type = current_device_type == null ? "" : current_device_type;
-                        current_project.save ();
+                        _current_project.profiles[_current_profile].device_type = current_device_type == null ? "" : current_device_type;
+                        _current_project.save ();
                 }
                 
@@ -239 +239 @@
                 _view.builders_list.linker_script_visible = device_type.has_linker_script;
                 if (_view.builders_list.linker_script_visible)
-                        _view.builders_list.current_linker_script = current_project.profiles[current_profile].linker_script;
+                        _view.builders_list.current_linker_script = _current_project.profiles[_current_profile].linker_script;
         }
 
@@ -247 +247 @@
                         return;
 
-                Project current_project;
-                string current_profile;
-                if (!get_current_project_and_profile (out current_project, out current_profile))
+                if (_current_project == null || _current_profile == null)
                         return;
                 
                 var current_device = _view.builders_list.current_device;
-                current_project.profiles[current_profile].device = current_device == null ? "" : current_device;
-                current_project.save ();
+                _current_project.profiles[_current_profile].device = current_device == null ? "" : current_device;
+                _current_project.save ();
         }
         
@@ -262 +260 @@
                         return;
                 
-                Project current_project;
-                string current_profile;
-                if (!get_current_project_and_profile (out current_project, out current_profile))
+                if (_current_project == null || _current_profile == null)
                         return;
                 
                 var current_linker_script = _view.builders_list.current_linker_script;
-                current_project.profiles[current_profile].linker_script = current_linker_script == null ? "" : current_linker_script;
-                current_project.save ();
+                _current_project.profiles[_current_profile].linker_script = current_linker_script == null ? "" : current_linker_script;
+                _current_project.save ();
         }
 
@@ -279 +275 @@
                 return null;
         }
-
-        private bool get_current_project_and_profile (out Project current_project, out string current_profile)
-        {
-                current_project = get_project_from_uri (_view.current_project);
-                current_profile = _view.current_profile;
-                return (current_project != null) && (current_profile != null);
-        }
 }