From a54dffebfad020fb3117cec297ce1f1977784969 Mon Sep 17 00:00:00 2001 From: Bruno Medeiros Date: Fri, 9 Oct 2015 17:02:59 +0100 Subject: [PATCH] LANG: Minor followup changes. Conflicts: plugin_ide.ui/src/LANG_PROJECT_ID/ide/ui/preferences/LANGUAGE_Root__PreferencePage.java --- .../ide/ui/dialogs/LangProjectWizardFirstPage.java | 14 +++++++++++++- .../ide/ui/preferences/LangRootPreferencePage.java | 4 +++- .../ide/ui/preferences/LangSDKConfigBlock.java | 4 ++-- .../util/swt/components/AbstractComponentExt.java | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) 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 index 27dc03818..62b3c0671 100644 --- 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 @@ -48,6 +48,7 @@ import melnorme.util.swt.SWTFactoryUtil; import melnorme.util.swt.SWTUtil; import melnorme.util.swt.components.AbstractComponent; +import melnorme.util.swt.components.AbstractComponentExt; import melnorme.util.swt.components.fields.DirectoryTextField; import melnorme.util.swt.components.fields.EnablementButtonTextField; import melnorme.util.swt.components.fields.TextFieldComponent; @@ -148,7 +149,7 @@ public void setVisible(boolean visible) { } } - public static class NameGroup extends AbstractComponent{ + public static class NameGroup extends AbstractComponentExt { protected TextFieldComponent textField = new TextFieldComponent(WizardMessages.LangNewProject_NameGroup_label); @@ -180,6 +181,11 @@ protected void createContents(Composite topControl) { textField.createComponentInlined(topControl); } + @Override + public void setEnabled(boolean enabled) { + textField.setEnabled(enabled); + } + @Override public void updateComponentFromInput() { } @@ -216,6 +222,12 @@ protected String getProjectName() { return nameGroup.getName(); } + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + nameGroup.setEnabled(enabled); + } + protected boolean isDefaultLocation() { return isUseDefault(); } diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangRootPreferencePage.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangRootPreferencePage.java index 9da2e97f6..bfde548b3 100644 --- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangRootPreferencePage.java +++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangRootPreferencePage.java @@ -30,7 +30,7 @@ public LangRootPreferencePage() { } protected LangSDKConfigBlock createLangSDKConfigBlock() { - LangSDKConfigBlock langSDKConfigBlock = new LangSDKConfigBlock(); + LangSDKConfigBlock langSDKConfigBlock = doCreateLangSDKConfigBlock(); connectStringField(ToolchainPreferences.SDK_PATH.key, langSDKConfigBlock.getLocationField(), getSDKValidator()); @@ -38,6 +38,8 @@ protected LangSDKConfigBlock createLangSDKConfigBlock() { return langSDKConfigBlock; } + protected abstract LangSDKConfigBlock doCreateLangSDKConfigBlock(); + protected abstract PathValidator getSDKValidator(); @Override diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangSDKConfigBlock.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangSDKConfigBlock.java index 1d101611d..2cea1bc12 100644 --- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangSDKConfigBlock.java +++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangSDKConfigBlock.java @@ -20,9 +20,9 @@ import melnorme.util.swt.components.fields.ButtonTextField; import melnorme.util.swt.components.fields.DirectoryTextField; -public class LangSDKConfigBlock extends AbstractComponent { +public abstract class LangSDKConfigBlock extends AbstractComponent { - protected final LangSDKConfigBlock.LanguageSDKLocationGroup sdkLocationGroup = createSDKLocationGroup(); + public final LangSDKConfigBlock.LanguageSDKLocationGroup sdkLocationGroup = createSDKLocationGroup(); public LangSDKConfigBlock() { } diff --git a/plugin_ide.ui/src-lang/melnorme/util/swt/components/AbstractComponentExt.java b/plugin_ide.ui/src-lang/melnorme/util/swt/components/AbstractComponentExt.java index 83692be61..fa0ba1db5 100644 --- a/plugin_ide.ui/src-lang/melnorme/util/swt/components/AbstractComponentExt.java +++ b/plugin_ide.ui/src-lang/melnorme/util/swt/components/AbstractComponentExt.java @@ -29,7 +29,7 @@ public AbstractComponentExt() { /* ----------------- ----------------- */ - public abstract void setEnabled(boolean readOnly); + public abstract void setEnabled(boolean enabled); protected void _verify_setEnabled() { _verify_setEnabled(getClass());