[Esbox-commits] r827 - in trunk: common/org.maemo.esbox.core/src/org/maemo/esbox/internal/api/core/sdk maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/providers
baranov at garage.maemo.org
baranov at garage.maemo.org
Thu Oct 2 14:42:23 EEST 2008
Author: baranov
Date: 2008-10-02 14:42:23 +0300 (Thu, 02 Oct 2008)
New Revision: 827
Modified:
trunk/common/org.maemo.esbox.core/src/org/maemo/esbox/internal/api/core/sdk/BaseSDKTarget.java
trunk/common/org.maemo.esbox.core/src/org/maemo/esbox/internal/api/core/sdk/HostSDKTarget.java
trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/IScratchboxSDKPlatformArchitectureProvider.java
trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox1SDK.java
trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox1SDKTarget.java
trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox2SDK.java
trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox2SDKTarget.java
trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/ScratchboxSDK.java
trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/providers/Scratchbox1SDKProvider.java
trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/providers/Scratchbox2SDKProvider.java
Log:
refactoring maemosdk.core project
Modified: trunk/common/org.maemo.esbox.core/src/org/maemo/esbox/internal/api/core/sdk/BaseSDKTarget.java
===================================================================
--- trunk/common/org.maemo.esbox.core/src/org/maemo/esbox/internal/api/core/sdk/BaseSDKTarget.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/common/org.maemo.esbox.core/src/org/maemo/esbox/internal/api/core/sdk/BaseSDKTarget.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -236,4 +236,11 @@
}
return adapter;
}
+
+ public String getPreferenceValue(String key) {
+ Assert.isNotNull(getSDK());
+ return getSDK().getPreferenceValue(key);
+ }
+
+
}
Modified: trunk/common/org.maemo.esbox.core/src/org/maemo/esbox/internal/api/core/sdk/HostSDKTarget.java
===================================================================
--- trunk/common/org.maemo.esbox.core/src/org/maemo/esbox/internal/api/core/sdk/HostSDKTarget.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/common/org.maemo.esbox.core/src/org/maemo/esbox/internal/api/core/sdk/HostSDKTarget.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -45,9 +45,6 @@
return new Path("/");
}
- public String getPreferenceValue(String key) {
- return getSDK().getPreferenceValue(key);
- }
}
Modified: trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/IScratchboxSDKPlatformArchitectureProvider.java
===================================================================
--- trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/IScratchboxSDKPlatformArchitectureProvider.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/IScratchboxSDKPlatformArchitectureProvider.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -26,7 +26,7 @@
* @param sdk the SDK
* @param target the target name
*/
- ISDKPlatform getPlatform(IScratchboxSDK sdk, IPath sdkTargetRoot, String target);
+ ISDKPlatform getPlatform(String target);
/**
* Identify the architecture for the target
@@ -34,5 +34,5 @@
* @param sdk the SDK
* @param target the target name
*/
- String getArchitecture(IScratchboxSDK sdk, IPath sdkTargetRoot, String target);
+ String getArchitecture(String target);
}
Modified: trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox1SDK.java
===================================================================
--- trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox1SDK.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox1SDK.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -32,7 +32,7 @@
public class Scratchbox1SDK extends ScratchboxSDK implements IScratchbox1SDK {
private IPath sdkRoot;
- private IPreferenceProvider prefProvider;
+// private IPreferenceProvider prefProvider;
private final IScratchboxSDKPlatformArchitectureProvider platformArchitectureProvider;
/**
@@ -60,8 +60,8 @@
IPath sb1TargetRoot = getSDKRoot().append("targets").append(target); //$NON-NLS-1$
ISDKTarget sdkTarget = new Scratchbox1SDKTarget(
this,
- platformArchitectureProvider.getPlatform(this, sb1TargetRoot, target),
- platformArchitectureProvider.getArchitecture(this, sb1TargetRoot, target),
+ platformArchitectureProvider.getPlatform(target),
+ platformArchitectureProvider.getArchitecture(target),
target,
sb1TargetRoot);
newTargets.add(sdkTarget);
@@ -89,10 +89,8 @@
return sdkRoot;
}
- public String getPreferenceValue(String key) {
- return prefProvider.getPreferenceValue(key);
- }
+
/**
* Return the list of available targets in Scratchbox.
Modified: trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox1SDKTarget.java
===================================================================
--- trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox1SDKTarget.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox1SDKTarget.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -62,9 +62,6 @@
return new Scratchbox1ProcessLauncherFactory(this, true);
}
- public String getPreferenceValue(String key) {
- return getSDK().getPreferenceValue(key);
- }
public IPath getRootstrapPath() {
// Rootstrap path is just the TargetRoot like this:
Modified: trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox2SDK.java
===================================================================
--- trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox2SDK.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox2SDK.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -32,7 +32,6 @@
public class Scratchbox2SDK extends ScratchboxSDK implements IScratchbox2SDK {
private static final IPath ROOT_PATH = new Path("/");
- private IPreferenceProvider prefProvider;
private final IScratchboxSDKPlatformArchitectureProvider platformArchitectureProvider;
/**
@@ -67,8 +66,8 @@
IPath config = getScratchbox2ConfigDirectory();
IPath sb2BasePath = config.append(target);
Scratchbox2SDKTarget sdkTarget = new Scratchbox2SDKTarget(this,
- platformArchitectureProvider.getPlatform(this, sb2BasePath, target),
- platformArchitectureProvider.getArchitecture(this, sb2BasePath, target),
+ platformArchitectureProvider.getPlatform(target),
+ platformArchitectureProvider.getArchitecture(target),
target,
sb2BasePath);
newTargets.add(sdkTarget);
@@ -88,11 +87,6 @@
return ROOT_PATH;
}
- public String getPreferenceValue(String key) {
- return prefProvider.getPreferenceValue(key);
- }
-
-
/**
* Return the list of available targets in Scratchbox.
Modified: trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox2SDKTarget.java
===================================================================
--- trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox2SDKTarget.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/Scratchbox2SDKTarget.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -67,11 +67,6 @@
return new Scratchbox2ProcessLauncherFactory(this, SB2PreferenceConstants.SB2_INSTALL_MAPPING_MODE, true);
}
- public String getPreferenceValue(String key) {
- return getSDK().getPreferenceValue(key);
- }
-
-
public IPath getRootstrapPath() {
return rootstrapRoot;
}
Modified: trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/ScratchboxSDK.java
===================================================================
--- trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/ScratchboxSDK.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/ScratchboxSDK.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -10,8 +10,10 @@
*******************************************************************************/
package org.maemo.esbox.internal.maemosdk.core.sdk;
+import org.eclipse.core.runtime.Assert;
import org.maemo.esbox.core.machine.ILocalMachine;
import org.maemo.esbox.core.machine.IMachine;
+import org.maemo.esbox.core.sdk.IPreferenceProvider;
import org.maemo.esbox.internal.api.core.sdk.BaseSDK;
import org.maemo.esbox.maemosdk.core.sdk.IScratchboxSDK;
@@ -22,6 +24,9 @@
*/
public abstract class ScratchboxSDK extends BaseSDK implements IScratchboxSDK {
+ protected IPreferenceProvider prefProvider=null;
+
+
public ScratchboxSDK(IMachine machine, String version, String name) {
super(machine, version, name);
}
@@ -51,4 +56,9 @@
public void setCachedCurrentTarget(String currentTarget) {
cachedCurrentTarget = currentTarget;
}
+
+ public String getPreferenceValue(String key) {
+ Assert.isNotNull(prefProvider);
+ return prefProvider.getPreferenceValue(key);
+ }
}
Modified: trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/providers/Scratchbox1SDKProvider.java
===================================================================
--- trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/providers/Scratchbox1SDKProvider.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/providers/Scratchbox1SDKProvider.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -112,7 +112,7 @@
return sdk;
}
- public ISDKPlatform getPlatform(IScratchboxSDK sdk, IPath sdkTargetRoot, String target) {
+ public ISDKPlatform getPlatform(String target) {
// convention says this is the part of the target before the underscore,
// usually the name of the platform directly, except for aberrant 'SDK' cases
int idx = target.lastIndexOf('_');
@@ -140,7 +140,7 @@
return new BaseSDKPlatform(platformName, version);
}
- public String getArchitecture(IScratchboxSDK sdk, IPath sdkTargetRoot, String target) {
+ public String getArchitecture( String target) {
// convention says this is the part of the target after the underscore
int idx = target.lastIndexOf('_');
if (idx > 0)
Modified: trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/providers/Scratchbox2SDKProvider.java
===================================================================
--- trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/providers/Scratchbox2SDKProvider.java 2008-10-01 18:28:17 UTC (rev 826)
+++ trunk/maemosdk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/sdk/providers/Scratchbox2SDKProvider.java 2008-10-02 11:42:23 UTC (rev 827)
@@ -123,7 +123,7 @@
private static Pattern TARGET_PLATFORM_VERSION_ARCHITECTURE_PATTERN =
Pattern.compile("([a-zA-Z_]+)(\\d+)_([a-zA-Z]+)");
- public ISDKPlatform getPlatform(IScratchboxSDK sdk, IPath sdkTargetRoot, String target) {
+ public ISDKPlatform getPlatform(String target) {
// convention says this is the part of the target before the underscore,
// minus a version.
Matcher matcher = TARGET_PLATFORM_VERSION_ARCHITECTURE_PATTERN.matcher(target);
@@ -140,7 +140,7 @@
}
}
- public String getArchitecture(IScratchboxSDK sdk, IPath sdkTargetRoot, String target) {
+ public String getArchitecture( String target) {
// convention says this is the part of the target after the underscore
Matcher matcher = TARGET_PLATFORM_VERSION_ARCHITECTURE_PATTERN.matcher(target);
if (matcher.matches()) {
More information about the Esbox-commits
mailing list