Skip to content
This repository has been archived by the owner on Apr 3, 2018. It is now read-only.

Commit

Permalink
!API Rename LangCoreTests_Actual, CompositeValidatableField. refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@bruno-medeiros
bruno-medeiros committed Apr 20, 2016
1 parent 4ab0024 commit 6a187ef
Show file tree
Hide file tree
Showing 15 changed files with 49 additions and 47 deletions.
4 changes: 2 additions & 2 deletions ...in_ide.core.tests/src-lang/melnorme/lang/ide/core/operations/build/BuildManager_Test.java
View file
Expand Up @@ -32,7 +32,7 @@
import melnorme.lang.ide.core.operations.build.BuildTargetOperation.BuildOperationParameters; import melnorme.lang.ide.core.operations.build.BuildTargetOperation.BuildOperationParameters;
import melnorme.lang.ide.core.project_model.LangBundleModel; import melnorme.lang.ide.core.project_model.LangBundleModel;
import melnorme.lang.ide.core.tests.CoreTestWithProject; 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.BuildConfigMessages;
import melnorme.lang.tooling.bundle.BuildConfiguration; import melnorme.lang.tooling.bundle.BuildConfiguration;
import melnorme.lang.tooling.bundle.BuildTargetNameParser; import melnorme.lang.tooling.bundle.BuildTargetNameParser;
Expand Down Expand Up @@ -149,7 +149,7 @@ protected BuildConfiguration getValidBuildconfiguration(String buildConfigName,


protected String SEP = buildMgr.getBuildTargetNameParser().getNameSeparator(); protected String SEP = buildMgr.getBuildTargetNameParser().getNameSeparator();


protected final BundleInfo bundleInfo = LangCoreTests_Actual.createSampleBundleInfoA("SampleBundle", null); protected final BundleInfo bundleInfo = ToolingTests_Actual.createSampleBundleInfoA("SampleBundle", null);


/* ----------------- ----------------- */ /* ----------------- ----------------- */


Expand Down
4 changes: 2 additions & 2 deletions plugin_ide.core.tests/src-lang/melnorme/lang/ide/core/tests/CoreTestWithProject.java
View file
Expand Up @@ -21,7 +21,7 @@


import melnorme.lang.ide.core.CoreSettings.SettingsField; import melnorme.lang.ide.core.CoreSettings.SettingsField;
import melnorme.lang.ide.core.LangCore; 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.lang.tooling.data.StatusException;
import melnorme.utilbox.core.CommonException; import melnorme.utilbox.core.CommonException;
import melnorme.utilbox.ownership.IDisposable; import melnorme.utilbox.ownership.IDisposable;
Expand All @@ -41,7 +41,7 @@ public void doCreate() throws CoreException, CommonException {
} }


