!API Rename LangCoreTests_Actual, CompositeValidatableField. refactoring

GoClipse · Apr 20, 2016 · 6a187ef · 6a187ef
1 parent 4ab0024
commit 6a187ef
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 47 deletions.
diff --git a/...in_ide.core.tests/src-lang/melnorme/lang/ide/core/operations/build/BuildManager_Test.java b/...in_ide.core.tests/src-lang/melnorme/lang/ide/core/operations/build/BuildManager_Test.java
@@ -32,7 +32,7 @@
 import melnorme.lang.ide.core.operations.build.BuildTargetOperation.BuildOperationParameters;
 import melnorme.lang.ide.core.project_model.LangBundleModel;
 import melnorme.lang.ide.core.tests.CoreTestWithProject;
-import melnorme.lang.tests.LangCoreTests_Actual;
+import melnorme.lang.tests.ToolingTests_Actual;
 import melnorme.lang.tooling.bundle.BuildConfigMessages;
 import melnorme.lang.tooling.bundle.BuildConfiguration;
 import melnorme.lang.tooling.bundle.BuildTargetNameParser;
@@ -149,7 +149,7 @@ protected BuildConfiguration getValidBuildconfiguration(String buildConfigName,
 
 	protected String SEP = buildMgr.getBuildTargetNameParser().getNameSeparator();
 
-	protected final BundleInfo bundleInfo = LangCoreTests_Actual.createSampleBundleInfoA("SampleBundle", null);
+	protected final BundleInfo bundleInfo = ToolingTests_Actual.createSampleBundleInfoA("SampleBundle", null);
 
 	/* -----------------  ----------------- */
 

diff --git a/plugin_ide.core.tests/src-lang/melnorme/lang/ide/core/tests/CoreTestWithProject.java b/plugin_ide.core.tests/src-lang/melnorme/lang/ide/core/tests/CoreTestWithProject.java
@@ -21,7 +21,7 @@
 
 import melnorme.lang.ide.core.CoreSettings.SettingsField;
 import melnorme.lang.ide.core.LangCore;
-import melnorme.lang.tests.LangCoreTests_Actual;
+import melnorme.lang.tests.ToolingTests_Actual;
 import melnorme.lang.tooling.data.StatusException;
 import melnorme.utilbox.core.CommonException;
 import melnorme.utilbox.ownership.IDisposable;
@@ -41,7 +41,7 @@ public void doCreate() throws CoreException, CommonException {
 		}
 
 		public static void setTestsSDKPath(IProject project) {
-			String SDK_PATH = LangCoreTests_Actual.SAMPLE_SDK_PATH.toString();
+			String SDK_PATH = ToolingTests_Actual.SAMPLE_SDK_PATH.toString();
 			SDK_LOCATION.doSetRawValue(project, SDK_PATH);
 		}
 	}

diff --git a/plugin_ide.core.tests/src-lang/melnorme/lang/ide/core/tests/SampleProject.java b/plugin_ide.core.tests/src-lang/melnorme/lang/ide/core/tests/SampleProject.java
@@ -23,7 +23,7 @@
 import melnorme.lang.ide.core.utils.EclipseUtils;
 import melnorme.lang.ide.core.utils.ResourceUtils;
 import melnorme.lang.ide.core.utils.ResourceUtils.CoreOperation;
-import melnorme.lang.tests.LangCoreTests_Actual;
+import melnorme.lang.tests.ToolingTests_Actual;
 import melnorme.lang.tooling.bundle.BundleInfo;
 import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.core.CommonException;
