You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ft...@apache.org on 2012/12/08 20:37:56 UTC
svn commit: r1418738 - in
/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk:
org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/
org.apache.flex....
Author: fthomas
Date: Sat Dec 8 19:37:54 2012
New Revision: 1418738
URL: http://svn.apache.org/viewvc?rev=1418738&view=rev
Log:
- Added Cygwin settings
Added:
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/CygwinHomeFormItem.mxml
- copied, changed from r1418197, incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/MavenHomeFormItem.mxml
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/ValidateCygwinPathCommand.as
- copied, changed from r1418200, incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/ValidateJavaPathCommand.as
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/message/ValidateCygwinPathMessage.as
- copied, changed from r1418200, incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/message/ValidateJavaPathMessage.as
Modified:
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/GeneralSettings.mxml
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/ToolHomeFormItem.mxml
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/ISettingsModel.as
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/SettingModel.as
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/InitDBCommand.as
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/config/ExecutorContext.mxml
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.host-swf/src/main/flex/org/apache/flex/utilities/developerToolSuite/MainApplication.mxml
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/en_US/SettingsWindow.properties
incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/fr_FR/SettingsWindow.properties
Modified: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/GeneralSettings.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/GeneralSettings.mxml?rev=1418738&r1=1418737&r2=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/GeneralSettings.mxml (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/GeneralSettings.mxml Sat Dec 8 19:37:54 2012
@@ -41,7 +41,7 @@ limitations under the License.
change="localeComboBox_changeHandler(event)" width="100%"/>
</component:Frame>
</mx:GridItem>
- <mx:GridItem rowSpan="3">
+ <mx:GridItem rowSpan="4">
<component:Frame label="{resourceManager.getString('SettingsWindow', 'TOOLS_PATH_LOCATION')}" skinClass="{FrameSkin}">
<component:layout>
<s:VerticalLayout horizontalAlign="center" paddingRight="35"/>
@@ -56,13 +56,15 @@ limitations under the License.
propertyValue="{model.ANT_HOME ? model.ANT_HOME : model.environmentVariables['ANT_HOME']}"/>
<formitem:MavenHomeFormItem id="mavenHomeFormItem" installationPathValidated="{model.mavenEnabled}"
propertyValue="{model.MAVEN_HOME ? model.MAVEN_HOME : model.environmentVariables['MAVEN_HOME']}"/>
+ <formitem:CygwinHomeFormItem id="cygwinHomeFormItem" installationPathValidated="{model.cygwinEnabled}"
+ propertyValue="{model.CYGWIN_HOME}"/>
</s:Form>
</component:Frame>
</mx:GridItem>
</mx:GridRow>
<mx:GridRow width="100%" horizontalAlign="center">
- <mx:GridItem rowSpan="2">
+ <mx:GridItem rowSpan="3">
<component:Frame label="{resourceManager.getString('SettingsWindow', 'VCS')}" skinClass="{FrameSkin}" height="100%">
<component:layout>
<s:HorizontalLayout horizontalAlign="center"
@@ -70,15 +72,15 @@ limitations under the License.
gap="16"/>
</component:layout>
<s:Form styleName="stackedForm">
- <s:layout>
- <s:FormLayout gap="-14"/>
- </s:layout>
+ <s:Label text="{resourceManager.getString('SettingsWindow', 'VCS_INTRO')}"/>
<formitem:SvnHomeFormItem id="svnHomeFormItem" installationPathValidated="{model.svnEnabled}"/>
<formitem:GitHomeFormItem id="gitHomeFormItem" installationPathValidated="{model.gitEnabled}"/>
</s:Form>
</component:Frame>
</mx:GridItem>
</mx:GridRow>
+
+ <mx:GridRow/>
<mx:GridRow/>
<fx:Script><![CDATA[
@@ -100,7 +102,8 @@ limitations under the License.
languageComboBox.dataProvider = model.availableLanguages;
languageComboBox.selectedItem = model.currentLanguage;
- svnHomeFormItem.dispatch = gitHomeFormItem.dispatch = javaHomeFormItem.dispatch = antHomeFormItem.dispatch = mavenHomeFormItem.dispatch = dispatch;
+ cygwinHomeFormItem.dispatch = svnHomeFormItem.dispatch = gitHomeFormItem.dispatch = javaHomeFormItem.dispatch = antHomeFormItem.dispatch
+ = mavenHomeFormItem.dispatch = dispatch;
}
private function localeComboBox_changeHandler(event:IndexChangeEvent):void {
Copied: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/CygwinHomeFormItem.mxml (from r1418197, incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/MavenHomeFormItem.mxml)
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/CygwinHomeFormItem.mxml?p2=incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/CygwinHomeFormItem.mxml&p1=incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/MavenHomeFormItem.mxml&r1=1418197&r2=1418738&rev=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/MavenHomeFormItem.mxml (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/CygwinHomeFormItem.mxml Sat Dec 8 19:37:54 2012
@@ -19,14 +19,14 @@ limitations under the License.
xmlns:s="library://ns.adobe.com/flex/spark"
xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:formitem="org.apache.flex.utilities.developerToolSuite.presentation.graphic.settings.formItem.*"
- propertyName="MAVEN_HOME"
- toolTipLabelResourceString="BROWSE_MAVEN_HOME"
- helpLabelResourcesString="INDICATE_MAVEN_HOME" helpUrlText="(Maven 3.x Home Page)"
- helpUrl="http://maventest.apache.org/download.html"
- browserDirectoryResourceString="PLEASE_INDICATE_MAVEN_HOME"
- validateToolMessageClass="{ValidateMavenPathMessage}"
- errorStringTextResourceString="MAVEN_HOME_ERROR_STRING">
+ propertyName="CYGWIN_HOME"
+ toolTipLabelResourceString="BROWSE_CYGWIN_HOME"
+ helpLabelResourcesString="INDICATE_CYGWIN_HOME" helpUrlText="(Cygwin Home Page)"
+ helpUrl="http://www.cygwin.com/"
+ browserDirectoryResourceString="PLEASE_INDICATE_CYGWIN_HOME"
+ validateToolMessageClass="{ValidateCygwinPathMessage}"
+ errorStringTextResourceString="CYGWIN_HOME_ERROR_STRING">
<fx:Script><![CDATA[
- import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.message.ValidateMavenPathMessage;
+ import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.message.ValidateCygwinPathMessage;
]]></fx:Script>
</formitem:ToolHomeFormItem>
Modified: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/ToolHomeFormItem.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/ToolHomeFormItem.mxml?rev=1418738&r1=1418737&r2=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/ToolHomeFormItem.mxml (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.component-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/presentation/graphic/settings/formItem/ToolHomeFormItem.mxml Sat Dec 8 19:37:54 2012
@@ -85,6 +85,7 @@ limitations under the License.
public var dispatch:Function;
private function creationCompleteHandler(event:FlexEvent):void {
+ validator.validate();
dispatch(new validateToolMessageClass(propertyValue));
}
Modified: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/ISettingsModel.as
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/ISettingsModel.as?rev=1418738&r1=1418737&r2=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/ISettingsModel.as (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/ISettingsModel.as Sat Dec 8 19:37:54 2012
@@ -24,12 +24,16 @@ package org.apache.flex.utilities.develo
function get MAVEN_HOME():String;
+ function get CYGWIN_HOME():String;
+
function get javaEnabled():Boolean;
function get antEnabled():Boolean;
function get mavenEnabled():Boolean;
+ function get cygwinEnabled():Boolean;
+
function get svnEnabled():Boolean;
function get gitEnabled():Boolean;
Modified: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/SettingModel.as
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/SettingModel.as?rev=1418738&r1=1418737&r2=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/SettingModel.as (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/domain/SettingModel.as Sat Dec 8 19:37:54 2012
@@ -38,10 +38,12 @@ package org.apache.flex.utilities.develo
private var _JAVA_HOME:String;
private var _ANT_HOME:String;
private var _MAVEN_HOME:String;
+ private var _CYGWIN_HOME:String;
private var _javaEnabled:Boolean;
private var _antEnabled:Boolean;
private var _mavenEnabled:Boolean;
+ private var _cygwinEnabled:Boolean;
private var _svnEnabled:Boolean;
private var _gitEnabled:Boolean;
@@ -94,6 +96,15 @@ package org.apache.flex.utilities.develo
_MAVEN_HOME = value;
}
+ public function get CYGWIN_HOME():String {
+ return _CYGWIN_HOME;
+ }
+
+ [Bindable]
+ public function set CYGWIN_HOME(value:String):void {
+ _CYGWIN_HOME = value;
+ }
+
public function get javaEnabled():Boolean {
return _javaEnabled;
}
@@ -121,6 +132,15 @@ package org.apache.flex.utilities.develo
_mavenEnabled = value;
}
+ public function get cygwinEnabled():Boolean {
+ return _cygwinEnabled;
+ }
+
+ [Bindable]
+ public function set cygwinEnabled(value:Boolean):void {
+ _cygwinEnabled = value;
+ }
+
public function get svnEnabled():Boolean {
return _svnEnabled;
}
Modified: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/InitDBCommand.as
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/InitDBCommand.as?rev=1418738&r1=1418737&r2=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/InitDBCommand.as (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/InitDBCommand.as Sat Dec 8 19:37:54 2012
@@ -116,11 +116,12 @@ package org.apache.flex.utilities.develo
function prepareSettingsData():void {
settingsDataSql = "INSERT INTO 'settings' SELECT '1' AS 'id', 'locale' AS 'name', '" + LocaleUtil.getDefaultLanguage().data + "' AS 'value' ";
- settingsDataSql += "UNION SELECT '2', 'JAVA_HOME', '' ";
- settingsDataSql += "UNION SELECT '3', 'ANT_HOME', '' ";
- settingsDataSql += "UNION SELECT '4', 'MAVEN_HOME', '' ";
- settingsDataSql += "UNION SELECT '5', 'appDisplayState', '' ";
- settingsDataSql += "UNION SELECT '6', 'appBounds', '';";
+ settingsDataSql += "UNION SELECT '2', 'appDisplayState', '' ";
+ settingsDataSql += "UNION SELECT '3', 'appBounds', '' ";
+ settingsDataSql += "UNION SELECT '4', 'JAVA_HOME', '' ";
+ settingsDataSql += "UNION SELECT '5', 'ANT_HOME', '' ";
+ settingsDataSql += "UNION SELECT '6', 'MAVEN_HOME', '' ";
+ settingsDataSql += "UNION SELECT '7', 'CYGWIN_HOME', '';";
}
}
}
Copied: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/ValidateCygwinPathCommand.as (from r1418200, incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/ValidateJavaPathCommand.as)
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/ValidateCygwinPathCommand.as?p2=incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/ValidateCygwinPathCommand.as&p1=incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/ValidateJavaPathCommand.as&r1=1418200&r2=1418738&rev=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/ValidateJavaPathCommand.as (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/command/ValidateCygwinPathCommand.as Sat Dec 8 19:37:54 2012
@@ -22,87 +22,58 @@ package org.apache.flex.utilities.develo
import mx.utils.ObjectUtil;
import org.apache.flex.utilities.developerToolSuite.executor.domain.SettingModel;
- import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.message.ValidateJavaPathMessage;
+ import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.message.ValidateCygwinPathMessage;
+ import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.nativeProcess.NativeShellHelper;
import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.util.LogUtil;
- public class ValidateJavaPathCommand extends AbstractShellCommand {
+ public class ValidateCygwinPathCommand {
- private static var LOG:ILogger = LogUtil.getLogger(ValidateAntPathCommand);
+ private static var LOG:ILogger = LogUtil.getLogger(ValidateCygwinPathCommand);
- private var _msg:ValidateJavaPathMessage;
+ private var _msg:ValidateCygwinPathMessage;
[Inject]
public var settings:SettingModel;
+ public var callback:Function;
+
private var _done:Boolean;
- public function execute(msg:ValidateJavaPathMessage):void {
+ public function execute(msg:ValidateCygwinPathMessage):void {
LOG.debug("Executing Command with message: " + ObjectUtil.toString(msg));
_msg = msg;
- settings.javaEnabled = false;
+ settings.cygwinEnabled = false;
executeCommand();
}
- override protected function executeCommand():void {
+ protected function executeCommand():void {
LOG.debug("Executing Command with message: " + ObjectUtil.toString(_msg));
var file:File;
if (!_msg.path) {
LOG.error("Path null, nothing to check, quit");
- error(false);
+ callback(false);
return;
}
try {
- file = new File(shell.formatPath(_msg.path));
- if (!file.resolvePath("lib/tools.jar").exists) {
- LOG.error("Error resolving JAVA_HOME");
- error(false);
- return;
+ file = new File(NativeShellHelper.formatPath(_msg.path));
+ if (!file.resolvePath("Cygwin.bat").exists) {
+ LOG.error("Error resolving CYGWIN_HOME");
+ callback(false);
+ }
+ else {
+ LOG.debug("Resolved CYGWIN_HOME");
+ settings.cygwinEnabled = true;
}
} catch (err:Error) {
- LOG.error(ObjectUtil.toString(err));
- error(false);
- return;
+ LOG.error("Ending Command with error: " + ObjectUtil.toString(err));
+ callback(false);
}
;
-
- var java:String = shell.formatPath(file.resolvePath("bin/java.exe").nativePath);
-
- if (shell.OS == "win") {
- command.push("/C");
- }
-
- command.push(java);
- command.push("-version");
-
- super.executeCommand();
- }
-
- private function extractVersion(output:String):void {
-
- if (_done) {
- return;
- }
-
- _done = true;
- if (output.indexOf("1.6.") > -1) {
- settings.javaEnabled = true;
- result(true);
- } else {
- error(false);
- }
- }
-
- override protected function outputDataHandler(event:ProgressEvent):void {
- super.outputDataHandler(event);
- extractVersion(standardOutput);
- }
-
- override protected function errorDataHandler(event:ProgressEvent):void {
- super.errorDataHandler(event);
- extractVersion(standardError);
+ LOG.debug("Ending Command with result: " + file.nativePath);
+ callback(true);
}
}
}
Modified: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/config/ExecutorContext.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/config/ExecutorContext.mxml?rev=1418738&r1=1418737&r2=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/config/ExecutorContext.mxml (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/config/ExecutorContext.mxml Sat Dec 8 19:37:54 2012
@@ -41,6 +41,7 @@ limitations under the License.
<parsley:MapCommand type="{ValidateMavenPathCommand}"/>
<parsley:MapCommand type="{ValidateSvnPathCommand}"/>
<parsley:MapCommand type="{ValidateGitPathCommand}"/>
+ <parsley:MapCommand type="{ValidateCygwinPathCommand}"/>
<domain:SettingModel/>
</fx:Declarations>
@@ -53,6 +54,7 @@ limitations under the License.
import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.command.SaveSettingCommand;
import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.command.SaveSettingsCommand;
import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.command.ValidateAntPathCommand;
+ import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.command.ValidateCygwinPathCommand;
import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.command.ValidateGitPathCommand;
import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.command.ValidateJavaPathCommand;
import org.apache.flex.utilities.developerToolSuite.executor.infrastructure.command.ValidateMavenPathCommand;
Copied: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/message/ValidateCygwinPathMessage.as (from r1418200, incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/message/ValidateJavaPathMessage.as)
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/message/ValidateCygwinPathMessage.as?p2=incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/message/ValidateCygwinPathMessage.as&p1=incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/message/ValidateJavaPathMessage.as&r1=1418200&r2=1418738&rev=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/message/ValidateJavaPathMessage.as (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.executor-lib/src/main/flex/org/apache/flex/utilities/developerToolSuite/executor/infrastructure/message/ValidateCygwinPathMessage.as Sat Dec 8 19:37:54 2012
@@ -15,11 +15,11 @@
limitations under the License.
*/
package org.apache.flex.utilities.developerToolSuite.executor.infrastructure.message {
- public class ValidateJavaPathMessage {
+ public class ValidateCygwinPathMessage {
private var _path:String;
- public function ValidateJavaPathMessage(path:String) {
+ public function ValidateCygwinPathMessage(path:String) {
_path = path;
}
Modified: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.host-swf/src/main/flex/org/apache/flex/utilities/developerToolSuite/MainApplication.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.host-swf/src/main/flex/org/apache/flex/utilities/developerToolSuite/MainApplication.mxml?rev=1418738&r1=1418737&r2=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.host-swf/src/main/flex/org/apache/flex/utilities/developerToolSuite/MainApplication.mxml (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.host-swf/src/main/flex/org/apache/flex/utilities/developerToolSuite/MainApplication.mxml Sat Dec 8 19:37:54 2012
@@ -107,7 +107,7 @@ limitations under the License.
private function addLog():void {
var parsleyLogger:TraceTarget = new TraceTarget();
parsleyLogger.filters = ["org.spicefactory.*", "mx.*"];
- parsleyLogger.level = LogEventLevel.ALL;
+ parsleyLogger.level = LogEventLevel.ERROR;
parsleyLogger.includeCategory = true;
parsleyLogger.includeLevel = true;
parsleyLogger.fieldSeparator = " -> ";
Modified: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/en_US/SettingsWindow.properties
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/en_US/SettingsWindow.properties?rev=1418738&r1=1418737&r2=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/en_US/SettingsWindow.properties (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/en_US/SettingsWindow.properties Sat Dec 8 19:37:54 2012
@@ -14,5 +14,10 @@ BROWSE_MAVEN_HOME=Browse to the Maven 3.
INDICATE_MAVEN_HOME=Indicate the Maven 3.x home directory.
PLEASE_INDICATE_MAVEN_HOME=Please, indicate the Maven 3.x home directory...
MAVEN_HOME_ERROR_STRING=You must enter a valid home path for Maven 3.x
+BROWSE_CYGWIN_HOME=Browse to the Cygwin installation Directory
+INDICATE_CYGWIN_HOME=Indicate the Cygwin home directory.
+PLEASE_INDICATE_CYGWIN_HOME=Please, indicate the Cygwin home directory...
+CYGWIN_HOME_ERROR_STRING=You must enter a valid home path for Cygwin
VCS=Version Control System
+VCS_INTRO=Should match the one(s) the SDK(s) you want to use.
SHOULD_BE_IN_PATH=Should be in your path
Modified: incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/fr_FR/SettingsWindow.properties
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/fr_FR/SettingsWindow.properties?rev=1418738&r1=1418737&r2=1418738&view=diff
==============================================================================
--- incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/fr_FR/SettingsWindow.properties (original)
+++ incubator/flex/whiteboard/fthomas/developerToolSuite/trunk/org.apache.flex.utilities.developerToolSuite.locale/src/main/resources/locale/fr_FR/SettingsWindow.properties Sat Dec 8 19:37:54 2012
@@ -14,5 +14,10 @@ BROWSE_MAVEN_HOME=Naviguez jusqu'au doss
INDICATE_MAVEN_HOME=Indiquez le dossier racine de Maven 3.x.
PLEASE_INDICATE_MAVEN_HOME=Merci d'indiquer le dossier racine de Maven 3.x ...
MAVEN_HOME_ERROR_STRING=Vous devez entrer un dossier racine valide pour Maven 3.x
+BROWSE_CYGWIN_HOME=Naviguez jusqu'au dossier d'installation de Cygwin
+INDICATE_CYGWIN_HOME=Indiquez le dossier racine de Cygwin.
+PLEASE_INDICATE_CYGWIN_HOME=Merci d'indiquer le dossier racine de Cygwin ...
+CYGWIN_HOME_ERROR_STRING=Vous devez entrer un dossier racine valide pour Cygwin
VCS=Système de contrôle de version
+VCS_INTRO=Il(s) doit/doivent correspondre à celui/ceux des SDK(s)\nque vous voulez utiliser.
SHOULD_BE_IN_PATH=Doit être dans votre chemin d'accès