Changeset 134a36022f726cd51165392d8d68b4249f425794

Timestamp:

07/01/11 13:25:32 (2 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

6907a8e216b3303b3279c644e459eecaded0446a

Parents:

372eb3dcd21ac852c68f554713d7b67588aa9f16

git-committer:

Matias De la Puente <mfpuente.ar@…> (07/01/11 13:25:32)

Message:

Rename Command to CommandRunner?

Files:

• .gitignore (modified) (1 diff)
• libi4uccore/Makefile.am (modified) (2 diffs)
• libi4uccore/commandrunner.vala (moved) (moved from libi4uccore/command.vala) (3 diffs)
• libi4uccore/commandrunnerfactory.c (moved) (moved from libi4uccore/commandfactory.c) (2 diffs)
• libi4uccore/posixcommandrunner.vala (moved) (moved from libi4uccore/posixcommand.vala) (2 diffs)
• libi4uccore/profilebuilder.vala (modified) (5 diffs)
• libi4uccore/programmerslogic.vala (modified) (5 diffs)
• libi4uccore/wincommandrunner.vala (moved) (moved from libi4uccore/wincommand.vala) (2 diffs)

.gitignore

@@ -38 +38 @@
 po/.intltool-merge-cache
 po/i4uc.pot
-!libi4uccore/i4uccommandfactory.c
-!libi4uccore/i4ucserialportutilsfactory.c
+!libi4uccore/commandrunnerfactory.c
+!libi4uccore/serialportutilsfactory.c

libi4uccore/Makefile.am

@@ -2 +2 @@
 
 WIN_SOURCES = \
-        wincommand.vala \
+        wincommandrunner.vala \
         winserialportutils.vala \
         $(NULL)
 
 POSIX_SOURCES = \
-        posixcommand.vala \
+        posixcommandrunner.vala \
         posixserialportutils.vala \
         $(NULL)
@@ -41 +41 @@
         builder.vala \
         builderslist.vala \
-        command.vala \
-        commandfactory.c \
+        commandrunner.vala \
+        commandrunnerfactory.c \
         dialogresponse.vala \
         document.vala \

libi4uccore/commandrunner.vala

@@ -1 @@
-/* command.vala
+/* commandrunner.vala
  *
- * Copyright (C) 2009  Matias De la Puente
+ * Copyright (C) 2009-2011  Matias De la Puente
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20 +20 @@
  */
 
-public abstract class I4uc.Core.Command : GLib.Object
+public abstract class I4uc.Core.CommandRunner : GLib.Object
 {
         protected Pid? _child_pid = null;
@@ -93 +93 @@
 namespace I4uc.Core
 {
-        //Defined in commandfactory.c
-        public extern Command create_command ();
+        //Defined in commandrunnerfactory.c
+        public extern CommandRunner create_command_runner ();
 }

libi4uccore/commandrunnerfactory.c

@@ -1 @@
-/* commandfactory.c
+/* commandrunnerfactory.c
  *
- * Copyright (C) 2010  Matias De la Puente
+ * Copyright (C) 2010-2011  Matias De la Puente
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21 +21 @@
 #include <i4uccore.h>
 
-I4ucCoreCommand* i4uc_core_create_command ()
+I4ucCoreCommandRunner* i4uc_core_create_command_runner ()
 {
 #if __gnu_linux__
-        return (I4ucCoreCommand*)i4uc_core_posix_command_new ();
+        return (I4ucCoreCommandRunner*)i4uc_core_posix_command_runner_new ();
 #elif __WIN32__
-        return (I4ucCoreCommand*)i4uc_core_win_command_new ();
+        return (I4ucCoreCommandRunner*)i4uc_core_win_command_runner_new ();
 #else
         return NULL;

libi4uccore/posixcommandrunner.vala

@@ -1 @@
-/* posixcommand.vala
+/* posixcommandrunner.vala
  *
- * Copyright (C) 2010  Matias De la Puente
+ * Copyright (C) 2010-2011  Matias De la Puente
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21 +21 @@
 using Posix;
 
-public class I4uc.Core.PosixCommand : Command
+public class I4uc.Core.PosixCommandRunner : CommandRunner
 {
         private override void close_process ()

libi4uccore/profilebuilder.vala

@@ -32 +32 @@
 {
         private App _app;
-        private Command _command = create_command ();
+        private CommandRunner _command_runner = create_command_runner ();
         private ArrayList<CommandContext> _commands = new ArrayList<CommandContext> ();
         private int _command_index = 0;
@@ -53 +53 @@
         {
                 _app = app;
-                _command.finished.connect (on_command_finished);
+                _command_runner.finished.connect (on_command_runner_finished);
         }
 
@@ -155 +155 @@
                         }
                 
-                on_command_finished (true);
+                on_command_runner_finished (true);
         }
         
@@ -203 +203 @@
         {
                 _commands.clear ();
-                _command.stop ();
-        }
-
-        private void on_command_finished (bool exited_ok, string standard_output="", string standard_error="")
+                _command_runner.stop ();
+        }
+
+        private void on_command_runner_finished (bool exited_ok, string standard_output="", string standard_error="")
         {
                 // When _command_index is different to 0, a command just finished
@@ -221 +221 @@
                         try
                         {
-                                _command.run (_commands[_command_index].command, folder_file.get_path ());
+                                _command_runner.run (_commands[_command_index].command, folder_file.get_path ());
                                 this.is_building = true;
                                 _command_index++;

libi4uccore/programmerslogic.vala

@@ -26 +26 @@
         private DocumentsLogic _documents_logic;
         private Programmer _current_programmer;
-        private Command _command = create_command ();
+        private CommandRunner _command_runner = create_command_runner ();
         private SerialPortUtils _serial_port_utils = create_serial_port_utils ();
         private string _read_firmware;
@@ -77 +77 @@
                 _view.read_fuses_clicked.connect (() => run_command (_current_programmer.read_fuses_command));
                 _view.get_version_clicked.connect (() => run_command (_current_programmer.get_version_command));
-                _view.stop_clicked.connect (() => _command.stop ());
-                _command.finished.connect (on_command_finished);
+                _view.stop_clicked.connect (() => _command_runner.stop ());
+                _command_runner.finished.connect (on_command_finished);
         }
         
@@ -94 +94 @@
                 {
                         _view.log_page.add_message ("<b>" + _("Running:") + " </b><i>" + filtered_command + "</i>");
-                        _command.run (filtered_command);
+                        _command_runner.run (filtered_command);
                         set_parameters_sensitive (false);
                         disable_actions ();
@@ -363 +363 @@
                 {
                         _view.log_page.add_message ("<b>" + _("Running:") + " </b><i>" + filtered_command + "</i>");
-                        _command.run (filtered_command);
+                        _command_runner.run (filtered_command);
                         set_parameters_sensitive (false);
                         disable_actions ();
@@ -427 +427 @@
                 _view.read_fuses_sensitive = _current_programmer.can_read_fuses;
                 _view.get_version_sensitive = _current_programmer.can_get_version;
-                _view.stop_sensitive = _command.is_running;
+                _view.stop_sensitive = _command_runner.is_running;
         }
         

libi4uccore/wincommandrunner.vala

@@ -1 @@
-/* wincommand.vala
+/* wincommandrunner.vala
  *
- * Copyright (C) 2010  Matias De la Puente
+ * Copyright (C) 2010-2011  Matias De la Puente
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21 +21 @@
 using Windows;
 
-public class I4uc.Core.WinCommand : Command
+public class I4uc.Core.WinCommandRunner : CommandRunner
 {
         private override void close_process ()