@@ -34,7 +34,7 @@
 public class SampleProject implements AutoCloseable {
 
 	public final IProject project;
-	public BundleInfo sampleBundleInfo = LangCoreTests_Actual.createSampleBundleInfoA("SampleBundle", null);
+	public BundleInfo sampleBundleInfo = ToolingTests_Actual.createSampleBundleInfoA("SampleBundle", null);
 	public Disposable bundleModelIgnoreReg;
 
 	public SampleProject(String name) throws CoreException, CommonException {

diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/build/CommandInvocation.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/build/CommandInvocation.java
@@ -31,6 +31,10 @@ public CommandInvocation(String commandArguments, VariablesResolver variablesRes
 		this.variablesResolver = assertNotNull(variablesResolver);
 	}
 
+	public String getCommandArguments() {
+		return commandArguments;
+	}
+
 	public Indexable<String> getEffectiveCommandLine() throws CommonException {
 		String evaluatedCommandLine = variablesResolver.performStringSubstitution(commandArguments);
 

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/dialogs/LangProjectWizardFirstPage.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/dialogs/LangProjectWizardFirstPage.java
@@ -197,8 +197,7 @@ public LocationGroup() {
 
 			nameGroup.getNameField().addListener(this::updateDefaultFieldValue);
 
-			IValidationSourceX validationSource = () -> doValidate();
-			validation.addFieldValidation(true, this, validationSource);
+			addFieldValidationX(true, () -> doValidate());
 		}
 
 		protected String getProjectName() {

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/operations/ToolSourceModifyingOperation.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/operations/ToolSourceModifyingOperation.java
@@ -36,7 +36,7 @@ public class ToolSourceModifyingOperation extends RunToolOperation {
 	protected IResource resource;
 
 	public ToolSourceModifyingOperation(String operationName, IProject project, Indexable<String> commands,
-			StartOperationOptions opViewOptions, @SuppressWarnings("unused") boolean APIdummy) {
+			StartOperationOptions opViewOptions) {
 		super(operationName, project, commands, opViewOptions);
 
 		resource = assertNotNull(project);

diff --git a/...n_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/AbstractCompositePreferencesBlock.java b/...n_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/AbstractCompositePreferencesBlock.java
@@ -16,7 +16,7 @@
 import melnorme.lang.ide.core.utils.prefs.DerivedValuePreference;
 import melnorme.lang.ide.ui.preferences.common.PreferencesPageContext;
 import melnorme.util.swt.components.AbstractCompositeWidget;
-import melnorme.utilbox.fields.IField;
+import melnorme.util.swt.components.FieldWidget;
 
 public abstract class AbstractCompositePreferencesBlock extends AbstractCompositeWidget {
 
@@ -27,8 +27,8 @@ public AbstractCompositePreferencesBlock(PreferencesPageContext prefContext) {
 		this.prefContext = assertNotNull(prefContext);
 	}
 
-	protected void bindToDerivedPreference(IField<String> field, DerivedValuePreference<?> pref) {
-		prefContext.bindToValidatedPreference(field, pref, validation);
+	protected void bindFieldToDerivedPreference(FieldWidget<String> field, DerivedValuePreference<?> pref) {
+		prefContext.bindToValidatedPreference(field, pref);
 	}
 
 }
diff --git a/...in_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/common/AbstractPreferencesBlock2.java b/...in_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/common/AbstractPreferencesBlock2.java
@@ -23,33 +23,21 @@
 import melnorme.lang.ide.core.utils.prefs.IGlobalPreference;
 import melnorme.lang.ide.core.utils.prefs.IntPreference;
 import melnorme.lang.ide.core.utils.prefs.StringPreference;
-import melnorme.lang.tooling.data.CompositeValidatableField;
-import melnorme.lang.tooling.data.IStatusMessage;
 import melnorme.util.swt.SWTFactory;
 import melnorme.util.swt.SWTFactoryUtil;
-import melnorme.util.swt.components.AbstractWidget;
 import melnorme.util.swt.components.FieldWidget;
-import melnorme.util.swt.components.IValidatableWidget;
 import melnorme.util.swt.components.fields.ComboBoxField;
 import melnorme.util.swt.components.fields.NumberField;
-import melnorme.utilbox.fields.IField;
-import melnorme.utilbox.fields.IFieldView;
 
-public abstract class AbstractPreferencesBlock2 extends AbstractWidget implements IValidatableWidget {
+public abstract class AbstractPreferencesBlock2 extends AbstractWidgetExt {
 
-	protected final CompositeValidatableField validation = new CompositeValidatableField();
 	protected final PreferencesPageContext prefContext;
 
 	public AbstractPreferencesBlock2(PreferencesPageContext prefContext) {
 		this.prefContext = assertNotNull(prefContext);
 	}
 
-	@Override
-	public IFieldView<IStatusMessage> getStatusField() {
-		return validation;
-	}
-
-	public final void bindToDerivedPreference(IField<String> field, DerivedValuePreference<?> pref) {
+	public final void bindToDerivedPreference(FieldWidget<String> field, DerivedValuePreference<?> pref) {
 		prefContext.bindToValidatedPreference(field, pref, validation);
 	}
 

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/common/AbstractWidgetExt.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/common/AbstractWidgetExt.java
@@ -11,15 +11,15 @@
 package melnorme.lang.ide.ui.preferences.common;
 
 
-import melnorme.lang.tooling.data.CompositeValidatableField;
+import melnorme.lang.tooling.data.ValidationField;
 import melnorme.lang.tooling.data.IStatusMessage;
 import melnorme.util.swt.components.AbstractWidget;
 import melnorme.util.swt.components.IValidatableWidget;
 import melnorme.utilbox.fields.IFieldView;
 
 public abstract class AbstractWidgetExt extends AbstractWidget implements IValidatableWidget {
 
-	protected final CompositeValidatableField validation = new CompositeValidatableField();
+	protected final ValidationField validation = new ValidationField();
 
 	public AbstractWidgetExt() {
 		super();
@@ -30,7 +30,7 @@ public final IFieldView<IStatusMessage> getStatusField() {
 		return validation;
 	}
 
-	public CompositeValidatableField getValidation() {
+	public ValidationField getValidation() {
 		return validation;
 	}
 

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/common/PreferencesPageContext.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/common/PreferencesPageContext.java
@@ -16,7 +16,7 @@
 import melnorme.lang.ide.core.utils.prefs.DerivedValuePreference;
 import melnorme.lang.ide.core.utils.prefs.IGlobalPreference;
 import melnorme.lang.ide.core.utils.prefs.IProjectPreference;
-import melnorme.lang.tooling.data.CompositeValidatableField;
+import melnorme.lang.tooling.data.ValidationField;
 import melnorme.util.swt.components.FieldWidget;
 import melnorme.utilbox.collections.ArrayList2;
 import melnorme.utilbox.core.CommonException;
@@ -49,7 +49,7 @@ public void addPrefElement(IPreferencesEditor prefElement) {
 	}
 	public void bindToPreference(FieldWidget<String> field, SettingsField<?> prefField) {
 		bindToPreference(field, prefField.getGlobalPreference());
-		field.getValidation().addFieldValidation(true, field, prefField.getValidator());
+		field.addFieldValidator(true, prefField.getValidator());
 	}
 	public <T> void bindToPreference(IProperty<T> field, IProjectPreference<T> pref) {
 		bindToPreference(field, pref.getGlobalPreference());
@@ -90,11 +90,17 @@ public void loadDefaults() {
 
 	/* ----------------- util ----------------- */
 
+	public void bindToValidatedPreference(FieldWidget<String> field, DerivedValuePreference<?> derivedPref) {
+		bindToPreference(field, derivedPref.getPreference());
+
+		field.addFieldValidator(true, derivedPref.getValidator());
+	}
+
 	public void bindToValidatedPreference(IField<String> field, DerivedValuePreference<?> derivedPref, 
-			CompositeValidatableField validation) {
+			ValidationField validation) {
 		bindToPreference(field, derivedPref.getPreference());
 
-		validation.addFieldValidation(true, field, derivedPref.getValidator());
+		validation.addFieldValidator(true, field, derivedPref.getValidator());
 	}
 
 }
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/pages/LanguageToolsBlock.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/pages/LanguageToolsBlock.java
@@ -63,7 +63,7 @@ public EngineToolGroup() {
 			}
 
 			PathValidator validator = (new LocationOrSinglePathValidator(getEngineToolName())).setFileOnly(true);
-			validation.addFieldValidation(false, toolLocationField, validator);
+			toolLocationField.addFieldValidator(false, validator);
 
 			prefContext.bindToPreference(toolLocationField, ToolchainPreferences.DAEMON_PATH);
 			prefContext.bindToPreference(startServerAutomatically, ToolchainPreferences.AUTO_START_DAEMON);

diff --git a/plugin_ide.ui/src-lang/melnorme/util/swt/components/FieldWidget.java b/plugin_ide.ui/src-lang/melnorme/util/swt/components/FieldWidget.java
@@ -13,6 +13,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
+import melnorme.lang.tooling.data.IValidationSource;
 import melnorme.lang.tooling.data.IValidator;
 import melnorme.util.swt.SWTUtil;
 import melnorme.utilbox.fields.Field;
@@ -122,8 +123,16 @@ public boolean isCreated() {
 
 	/* -----------------  ----------------- */
 
-	public void addFieldValidator(IValidator<VALUE, ?> validator) {
-		validation.addFieldValidation(true, this, validator);
+	public void addFieldValidator(boolean init, IValidator<VALUE, ?> validator) {
+		validation.addFieldValidator(init, this, validator);
+	}
+
+	public void addFieldValidation(boolean init, IValidationSource validationSource) {
+		validation.addFieldValidation(init, this, validationSource);
+	}
+
+	public void addFieldValidationX(boolean init, IValidationSourceX validationSource) {
+		validation.addFieldValidation(init, this, validationSource);
 	}
 
 }
diff --git a/plugin_ide.ui/src-lang/melnorme/util/swt/components/IValidatableWidget.java b/plugin_ide.ui/src-lang/melnorme/util/swt/components/IValidatableWidget.java
@@ -11,15 +11,7 @@
 package melnorme.util.swt.components;
 
 import melnorme.lang.tooling.data.IStatusFieldSource;
-import melnorme.lang.tooling.data.IStatusMessage;
-import melnorme.utilbox.fields.IFieldView;
 
 public interface IValidatableWidget extends IWidgetComponent, IStatusFieldSource {
 
-	/* FIXME: WTF */
-	@Override
-	default IFieldView<IStatusMessage> getStatusField() {
-		return IFieldView.NULL_FIELD_VIEW();
-	}
-
 }
diff --git a/...oling/data/CompositeValidatableField.java → ...me/lang/tooling/data/ValidationField.java b/...oling/data/CompositeValidatableField.java → ...me/lang/tooling/data/ValidationField.java
@@ -15,11 +15,15 @@
 import melnorme.utilbox.fields.Field;
 import melnorme.utilbox.fields.IFieldView;
 
-public class CompositeValidatableField extends Field<IStatusMessage> implements IValidationSource {
+public class ValidationField extends Field<IStatusMessage> implements IValidationSource {
 
 	protected final ArrayList2<IValidationSource> validators = new ArrayList2<>();
 
-	public <SOURCE> void addFieldValidation(boolean init, IFieldView<SOURCE> field, IValidator<SOURCE, ?> validator) {
+	public ValidationField() {
+		super(null);
+	}
+
+	public <SOURCE> void addFieldValidator(boolean init, IFieldView<SOURCE> field, IValidator<SOURCE, ?> validator) {
 		addFieldValidation(init, field, new ValidatableField<>(field, validator));
 	}
 

diff --git a/...orme/lang/tests/LangCoreTests_Actual.java → ...norme/lang/tests/ToolingTests_Actual.java b/...orme/lang/tests/LangCoreTests_Actual.java → ...norme/lang/tests/ToolingTests_Actual.java
@@ -16,7 +16,7 @@
 
 @LANG_SPECIFIC
 /* FIXME: rename. */
-public class LangCoreTests_Actual {
+public class ToolingTests_Actual {
 
 	public static Location SAMPLE_SDK_PATH = LangToolingTestResources.getTestResourceLoc("mock_sdk");