!API refactor IProperty, use Supplier. Renamed IModelField, DomainField.

Fix setupVariableResolver bug
GoClipse · Apr 14, 2016 · 80ea80e · 80ea80e
1 parent 7187292
commit 80ea80e
Show file tree

Hide file tree

Showing 35 changed files with 134 additions and 108 deletions.
diff --git a/plugin_ide.core.tests/src-lang/melnorme/lang/ide/core/engine/ModelReconcilationTest.java b/plugin_ide.core.tests/src-lang/melnorme/lang/ide/core/engine/ModelReconcilationTest.java
@@ -28,6 +28,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.text.IDocument;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import melnorme.lang.ide.core.engine.SourceModelManager.StructureModelRegistration;
@@ -53,6 +54,8 @@ public Indexable<?> getAnnotations(IProject project) {
 
 }
 
+/* FIXME: review test*/
+@Ignore
 public class ModelReconcilationTest extends CommonCoreTest {
 
 	protected ITextFileBufferManager fbm = FileBuffers.getTextFileBufferManager();

diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/ToolManager.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/ToolManager.java
@@ -43,7 +43,6 @@
 import melnorme.utilbox.concurrency.ICancelMonitor;
 import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.core.CommonException;
-import melnorme.utilbox.fields.DomainField;
 import melnorme.utilbox.fields.EventSource;
 import melnorme.utilbox.misc.Location;
 import melnorme.utilbox.process.ExternalProcessHelper.ExternalProcessResult;
@@ -85,15 +84,11 @@ public VariablesResolver getVariablesManager(IProject project) {
 	}
 
 	protected void setupVariableResolver(VariablesResolver variablesResolver, IProject project) {
-		/* FIXME: use Supplier*/
-		DomainField<String> sdkPathField = new DomainField<String>() {
-			@Override
-			public String getFieldValue() {
-				return ToolchainPreferences.SDK_PATH2.getStoredValue(project);
-			}
-		};
-		variablesResolver.putDynamicVar(
-			new SupplierAdapterVar(LangCore_Actual.VAR_NAME_SdkToolPath, "xxxxx", sdkPathField));
+		variablesResolver.putDynamicVar(new SupplierAdapterVar(
+			LangCore_Actual.VAR_NAME_SdkToolPath, 
+			LangCore_Actual.VAR_NAME_SdkToolPath_DESCRIPTION, 
+			ToolchainPreferences.SDK_PATH2.getProperty(project))
+		);
 	}
 
 	/* -----------------  ----------------- */

diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/build/BuildTargetsSerializer.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/build/BuildTargetsSerializer.java
@@ -30,8 +30,8 @@ public class BuildTargetsSerializer extends DocumentSerializerHelper {
 	private static final String PROP_NAME = "config";
 	private static final String PROP_ENABLED = "n_enabled";
 	private static final String PROP_AUTO_ENABLED = "auto_enabled";
+	private static final String PROP_FORMAT_VERSION2 = "version2";
 	private static final String PROP_ARGUMENTS = "options";
-	private static final String PROP_COMMANDLINE = "commandline";
 	private static final String PROP_EXE_PATH = "exe_path";
 
 	/* -----------------  ----------------- */
@@ -91,7 +91,9 @@ protected Element writeBuildTargetElement(Document doc, BuildTargetDataView btd)
 		targetElem.setAttribute(PROP_NAME, btd.getTargetName());
 		targetElem.setAttribute(PROP_ENABLED, Boolean.toString(btd.isNormalBuildEnabled()));
 		targetElem.setAttribute(PROP_AUTO_ENABLED, Boolean.toString(btd.isAutoBuildEnabled()));
-		setOptionalAttribute(targetElem, PROP_COMMANDLINE, btd.getBuildArguments());
+		targetElem.setAttribute(PROP_FORMAT_VERSION2, "true");
+
+		setOptionalAttribute(targetElem, PROP_ARGUMENTS, btd.getBuildArguments());
 		setOptionalAttribute(targetElem, PROP_EXE_PATH, btd.getExecutablePath());
 
 		return targetElem;
@@ -105,13 +107,16 @@ protected BuildTargetData readBuildTargetElement(Node targetElem) throws CommonE
 			buildTargetData.normalBuildEnabled = getBooleanAttribute(targetElem, PROP_ENABLED, false);
 			buildTargetData.autoBuildEnabled = getBooleanAttribute(targetElem, PROP_AUTO_ENABLED, false);
 			buildTargetData.targetName = getAttribute(targetElem, PROP_NAME, "");
-			buildTargetData.buildArguments = getAttribute(targetElem, PROP_COMMANDLINE, null);
+			buildTargetData.buildArguments = getAttribute(targetElem, PROP_ARGUMENTS, null);
 			buildTargetData.executablePath = getAttribute(targetElem, PROP_EXE_PATH, null);
 
-			if(buildTargetData.buildArguments == null) {
+			if(getAttribute(targetElem, PROP_FORMAT_VERSION2, null) == null) {
+				// we have a version 1 format
 				String buildArgs_old = getAttribute(targetElem, PROP_ARGUMENTS, null);
-				// Try to migrate old format for settings
-				buildTargetData.buildArguments = variableRefString(VAR_NAME_SdkToolPath) + " " + buildArgs_old; 
+				if(buildArgs_old != null) {
+					// Try to migrate from previous settings format
+					buildTargetData.buildArguments = variableRefString(VAR_NAME_SdkToolPath) + " " + buildArgs_old; 
+				}
 			}
 
 			return createBuildTarget(targetElem, buildTargetData);

diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/build/VariablesResolver.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/build/VariablesResolver.java
@@ -13,6 +13,7 @@
 import static melnorme.utilbox.core.Assert.AssertNamespace.assertNotNull;
 
 import java.text.MessageFormat;
+import java.util.function.Supplier;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.variables.IDynamicVariable;
@@ -26,7 +27,6 @@
 import melnorme.utilbox.collections.ArrayList2;
 import melnorme.utilbox.collections.HashMap2;
 import melnorme.utilbox.core.CommonException;
-import melnorme.utilbox.fields.IFieldView;
 
 public class VariablesResolver {
 
@@ -144,9 +144,9 @@ public static class SupplierAdapterVar implements IDynamicVariable {
 
 		protected final String name;
 		protected final String description;
-		protected final IFieldView<String> fieldView;
+		protected final Supplier<String> fieldView;
 
-		public SupplierAdapterVar(String name, String description, IFieldView<String> fieldView) {
+		public SupplierAdapterVar(String name, String description, Supplier<String> fieldView) {
 			this.name = assertNotNull(name);
 			this.description = assertNotNull(description);
 			this.fieldView = assertNotNull(fieldView);
@@ -173,7 +173,7 @@ public String getValue(String argument) throws CoreException {
 				throw LangCore.createCoreException(
 					MessageFormat.format("Variable {0} does not accept arguments.", getName()) , null);
 			}
-			return fieldView.getFieldValue();
+			return fieldView.get();
 		}
 	}
 

diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/utils/prefs/IGlobalPreference.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/utils/prefs/IGlobalPreference.java
@@ -21,7 +21,7 @@ public interface IGlobalPreference<T> {
 	IFieldView<T> asField();
 
 	default T get() {
-		return asField().getValue();
+		return asField().get();
 	}
 
 	T getDefaultValue();

diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/utils/prefs/IProjectPreference.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/utils/prefs/IProjectPreference.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package melnorme.lang.ide.core.utils.prefs;
 
+import java.util.function.Supplier;
+
 import org.eclipse.core.resources.IProject;
 
 import melnorme.utilbox.core.CommonException;
@@ -33,4 +35,6 @@ default String getKey() {
 
 	IProjectPreference<Boolean> getEnableProjectSettingPref();
 
+	Supplier<T> getProperty(IProject project);
+
 }
diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/utils/prefs/PreferenceHelper.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/utils/prefs/PreferenceHelper.java
@@ -14,6 +14,7 @@
 import static melnorme.utilbox.core.Assert.AssertNamespace.assertTrue;
 
 import java.util.HashMap;
+import java.util.function.Supplier;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
@@ -26,7 +27,7 @@
 import melnorme.lang.ide.core.LangCore;
 import melnorme.lang.ide.core.PreferencesOverride;
 import melnorme.utilbox.core.CommonException;
-import melnorme.utilbox.fields.DomainField;
+import melnorme.utilbox.fields.Field;
 import melnorme.utilbox.fields.IFieldView;
 
 public abstract class PreferenceHelper<T> implements IGlobalPreference<T> {
@@ -48,7 +49,7 @@ public static void checkUniqueKey(String key, PreferenceHelper<?> preference) {
 
 	protected final IProjectPreference<Boolean> useProjectPreference;
 
-	protected final DomainField<T> field = new DomainField<T>();
+	protected final Field<T> field = new Field<T>();
 
 	public PreferenceHelper(String key, T defaultValue) {
 		this(LangCore.PLUGIN_ID, key, defaultValue);
@@ -191,6 +192,16 @@ public T getDefaultValue() {
 			return PreferenceHelper.this.getDefaultValue();
 		}
 
+		@Override
+		public Supplier<T> getProperty(IProject project) {
+			return new Supplier<T>() {
+				@Override
+				public T get() {
+					return getStoredValue(project);
+				}
+			};
+		}
+
 		@Override
 		public T getStoredValue(IProject project) {
 			return getProjectScopeValue(project);

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/dialogs/AbstractLangPropertyPage2.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/dialogs/AbstractLangPropertyPage2.java
@@ -71,7 +71,7 @@ protected Control doCreateContents(Composite parent, IProject project) {
 	}
 
 	protected void updateStatusMessage() {
-		DialogPageUtils.setPrefPageStatus(this, preferencesWidget.getStatusField().getValue());
+		DialogPageUtils.setPrefPageStatus(this, preferencesWidget.getStatusField().get());
 	}
 
 	@Override

diff --git a/...in_ide.ui/src-lang/melnorme/lang/ide/ui/editor/structure/AbstractLangStructureEditor.java b/...in_ide.ui/src-lang/melnorme/lang/ide/ui/editor/structure/AbstractLangStructureEditor.java
@@ -46,7 +46,7 @@
 import melnorme.lang.tooling.structure.SourceFileStructure;
 import melnorme.lang.tooling.structure.StructureElement;
 import melnorme.util.swt.jface.text.ColorManager2;
-import melnorme.utilbox.fields.DomainField;
+import melnorme.utilbox.fields.Field;
 import melnorme.utilbox.misc.Location;
 
 /**
@@ -112,14 +112,14 @@ public static LocationKey getStructureModelKeyFromEditorInput(IEditorInput input
 		}
 	}
 
-	protected final DomainField<SourceFileStructure> structureField = new DomainField<>();
-	protected final DomainField<StructureElement> selectedElementField = new DomainField<>();
+	protected final Field<SourceFileStructure> structureField = new Field<>();
+	protected final Field<StructureElement> selectedElementField = new Field<>();
 
-	public DomainField<SourceFileStructure> getStructureField() {
+	public Field<SourceFileStructure> getStructureField() {
 		return structureField;
 	}
 
-	public DomainField<StructureElement> getSelectedElementField() {
+	public Field<StructureElement> getSelectedElementField() {
 		return selectedElementField;
 	}
 

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.IModelField;
+import melnorme.utilbox.fields.IField;
 
 public abstract class AbstractCompositePreferencesBlock extends AbstractCompositeWidget {
 
@@ -28,7 +28,7 @@ public AbstractCompositePreferencesBlock(PreferencesPageContext prefContext) {
 		createInlined = false;
 	}
 
-	protected void bindToDerivedPreference(IModelField<String> field, DerivedValuePreference<?> pref) {
+	protected void bindToDerivedPreference(IField<String> field, DerivedValuePreference<?> pref) {
 		prefContext.bindToValidatedPreference(field, pref, validation);
 	}
 

diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/ProjectPreferencesBlock.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/ProjectPreferencesBlock.java
@@ -132,21 +132,21 @@ public PreferencePropertyBinding(IProperty<T> property, IProjectPreference<T> pr
 			this.preference = preference;
 			this.project = project;
 
-			property.setValue(preference.getStoredValue(project));
+			property.set(preference.getStoredValue(project));
 		}
 
 		public void updateFieldFromInput() {
-			property.setValue(preference.getStoredValue(project));
+			property.set(preference.getStoredValue(project));
 		}
 
 		@Override
 		public void loadDefaults() {
-			property.setValue(preference.getGlobalPreference().get());
+			property.set(preference.getGlobalPreference().get());
 		}
 
 		@Override
 		public void doSaveSettings() throws CommonException {
-			preference.setValue(project, property.getValue());
+			preference.setValue(project, property.get());
 		}
 	}
 

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
@@ -33,7 +33,7 @@
 import melnorme.util.swt.components.fields.ComboBoxField;
 import melnorme.util.swt.components.fields.NumberField;
 import melnorme.utilbox.fields.IFieldView;
-import melnorme.utilbox.fields.IModelField;
+import melnorme.utilbox.fields.IField;
 
 public abstract class AbstractPreferencesBlock2 extends AbstractWidget implements IValidatableWidget {
 
@@ -49,7 +49,7 @@ public IFieldView<IStatusMessage> getStatusField() {
 		return validation;
 	}
 
-	public final void bindToDerivedPreference(IModelField<String> field, DerivedValuePreference<?> pref) {
+	public final void bindToDerivedPreference(IField<String> field, DerivedValuePreference<?> pref) {
 		prefContext.bindToValidatedPreference(field, pref, validation);
 	}
 

diff --git a/...ui/src-lang/melnorme/lang/ide/ui/preferences/common/AbstractPreferencesBlockPrefPage.java b/...ui/src-lang/melnorme/lang/ide/ui/preferences/common/AbstractPreferencesBlockPrefPage.java
@@ -55,7 +55,7 @@ protected void updateStatusMessage() {
 
 	/** @return page status message. Can be null */
 	protected IStatusMessage getPageStatus() {
-		return preferencesBlock.getStatusField().getValue();
+		return preferencesBlock.getStatusField().get();
 	}
 
 	/* -----------------  ----------------- */

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
@@ -18,7 +18,7 @@
 import melnorme.lang.tooling.data.CompositeValidatableField;
 import melnorme.utilbox.collections.ArrayList2;
 import melnorme.utilbox.core.CommonException;
-import melnorme.utilbox.fields.IModelField;
+import melnorme.utilbox.fields.IField;
 import melnorme.utilbox.fields.IProperty;
 
 public class PreferencesPageContext implements IPreferencesEditor {
@@ -67,24 +67,24 @@ public GlobalPreferenceAdapter(IGlobalPreference<T> preference, IProperty<T> pro
 			this.preference = assertNotNull(preference);
 			this.property = assertNotNull(property);
 
-			property.setValue(preference.asField().getValue());
+			property.set(preference.asField().get());
 		}
 
 		@Override
 		public void doSaveSettings() throws CommonException {
-			preference.setInstanceScopeValue(property.getValue());
+			preference.setInstanceScopeValue(property.get());
 		}
 
 		@Override
 		public void loadDefaults() {
-			property.setValue(preference.getDefaultValue());
+			property.set(preference.getDefaultValue());
 		}
 
 	}
 
 	/* ----------------- util ----------------- */
 
-	public void bindToValidatedPreference(IModelField<String> field, DerivedValuePreference<?> derivedPref, 
+	public void bindToValidatedPreference(IField<String> field, DerivedValuePreference<?> derivedPref, 
 			CompositeValidatableField validation) {
 		bindToPreference(field, derivedPref.getPreference());
 

diff --git a/...src-lang/melnorme/lang/ide/ui/text/coloring/AbstractSourceColoringConfigurationBlock.java b/...src-lang/melnorme/lang/ide/ui/text/coloring/AbstractSourceColoringConfigurationBlock.java
@@ -55,7 +55,7 @@
 import melnorme.util.swt.jface.text.ColorManager2;
 import melnorme.utilbox.core.CommonException;
 import melnorme.utilbox.fields.IFieldValueListener;
-import melnorme.utilbox.fields.IModelField;
+import melnorme.utilbox.fields.IField;
 import melnorme.utilbox.fields.IProperty;
 import melnorme.utilbox.misc.StreamUtil;
 import melnorme.utilbox.misc.StringUtil;
@@ -124,7 +124,7 @@ public class SourceColoringElement extends LabeledTreeElement implements IPrefer
 
 		protected final ThemedTextStylingPreference stylingPref;
 		protected final String prefId;
-		protected final IModelField<TextStyling> temporaryPref;
+		protected final IField<TextStyling> temporaryPref;
 
 		public SourceColoringElement(String labelText, ThemedTextStylingPreference stylingPref) {
 			super(null, null, labelText);
@@ -135,21 +135,21 @@ public SourceColoringElement(String labelText, ThemedTextStylingPreference styli
 		}
 
 		public void loadFromPrefs() {
-			this.temporaryPref.setValue(stylingPref.getFieldValue());
+			this.temporaryPref.set(stylingPref.getFieldValue());
 		}
 
 		public TextStyling getWorkingValue() {
-			return temporaryPref.getValue();
+			return temporaryPref.get();
 		}
 
 		@Override
 		public void loadDefaults() {
-			temporaryPref.setValue(stylingPref.getDefaultValue());
+			temporaryPref.set(stylingPref.getDefaultValue());
 		}
 
 		@Override
 		public void doSaveSettings() throws CommonException {
-			stylingPref.setInstanceScopeValue(temporaryPref.getValue());
+			stylingPref.setInstanceScopeValue(temporaryPref.get());
 		}
 
 	}
@@ -296,10 +296,10 @@ protected abstract class ChangeStylingField implements IFieldValueListener {
 		@Override
 		public void fieldValueChanged() {
 			IProperty<TextStyling> field = getSelectedColoringItem().temporaryPref;
-			TextStyling newStyling = field.getValue();
+			TextStyling newStyling = field.get();
 			TextStylingData data = newStyling.getData();
 			changeStylingValue(data);
-			field.setValue(new TextStyling(data));
+			field.set(new TextStyling(data));
 		}
 
 		protected abstract void changeStylingValue(TextStylingData data);