public static void setTestsSDKPath(IProject project) { 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); SDK_LOCATION.doSetRawValue(project, SDK_PATH);
} }
} }
Expand Down
4 changes: 2 additions & 2 deletions plugin_ide.core.tests/src-lang/melnorme/lang/ide/core/tests/SampleProject.java
View file
Expand Up @@ -23,7 +23,7 @@
import melnorme.lang.ide.core.utils.EclipseUtils; import melnorme.lang.ide.core.utils.EclipseUtils;
import melnorme.lang.ide.core.utils.ResourceUtils; import melnorme.lang.ide.core.utils.ResourceUtils;
import melnorme.lang.ide.core.utils.ResourceUtils.CoreOperation; 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.lang.tooling.bundle.BundleInfo;
import melnorme.utilbox.concurrency.OperationCancellation; import melnorme.utilbox.concurrency.OperationCancellation;
import melnorme.utilbox.core.CommonException; import melnorme.utilbox.core.CommonException;
Expand All @@ -34,7 +34,7 @@
public class SampleProject implements AutoCloseable { public class SampleProject implements AutoCloseable {


public final IProject project; public final IProject project;
public BundleInfo sampleBundleInfo = LangCoreTests_Actual.createSampleBundleInfoA("SampleBundle", null); public BundleInfo sampleBundleInfo = ToolingTests_Actual.createSampleBundleInfoA("SampleBundle", null);
public Disposable bundleModelIgnoreReg; public Disposable bundleModelIgnoreReg;


public SampleProject(String name) throws CoreException, CommonException { public SampleProject(String name) throws CoreException, CommonException {
Expand Down
4 changes: 4 additions & 0 deletions plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/build/CommandInvocation.java
View file
Expand Up @@ -31,6 +31,10 @@ public CommandInvocation(String commandArguments, VariablesResolver variablesRes
this.variablesResolver = assertNotNull(variablesResolver); this.variablesResolver = assertNotNull(variablesResolver);
} }


public String getCommandArguments() {
return commandArguments;
}

public Indexable<String> getEffectiveCommandLine() throws CommonException { public Indexable<String> getEffectiveCommandLine() throws CommonException {
String evaluatedCommandLine = variablesResolver.performStringSubstitution(commandArguments); String evaluatedCommandLine = variablesResolver.performStringSubstitution(commandArguments);


Expand Down
3 changes: 1 addition & 2 deletions plugin_ide.ui/src-lang/melnorme/lang/ide/ui/dialogs/LangProjectWizardFirstPage.java
View file
Expand Up @@ -197,8 +197,7 @@ public LocationGroup() {


nameGroup.getNameField().addListener(this::updateDefaultFieldValue); nameGroup.getNameField().addListener(this::updateDefaultFieldValue);


IValidationSourceX validationSource = () -> doValidate(); addFieldValidationX(true, () -> doValidate());
validation.addFieldValidation(true, this, validationSource);
} }


protected String getProjectName() { protected String getProjectName() {
Expand Down
2 changes: 1 addition & 1 deletion plugin_ide.ui/src-lang/melnorme/lang/ide/ui/operations/ToolSourceModifyingOperation.java
View file
Expand Up @@ -36,7 +36,7 @@ public class ToolSourceModifyingOperation extends RunToolOperation {
protected IResource resource; protected IResource resource;


public ToolSourceModifyingOperation(String operationName, IProject project, Indexable<String> commands, public ToolSourceModifyingOperation(String operationName, IProject project, Indexable<String> commands,
StartOperationOptions opViewOptions, @SuppressWarnings("unused") boolean APIdummy) { StartOperationOptions opViewOptions) {
super(operationName, project, commands, opViewOptions); super(operationName, project, commands, opViewOptions);


resource = assertNotNull(project); resource = assertNotNull(project);
Expand Down
6 changes: 3 additions & 3 deletions ...n_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/AbstractCompositePreferencesBlock.java
View file
Expand Up @@ -16,7 +16,7 @@
import melnorme.lang.ide.core.utils.prefs.DerivedValuePreference; import melnorme.lang.ide.core.utils.prefs.DerivedValuePreference;
import melnorme.lang.ide.ui.preferences.common.PreferencesPageContext; import melnorme.lang.ide.ui.preferences.common.PreferencesPageContext;
import melnorme.util.swt.components.AbstractCompositeWidget; import melnorme.util.swt.components.AbstractCompositeWidget;
import melnorme.utilbox.fields.IField; import melnorme.util.swt.components.FieldWidget;


public abstract class AbstractCompositePreferencesBlock extends AbstractCompositeWidget { public abstract class AbstractCompositePreferencesBlock extends AbstractCompositeWidget {


Expand All @@ -27,8 +27,8 @@ public AbstractCompositePreferencesBlock(PreferencesPageContext prefContext) {
this.prefContext = assertNotNull(prefContext); this.prefContext = assertNotNull(prefContext);
} }


protected void bindToDerivedPreference(IField<String> field, DerivedValuePreference<?> pref) { protected void bindFieldToDerivedPreference(FieldWidget<String> field, DerivedValuePreference<?> pref) {
prefContext.bindToValidatedPreference(field, pref, validation); prefContext.bindToValidatedPreference(field, pref);
} }


} }
16 changes: 2 additions & 14 deletions ...in_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/common/AbstractPreferencesBlock2.java
View file
Expand Up @@ -23,33 +23,21 @@
import melnorme.lang.ide.core.utils.prefs.IGlobalPreference; import melnorme.lang.ide.core.utils.prefs.IGlobalPreference;
import melnorme.lang.ide.core.utils.prefs.IntPreference; import melnorme.lang.ide.core.utils.prefs.IntPreference;
import melnorme.lang.ide.core.utils.prefs.StringPreference; 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.SWTFactory;
import melnorme.util.swt.SWTFactoryUtil; import melnorme.util.swt.SWTFactoryUtil;
import melnorme.util.swt.components.AbstractWidget;
import melnorme.util.swt.components.FieldWidget; 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.ComboBoxField;
import melnorme.util.swt.components.fields.NumberField; 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; protected final PreferencesPageContext prefContext;


public AbstractPreferencesBlock2(PreferencesPageContext prefContext) { public AbstractPreferencesBlock2(PreferencesPageContext prefContext) {
this.prefContext = assertNotNull(prefContext); this.prefContext = assertNotNull(prefContext);
} }


@Override public final void bindToDerivedPreference(FieldWidget<String> field, DerivedValuePreference<?> pref) {
public IFieldView<IStatusMessage> getStatusField() {
return validation;
}

public final void bindToDerivedPreference(IField<String> field, DerivedValuePreference<?> pref) {
prefContext.bindToValidatedPreference(field, pref, validation); prefContext.bindToValidatedPreference(field, pref, validation);
} }


Expand Down
6 changes: 3 additions & 3 deletions plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/common/AbstractWidgetExt.java
View file
Expand Up @@ -11,15 +11,15 @@
package melnorme.lang.ide.ui.preferences.common; 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.lang.tooling.data.IStatusMessage;
import melnorme.util.swt.components.AbstractWidget; import melnorme.util.swt.components.AbstractWidget;
import melnorme.util.swt.components.IValidatableWidget; import melnorme.util.swt.components.IValidatableWidget;
import melnorme.utilbox.fields.IFieldView; import melnorme.utilbox.fields.IFieldView;


public abstract class AbstractWidgetExt extends AbstractWidget implements IValidatableWidget { public abstract class AbstractWidgetExt extends AbstractWidget implements IValidatableWidget {


protected final CompositeValidatableField validation = new CompositeValidatableField(); protected final ValidationField validation = new ValidationField();


public AbstractWidgetExt() { public AbstractWidgetExt() {
super(); super();
Expand All @@ -30,7 +30,7 @@ public final IFieldView<IStatusMessage> getStatusField() {
return validation; return validation;
} }


public CompositeValidatableField getValidation() { public ValidationField getValidation() {
return validation; return validation;
} }


Expand Down
14 changes: 10 additions & 4 deletions plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/common/PreferencesPageContext.java
View file
Expand Up @@ -16,7 +16,7 @@
import melnorme.lang.ide.core.utils.prefs.DerivedValuePreference; import melnorme.lang.ide.core.utils.prefs.DerivedValuePreference;
import melnorme.lang.ide.core.utils.prefs.IGlobalPreference; import melnorme.lang.ide.core.utils.prefs.IGlobalPreference;
import melnorme.lang.ide.core.utils.prefs.IProjectPreference; 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.util.swt.components.FieldWidget;
import melnorme.utilbox.collections.ArrayList2; import melnorme.utilbox.collections.ArrayList2;
import melnorme.utilbox.core.CommonException; import melnorme.utilbox.core.CommonException;
Expand Down Expand Up @@ -49,7 +49,7 @@ public void addPrefElement(IPreferencesEditor prefElement) {
} }
public void bindToPreference(FieldWidget<String> field, SettingsField<?> prefField) { public void bindToPreference(FieldWidget<String> field, SettingsField<?> prefField) {
bindToPreference(field, prefField.getGlobalPreference()); 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) { public <T> void bindToPreference(IProperty<T> field, IProjectPreference<T> pref) {
bindToPreference(field, pref.getGlobalPreference()); bindToPreference(field, pref.getGlobalPreference());
Expand Down Expand Up @@ -90,11 +90,17 @@ public void loadDefaults() {


/* ----------------- util ----------------- */ /* ----------------- 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, public void bindToValidatedPreference(IField<String> field, DerivedValuePreference<?> derivedPref,
CompositeValidatableField validation) { ValidationField validation) {
bindToPreference(field, derivedPref.getPreference()); bindToPreference(field, derivedPref.getPreference());


validation.addFieldValidation(true, field, derivedPref.getValidator()); validation.addFieldValidator(true, field, derivedPref.getValidator());
} }


} }
2 changes: 1 addition & 1 deletion plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/pages/LanguageToolsBlock.java
View file
Expand Up @@ -63,7 +63,7 @@ public EngineToolGroup() {
} }


PathValidator validator = (new LocationOrSinglePathValidator(getEngineToolName())).setFileOnly(true); PathValidator validator = (new LocationOrSinglePathValidator(getEngineToolName())).setFileOnly(true);
validation.addFieldValidation(false, toolLocationField, validator); toolLocationField.addFieldValidator(false, validator);


prefContext.bindToPreference(toolLocationField, ToolchainPreferences.DAEMON_PATH); prefContext.bindToPreference(toolLocationField, ToolchainPreferences.DAEMON_PATH);
prefContext.bindToPreference(startServerAutomatically, ToolchainPreferences.AUTO_START_DAEMON); prefContext.bindToPreference(startServerAutomatically, ToolchainPreferences.AUTO_START_DAEMON);
Expand Down
13 changes: 11 additions & 2 deletions plugin_ide.ui/src-lang/melnorme/util/swt/components/FieldWidget.java
View file
Expand Up @@ -13,6 +13,7 @@
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;


import melnorme.lang.tooling.data.IValidationSource;
import melnorme.lang.tooling.data.IValidator; import melnorme.lang.tooling.data.IValidator;
import melnorme.util.swt.SWTUtil; import melnorme.util.swt.SWTUtil;
import melnorme.utilbox.fields.Field; import melnorme.utilbox.fields.Field;
Expand Down Expand Up @@ -122,8 +123,16 @@ public boolean isCreated() {


/* ----------------- ----------------- */ /* ----------------- ----------------- */


public void addFieldValidator(IValidator<VALUE, ?> validator) { public void addFieldValidator(boolean init, IValidator<VALUE, ?> validator) {
validation.addFieldValidation(true, this, 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);
} }


} }
8 changes: 0 additions & 8 deletions plugin_ide.ui/src-lang/melnorme/util/swt/components/IValidatableWidget.java
View file
Expand Up @@ -11,15 +11,7 @@
package melnorme.util.swt.components; package melnorme.util.swt.components;


import melnorme.lang.tooling.data.IStatusFieldSource; import melnorme.lang.tooling.data.IStatusFieldSource;
import melnorme.lang.tooling.data.IStatusMessage;
import melnorme.utilbox.fields.IFieldView;


public interface IValidatableWidget extends IWidgetComponent, IStatusFieldSource { public interface IValidatableWidget extends IWidgetComponent, IStatusFieldSource {


/* FIXME: WTF */
@Override
default IFieldView<IStatusMessage> getStatusField() {
return IFieldView.NULL_FIELD_VIEW();
}

} }
8 changes: 6 additions & 2 deletions ...oling/data/CompositeValidatableField.java → ...me/lang/tooling/data/ValidationField.java
View file
Expand Up @@ -15,11 +15,15 @@
import melnorme.utilbox.fields.Field; import melnorme.utilbox.fields.Field;
import melnorme.utilbox.fields.IFieldView; 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<>(); 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)); addFieldValidation(init, field, new ValidatableField<>(field, validator));
} }


Expand Down
2 changes: 1 addition & 1 deletion ...orme/lang/tests/LangCoreTests_Actual.java → ...norme/lang/tests/ToolingTests_Actual.java
View file
Expand Up @@ -16,7 +16,7 @@


@LANG_SPECIFIC @LANG_SPECIFIC
/* FIXME: rename. */ /* FIXME: rename. */
public class LangCoreTests_Actual { public class ToolingTests_Actual {


public static Location SAMPLE_SDK_PATH = LangToolingTestResources.getTestResourceLoc("mock_sdk"); public static Location SAMPLE_SDK_PATH = LangToolingTestResources.getTestResourceLoc("mock_sdk");


Expand Down

0 comments on commit 6a187ef

Please sign in to comment.