--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Fri Sep 17 16:02:09 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Fri Sep 17 16:02:48 2010 -0500
@@ -163,8 +163,6 @@
{
ArrayList<ISymbianSDK> oldSDKList = new ArrayList<ISymbianSDK>(sdkList);
- getSBSv2Version(true);
-
if (sdkList != null){
sdkList.clear();
}
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java Fri Sep 17 16:02:09 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java Fri Sep 17 16:02:48 2010 -0500
@@ -56,7 +56,6 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
boolean installed = false;
- boolean oneSDKWasScanned = false;
SubMonitor subMonitor = SubMonitor.convert(monitor, 100);
int worked = 100 / sdkList.size();
for (ISymbianSDK sdk : sdkList) {
@@ -66,7 +65,6 @@
ISBSv2BuildInfo sbsv2BuildInfo = (ISBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER);
if (sbsv2BuildInfo != null) {
if (sbsv2BuildInfo.isPreviouslyScanned() == false) {
- oneSDKWasScanned = true;
// XML was parsed, now try to run the feature installer
sbsv2BuildInfo.setPreviouslyScanned(true);
File featureDir = new File(sdk.getEPOCROOT() + SDK_FEATURE_SUBDIR);
@@ -93,9 +91,6 @@
}
}
- if (oneSDKWasScanned) {
- SDKCorePlugin.getSDKManager().updateCarbideSDKCache();
- }
if (installed) {
// plugins from some SDK were installed
//doEclipseRestartDialog(workbench);
--- a/core/com.nokia.carbide.discovery.ui/plugin.xml Fri Sep 17 16:02:09 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/plugin.xml Fri Sep 17 16:02:48 2010 -0500
@@ -111,12 +111,14 @@
pageId="com.nokia.carbide.discovery.ui.homePage"
title="Report Bugs">
</portalPageLayer>
- <portalPageLayer
+<!--
+ <portalPageLayer
class="com.nokia.carbide.internal.discovery.ui.view.PulsarPageLayer"
order="25"
pageId="com.nokia.carbide.discovery.ui.kitsPage"
title="Install SDKs">
</portalPageLayer>
+-->
<portalPageLayer
class="com.nokia.carbide.internal.discovery.ui.view.InstallPlatSimPage"
order="10"
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java Fri Sep 17 16:02:09 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java Fri Sep 17 16:02:48 2010 -0500
@@ -33,9 +33,6 @@
class NavigationBar extends RoundedCornerComposite {
- private PortalEditor portalEditor;
-
-
private final class ButtonListener extends SelectionAdapter {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -44,21 +41,21 @@
}
}
+ private static final int BUTTON_SPACING = -2;
+ private PortalEditor portalEditor;
private Map<Button, PortalPage> buttonToPageMap;
private SelectionListener listener;
private Font buttonFont;
private Font selectedButtonFont;
NavigationBar(PortalEditor portalEditor, Composite parent) {
- super(parent, portalEditor.getBackgroundParent(),
- parent.getDisplay().getSystemColor(SWT.COLOR_BLACK),
- parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+ super(parent, portalEditor.getBackgroundParent(), null, null);
this.portalEditor = portalEditor;
buttonToPageMap = new LinkedHashMap<Button, PortalPage>();
FillLayout layout = new FillLayout(SWT.HORIZONTAL);
- layout.spacing = 5;
- layout.marginHeight = 5;
- layout.marginWidth = 5;
+ layout.spacing = BUTTON_SPACING;
+ layout.marginHeight = BUTTON_SPACING;
+ layout.marginWidth = BUTTON_SPACING;
setLayout(layout);
listener = new ButtonListener();
selectedButtonFont = JFaceResources.getHeaderFont();
@@ -77,10 +74,10 @@
}
public void addNavButton(NavigationBar bar, PortalPage page) {
- Button b = new Button(bar, SWT.TOGGLE | SWT.FLAT);
+ Button b = new Button(bar, SWT.LEFT | SWT.TOGGLE);
b.setFont(buttonFont);
b.setText(page.getTitle());
- b.setImage(portalEditor.createImage(page.getImageDescriptor(), 16, 16));
+ b.setImage(portalEditor.createImage(page.getImageDescriptor(), 32, 32));
b.addSelectionListener(listener);
buttonToPageMap.put(b, page);
}
--- a/debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF Fri Sep 17 16:02:09 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF Fri Sep 17 16:02:48 2010 -0500
@@ -11,7 +11,8 @@
org.eclipse.debug.core;bundle-version="3.6.0",
com.nokia.carbide.cdt.builder;bundle-version="2.0.0",
org.eclipse.cdt.debug.edc,
- com.nokia.carbide.remoteConnections;bundle-version="1.4.0"
+ com.nokia.carbide.remoteConnections;bundle-version="1.4.0",
+ org.eclipse.core.filesystem;bundle-version="1.3.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: com.nokia.cdt.debug.common.internal.api,
--- a/debuggercdi/com.nokia.cdt.debug.common/src/com/nokia/cdt/debug/common/internal/source/lookup/SymbianSourceContainer.java Fri Sep 17 16:02:09 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.common/src/com/nokia/cdt/debug/common/internal/source/lookup/SymbianSourceContainer.java Fri Sep 17 16:02:48 2010 -0500
@@ -17,9 +17,17 @@
package com.nokia.cdt.debug.common.internal.source.lookup;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+
+import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.sourcelookup.AbsolutePathSourceContainer;
import org.eclipse.cdt.debug.core.sourcelookup.MappingSourceContainer;
import org.eclipse.cdt.debug.internal.core.sourcelookup.MapEntrySourceContainer;
+import org.eclipse.cdt.internal.core.model.ExternalTranslationUnit;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -28,6 +36,7 @@
import org.eclipse.debug.core.sourcelookup.ISourceContainer;
import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
+import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
import com.nokia.cdt.debug.common.CarbideCommonDebuggerPlugin;
@@ -56,6 +65,7 @@
return getSourceContainerType( TYPE_ID );
}
+ @SuppressWarnings("restriction")
protected Object[] findSourceElements(String name, ISourceContainer[] containers) throws CoreException {
Object[] result = super.findSourceElements(name, containers);
if (result.length == 0)
@@ -69,6 +79,9 @@
if (result.length > 0)
{
if (!mapping.getBackendPath().equals(mapping.getLocalPath())){
+ IPath compPath = sourcePath.removeLastSegments(1);
+ IPath newSourcePath = new Path(foundElementToPath(result[0])).removeLastSegments(1);
+ mapping = new MapEntrySourceContainer(compPath, newSourcePath);
addMapEntry(mapping);
}
if (director != null)
@@ -97,4 +110,52 @@
return epocRoot;
}
+ /**
+ * Utility method to convert the element found by the source locators to a
+ * canonical file path
+ *
+ * @param foundElement
+ * the element found by the source locator, or null if not found
+ * @return the canonical file path of the element
+ */
+ @SuppressWarnings("restriction")
+ private static String foundElementToPath(Object foundElement) {
+ if (foundElement != null) {
+ try {
+ if (foundElement instanceof IFile) {
+ IPath path = ((IFile)foundElement).getLocation();
+ if (path != null) {
+ File file = path.toFile();
+ if (file != null) {
+ return file.getCanonicalPath();
+ }
+ }
+
+ }
+ else if (foundElement instanceof LocalFileStorage) {
+ File file = ((LocalFileStorage)foundElement).getFile();
+ if (file != null) {
+ return file.getCanonicalPath();
+ }
+ }
+ else if (foundElement instanceof ExternalTranslationUnit) {
+ URI uri = ((ExternalTranslationUnit)foundElement).getLocationURI();
+ if (uri != null) {
+ IPath path = URIUtil.toPath(uri);
+ if (path != null) {
+ File file = path.toFile();
+ if (file != null) {
+ return file.getCanonicalPath();
+ }
+ }
+ }
+ }
+ } catch (IOException e) {
+ CDebugCorePlugin.log(e);
+ }
+ }
+
+ return null;
+ }
+
}