# HG changeset patch
# User wpaul
# Date 1244754965 18000
# Node ID 0c429b331dcc240e9846ab75d1fba05b7270ec4a
# Parent ba58b2ff6c3edc6d552b3c2b5c9979b1e6068607# Parent 6dc648a34ee6456e7a8d3dedd221d784ee8854d3
merged
diff -r ba58b2ff6c3e -r 0c429b331dcc builder/com.nokia.carbide.cdt.builder/plugin.properties
--- a/builder/com.nokia.carbide.cdt.builder/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -8,3 +8,8 @@
CarbideBuilder.Change_Config_ToolTip=Change the Active Build Configuration for the Selected Project
CarbideBuilder.Build_Selected_Project_ToolTip=Build the Selected Project
+
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.build=winscw build emulator bld.inf concurrent jobs clean dependency actions mmp
diff -r ba58b2ff6c3e -r 0c429b331dcc builder/com.nokia.carbide.cdt.builder/plugin.xml
--- a/builder/com.nokia.carbide.cdt.builder/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -66,8 +66,36 @@
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
class="com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage"
id="com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -27,5 +33,16 @@
class="com.nokia.carbide.internal.bugdatacollector.ui.preferences.BugDataCollectorPreferenceInitializer">
+
+
+
+
+
+
diff -r ba58b2ff6c3e -r 0c429b331dcc core/com.nokia.carbide.cpp.codescanner/plugin.properties
--- a/core/com.nokia.carbide.cpp.codescanner/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -19,3 +19,8 @@
providerName=Nokia.com
CSProblemMarker.name=CodeScanner Problem
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.codescanner=codescanner html xml knowledge base filters rules patterns
+
diff -r ba58b2ff6c3e -r 0c429b331dcc core/com.nokia.carbide.cpp.codescanner/plugin.xml
--- a/core/com.nokia.carbide.cpp.codescanner/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -69,6 +69,12 @@
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
class="com.nokia.carbide.cpp.internal.codescanner.ui.CSPreferencePage"
id="com.nokia.carbide.cpp.codescanner.ui.CSPreferencePage">
+
+
+
+
@@ -338,5 +344,16 @@
+
+
+
+
+
diff -r ba58b2ff6c3e -r 0c429b331dcc core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_categories.png
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_categories.png has changed
diff -r ba58b2ff6c3e -r 0c429b331dcc core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm Thu Jun 11 16:16:05 2009 -0500
@@ -0,0 +1,28 @@
+
+
+
+Launch Types
+Launch Types
+The following launch configuration types are available:
+
+Other references
+
+
+
+
diff -r ba58b2ff6c3e -r 0c429b331dcc core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm Thu Jun 11 16:14:53 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-
-
-
- New Launch Configuration Wizard
- New Launch Configuration Wizard
-The New Launch Configuration Wizard launches when no launch configuration exists for a project. Wherever possible the New Launch Configuration wizard gathers the information from the project and asks additional questions based on the type of launch configuration chosen. For example, a launch configuration using Application TRK requires different information than one targeted for System TRK.
-For Application TRK and System TRK the following pages appear:
-
-For Trace32 launch configurations the following wizard pages appear:
-
-For Sophia STI launch configurations the following wizard pages appear:
-
-For Attach to Process launch configurations the following wizard pages appear:
-
-To access the New Launch Configurtion Wizard , set the Build Target to a Phone Debug target (Figure 1), then click the Debug icon (
-For emulator targets, the New Launch Configuration Wizard can gather all the information it needs from the project, so clicking Debug just launches the debug session.
-
-Figure 1 - Build Target selection list
-Use the Launch Types page to select the type of launch configuration for the build target. Available types are listed from the most frequently chosen (Application TRK) to the least likely type (Attach to Process). Select a type and click Next .
-
-Figure 2 - Launch Type page
-
-Use the Application Selection page to choose a binary created by the project to launch and debug and verify its location. If only a single binary is available the Executable to launch option is disabled. Use the Specify device or emulator path of executable to launch option to specify alternate paths for launching the executable from RAM (c:\sys\bin\), ROM (z:\sys\bin\) or memory cards (e:\sys\bin\) .
-Use the Location field for emulator targets to verify that the correct executable on the host is selected. This field is not used with on-device launch configurations.
-Select the Executable to launch, verify it is the correct binary, then click Next .
-
-Figure 3 - Executable Selection page
-Use the TRK Connection Settings page to specify the COM port used to communicate with the target device. If the device is already connected, the drop down list will include both the COM port and the name of the device using that port. Use the On-Device Setup dialog to verify and update all Carbide software services on the device. Choose the serial port used to communicate with the target device and click Next .
-
-Figure 4 - TRK Connection Settings page
-
-Use the TRK SIS Selection page to select the SIS file to install on the target device. Click the Modify SIS builder settings for build configuration link to open the SIS Builder properties page to add, edit, or review the SIS files to build. Once the correct SIS File to Install is selected, click Next .
-
-Figure 5 - TRK SIS Selection page
-Use the New Launch Configuration page to note the name of the configuration, confirm the launch configuration settings, and then launch the debug session. If something doesn't look right, click Back to return to a page and change its setting. If all the settings are correct, click Finish to start the debug session using this launch configuration.
-If you checkmark Advanced settings , the Debug dialog appears instead of launching the project. This enables you to make additional changes to the new launch configuration before starting the debug session. By design and intent, this should seldom be required for the initial launch.
-
-Figure 6 - New Launch Configuration page
-Use the Trace32 Initialization Settings page to specify the initialization script and target processor of the target device.Enter the Trace32 Initialization Script and choose the Target Processor, then click Next .
- This page only appears when creating a Trace32 launch configuration.
-
-Figure 7 - Trace32 Initialization Settings page
-Use the Sophia STI Initialization Settings page to specify the target interface, initialization file, and target processor of the target device. Enter the Sophia Target Interface and Target Initialization File paths, choose a Target Processor, then click Next .
-This page only appears when creating a Sophia STI launch configuration.
-
-Figure 8 - Sophia STI Initialization Settings page
-Use the Symbian ROM Image Settings page to specify the method of debugging , the start address, and the ROM Image and Log File locations.
-This page appears when creating a Trace32 or Sophia STI launch configuration.
-
-Figure 9 - Symbian ROM Image Settings page
-Other references
-
-
-
-
\ No newline at end of file
diff -r ba58b2ff6c3e -r 0c429b331dcc core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Jun 11 16:16:05 2009 -0500
@@ -189,7 +189,7 @@
+
+
+
+
+
+
+
+
+
+
diff -r ba58b2ff6c3e -r 0c429b331dcc core/com.nokia.carbide.cpp.sysdoc.hover/plugin.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -0,0 +1,4 @@
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.hoverhelp=hover help libraries developer
diff -r ba58b2ff6c3e -r 0c429b331dcc core/com.nokia.carbide.cpp.sysdoc.hover/plugin.xml
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -18,6 +18,12 @@
id="com.nokia.carbide.cpp.sysdoc.internal.hover.preferences.HoverHelpPreferencePage"
name="Hover Help"
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage">
+
+
+
+
+
+
+
+
+
diff -r ba58b2ff6c3e -r 0c429b331dcc core/com.nokia.carbide.search.system/plugin.properties
--- a/core/com.nokia.carbide.search.system/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/core/com.nokia.carbide.search.system/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -31,7 +31,7 @@
SearchPreferencePage.label= System Search
-preferenceKeywords.general=System Search
+preferenceKeywords.general=system search editors color perspective matches
ActionDefinition.openFileSearchPage.name= System Search
ActionDefinition.openFileSearchPage.description= Open the System Search dialog\'s file search page
diff -r ba58b2ff6c3e -r 0c429b331dcc debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.properties
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -1,3 +1,7 @@
HwBreakpoint.label=Toggle HW Breakpoint
-SkipAction.name=Skip Action
\ No newline at end of file
+SkipAction.name=Skip Action
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.carbidedebugger=debug debugger dynamic runtime objects support code arrays sdk view
\ No newline at end of file
diff -r ba58b2ff6c3e -r 0c429b331dcc debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -15,6 +15,8 @@
category="org.eclipse.cdt.debug.ui.CDebugPreferencePage"
class="com.nokia.cdt.debug.cw.symbian.ui.GlobalSettings"
id="com.nokia.cdt.debug.cw.symbian.ui.GlobalSettings">
+
+
+
+
+
+
+
+
+
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/plugin.properties
--- a/project/com.nokia.carbide.cpp.project.ui/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -31,3 +31,8 @@
markerGrouping.errors=Errors
markerGrouping.warnings=Warnings
markerGrouping.other=Other
+
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.carbidecpp=project bld.inf mmp moved modified
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/plugin.xml
--- a/project/com.nokia.carbide.cpp.project.ui/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -78,6 +78,12 @@
name="%carbidePrefPageName"
class="com.nokia.carbide.cpp.internal.project.ui.preferences.CarbidePreferencePage"
id="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage">
+
+
+
+
+
+
+
+
+
+
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/BldInfEditor.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/BldInfEditor.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/BldInfEditor.java Thu Jun 11 16:16:05 2009 -0500
@@ -45,6 +45,7 @@
import com.nokia.carbide.cdt.internal.api.builder.ui.ManageConfigurationsDialog;
import com.nokia.carbide.cpp.epoc.engine.model.BldInfModelFactory;
import com.nokia.carbide.cpp.epoc.engine.model.IView;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IBldInfView;
import com.nokia.carbide.cpp.internal.project.ui.editors.common.CarbideFormEditor;
import com.nokia.carbide.cpp.internal.project.ui.editors.common.CarbideTextEditor;
import com.nokia.cpp.internal.api.utils.core.Check;
@@ -338,4 +339,8 @@
return exportsPage;
}
+ public IBldInfView getBldInfView() {
+ return editorContext.bldInfView;
+ }
+
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/ExportsPage.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/ExportsPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/ExportsPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -105,7 +105,7 @@
return testExports;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/OverviewPage.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/OverviewPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/OverviewPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -194,7 +194,7 @@
return testMakMakeFiles;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/BldInfEditorTester.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/BldInfEditorTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/BldInfEditorTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -21,6 +21,7 @@
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.editor.FormPage;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IBldInfView;
import com.nokia.carbide.cpp.internal.project.ui.editors.inf.BldInfEditor;
/**
@@ -67,4 +68,17 @@
return null;
}
+ /**
+ * Retrieves the view model of the Bld.inf editor.
+ * @param editor - editor part provided by caller
+ * @return Bld.inf view model if success, null otherwise
+ */
+ public static IBldInfView getBldInfView(FormEditor editor) {
+ if (editor != null && editor instanceof BldInfEditor) {
+ BldInfEditor infEditor = (BldInfEditor) editor;
+ return infEditor.getBldInfView();
+ }
+ return null;
+ }
+
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/ExpportsPageTester.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/ExpportsPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/ExpportsPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -36,10 +36,10 @@
* @param page - Exports page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof ExportsPage) {
ExportsPage exportsPage = (ExportsPage) page;
- return exportsPage.getErrorMesaage();
+ return exportsPage.getErrorMessage();
}
return null;
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/OverviewPageTester.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/OverviewPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/inf/testapi/OverviewPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -39,10 +39,10 @@
* @param page - Overview page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof OverviewPage) {
OverviewPage overviewPage = (OverviewPage) page;
- return overviewPage.getErrorMesaage();
+ return overviewPage.getErrorMessage();
}
return null;
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/LibrariesPage.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/LibrariesPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/LibrariesPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -156,7 +156,7 @@
return debugLibraries;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/MMPEditor.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/MMPEditor.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/MMPEditor.java Thu Jun 11 16:16:05 2009 -0500
@@ -21,6 +21,7 @@
import com.nokia.carbide.cdt.internal.api.builder.ui.ManageConfigurationsDialog;
import com.nokia.carbide.cpp.epoc.engine.model.IView;
import com.nokia.carbide.cpp.epoc.engine.model.MMPModelFactory;
+import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPView;
import com.nokia.carbide.cpp.internal.project.ui.editors.common.*;
import com.nokia.cpp.internal.api.utils.core.*;
import com.nokia.cpp.internal.api.utils.ui.*;
@@ -370,4 +371,7 @@
return optionsPage;
}
+ public IMMPView getMMPView() {
+ return editorContext.mmpView;
+ }
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OptionsPage.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OptionsPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OptionsPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -127,7 +127,7 @@
return kernelSectionPart;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OverviewPage.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OverviewPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/OverviewPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -453,7 +453,7 @@
return optionsImageHyperlink;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/SourcesPage.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/SourcesPage.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/SourcesPage.java Thu Jun 11 16:16:05 2009 -0500
@@ -136,7 +136,7 @@
return missingSourcesSectionPart;
}
- public String getErrorMesaage() {
+ public String getErrorMessage() {
return getManagedForm().getForm().getMessage();
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/LibrariesPageTester.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/LibrariesPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/LibrariesPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -36,10 +36,10 @@
* @param page - Libraries page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof LibrariesPage) {
LibrariesPage librariesPage = (LibrariesPage) page;
- return librariesPage.getErrorMesaage();
+ return librariesPage.getErrorMessage();
}
return null;
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/MMPEditorTester.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/MMPEditorTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/MMPEditorTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -21,6 +21,7 @@
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.editor.FormPage;
+import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPView;
import com.nokia.carbide.cpp.internal.project.ui.mmpEditor.MMPEditor;
/**
@@ -93,4 +94,17 @@
return null;
}
+ /**
+ * Retrieves the view model of the MMP editor.
+ * @param editor - editor part provided by caller
+ * @return MMP view model if success, null otherwise
+ */
+ public static IMMPView getMMPView(FormEditor editor) {
+ if (editor != null && editor instanceof MMPEditor) {
+ MMPEditor mmpEditor = (MMPEditor) editor;
+ return mmpEditor.getMMPView();
+ }
+ return null;
+ }
+
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OptionsPageTester.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OptionsPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OptionsPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -41,10 +41,10 @@
* @param page - Options page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof OptionsPage) {
OptionsPage optionsPage = (OptionsPage) page;
- return optionsPage.getErrorMesaage();
+ return optionsPage.getErrorMessage();
}
return null;
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OverviewPageTester.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OverviewPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/OverviewPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -36,10 +36,10 @@
* @param page - Overview page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof OverviewPage) {
OverviewPage overviewPage = (OverviewPage) page;
- return overviewPage.getErrorMesaage();
+ return overviewPage.getErrorMessage();
}
return null;
}
diff -r ba58b2ff6c3e -r 0c429b331dcc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/SourcesPageTester.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/SourcesPageTester.java Thu Jun 11 16:14:53 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/testapi/SourcesPageTester.java Thu Jun 11 16:16:05 2009 -0500
@@ -39,10 +39,10 @@
* @param page - Sources page provided by caller
* @return error message string if success, null otherwise
*/
- public static String getErrorMesaage(FormPage page) {
+ public static String getErrorMessage(FormPage page) {
if (page != null && page instanceof SourcesPage) {
SourcesPage sourcesPage = (SourcesPage) page;
- return sourcesPage.getErrorMesaage();
+ return sourcesPage.getErrorMessage();
}
return null;
}
diff -r ba58b2ff6c3e -r 0c429b331dcc uidesigner/com.nokia.sdt.uidesigner/plugin.properties
--- a/uidesigner/com.nokia.sdt.uidesigner/plugin.properties Thu Jun 11 16:14:53 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner/plugin.properties Thu Jun 11 16:16:05 2009 -0500
@@ -19,4 +19,9 @@
pluginName = My Model
providerName = www.example.org
-carbideCPPCategory = Carbide.c++
\ No newline at end of file
+carbideCPPCategory = Carbide.c++
+
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.uidesigner=ui designer event handler source design objects sync
diff -r ba58b2ff6c3e -r 0c429b331dcc uidesigner/com.nokia.sdt.uidesigner/plugin.xml
--- a/uidesigner/com.nokia.sdt.uidesigner/plugin.xml Thu Jun 11 16:14:53 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner/plugin.xml Thu Jun 11 16:16:05 2009 -0500
@@ -55,6 +55,24 @@
category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
class="com.nokia.sdt.uidesigner.preferences.UIDesignerPreferences"
id="com.nokia.sdt.uidesigner.preferences.UIDesignerPreferences"
- name="UI Designer"/>
+ name="UI Designer">
+
+
+
+
+
+
+
+
+
+
+
). If no launch configuration exists for the build target the wizard is launched. If a launch configuration already exists, then that launch configuration is launched and not the wizard.
