From: Timo Mueller <timo.muel...@bmw-carit.de>
Through the context of the ProjectPreferenceUtil class we can infer
that all methods act on project preferences. Having this context
information duplicated in the method name is not needed anymore and
can be removed to get a cleaner API.
Signed-off-by: Timo Mueller <timo.muel...@bmw-carit.de>
---
.../sdk/ide/preferences/YoctoSDKPreferencePage.java | 6 +++---
.../ide/preferences/YoctoSDKProjectPropertyPage.java | 18 +++++++++---------
.../yocto/sdk/ide/utils/ProjectPreferenceUtils.java | 12 ++++++------
.../sdk/ide/wizard/NewYoctoProjectTemplateProcess.java | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
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 e8123e2..4e6ca2a 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
@@ -241,7 +241,7 @@ public class YoctoSDKPreferencePage extends PreferencePage
implements IWorkbench
for (IProject project : yoctoProjects)
{
-
ProjectPreferenceUtils.saveProfilesToProjectPreferences(profileElement,
project);
+ ProjectPreferenceUtils.saveProfiles(profileElement,
project);
YoctoUIElement elem = YoctoSDKUtils.getElemFromStore(
YoctoSDKPlugin.getProfilePreferenceStore(PreferenceConstants.STANDARD_PROFILE_NAME));
ProjectPreferenceUtils.saveElemToProjectEnv(elem,
project);
@@ -255,7 +255,7 @@ public class YoctoSDKPreferencePage extends PreferencePage
implements IWorkbench
for (IProject project : yoctoProjects)
{
-
ProjectPreferenceUtils.saveProfilesToProjectPreferences(profileElement,
project);
+ ProjectPreferenceUtils.saveProfiles(profileElement,
project);
}
}
@@ -296,7 +296,7 @@ public class YoctoSDKPreferencePage extends PreferencePage
implements IWorkbench
private boolean projectUsesProfile(IProject project, String profile)
{
- YoctoProfileElement profileElement =
ProjectPreferenceUtils.getProfilesFromProjectPreferences(project);
+ YoctoProfileElement profileElement =
ProjectPreferenceUtils.getProfiles(project);
if (!profileElement.getSelectedProfile().equals(profile)) {
return 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 58ef594..a85cbd9 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
@@ -65,7 +65,7 @@ public class YoctoSDKProjectPropertyPage extends PropertyPage
implements
IProject project = getProject();
YoctoProfileElement globalProfileElement=
YoctoSDKUtils.getProfilesFromDefaultStore();
- YoctoProfileElement profileElement =
ProjectPreferenceUtils.getProfilesFromProjectPreferences(project);
+ YoctoProfileElement profileElement =
ProjectPreferenceUtils.getProfiles(project);
String selectedProfile = profileElement.getSelectedProfile();
if (!globalProfileElement.contains(selectedProfile)) {
@@ -74,10 +74,10 @@ public class YoctoSDKProjectPropertyPage extends
PropertyPage implements
yoctoProfileSetting = new YoctoProfileSetting(
new
YoctoProfileElement(globalProfileElement.getProfilesAsString(),
selectedProfile), this, false);
- boolean useProjectSpecificSetting =
ProjectPreferenceUtils.getUseProjectSpecificOptionFromProjectPreferences(project);
+ boolean useProjectSpecificSetting =
ProjectPreferenceUtils.getUseProjectSpecificOption(project);
if (useProjectSpecificSetting) {
- yoctoUISetting = new
YoctoUISetting(ProjectPreferenceUtils.getElemFromProjectPreferences(project));
+ yoctoUISetting = new
YoctoUISetting(ProjectPreferenceUtils.getElem(project));
} else {
yoctoUISetting = new
YoctoUISetting(YoctoSDKUtils.getElemFromStore(YoctoSDKPlugin.getProfilePreferenceStore(selectedProfile)));
}
@@ -155,12 +155,12 @@ public class YoctoSDKProjectPropertyPage extends
PropertyPage implements
return false;
}
-
ProjectPreferenceUtils.saveUseProjectSpecificOptionToProjectPreferences(project,
true);
-
ProjectPreferenceUtils.saveProfilesToProjectPreferences(yoctoProfileSetting.getCurrentInput(),
project);
-
ProjectPreferenceUtils.saveElemToProjectPreferences(yoctoUISetting.getCurrentInput(),
project);
+
ProjectPreferenceUtils.saveUseProjectSpecificOption(project, true);
+
ProjectPreferenceUtils.saveProfiles(yoctoProfileSetting.getCurrentInput(),
project);
+
ProjectPreferenceUtils.saveElem(yoctoUISetting.getCurrentInput(), project);
} else {
-
ProjectPreferenceUtils.saveUseProjectSpecificOptionToProjectPreferences(project,
false);
-
ProjectPreferenceUtils.saveProfilesToProjectPreferences(yoctoProfileSetting.getCurrentInput(),
project);
+
ProjectPreferenceUtils.saveUseProjectSpecificOption(project, false);
+
ProjectPreferenceUtils.saveProfiles(yoctoProfileSetting.getCurrentInput(),
project);
}
ProjectPreferenceUtils.saveElemToProjectEnv(yoctoUISetting.getCurrentInput(),
getProject());
@@ -182,7 +182,7 @@ public class YoctoSDKProjectPropertyPage extends
PropertyPage implements
public void switchToProjectSpecificProfile()
{
- YoctoUIElement profileElement =
ProjectPreferenceUtils.getElemFromProjectPreferences(getProject());
+ YoctoUIElement profileElement =
ProjectPreferenceUtils.getElem(getProject());
SDKCheckResults result =
YoctoSDKChecker.checkYoctoSDK(profileElement);
if ((result != SDKCheckResults.SDK_PASS)) {
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 50904c1..a06a03c 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
@@ -36,7 +36,7 @@ public class ProjectPreferenceUtils {
private static final String CONSOLE_MESSAGE =
"Menu.SDK.Console.Configure.Message";
/* Get POKY Preference settings from project's preference store */
- public static YoctoUIElement getElemFromProjectPreferences(IProject
project) {
+ public static YoctoUIElement getElem(IProject project) {
IScopeContext projectScope = new ProjectScope(project);
IEclipsePreferences projectNode =
projectScope.getNode(YoctoSDKUtilsConstants.PROJECT_SCOPE);
if (projectNode == null) {
@@ -98,7 +98,7 @@ public class ProjectPreferenceUtils {
}
/* Get profiles and selected profile from the project's preference
store */
- public static YoctoProfileElement
getProfilesFromProjectPreferences(IProject project) {
+ public static YoctoProfileElement getProfiles(IProject project) {
IScopeContext projectScope = new ProjectScope(project);
IEclipsePreferences projectNode =
projectScope.getNode(YoctoSDKUtilsConstants.PROJECT_SCOPE);
@@ -112,7 +112,7 @@ public class ProjectPreferenceUtils {
return new YoctoProfileElement(profiles, selectedProfile);
}
- public static boolean
getUseProjectSpecificOptionFromProjectPreferences(IProject project) {
+ public static boolean getUseProjectSpecificOption(IProject project) {
IScopeContext projectScope = new ProjectScope(project);
IEclipsePreferences projectNode =
projectScope.getNode(YoctoSDKUtilsConstants.PROJECT_SCOPE);
if (projectNode == null) {
@@ -130,7 +130,7 @@ public class ProjectPreferenceUtils {
}
/* Save POKY Preference settings to project's preference store */
- public static void saveElemToProjectPreferences(YoctoUIElement elem,
IProject project) {
+ public static void saveElem(YoctoUIElement elem, IProject project) {
IScopeContext projectScope = new ProjectScope(project);
IEclipsePreferences projectNode =
projectScope.getNode(YoctoSDKUtilsConstants.PROJECT_SCOPE);
if (projectNode == null) {
@@ -199,7 +199,7 @@ public class ProjectPreferenceUtils {
}
/* Save profiles and selected profile to the project's preference store
*/
- public static void saveProfilesToProjectPreferences(YoctoProfileElement
profileElement, IProject project) {
+ public static void saveProfiles(YoctoProfileElement profileElement,
IProject project) {
IScopeContext projectScope = new ProjectScope(project);
IEclipsePreferences projectPreferences =
projectScope.getNode(YoctoSDKUtilsConstants.PROJECT_SCOPE);
@@ -218,7 +218,7 @@ public class ProjectPreferenceUtils {
}
}
- public static void
saveUseProjectSpecificOptionToProjectPreferences(IProject project, boolean
useProjectSpecificSetting) {
+ public static void saveUseProjectSpecificOption(IProject project,
boolean useProjectSpecificSetting) {
IScopeContext projectScope = new ProjectScope(project);
IEclipsePreferences projectNode =
projectScope.getNode(YoctoSDKUtilsConstants.PROJECT_SCOPE);
if (projectNode == null) {
diff --git
a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java
b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java
index f64043d..d8c1232 100644
---
a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java
+++
b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java
@@ -206,7 +206,7 @@ public class NewYoctoProjectTemplateProcess extends
ProcessRunner {
YoctoSDKChecker.checkIfGloballySelectedYoctoProfileIsValid();
YoctoProfileElement profileElement =
YoctoSDKUtils.getProfilesFromDefaultStore();
-
ProjectPreferenceUtils.saveProfilesToProjectPreferences(profileElement,
project);
+ ProjectPreferenceUtils.saveProfiles(profileElement, project);
IPreferenceStore selecteProfileStore =
YoctoSDKPlugin.getProfilePreferenceStore(profileElement.getSelectedProfile());
YoctoUIElement elem =
YoctoSDKUtils.getElemFromStore(selecteProfileStore);
--
1.8.1.4
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
