LANG: Fix LangProjectBuildConfigurationComponent

GoClipse · Aug 20, 2015 · 61429b8 · 61429b8
1 parent 2b8433e
commit 61429b8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/launch/BuildTargetSettingsValidator.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/launch/BuildTargetSettingsValidator.java
@@ -79,12 +79,20 @@ protected ValidatedBuildTarget getValidatedOriginalBuildTarget() throws CommonEx
 
 	/* -----------------  ----------------- */
 
-	public String getDefaultBuildArguments() throws CommonException {
+	public String getOriginalBuildArguments() throws CommonException {
 		return getValidatedOriginalBuildTarget().getEffectiveBuildArguments();
 	}
 
-	public String getDefaultExecutablePath() throws CommonException {
-		return getValidatedBuildTarget().getEffectiveValidExecutablePath();
+	public String getOriginalExecutablePath() throws CommonException {
+		return getValidatedOriginalBuildTarget().getEffectiveValidExecutablePath();
+	}
+
+	public String getDefaultBuildArguments2() throws CommonException {
+		return getValidatedOriginalBuildTarget().getDefaultBuildArguments();
+	}
+
+	public String getDefaultExecutablePath2() throws CommonException {
+		return getValidatedOriginalBuildTarget().getDefaultExecutablePath();
 	}
 
 	/* -----------------  ----------------- */ 

diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/build/ValidatedBuildTarget.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/build/ValidatedBuildTarget.java
@@ -113,6 +113,10 @@ public String getEffectiveValidExecutablePath() throws CommonException {
 			return executablePath;
 		}
 
+		return getDefaultExecutablePath();
+	}
+
+	public String getDefaultExecutablePath() throws CommonException {
 		Indexable<LaunchArtifact> launchArtifacts = getLaunchArtifacts();
 		if(launchArtifacts.size() > 1) {
 			throw new CommonException(LaunchMessages.MSG_BuildTarget_MultipleExecutablesAvailable());

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/launch/MainLaunchConfigurationTab.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/launch/MainLaunchConfigurationTab.java
@@ -82,11 +82,11 @@ protected BuildTargetSettingsComponent init_BuildTargetSettingsComponent() {
 	/* -----------------  ----------------- */
 
 	protected String getDefaultBuildTargetArguments() throws CommonException {
-		return getValidator().getDefaultBuildArguments();
+		return getValidator().getOriginalBuildArguments();
 	}
 
 	protected String getDefaultProgramPath() throws CommonException {
-		return getValidator().getDefaultExecutablePath();
+		return getValidator().getOriginalExecutablePath();
 	}
 
 	protected BuildTargetSettingsValidator getValidator() throws CommonException {

diff --git a/....ui/src-lang/melnorme/lang/ide/ui/preferences/LangProjectBuildConfigurationComponent.java b/....ui/src-lang/melnorme/lang/ide/ui/preferences/LangProjectBuildConfigurationComponent.java
@@ -53,7 +53,7 @@ protected BuildTargetField init_createBuildTargetField() {
 	}
 	protected BuildTargetSettingsComponent init_createBuildTargetSettingsComponent() {
 		return new BuildTargetSettingsComponent(
-			getValidator()::getDefaultBuildArguments, getValidator()::getDefaultExecutablePath);
+			getValidator()::getDefaultBuildArguments2, getValidator()::getDefaultBuildArguments2);
 	}
 
 	public BuildTargetField getBuildTargetField() {