[ jEdit-commits ] [ HaXeSideKick plugin ] HaXeSideKick jEdit plugin branch master updated. haxe_0_3-24-g0bee6d7

[Dion A. <di...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "HaXeSideKick jEdit plugin".

The branch, master has been updated
       via  0bee6d7fc9f823c595419bcdd282705ad6694f0b (commit)
      from  7983956287f8cb451d88f9aa6c90a9b8f590fc68 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit: http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/HaXeSideKick;a=commit;h=0bee6d7fc9f823c595419bcdd282705ad6694f0b
commitdiff: http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/HaXeSideKick;a=commitdiff;h=0bee6d7fc9f823c595419bcdd282705ad6694f0b
tree: http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/HaXeSideKick;a=tree;h=0bee6d7fc9f823c595419bcdd282705ad6694f0b;hb=0bee6d7fc9f823c595419bcdd282705ad6694f0b

commit 0bee6d7fc9f823c595419bcdd282705ad6694f0b
Author: dionjwa <di...@gm...>
Date:   Mon Dec 3 19:42:32 2012 -0800

    Better preferences.

diff --git a/HaXeSideKick.props b/HaXeSideKick.props
index 2e2e7a5..2e12f7c 100644
--- a/HaXeSideKick.props
+++ b/HaXeSideKick.props
@@ -65,8 +65,10 @@ options.haxe.code=new sidekick.haxe.HaXeOptionPane();
 
 #ProjectViewer optionpanel
 options.haxe-project-options.label=HaXe Options
-options.haxe.projectLaunchCommand.label=Calls this command preceded by a successful compilation:
-options.haxe.projectBuildCommand.label=Haxe build command.  If empty, searches for the first hxml file in the project root:
+options.haxe.projectLaunchCommand.label=Launch command. The build is called first:
+options.haxe.projectBuildCommand.label=Haxe build command.  If empty, searches for the first *.hxml or *.hxproj file in the project root:
+options.haxe.projectPreBuildCommand.label=Call this before building:
+options.haxe.projectCurrentBuildCommand.label=Current build command:
 
 #Errors
 haxe.error.noBuildFile.message=Attempting to build haxe project, but not custom build comamnd or *.hxml at the project root.
diff --git a/src/sidekick/haxe/ProjectOptionPane.java b/src/sidekick/haxe/ProjectOptionPane.java
index fc35980..87e5f1a 100644
--- a/src/sidekick/haxe/ProjectOptionPane.java
+++ b/src/sidekick/haxe/ProjectOptionPane.java
@@ -1,5 +1,7 @@
 package sidekick.haxe;
 
+import java.awt.Dimension;
+
 import javax.swing.JLabel;
 import javax.swing.JTextField;
 
@@ -16,10 +18,13 @@ public class ProjectOptionPane extends AbstractOptionPane
     private static final String OPTION_PREFIX = "options.haxe.";
     public static final String PROJECT_LAUNCH_CMD = "projectLaunchCommand";
     public static final String PROJECT_BUILD_CMD = "projectBuildCommand";
+    public static final String PROJECT_PRE_BUILD_CMD = "projectPreBuildCommand";
+    public static final String PROJECT_CURRENT_BUILD_CMD = "projectCurrentBuildCommand";
 
     VPTProject project;
 
     private JTextField launchCommand;
+    private JTextField preBuildCommand;
     private JTextField buildCommand;
 
     public ProjectOptionPane(VPTProject project)
@@ -31,9 +36,21 @@ public class ProjectOptionPane extends AbstractOptionPane
     @Override
     protected void _init()
     {
+        addComponent(new JLabel(jEdit.getProperty(OPTION_PREFIX + PROJECT_PRE_BUILD_CMD + ".label")));
+        buildCommand = new JTextField(project.getProperty(PROJECT_PRE_BUILD_CMD));
+        addComponent("", buildCommand);
+        addSeparator();
         addComponent(new JLabel(jEdit.getProperty(OPTION_PREFIX + PROJECT_BUILD_CMD + ".label")));
         buildCommand = new JTextField(project.getProperty(PROJECT_BUILD_CMD));
         addComponent("", buildCommand);
+        addSeparator();
+        addComponent(new JLabel(jEdit.getProperty(OPTION_PREFIX + PROJECT_CURRENT_BUILD_CMD + ".label")));
+        JTextField command = new JTextField(HaXeSideKickPlugin.getBuildCommand());
+        command.setMinimumSize(new Dimension(500, 300));
+        command.setMaximumSize(new Dimension(500, 1000));
+        command.setEditable(false);
+        addComponent(command);
+        addSeparator();
         addComponent(new JLabel(jEdit.getProperty(OPTION_PREFIX + PROJECT_LAUNCH_CMD + ".label")));
         launchCommand = new JTextField(project.getProperty(PROJECT_LAUNCH_CMD));
         addComponent("", launchCommand);
@@ -44,6 +61,7 @@ public class ProjectOptionPane extends AbstractOptionPane
     {
         project.setProperty(PROJECT_LAUNCH_CMD, launchCommand.getText().trim());
         project.setProperty(PROJECT_BUILD_CMD, buildCommand.getText().trim());
+        project.setProperty(PROJECT_PRE_BUILD_CMD, preBuildCommand.getText().trim());
     }
 
 

-----------------------------------------------------------------------

Summary of changes:
 HaXeSideKick.props                       |    6 ++++--
 src/sidekick/haxe/ProjectOptionPane.java |   18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
HaXeSideKick jEdit plugin