[eclipse-yocto] [PATCH 2/4] org.yocto.sdk.ide: rename eclipse-poky to eclipse-yocto
Tim Orling
timothy.t.orling at linux.intel.com
Wed Jul 11 16:06:39 PDT 2018
Rebased and merged.
> On Feb 27, 2018, at 6:52 PM, Chin Huat Ang <chin.huat.ang at intel.com> wrote:
>
> Rename all Java types, methods, comments etc. to get rid of all reminiscent of
> eclipse-poky.
>
> Signed-off-by: Chin Huat Ang <chin.huat.ang at intel.com>
> ---
> .../src/org/yocto/sdk/ide/YoctoSDKChecker.java | 42 ++++++++--------
> .../org/yocto/sdk/ide/YoctoSDKMessages.properties | 58 +++++++++++-----------
> .../src/org/yocto/sdk/ide/YoctoUIElement.java | 22 ++++----
> .../src/org/yocto/sdk/ide/YoctoUISetting.java | 30 +++++------
> .../ide/preferences/YoctoSDKPreferencePage.java | 6 +--
> .../preferences/YoctoSDKProjectPropertyPage.java | 2 +-
> .../sdk/ide/utils/ProjectPreferenceUtils.java | 18 +++----
> .../src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java | 20 ++++----
> 8 files changed, 99 insertions(+), 99 deletions(-)
>
> diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKChecker.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKChecker.java
> index d1d74f2..0adfec5 100644
> --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKChecker.java
> +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKChecker.java
> @@ -33,29 +33,29 @@ public class YoctoSDKChecker {
> public static enum SDKCheckResults {
> SDK_PASS("", false),
> TOOLCHAIN_LOCATION_EMPTY(
> - "Poky.SDK.Location.Empty", true),
> + "Yocto.SDK.Location.Empty", true),
> TOOLCHAIN_LOCATION_NONEXIST(
> - "Poky.SDK.Location.Nonexist", true),
> + "Yocto.SDK.Location.Nonexist", true),
> SDK_TARGET_EMPTY(
> - "Poky.SDK.Target.Empty", true),
> + "Yocto.SDK.Target.Empty", true),
> SDK_NO_TARGET_SELECTED(
> - "Poky.SDK.No.Target.Selected", false),
> + "Yocto.SDK.No.Target.Selected", false),
> SYSROOT_EMPTY(
> - "Poky.Sysroot.Empty", true),
> + "Yocto.Sysroot.Empty", true),
> SYSROOT_NONEXIST(
> - "Poky.Sysroot.Nonexist", true),
> + "Yocto.Sysroot.Nonexist", true),
> QEMU_KERNEL_EMPTY(
> - "Poky.Qemu.Kernel.Empty", true),
> + "Yocto.Qemu.Kernel.Empty", true),
> QEMU_KERNEL_NONEXIST(
> - "Poky.Qemu.Kernel.Nonexist", true),
> + "Yocto.Qemu.Kernel.Nonexist", true),
> WRONG_SDK_VERSION(
> - "Poky.SDK.Sysroot.Wrongversion", false),
> + "Yocto.SDK.Sysroot.Wrongversion", false),
> ENV_SETUP_SCRIPT_NONEXIST(
> - "Poky.Env.Script.Nonexist", false),
> + "Yocto.Env.Script.Nonexist", false),
> TOOLCHAIN_NO_SYSROOT(
> - "Poky.Toolchain.No.Sysroot", false),
> + "Yocto.Toolchain.No.Sysroot", false),
> TOOLCHAIN_HOST_MISMATCH(
> - "Poky.Toolchain.Host.Mismatch", false);
> + "Yocto.Toolchain.Host.Mismatch", false);
>
> private static final String DEFAULT_ADVICE = "Default.Advice";
> private static final String ADVICE_SUFFIX = ".Advice";
> @@ -84,10 +84,10 @@ public class YoctoSDKChecker {
> };
>
> public static enum SDKCheckRequestFrom {
> - Wizard("Poky.SDK.Error.Origin.Wizard"),
> - Menu("Poky.SDK.Error.Origin.Menu"),
> - Preferences("Poky.SDK.Error.Origin.Preferences"),
> - Other("Poky.SDK.Error.Origin.Other");
> + Wizard("Yocto.SDK.Error.Origin.Wizard"),
> + Menu("Yocto.SDK.Error.Origin.Menu"),
> + Preferences("Yocto.SDK.Error.Origin.Preferences"),
> + Other("Yocto.SDK.Error.Origin.Other");
>
> private final String errorMessageID;
>
> @@ -129,7 +129,7 @@ public class YoctoSDKChecker {
> return SDKCheckResults.SYSROOT_NONEXIST;
> }
>
> - if (elem.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_SDK_MODE) {
> + if (elem.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_SDK_MODE) {
> //Check for SDK compatible with the host arch
> String platform = getPlatformArch();
> String sysroot_dir_str = elem.getStrToolChainRoot() + "/" + SYSROOTS_DIR;
> @@ -156,18 +156,18 @@ public class YoctoSDKChecker {
> }
>
> if (elem.getIntTargetIndex() < 0 || elem.getStrTarget().isEmpty()) {
> - //if this is poky tree mode, prompt user whether bitbake meta-ide-support is executed?
> - if (elem.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_TREE_MODE)
> + //if this is Yocto tree mode, prompt user whether bitbake meta-ide-support is executed?
> + if (elem.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_TREE_MODE)
> return SDKCheckResults.ENV_SETUP_SCRIPT_NONEXIST;
> else
> return SDKCheckResults.SDK_TARGET_EMPTY;
> } else {
> String sFileName;
>
> - if (elem.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_SDK_MODE) {
> + if (elem.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_SDK_MODE) {
> sFileName = elem.getStrToolChainRoot()+"/" + YoctoSDKUtilsConstants.DEFAULT_ENV_FILE_PREFIX + elem.getStrTarget();
> } else {
> - //POKY TREE Mode
> + //YOCTO TREE Mode
> sFileName = elem.getStrToolChainRoot() + YoctoSDKUtilsConstants.DEFAULT_TMP_PREFIX +
> YoctoSDKUtilsConstants.DEFAULT_ENV_FILE_PREFIX + elem.getStrTarget();
> }
> diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKMessages.properties b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKMessages.properties
> index c8207de..dd28526 100644
> --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKMessages.properties
> +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKMessages.properties
> @@ -12,38 +12,38 @@
> Wizard.SDK.Warning.Title = Invalid Yocto Project SDK Location
> Wizard.SDK.Error.ProjectName = Project name "{0}" is invalid! \nNone of these characters are accepted inside project names: whitespaces, {1}
>
> -Poky.SDK.Location.Empty = Specified Toolchain Root Location is empty.
> -Poky.SDK.Location.Empty.Advice = You need specify Toolchain Root Location before building any project.
> -Poky.SDK.Location.Nonexist = Specified SDK toolchain directory does not exist.
> -Poky.SDK.Location.Nonexist.Advice = Please specify a valid toolchain directory.
> -Poky.SDK.Target.Empty = Specified location does not contain environment script file.
> -Poky.SDK.Target.Empty.Advice = You need specify Target Architecture before building any project.
> -Poky.SDK.No.Target.Selected = Target Architecture is not defined.
> -Poky.SDK.No.Target.Selected.Advice = Please choose a Target Architecture.
> -Poky.Sysroot.Empty = Specified Sysroot Location is empty.
> -Poky.Sysroot.Empty.Advice = You need specify Sysroot Location before building any project.
> -Poky.Sysroot.Nonexist = Specified Sysroot Location does not exist.
> -Poky.Sysroot.Nonexist.Advice = You need specify a valid Sysroot Location before building any project.
> -Poky.Qemu.Kernel.Empty = Specified QEMU kernel location is emtpy.
> -Poky.Qemu.Kernel.Empty.Advice = You need specify QEMU kernel image file Location before building any project.
> -Poky.Qemu.Kernel.Nonexist = Specified QEMU kernel image file does not exist.
> -Poky.Qemu.Kernel.Empty.Advice = You need specify a valid QEMU kernel image file before building any project.
> -Poky.SDK.Sysroot.Wrongversion = The SDK version you're using is too old.
> -Poky.SDK.Sysroot.Wrongversion.Advice = OECORE related items are not found in environment setup files.\nPlease upgrade to our latest SDK Version!
> -Poky.Env.Script.Nonexist = Specified toolchain directory does not contain a toolchain generated with "bitbake meta-ide-support".
> -Poky.Env.Script.Nonexist.Advice = Please run "bitbake meta-ide-support" to build the toolchain.
> -Poky.Toolchain.No.Sysroot = Specified Toolchain Root Location does not contain a sysroot directory.
> -Poky.Toolchain.No.Sysroot.Advice = Please install a valid toolchain sysroot.
> -Poky.Toolchain.Host.Mismatch = Toolchain and host arch mismatch.
> -Poky.Toolchain.Host.Mismatch.Advice = Make sure you use 32bit toolchain for 32bit host and same for 64bit machines!
> +Yocto.SDK.Location.Empty = Specified Toolchain Root Location is empty.
> +Yocto.SDK.Location.Empty.Advice = You need specify Toolchain Root Location before building any project.
> +Yocto.SDK.Location.Nonexist = Specified SDK toolchain directory does not exist.
> +Yocto.SDK.Location.Nonexist.Advice = Please specify a valid toolchain directory.
> +Yocto.SDK.Target.Empty = Specified location does not contain environment script file.
> +Yocto.SDK.Target.Empty.Advice = You need specify Target Architecture before building any project.
> +Yocto.SDK.No.Target.Selected = Target Architecture is not defined.
> +Yocto.SDK.No.Target.Selected.Advice = Please choose a Target Architecture.
> +Yocto.Sysroot.Empty = Specified Sysroot Location is empty.
> +Yocto.Sysroot.Empty.Advice = You need specify Sysroot Location before building any project.
> +Yocto.Sysroot.Nonexist = Specified Sysroot Location does not exist.
> +Yocto.Sysroot.Nonexist.Advice = You need specify a valid Sysroot Location before building any project.
> +Yocto.Qemu.Kernel.Empty = Specified QEMU kernel location is emtpy.
> +Yocto.Qemu.Kernel.Empty.Advice = You need specify QEMU kernel image file Location before building any project.
> +Yocto.Qemu.Kernel.Nonexist = Specified QEMU kernel image file does not exist.
> +Yocto.Qemu.Kernel.Empty.Advice = You need specify a valid QEMU kernel image file before building any project.
> +Yocto.SDK.Sysroot.Wrongversion = The SDK version you're using is too old.
> +Yocto.SDK.Sysroot.Wrongversion.Advice = OECORE related items are not found in environment setup files.\nPlease upgrade to our latest SDK Version!
> +Yocto.Env.Script.Nonexist = Specified toolchain directory does not contain a toolchain generated with "bitbake meta-ide-support".
> +Yocto.Env.Script.Nonexist.Advice = Please run "bitbake meta-ide-support" to build the toolchain.
> +Yocto.Toolchain.No.Sysroot = Specified Toolchain Root Location does not contain a sysroot directory.
> +Yocto.Toolchain.No.Sysroot.Advice = Please install a valid toolchain sysroot.
> +Yocto.Toolchain.Host.Mismatch = Toolchain and host arch mismatch.
> +Yocto.Toolchain.Host.Mismatch.Advice = Make sure you use 32bit toolchain for 32bit host and same for 64bit machines!
>
> Default.Advice = \nDo IDE-wide settings from Window > Preferences > Yocto Project SDK\nOr do Project-wide settings from Project > Change Yocto Project Settings.
> -Poky.SDK.Revalidation.Message = Please apply the changes to revalidate.
> +Yocto.SDK.Revalidation.Message = Please apply the changes to revalidate.
>
> -Poky.SDK.Error.Origin.Wizard = Yocto Wizard Configuration Error:
> -Poky.SDK.Error.Origin.Menu = Yocto Menu Configuration Error:
> -Poky.SDK.Error.Origin.Preferences = Yocto Preferences Configuration Error:
> -Poky.SDK.Error.Origin.Other = Yocto Configuration Error:
> +Yocto.SDK.Error.Origin.Wizard = Yocto Wizard Configuration Error:
> +Yocto.SDK.Error.Origin.Menu = Yocto Menu Configuration Error:
> +Yocto.SDK.Error.Origin.Preferences = Yocto Preferences Configuration Error:
> +Yocto.SDK.Error.Origin.Other = Yocto Configuration Error:
>
> Menu.SDK.Console.Configure.Message = The Yocto Project SDK has been successfully set up for this project.\nTo see the environment variables created during setup,\ngo to Project > Properties > C/C++ Build > Environment.
> Menu.SDK.Console.Deploy.Action.Message = \nDeploying {0} to {1} ...\n
> diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUIElement.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUIElement.java
> index de3e905..30319ec 100644
> --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUIElement.java
> +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUIElement.java
> @@ -11,10 +11,10 @@
> package org.yocto.sdk.ide;
>
> public class YoctoUIElement {
> - public enum PokyMode
> + public enum YoctoMode
> {
> - POKY_SDK_MODE,
> - POKY_TREE_MODE
> + YOCTO_SDK_MODE,
> + YOCTO_TREE_MODE
> };
> public enum DeviceMode
> {
> @@ -28,14 +28,14 @@ public class YoctoUIElement {
> private String strQemuKernelLoc;
> private String strQemuOption;
> private String strSysrootLoc;
> - private PokyMode enumPokyMode;
> + private YoctoMode enumYoctoMode;
> private String strToolChainRoot;
> private int intTargetIndex;
>
> public YoctoUIElement()
> {
> this.enumDeviceMode = DeviceMode.QEMU_MODE;
> - this.enumPokyMode = PokyMode.POKY_SDK_MODE;
> + this.enumYoctoMode = YoctoMode.YOCTO_SDK_MODE;
> this.strToolChainRoot = "";
> this.strQemuKernelLoc = "";
> this.strQemuOption = "";
> @@ -44,11 +44,11 @@ public class YoctoUIElement {
> this.strTarget = "";
> }
>
> - public PokyMode getEnumPokyMode() {
> - return enumPokyMode;
> + public YoctoMode getEnumYoctoMode() {
> + return enumYoctoMode;
> }
> - public void setEnumPokyMode(PokyMode enumPokyMode) {
> - this.enumPokyMode = enumPokyMode;
> + public void setEnumYoctoMode(YoctoMode enumYoctoMode) {
> + this.enumYoctoMode = enumYoctoMode;
> }
> public String getStrToolChainRoot() {
> return strToolChainRoot;
> @@ -106,7 +106,7 @@ public class YoctoUIElement {
> final int prime = 31;
> int result = 1;
> result = prime * result + ((enumDeviceMode == null) ? 0 : enumDeviceMode.hashCode());
> - result = prime * result + ((enumPokyMode == null) ? 0 : enumPokyMode.hashCode());
> + result = prime * result + ((enumYoctoMode == null) ? 0 : enumYoctoMode.hashCode());
> result = prime * result + intTargetIndex;
> result = prime * result + ((strQemuKernelLoc == null) ? 0 : strQemuKernelLoc.hashCode());
> result = prime * result + ((strQemuOption == null) ? 0 : strQemuOption.hashCode());
> @@ -127,7 +127,7 @@ public class YoctoUIElement {
> YoctoUIElement other = (YoctoUIElement) obj;
> if (enumDeviceMode != other.enumDeviceMode)
> return false;
> - if (enumPokyMode != other.enumPokyMode)
> + if (enumYoctoMode != other.enumYoctoMode)
> return false;
> if (intTargetIndex != other.intTargetIndex)
> return false;
> diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUISetting.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUISetting.java
> index d192538..674cfc7 100644
> --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUISetting.java
> +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUISetting.java
> @@ -52,7 +52,7 @@ public class YoctoUISetting {
>
> private Button btnSDKRoot;
> private Button btnQemu;
> - private Button btnPokyRoot;
> + private Button btnYoctoRoot;
> private Button btnDevice;
>
> private Button btnKernelLoc;
> @@ -223,14 +223,14 @@ public class YoctoUISetting {
> crossCompilerGroup.setLayoutData(gd);
> crossCompilerGroup.setText("Cross Compiler Options:");
>
> - if (yoctoUIElement.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_SDK_MODE) {
> + if (yoctoUIElement.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_SDK_MODE) {
>
> btnSDKRoot = (Button)addRadioButton(crossCompilerGroup, "Standalone pre-built toolchain", PreferenceConstants.SDK_MODE + "_1", true);
> - btnPokyRoot = (Button)addRadioButton(crossCompilerGroup, "Build system derived toolchain", PreferenceConstants.SDK_MODE + "_2", false);
> + btnYoctoRoot = (Button)addRadioButton(crossCompilerGroup, "Build system derived toolchain", PreferenceConstants.SDK_MODE + "_2", false);
> }
> else {
> btnSDKRoot = (Button)addRadioButton(crossCompilerGroup, "Standalone pre-built toolchain", PreferenceConstants.SDK_MODE + "_1", false);
> - btnPokyRoot = (Button)addRadioButton(crossCompilerGroup, "Build system derived toolchain", PreferenceConstants.SDK_MODE + "_2", true);
> + btnYoctoRoot = (Button)addRadioButton(crossCompilerGroup, "Build system derived toolchain", PreferenceConstants.SDK_MODE + "_2", true);
> }
>
> root_label = new Label(crossCompilerGroup, SWT.NONE);
> @@ -296,7 +296,7 @@ public class YoctoUISetting {
> //we add the listener at the end for avoiding the useless event trigger when control
> //changed or modified.
> btnSDKRoot.addSelectionListener(fSelectionListener);
> - btnPokyRoot.addSelectionListener(fSelectionListener);
> + btnYoctoRoot.addSelectionListener(fSelectionListener);
> btnQemu.addSelectionListener(fSelectionListener);
> btnDevice.addSelectionListener(fSelectionListener);
> targetArchCombo.addSelectionListener(fSelectionListener);
> @@ -311,9 +311,9 @@ public class YoctoUISetting {
> {
> YoctoUIElement elem = new YoctoUIElement();
> if (btnSDKRoot.getSelection())
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_SDK_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_SDK_MODE);
> else
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_TREE_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_TREE_MODE);
>
> if (btnQemu.getSelection())
> {
> @@ -336,12 +336,12 @@ public class YoctoUISetting {
> elem.setStrTargetsArray(getTargetArray(elem));
>
> btnSDKRoot.setSelection(false);
> - btnPokyRoot.setSelection(false);
> - if(elem.getEnumPokyMode().equals(YoctoUIElement.PokyMode.POKY_SDK_MODE)){
> + btnYoctoRoot.setSelection(false);
> + if(elem.getEnumYoctoMode().equals(YoctoUIElement.YoctoMode.YOCTO_SDK_MODE)){
> btnSDKRoot.setSelection(true);
> }
> - else if(elem.getEnumPokyMode().equals(YoctoUIElement.PokyMode.POKY_TREE_MODE)){
> - btnPokyRoot.setSelection(true);
> + else if(elem.getEnumYoctoMode().equals(YoctoUIElement.YoctoMode.YOCTO_TREE_MODE)){
> + btnYoctoRoot.setSelection(true);
> }
>
> btnQemu.setSelection(false);
> @@ -385,7 +385,7 @@ public class YoctoUISetting {
>
> public void setUIFormEnabledState(boolean isEnabled) {
> btnSDKRoot.setEnabled(isEnabled);
> - btnPokyRoot.setEnabled(isEnabled);
> + btnYoctoRoot.setEnabled(isEnabled);
>
> root_label.setEnabled(isEnabled);
> textRootLoc.setEnabled(isEnabled);
> @@ -455,7 +455,7 @@ public class YoctoUISetting {
>
> private void controlChanged(Widget widget) {
>
> - if (widget == btnSDKRoot || widget == btnPokyRoot)
> + if (widget == btnSDKRoot || widget == btnYoctoRoot)
> {
>
> setTargetCombo(targetArchCombo);
> @@ -499,7 +499,7 @@ public class YoctoUISetting {
> ArrayList<String> arrTarget;
> String sEnvFilePath = elem.getStrToolChainRoot();
>
> - if (elem.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_SDK_MODE)
> + if (elem.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_SDK_MODE)
> {
> arrTarget = getTargetTripletList(sEnvFilePath);
> }
> @@ -540,7 +540,7 @@ public class YoctoUISetting {
> }
> }
> //prompt user,if he use tree mode, maybe he hasn't bitbake meta-ide-support yet.
> - else if (elem.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_TREE_MODE)
> + else if (elem.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_TREE_MODE)
> {
> if (elem.getStrToolChainRoot().isEmpty())
> return;
> diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKPreferencePage.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKPreferencePage.java
> index 4e6ca2a..33809e0 100644
> --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKPreferencePage.java
> +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKPreferencePage.java
> @@ -47,7 +47,7 @@ public class YoctoSDKPreferencePage extends PreferencePage implements IWorkbench
> private static final String NEW_DIALOG_MESSAGE = "Preferences.Profile.New.Dialog.Message";
> private static final String UPDATE_DIALOG_TITLE = "Preferences.Profile.Update.Dialog.Title";
> private static final String UPDATE_DIALOG_MESSAGE = "Preferences.Profile.Update.Dialog.Message";
> - private static final String REVALIDATION_MESSAGE = "Poky.SDK.Revalidation.Message";
> + private static final String REVALIDATION_MESSAGE = "Yocto.SDK.Revalidation.Message";
>
> private YoctoProfileSetting yoctoProfileSetting;
> private YoctoUISetting yoctoUISetting;
> @@ -212,11 +212,11 @@ public class YoctoSDKPreferencePage extends PreferencePage implements IWorkbench
> resetProfileInAffectedProjects(selectedProfile);
> }
>
> - /* Save IDE wide POKY Preference settings to a specific preference store */
> + /* Save IDE wide Yocto Preference settings to a specific preference store */
> private void saveElemToStore(YoctoUIElement elem, IPreferenceStore store) {
> store.setValue(PreferenceConstants.TARGET_ARCH_INDEX, elem.getIntTargetIndex());
>
> - if (elem.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_SDK_MODE) {
> + if (elem.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_SDK_MODE) {
> store.setValue(PreferenceConstants.SDK_MODE, IPreferenceStore.TRUE);
> } else {
> store.setValue(PreferenceConstants.SDK_MODE, IPreferenceStore.FALSE);
> diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKProjectPropertyPage.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKProjectPropertyPage.java
> index a85cbd9..db1ae64 100644
> --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKProjectPropertyPage.java
> +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKProjectPropertyPage.java
> @@ -39,7 +39,7 @@ import org.yocto.sdk.ide.utils.YoctoSDKUtils;
> public class YoctoSDKProjectPropertyPage extends PropertyPage implements
> IWorkbenchPropertyPage {
>
> - private static final String REVALIDATION_MESSAGE = "Poky.SDK.Revalidation.Message";
> + private static final String REVALIDATION_MESSAGE = "Yocto.SDK.Revalidation.Message";
>
> private YoctoProfileSetting yoctoProfileSetting;
> private YoctoProjectSpecificSetting yoctoProjectSpecificSetting;
> diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/ProjectPreferenceUtils.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/ProjectPreferenceUtils.java
> index a06a03c..acd0c0c 100644
> --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/ProjectPreferenceUtils.java
> +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/ProjectPreferenceUtils.java
> @@ -35,7 +35,7 @@ import org.yocto.sdk.ide.preferences.PreferenceConstants;
> public class ProjectPreferenceUtils {
> private static final String CONSOLE_MESSAGE = "Menu.SDK.Console.Configure.Message";
>
> - /* Get POKY Preference settings from project's preference store */
> + /* Get Yocto Preference settings from project's preference store */
> public static YoctoUIElement getElem(IProject project) {
> IScopeContext projectScope = new ProjectScope(project);
> IEclipsePreferences projectNode = projectScope.getNode(YoctoSDKUtilsConstants.PROJECT_SCOPE);
> @@ -55,9 +55,9 @@ public class ProjectPreferenceUtils {
> }
>
> if (projectNode.get(PreferenceConstants.SDK_MODE,"").equalsIgnoreCase(IPreferenceStore.TRUE)) {
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_SDK_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_SDK_MODE);
> } else {
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_TREE_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_TREE_MODE);
> }
>
> if(projectNode.get(PreferenceConstants.TARGET_MODE,"").equalsIgnoreCase(IPreferenceStore.TRUE)) {
> @@ -68,7 +68,7 @@ public class ProjectPreferenceUtils {
> return elem;
> }
>
> - /* Get POKY Preference settings from project's environment */
> + /* Get Yocto Preference settings from project's environment */
> public static YoctoUIElement getElemFromProjectEnv(IProject project) {
> YoctoUIElement elem = new YoctoUIElement();
> elem.setStrToolChainRoot(YoctoSDKUtils.getEnvValue(project, PreferenceConstants.TOOLCHAIN_ROOT));
> @@ -83,9 +83,9 @@ public class ProjectPreferenceUtils {
> }
>
> if (YoctoSDKUtils.getEnvValue(project, PreferenceConstants.SDK_MODE).equalsIgnoreCase(IPreferenceStore.TRUE)) {
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_SDK_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_SDK_MODE);
> } else {
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_TREE_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_TREE_MODE);
> }
>
> if(YoctoSDKUtils.getEnvValue(project, PreferenceConstants.TARGET_MODE).equalsIgnoreCase(IPreferenceStore.TRUE)) {
> @@ -129,7 +129,7 @@ public class ProjectPreferenceUtils {
> return true;
> }
>
> - /* Save POKY Preference settings to project's preference store */
> + /* Save Yocto Preference settings to project's preference store */
> public static void saveElem(YoctoUIElement elem, IProject project) {
> IScopeContext projectScope = new ProjectScope(project);
> IEclipsePreferences projectNode = projectScope.getNode(YoctoSDKUtilsConstants.PROJECT_SCOPE);
> @@ -138,7 +138,7 @@ public class ProjectPreferenceUtils {
> }
>
> projectNode.putInt(PreferenceConstants.TARGET_ARCH_INDEX, elem.getIntTargetIndex());
> - if (elem.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_SDK_MODE) {
> + if (elem.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_SDK_MODE) {
> projectNode.put(PreferenceConstants.SDK_MODE, IPreferenceStore.TRUE);
> } else {
> projectNode.put(PreferenceConstants.SDK_MODE, IPreferenceStore.FALSE);
> @@ -161,7 +161,7 @@ public class ProjectPreferenceUtils {
> }
> }
>
> - /* Save POKY Preference settings to project's environment */
> + /* Save Yocto Preference settings to project's environment */
> public static void saveElemToProjectEnv(YoctoUIElement elem, IProject project) {
> ConsoleOutputStream consoleOutStream = null;
>
> diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
> index d4ee8ab..f14942f 100644
> --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
> +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
> @@ -82,7 +82,7 @@ public class YoctoSDKUtils {
> return var.getValue();
> }
>
> - /* Save project wide settings into ENV VARs including POKY preference settings
> + /* Save project wide settings into ENV VARs including Yocto preference settings
> * and Environment Script File export VARs
> */
> private static void setEnvVars(ICProjectDescription cpdesc,
> @@ -92,7 +92,7 @@ public class YoctoSDKUtils {
> IContributedEnvironment env = manager.getContributedEnvironment();
> String delimiter = manager.getDefaultDelimiter();
>
> - if (elem.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_SDK_MODE)
> + if (elem.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_SDK_MODE)
> env.addVariable(PreferenceConstants.SDK_MODE, IPreferenceStore.TRUE,
> IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc);
> else
> @@ -192,10 +192,10 @@ public class YoctoSDKUtils {
> private static String getEnvironmentSetupFileFullPath(YoctoUIElement elem) {
> String envSetupFile = "";
>
> - if (elem.getEnumPokyMode() == YoctoUIElement.PokyMode.POKY_SDK_MODE) {
> + if (elem.getEnumYoctoMode() == YoctoUIElement.YoctoMode.YOCTO_SDK_MODE) {
> envSetupFile = elem.getStrToolChainRoot() + "/";
> } else {
> - //POKY TREE Mode
> + //YOCTO TREE Mode
> envSetupFile = elem.getStrToolChainRoot() + YoctoSDKUtilsConstants.DEFAULT_TMP_PREFIX;
> }
> envSetupFile += YoctoSDKUtilsConstants.DEFAULT_ENV_FILE_PREFIX + elem.getStrTarget();
> @@ -403,13 +403,13 @@ public class YoctoSDKUtils {
> return qemu_target;
> }
>
> - /* Get IDE wide POKY Preference settings from a specific preference store */
> + /* Get IDE wide Yocto Preference settings from a specific preference store */
> public static YoctoUIElement getElemFromStore(IPreferenceStore store) {
> YoctoUIElement elem = new YoctoUIElement();
> if (store.getString(PreferenceConstants.SDK_MODE).equals(IPreferenceStore.TRUE))
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_SDK_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_SDK_MODE);
> else
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_TREE_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_TREE_MODE);
>
> elem.setStrToolChainRoot(store.getString(PreferenceConstants.TOOLCHAIN_ROOT));
> elem.setStrTarget(store.getString(PreferenceConstants.TOOLCHAIN_TRIPLET));
> @@ -426,15 +426,15 @@ public class YoctoSDKUtils {
> return elem;
> }
>
> - /* Get default POKY Preference settings from the default preference store */
> + /* Get default Yocto Preference settings from the default preference store */
> public static YoctoUIElement getDefaultElemFromDefaultStore()
> {
> IPreferenceStore store = YoctoSDKPlugin.getDefault().getPreferenceStore();
> YoctoUIElement elem = new YoctoUIElement();
> if (store.getDefaultString(PreferenceConstants.SDK_MODE).equals(IPreferenceStore.TRUE))
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_SDK_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_SDK_MODE);
> else
> - elem.setEnumPokyMode(YoctoUIElement.PokyMode.POKY_TREE_MODE);
> + elem.setEnumYoctoMode(YoctoUIElement.YoctoMode.YOCTO_TREE_MODE);
>
> elem.setStrToolChainRoot(store.getDefaultString(PreferenceConstants.TOOLCHAIN_ROOT));
> elem.setStrTarget(store.getDefaultString(PreferenceConstants.TOOLCHAIN_TRIPLET));
> --
> 2.7.4
>
> _______________________________________________
> eclipse-yocto mailing list
> eclipse-yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/eclipse-yocto
More information about the eclipse-yocto
mailing list