diff --git a/plugins/org.eclipse.embedcdt.codered.ui/plugin.xml b/plugins/org.eclipse.embedcdt.codered.ui/plugin.xml
index 9910a6dbc..a67f35b5b 100644
--- a/plugins/org.eclipse.embedcdt.codered.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.codered.ui/plugin.xml
@@ -64,7 +64,7 @@
+ id="org.eclipse.embedcdt.internal.debug.gdbjtag.ui.views.PeripheralsView" />
diff --git a/plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/internal/codered/ui/perspectives/CodeRedPerspectiveFactory.java b/plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/internal/codered/ui/perspectives/CodeRedPerspectiveFactory.java
index 4824d574d..48953f02a 100644
--- a/plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/internal/codered/ui/perspectives/CodeRedPerspectiveFactory.java
+++ b/plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/internal/codered/ui/perspectives/CodeRedPerspectiveFactory.java
@@ -93,9 +93,12 @@ private void createLayout(IPageLayout layout) {
topLeftLayout.addPlaceholder(IPageLayout.ID_BOOKMARKS);
topLeftLayout.addView(IDebugUIConstants.ID_REGISTER_VIEW);
- bundle = Platform.getBundle("org.eclipse.embedcdt.codered.ui.debug.gdbjtag");
+
+ // If the 'debug.gdbjtag.ui' plug-in is available, add a view
+ // with the PeripheralsView.
+ bundle = Platform.getBundle("org.eclipse.embedcdt.debug.gdbjtag.ui");
if (bundle != null) {
- topLeftLayout.addView("org.eclipse.embedcdt.codered.ui.debug.gdbjtag.ui.views.PeripheralsView");
+ topLeftLayout.addView("org.eclipse.embedcdt.internal.debug.gdbjtag.ui.views.PeripheralsView");
}
IFolderLayout bottomLeftLayout = layout.createFolder("bottomLeft", IPageLayout.BOTTOM, 0.5F, "topLeft");
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuLaunch.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuLaunch.java
index b66892285..6da13c484 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuLaunch.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuLaunch.java
@@ -240,5 +240,12 @@ public AbstractCLIProcess call() throws CoreException {
return newProcess;
}
+ protected String getDefaultGDBPath()
+ {
+ // Currently returns 'gdb'.
+ String path = super.getDefaultGDBPath();
+ return path;
+ }
+
// ------------------------------------------------------------------------
}
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/plugin.xml b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/plugin.xml
index 7b31f59fc..1edff3ab6 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/plugin.xml
@@ -19,27 +19,27 @@
+ id="org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.launchConfigurationTypeImage" />
@@ -47,8 +47,8 @@
-
+
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/TabDebugger.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/TabDebugger.java
index 21f3fc0f7..8209ac3c5 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/TabDebugger.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/TabDebugger.java
@@ -42,10 +42,10 @@
import org.eclipse.embedcdt.debug.gdbjtag.jlink.core.ConfigurationAttributes;
import org.eclipse.embedcdt.debug.gdbjtag.jlink.core.preferences.DefaultPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.jlink.core.preferences.PersistentPreferences;
-import org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.preferences.GlobalMcuPage;
-import org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.preferences.WorkspaceMcuPage;
-import org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.properties.ProjectMcuPage;
import org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.Messages;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.preferences.GlobalMcuPage;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.preferences.WorkspaceMcuPage;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.properties.ProjectMcuPage;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/preferences/GlobalMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/jlink/ui/preferences/GlobalMcuPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/preferences/GlobalMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/jlink/ui/preferences/GlobalMcuPage.java
index b0f852e8a..96ce98c67 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/preferences/GlobalMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/jlink/ui/preferences/GlobalMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.preferences;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.preferences;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.embedcdt.debug.gdbjtag.jlink.core.preferences.DefaultPreferences;
@@ -41,7 +41,7 @@ public class GlobalMcuPage extends FieldEditorPreferencePage implements IWorkben
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.jlink.globalPreferencePage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.globalPreferencePage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/preferences/WorkspaceMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/jlink/ui/preferences/WorkspaceMcuPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/preferences/WorkspaceMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/jlink/ui/preferences/WorkspaceMcuPage.java
index 569ed41ed..8a537d1e3 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/preferences/WorkspaceMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/jlink/ui/preferences/WorkspaceMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.preferences;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.preferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.embedcdt.debug.gdbjtag.jlink.core.preferences.DefaultPreferences;
@@ -41,7 +41,7 @@ public class WorkspaceMcuPage extends FieldEditorPreferencePage implements IWork
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.jlink.workspacePreferencePage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.workspacePreferencePage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/properties/ProjectMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/jlink/ui/properties/ProjectMcuPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/properties/ProjectMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/jlink/ui/properties/ProjectMcuPage.java
index ecbc13122..2147f2aef 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/debug/gdbjtag/jlink/ui/properties/ProjectMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/jlink/ui/properties/ProjectMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.properties;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.properties;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
@@ -32,7 +32,7 @@ public class ProjectMcuPage extends FieldEditorPropertyPage {
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.jlink.projectPropertiesPage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.projectPropertiesPage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/plugin.xml b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/plugin.xml
index a1e277d1d..64e5928d1 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/plugin.xml
@@ -19,7 +19,7 @@
+ id="org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.launchConfigurationTypeImage" />
@@ -32,22 +32,22 @@
-
+
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/TabDebugger.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/TabDebugger.java
index b71d47005..ffa750b09 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/TabDebugger.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/TabDebugger.java
@@ -41,10 +41,10 @@
import org.eclipse.embedcdt.debug.gdbjtag.openocd.core.ConfigurationAttributes;
import org.eclipse.embedcdt.debug.gdbjtag.openocd.core.preferences.DefaultPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.openocd.core.preferences.PersistentPreferences;
-import org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.preferences.GlobalMcuPage;
-import org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.preferences.WorkspaceMcuPage;
-import org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.properties.ProjectMcuPage;
import org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.Messages;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.preferences.GlobalMcuPage;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.preferences.WorkspaceMcuPage;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.properties.ProjectMcuPage;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/preferences/GlobalMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/openocd/ui/preferences/GlobalMcuPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/preferences/GlobalMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/openocd/ui/preferences/GlobalMcuPage.java
index 80c966440..2d8a2311a 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/preferences/GlobalMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/openocd/ui/preferences/GlobalMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.preferences;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.preferences;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.embedcdt.debug.gdbjtag.openocd.core.preferences.DefaultPreferences;
@@ -41,7 +41,7 @@ public class GlobalMcuPage extends FieldEditorPreferencePage implements IWorkben
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.openocd.globalPreferencePage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.globalPreferencePage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/preferences/WorkspaceMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/openocd/ui/preferences/WorkspaceMcuPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/preferences/WorkspaceMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/openocd/ui/preferences/WorkspaceMcuPage.java
index beee8cabc..395cef5cf 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/preferences/WorkspaceMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/openocd/ui/preferences/WorkspaceMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.preferences;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.preferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.embedcdt.debug.gdbjtag.openocd.core.preferences.DefaultPreferences;
@@ -41,7 +41,7 @@ public class WorkspaceMcuPage extends FieldEditorPreferencePage implements IWork
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.openocd.workspacePreferencePage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.workspacePreferencePage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/properties/ProjectMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/openocd/ui/properties/ProjectMcuPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/properties/ProjectMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/openocd/ui/properties/ProjectMcuPage.java
index 4098f6e21..8d79a8de8 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/openocd/ui/properties/ProjectMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/openocd/ui/properties/ProjectMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.properties;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.properties;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
@@ -32,7 +32,7 @@ public class ProjectMcuPage extends FieldEditorPropertyPage {
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.openocd.projectPropertiesPage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.projectPropertiesPage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/plugin.xml b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/plugin.xml
index 07399d1c0..e1226daa1 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/plugin.xml
@@ -19,7 +19,7 @@
+ id="org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.launchConfigurationTypeImage" />
@@ -32,22 +32,22 @@
-
+
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/TabDebugger.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/TabDebugger.java
index ca6897366..378eccf13 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/TabDebugger.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/TabDebugger.java
@@ -53,10 +53,10 @@
import org.eclipse.embedcdt.debug.gdbjtag.pyocd.core.PyOCD.Target;
import org.eclipse.embedcdt.debug.gdbjtag.pyocd.core.preferences.DefaultPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.pyocd.core.preferences.PersistentPreferences;
-import org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.preferences.GlobalMcuPage;
-import org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.preferences.WorkspaceMcuPage;
-import org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.properties.ProjectMcuPage;
import org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.Messages;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.preferences.GlobalMcuPage;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.preferences.WorkspaceMcuPage;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.properties.ProjectMcuPage;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/preferences/GlobalMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/pyocd/ui/preferences/GlobalMcuPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/preferences/GlobalMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/pyocd/ui/preferences/GlobalMcuPage.java
index 30846b656..2cf37ed47 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/preferences/GlobalMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/pyocd/ui/preferences/GlobalMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.preferences;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.preferences;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.embedcdt.debug.gdbjtag.pyocd.core.preferences.DefaultPreferences;
@@ -41,7 +41,7 @@ public class GlobalMcuPage extends FieldEditorPreferencePage implements IWorkben
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.pyocd.globalPreferencePage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.globalPreferencePage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/preferences/WorkspaceMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/pyocd/ui/preferences/WorkspaceMcuPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/preferences/WorkspaceMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/pyocd/ui/preferences/WorkspaceMcuPage.java
index 6c5e64741..08eb6714e 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/preferences/WorkspaceMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/pyocd/ui/preferences/WorkspaceMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.preferences;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.preferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.embedcdt.debug.gdbjtag.pyocd.core.preferences.DefaultPreferences;
@@ -41,7 +41,7 @@ public class WorkspaceMcuPage extends FieldEditorPreferencePage implements IWork
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.pyocd.workspacePreferencePage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.workspacePreferencePage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/properties/ProjectMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/pyocd/ui/properties/ProjectMcuPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/properties/ProjectMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/pyocd/ui/properties/ProjectMcuPage.java
index 445264b4c..febe63220 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/properties/ProjectMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/pyocd/ui/properties/ProjectMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.properties;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.properties;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
@@ -32,7 +32,7 @@ public class ProjectMcuPage extends FieldEditorPropertyPage {
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.pyocd.projectPropertiesPage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.projectPropertiesPage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/plugin.xml b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/plugin.xml
index 6e6864792..123c0ae6c 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/plugin.xml
@@ -19,7 +19,7 @@
+ id="org.eclipse.embedcdt.debug.gdbjtag.qemu.ui.launchConfigurationTypeImage" />
@@ -32,22 +32,22 @@
-
+
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/TabDebugger.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/TabDebugger.java
index 0c9f9fb04..a39fb8767 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/TabDebugger.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/TabDebugger.java
@@ -43,10 +43,10 @@
import org.eclipse.embedcdt.debug.gdbjtag.qemu.core.ConfigurationAttributes;
import org.eclipse.embedcdt.debug.gdbjtag.qemu.core.preferences.DefaultPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.qemu.core.preferences.PersistentPreferences;
-import org.eclipse.embedcdt.debug.gdbjtag.qemu.ui.preferences.GlobalMcuPage;
-import org.eclipse.embedcdt.debug.gdbjtag.qemu.ui.preferences.WorkspaceMcuPage;
-import org.eclipse.embedcdt.debug.gdbjtag.qemu.ui.properties.ProjectMcuPage;
import org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.Messages;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.preferences.GlobalMcuPage;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.preferences.WorkspaceMcuPage;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.properties.ProjectMcuPage;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/preferences/GlobalMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/qemu/ui/preferences/GlobalMcuPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/preferences/GlobalMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/qemu/ui/preferences/GlobalMcuPage.java
index b3bb496de..022767279 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/preferences/GlobalMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/qemu/ui/preferences/GlobalMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.qemu.ui.preferences;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.preferences;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.embedcdt.debug.gdbjtag.qemu.core.preferences.DefaultPreferences;
@@ -41,7 +41,7 @@ public class GlobalMcuPage extends FieldEditorPreferencePage implements IWorkben
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.qemu.globalPreferencePage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.globalPreferencePage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/preferences/WorkspaceMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/qemu/ui/preferences/WorkspaceMcuPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/preferences/WorkspaceMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/qemu/ui/preferences/WorkspaceMcuPage.java
index cb40cc821..b33127d77 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/preferences/WorkspaceMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/qemu/ui/preferences/WorkspaceMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.qemu.ui.preferences;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.preferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.embedcdt.debug.gdbjtag.qemu.core.preferences.DefaultPreferences;
@@ -41,7 +41,7 @@ public class WorkspaceMcuPage extends FieldEditorPreferencePage implements IWork
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.qemu.workspacePreferencePage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.workspacePreferencePage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/properties/ProjectMcuPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/qemu/ui/properties/ProjectMcuPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/properties/ProjectMcuPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/qemu/ui/properties/ProjectMcuPage.java
index f0fe03ef8..83a217c8b 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/debug/gdbjtag/qemu/ui/properties/ProjectMcuPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.qemu.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/qemu/ui/properties/ProjectMcuPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.qemu.ui.properties;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.properties;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
@@ -32,7 +32,7 @@ public class ProjectMcuPage extends FieldEditorPropertyPage {
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.qemu.projectPropertiesPage";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.qemu.ui.projectPropertiesPage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.restart.ui/src/org/eclipse/embedcdt/debug/gdbjtag/restart/ui/action/RestartCommandAction.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.restart.ui/src/org/eclipse/embedcdt/debug/gdbjtag/restart/ui/action/RestartCommandAction.java
index e8e74e70f..b896dda8c 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.restart.ui/src/org/eclipse/embedcdt/debug/gdbjtag/restart/ui/action/RestartCommandAction.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.restart.ui/src/org/eclipse/embedcdt/debug/gdbjtag/restart/ui/action/RestartCommandAction.java
@@ -26,7 +26,7 @@ public class RestartCommandAction extends DebugCommandAction {
// ------------------------------------------------------------------------
public RestartCommandAction() {
- setActionDefinitionId(Activator.PLUGIN_ID + ".commands.Restart");
+ setActionDefinitionId("org.eclipse.embedcdt.debug.gdbjtag.restart.ui.commands.Restart");
}
@Override
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/plugin.xml b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/plugin.xml
index 3b6a33088..6cea51929 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/plugin.xml
@@ -19,9 +19,9 @@
@@ -29,14 +29,14 @@
+ id="org.eclipse.embedcdt.internal.debug.gdbjtag.ui.views.PeripheralsView">
@@ -44,7 +44,7 @@
@@ -75,13 +75,13 @@
+ defaultIds="org.eclipse.embedcdt.internal.debug.gdbjtag.ui.memoryRendering"
+ primaryId="org.eclipse.embedcdt.internal.debug.gdbjtag.ui.memoryRendering"
+ renderingIds="org.eclipse.embedcdt.internal.debug.gdbjtag.ui.memoryRendering">
@@ -94,16 +94,16 @@
Colors used in the peripherals views.
@@ -111,9 +111,9 @@
@@ -121,9 +121,9 @@
@@ -131,9 +131,9 @@
@@ -142,9 +142,9 @@
@@ -156,8 +156,8 @@
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/MemoryBlockMonitor.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/MemoryBlockMonitor.java
index 8501957f6..ae071b7f7 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/MemoryBlockMonitor.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/MemoryBlockMonitor.java
@@ -31,8 +31,8 @@
import org.eclipse.embedcdt.debug.gdbjtag.core.datamodel.PeripheralDMContext;
import org.eclipse.embedcdt.debug.gdbjtag.core.memory.PeripheralMemoryBlockExtension;
import org.eclipse.embedcdt.debug.gdbjtag.core.memory.PeripheralMemoryBlockRetrieval;
-import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralRendering;
import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.Messages;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.preferences.PeripheralRendering;
import org.eclipse.embedcdt.ui.EclipseUiUtils;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IViewPart;
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedFactory.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedFactory.java
index d37ee7faf..cd2707c65 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedFactory.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedFactory.java
@@ -16,7 +16,7 @@
import org.eclipse.embedcdt.debug.gdbjtag.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.ui.PeripheralsColorFactory;
-import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
public class ColorChangedFactory extends PeripheralsColorFactory {
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedLightFactory.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedLightFactory.java
index 299193c63..f0adc74f0 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedLightFactory.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedLightFactory.java
@@ -16,7 +16,7 @@
import org.eclipse.embedcdt.debug.gdbjtag.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.ui.PeripheralsColorFactory;
-import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
public class ColorChangedLightFactory extends PeripheralsColorFactory {
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedMediumFactory.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedMediumFactory.java
index 014ea5957..58dd339fb 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedMediumFactory.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorChangedMediumFactory.java
@@ -16,7 +16,7 @@
import org.eclipse.embedcdt.debug.gdbjtag.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.ui.PeripheralsColorFactory;
-import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
public class ColorChangedMediumFactory extends PeripheralsColorFactory {
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorReadOnlyFactory.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorReadOnlyFactory.java
index 4e590e34c..bbc875c11 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorReadOnlyFactory.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorReadOnlyFactory.java
@@ -16,7 +16,7 @@
import org.eclipse.embedcdt.debug.gdbjtag.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.ui.PeripheralsColorFactory;
-import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
public class ColorReadOnlyFactory extends PeripheralsColorFactory {
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorWriteOnlyFactory.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorWriteOnlyFactory.java
index eb13dbe73..3d787a08f 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorWriteOnlyFactory.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/ColorWriteOnlyFactory.java
@@ -16,7 +16,7 @@
import org.eclipse.embedcdt.debug.gdbjtag.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.ui.PeripheralsColorFactory;
-import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
public class ColorWriteOnlyFactory extends PeripheralsColorFactory {
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralRenderingDelegate.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralRenderingDelegate.java
index 5dd7c5abe..b8a739d5b 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralRenderingDelegate.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralRenderingDelegate.java
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.ui.memory.IMemoryRendering;
import org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.preferences.PeripheralRendering;
public class PeripheralRenderingDelegate implements IMemoryRenderingTypeDelegate {
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/viewmodel/GnuMcuViewModelAdapter.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/viewmodel/GnuMcuViewModelAdapter.java
index 3df3ee6df..ffe212d89 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/viewmodel/GnuMcuViewModelAdapter.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/viewmodel/GnuMcuViewModelAdapter.java
@@ -19,8 +19,8 @@
import org.eclipse.cdt.dsf.service.DsfSession;
import org.eclipse.cdt.dsf.ui.viewmodel.IVMProvider;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
-import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripherals.PeripheralsView;
import org.eclipse.embedcdt.debug.gdbjtag.ui.viewmodel.peripherals.PeripheralsVMProvider;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripherals.PeripheralsView;
@SuppressWarnings("restriction")
public class GnuMcuViewModelAdapter extends GdbViewModelAdapter {
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralRendering.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/preferences/PeripheralRendering.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralRendering.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/preferences/PeripheralRendering.java
index 68c9c1c30..a27039a84 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralRendering.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/preferences/PeripheralRendering.java
@@ -13,7 +13,7 @@
* (many thanks to Code Red for providing the inspiration)
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.ui.preferences;
import java.math.BigInteger;
@@ -38,6 +38,15 @@
import org.eclipse.embedcdt.debug.gdbjtag.core.viewmodel.peripheral.PeripheralRegisterVMNode;
import org.eclipse.embedcdt.debug.gdbjtag.core.viewmodel.peripheral.PeripheralTreeVMNode;
import org.eclipse.embedcdt.debug.gdbjtag.ui.Activator;
+import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.ILinkToolTipListener;
+import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.LinkToolTip;
+import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralColumnInfo;
+import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralContentProvider;
+import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralEditingSupport;
+import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralFilterDialog;
+import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralNameFilter;
+import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralViewerComparator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
import org.eclipse.embedcdt.ui.SystemUIJob;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
@@ -87,7 +96,7 @@ public class PeripheralRendering extends AbstractTableRendering
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.memoryRendering";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.ui.memoryRendering";
private static final PeripheralColumnInfo[] fgColumnInfo = new PeripheralColumnInfo[] {
new PeripheralColumnInfo("Register", 4, PeripheralColumnInfo.ColumnType.REGISTER, true), // sortable
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/PeripheralsPage.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/preferences/PeripheralsPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/PeripheralsPage.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/preferences/PeripheralsPage.java
index 1901d08f5..04fb11f64 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/preferences/PeripheralsPage.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/preferences/PeripheralsPage.java
@@ -13,13 +13,13 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.ui.preferences;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.ui.preferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.embedcdt.debug.gdbjtag.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.debug.gdbjtag.ui.Activator;
-import org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.Messages;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripheral.PeripheralColumnLabelProvider;
import org.eclipse.embedcdt.ui.ThemeColorFieldEditor;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditor;
@@ -42,7 +42,7 @@ public class PeripheralsPage extends FieldEditorPreferencePage implements IWorkb
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.debug.gdbjtag.preferencePage.peripherals";
+ public static final String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.ui.preferencePage.peripherals";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralColumnLabelProvider.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/render/peripheral/PeripheralColumnLabelProvider.java
similarity index 98%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralColumnLabelProvider.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/render/peripheral/PeripheralColumnLabelProvider.java
index 49439202e..1711a6690 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripheral/PeripheralColumnLabelProvider.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/render/peripheral/PeripheralColumnLabelProvider.java
@@ -14,7 +14,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripheral;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripheral;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IMemoryBlockExtension;
@@ -42,7 +42,7 @@ public class PeripheralColumnLabelProvider extends ColumnLabelProvider implement
// ------------------------------------------------------------------------
- private static final String COLOR_PREFIX = "org.eclipse.embedcdt.debug.gdbjtag.peripherals.color.";
+ private static final String COLOR_PREFIX = "org.eclipse.embedcdt.internal.debug.gdbjtag.ui.peripherals.color.";
public static final String COLOR_READONLY = COLOR_PREFIX + "readonly";
public static final String COLOR_WRITEONLY = COLOR_PREFIX + "writeonly";
diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripherals/PeripheralsView.java b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/render/peripherals/PeripheralsView.java
similarity index 97%
rename from plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripherals/PeripheralsView.java
rename to plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/render/peripherals/PeripheralsView.java
index b916535f7..3c312558a 100644
--- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/debug/gdbjtag/ui/render/peripherals/PeripheralsView.java
+++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.ui/src/org/eclipse/embedcdt/internal/debug/gdbjtag/ui/render/peripherals/PeripheralsView.java
@@ -14,7 +14,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.debug.gdbjtag.ui.render.peripherals;
+package org.eclipse.embedcdt.internal.debug.gdbjtag.ui.render.peripherals;
import java.util.HashSet;
import java.util.Set;
@@ -45,6 +45,9 @@ public class PeripheralsView extends VariablesView implements IMemoryBlockListen
// ------------------------------------------------------------------------
+ // Note: also refered in the codered perspective.
+ public final static String ID = "org.eclipse.embedcdt.internal.debug.gdbjtag.ui.views.PeripheralsView";
+
public final static String PRESENTATION_CONTEXT_ID = "PeripheralsView";
private UIJob fRefreshUIjob = new SystemUIJob(PeripheralsView.class.getSimpleName() + "#refreshUIjob") {
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
index 15b9418b2..1e0c64895 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
@@ -16,7 +16,7 @@
-->
@@ -1672,7 +1672,7 @@
configurationMacroSupplier="org.eclipse.embedcdt.managedbuild.cross.arm.core.ConfigurationBuildMacroSupplier"
id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base"
isAbstract="false"
- languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.embedcdt.managedbuild.cross.GCCBuiltinSpecsDetector"
+ languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector"
name="%toolchain.name"
osList="all"
targetTool="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker;cdt.managedbuild.tool.gnu.archiver">
@@ -3577,7 +3577,7 @@
@@ -3606,7 +3606,7 @@
type="java.lang.Object">
-
+
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/schema/toolchains.exsd b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/schema/toolchains.exsd
index 27762b4e3..1ef37a2ba 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/schema/toolchains.exsd
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/schema/toolchains.exsd
@@ -1,9 +1,9 @@
-
+
-
+
This extension point provides the ability to add custom GNU MCU toolchains.
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/src/org/eclipse/embedcdt/managedbuild/cross/arm/core/SpecsProvider.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/src/org/eclipse/embedcdt/managedbuild/cross/arm/core/SpecsProvider.java
index 1cc28d4b4..54b6edd7a 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/src/org/eclipse/embedcdt/managedbuild/cross/arm/core/SpecsProvider.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/src/org/eclipse/embedcdt/managedbuild/cross/arm/core/SpecsProvider.java
@@ -21,7 +21,7 @@ public class SpecsProvider {
// ------------------------------------------------------------------------
- private static String PROVIDER_ID = "org.eclipse.embedcdt.managedbuild.cross.GCCBuiltinSpecsDetector";
+ private static String PROVIDER_ID = "org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/src/org/eclipse/embedcdt/managedbuild/cross/arm/core/ToolchainDefinition.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/src/org/eclipse/embedcdt/managedbuild/cross/arm/core/ToolchainDefinition.java
index b6cff2c11..2426fe481 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/src/org/eclipse/embedcdt/managedbuild/cross/arm/core/ToolchainDefinition.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/src/org/eclipse/embedcdt/managedbuild/cross/arm/core/ToolchainDefinition.java
@@ -172,7 +172,7 @@ private static void addExtensionsToolchains(String extensionPointId) {
// ------------------------------------------------------------------------
- private static final String CUSTOM_TOOLCHAINS_EXTENSION_POINT_ID = "org.eclipse.embedcdt.managedbuild.cross.arm.toolchains";
+ private static final String CUSTOM_TOOLCHAINS_EXTENSION_POINT_ID = "org.eclipse.embedcdt.managedbuild.cross.arm.core.toolchains";
// Initialise the list of known toolchains
static {
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/plugin.xml
index ca708e291..6e4808048 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/plugin.xml
@@ -18,9 +18,9 @@
+ pageClass="org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.SetCrossCommandWizardPage">
- public static final String PAGE_ID = "org.eclipse.embedcdt.managedbuild.cross.setCrossCommandWizardPage"; //$NON-NLS-1$
+ public static final String PAGE_ID = "org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.setCrossCommandWizardPage"; //$NON-NLS-1$
public static final String CROSS_WIZARD = "wizard"; //$NON-NLS-1$
public static final String CROSS_PROJECT_NAME = "projectName"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/preferences/GlobalToolchainsPathsPreferencesPage.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/arm/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
rename to plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/arm/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
index 15399ef31..23ceee077 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/arm/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.cross.arm.ui.preferences;
+package org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.preferences;
import java.util.HashSet;
import java.util.Set;
@@ -30,6 +30,7 @@
import org.eclipse.embedcdt.managedbuild.cross.arm.core.Option;
import org.eclipse.embedcdt.managedbuild.cross.arm.core.preferences.DefaultPreferences;
import org.eclipse.embedcdt.managedbuild.cross.arm.ui.Activator;
+import org.eclipse.embedcdt.managedbuild.cross.arm.ui.preferences.ToolchainsFieldEditor;
import org.eclipse.embedcdt.managedbuild.cross.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.ui.LabelFakeFieldEditor;
import org.eclipse.embedcdt.ui.XpackDirectoryNotStrictFieldEditor;
@@ -55,7 +56,7 @@ public class GlobalToolchainsPathsPreferencesPage extends FieldEditorPreferenceP
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.managedbuild.cross.arm.preferencePage.globalToolchainsPaths";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.preferencePage.globalToolchainsPaths";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/arm/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
rename to plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/arm/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
index 9a9a1531a..3d13de26c 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/arm/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.cross.arm.ui.preferences;
+package org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.preferences;
import java.util.HashSet;
import java.util.Set;
@@ -29,6 +29,7 @@
import org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.Messages;
import org.eclipse.embedcdt.managedbuild.cross.arm.core.Option;
import org.eclipse.embedcdt.managedbuild.cross.arm.ui.Activator;
+import org.eclipse.embedcdt.managedbuild.cross.arm.ui.preferences.ToolchainsFieldEditor;
import org.eclipse.embedcdt.managedbuild.cross.core.preferences.DefaultPreferences;
import org.eclipse.embedcdt.managedbuild.cross.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.ui.LabelFakeFieldEditor;
@@ -54,7 +55,7 @@ public class WorkspaceToolchainsPathsPreferencesPage extends FieldEditorPreferen
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.managedbuild.cross.arm.preferencePage.workspaceToolchainsPaths";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.preferencePage.workspaceToolchainsPaths";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/properties/ProjectToolchainsPathPropertiesPage.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/arm/ui/properties/ProjectToolchainsPathPropertiesPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/properties/ProjectToolchainsPathPropertiesPage.java
rename to plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/arm/ui/properties/ProjectToolchainsPathPropertiesPage.java
index d68eb9a8d..edd9ca24f 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/properties/ProjectToolchainsPathPropertiesPage.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/arm/ui/properties/ProjectToolchainsPathPropertiesPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.cross.arm.ui.properties;
+package org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.properties;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +41,7 @@ public class ProjectToolchainsPathPropertiesPage extends FieldEditorPropertyPage
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.managedbuild.cross.arm.properties.toolchainsPage";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.properties.toolchainsPage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/SetCrossCommandWizardOperation.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/SetCrossCommandWizardOperation.java
index 036e66114..25c4c3c35 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/SetCrossCommandWizardOperation.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/SetCrossCommandWizardOperation.java
@@ -29,6 +29,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.SetCrossCommandWizardPage;
import org.eclipse.embedcdt.managedbuild.cross.arm.core.ToolchainDefinition;
import org.eclipse.embedcdt.managedbuild.cross.core.preferences.PersistentPreferences;
import org.eclipse.jface.operation.IRunnableWithProgress;
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/TabToolchains.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/TabToolchains.java
index 6f2061518..9fc3d1511 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/TabToolchains.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.ui/src/org/eclipse/embedcdt/managedbuild/cross/arm/ui/TabToolchains.java
@@ -39,18 +39,18 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.embedcdt.core.EclipseUtils;
import org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.Messages;
+import org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.preferences.GlobalToolchainsPathsPreferencesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.preferences.WorkspaceToolchainsPathsPreferencesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.arm.ui.properties.ProjectToolchainsPathPropertiesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.ui.preferences.BuildToolsGlobalPathsPreferencesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.ui.preferences.BuildToolsWorkspacePathsPreferencesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.ui.properties.BuildToolsProjectPathPropertiesPage;
import org.eclipse.embedcdt.managedbuild.cross.arm.core.IDs;
import org.eclipse.embedcdt.managedbuild.cross.arm.core.Option;
import org.eclipse.embedcdt.managedbuild.cross.arm.core.ToolchainDefinition;
-import org.eclipse.embedcdt.managedbuild.cross.arm.ui.preferences.GlobalToolchainsPathsPreferencesPage;
-import org.eclipse.embedcdt.managedbuild.cross.arm.ui.preferences.WorkspaceToolchainsPathsPreferencesPage;
-import org.eclipse.embedcdt.managedbuild.cross.arm.ui.properties.ProjectToolchainsPathPropertiesPage;
import org.eclipse.embedcdt.managedbuild.cross.core.GnuMcuMakefileGenerator;
import org.eclipse.embedcdt.managedbuild.cross.core.Utils;
import org.eclipse.embedcdt.managedbuild.cross.core.preferences.PersistentPreferences;
-import org.eclipse.embedcdt.managedbuild.cross.ui.preferences.BuildToolsGlobalPathsPreferencesPage;
-import org.eclipse.embedcdt.managedbuild.cross.ui.preferences.BuildToolsWorkspacePathsPreferencesPage;
-import org.eclipse.embedcdt.managedbuild.cross.ui.properties.BuildToolsProjectPathPropertiesPage;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.xml
index 2874dc9b3..4b086bdd4 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/plugin.xml
@@ -1358,8 +1358,8 @@
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
index 2ecae3888..b39758c66 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
@@ -18,7 +18,7 @@
-->
@@ -587,7 +587,7 @@
configurationMacroSupplier="org.eclipse.embedcdt.managedbuild.cross.riscv.core.ConfigurationBuildMacroSupplier"
id="ilg.gnumcueclipse.managedbuild.cross.riscv.toolchain.base"
isAbstract="false"
- languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.embedcdt.managedbuild.cross.riscv.GCCBuiltinSpecsDetector"
+ languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.embedcdt.managedbuild.cross.riscv.core.GCCBuiltinSpecsDetector"
name="%toolchain.name"
osList="all"
targetTool="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.linker;ilg.gnumcueclipse.managedbuild.cross.riscv.tool.cpp.linker;cdt.managedbuild.tool.gnu.archiver">
@@ -2477,7 +2477,7 @@
@@ -2507,7 +2507,7 @@
-
+
-
+
-
+
This extension point provides the ability to add custom GNU RISC-V toolchains.
@@ -109,7 +109,7 @@
<extension
- point="org.eclipse.embedcdt.managedbuild.cross.riscv.toolchains">
+ point="org.eclipse.embedcdt.managedbuild.cross.riscv.core.toolchains">
<toolchain name="Custom" prefix="riscv64-unknown-linux-gnu-" />
</extension>
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/src/org/eclipse/embedcdt/managedbuild/cross/riscv/core/SpecsProvider.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/src/org/eclipse/embedcdt/managedbuild/cross/riscv/core/SpecsProvider.java
index 400af8d7e..d66f2826e 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/src/org/eclipse/embedcdt/managedbuild/cross/riscv/core/SpecsProvider.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/src/org/eclipse/embedcdt/managedbuild/cross/riscv/core/SpecsProvider.java
@@ -21,7 +21,7 @@ public class SpecsProvider {
// ------------------------------------------------------------------------
- private static String PROVIDER_ID = "org.eclipse.embedcdt.managedbuild.cross.riscv.GCCBuiltinSpecsDetector";
+ private static String PROVIDER_ID = "org.eclipse.embedcdt.managedbuild.cross.riscv.core.GCCBuiltinSpecsDetector";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/src/org/eclipse/embedcdt/managedbuild/cross/riscv/core/ToolchainDefinition.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/src/org/eclipse/embedcdt/managedbuild/cross/riscv/core/ToolchainDefinition.java
index 518f9edc5..9a3d24031 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/src/org/eclipse/embedcdt/managedbuild/cross/riscv/core/ToolchainDefinition.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/src/org/eclipse/embedcdt/managedbuild/cross/riscv/core/ToolchainDefinition.java
@@ -176,7 +176,7 @@ public static void addExtensionsToolchains(String extensionPointId) {
// ------------------------------------------------------------------------
- private static final String CUSTOM_TOOLCHAINS_EXTENSION_POINT_ID = "org.eclipse.embedcdt.managedbuild.cross.riscv.toolchains";
+ private static final String CUSTOM_TOOLCHAINS_EXTENSION_POINT_ID = "org.eclipse.embedcdt.managedbuild.cross.riscv.core.toolchains";
// Initialise the list of known toolchains
static {
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/META-INF/MANIFEST.MF
index be659f39a..f5f77c363 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/META-INF/MANIFEST.MF
@@ -20,9 +20,9 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %bundle.vendor
Bundle-Localization: plugin
-Export-Package: org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
- org.eclipse.embedcdt.managedbuild.cross.riscv.ui.preferences,
- org.eclipse.embedcdt.managedbuild.cross.riscv.ui.properties
+Export-Package: org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.properties,
+ org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
+ org.eclipse.embedcdt.managedbuild.cross.riscv.ui.preferences
Bundle-Activator: org.eclipse.embedcdt.managedbuild.cross.riscv.ui.Activator
Import-Package: org.eclipse.embedcdt.managedbuild.cross.arm.core.preferences
Automatic-Module-Name: org.eclipse.embedcdt.managedbuild.cross.riscv.ui
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/plugin.xml
index a5ce3d0eb..60b82f181 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/plugin.xml
@@ -19,9 +19,9 @@
+ pageClass="org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.SetCrossCommandWizardPage">
@@ -59,22 +59,22 @@
- public static final String PAGE_ID = "org.eclipse.embedcdt.managedbuild.cross.riscv.setCrossCommandWizardPage"; //$NON-NLS-1$
+ public static final String PAGE_ID = "org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.setCrossCommandWizardPage"; //$NON-NLS-1$
public static final String CROSS_WIZARD = "wizard"; //$NON-NLS-1$
public static final String CROSS_PROJECT_NAME = "projectName"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/preferences/GlobalToolchainsPathsPreferencesPage.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/riscv/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
rename to plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/riscv/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
index 393e543f0..82cebfbde 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/riscv/ui/preferences/GlobalToolchainsPathsPreferencesPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.cross.riscv.ui.preferences;
+package org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.preferences;
import java.util.HashSet;
import java.util.Set;
@@ -31,6 +31,7 @@
import org.eclipse.embedcdt.managedbuild.cross.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.managedbuild.cross.riscv.core.Option;
import org.eclipse.embedcdt.managedbuild.cross.riscv.ui.Activator;
+import org.eclipse.embedcdt.managedbuild.cross.riscv.ui.preferences.ToolchainsFieldEditor;
import org.eclipse.embedcdt.ui.LabelFakeFieldEditor;
import org.eclipse.embedcdt.ui.XpackDirectoryNotStrictFieldEditor;
import org.eclipse.jface.preference.FieldEditor;
@@ -55,7 +56,7 @@ public class GlobalToolchainsPathsPreferencesPage extends FieldEditorPreferenceP
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.managedbuild.cross.riscv.preferencePage.globalToolchainsPaths";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.preferencePage.globalToolchainsPaths";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/riscv/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
rename to plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/riscv/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
index db254c285..f4d36014c 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/riscv/ui/preferences/WorkspaceToolchainsPathsPreferencesPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.cross.riscv.ui.preferences;
+package org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.preferences;
import java.util.HashSet;
import java.util.Set;
@@ -31,6 +31,7 @@
import org.eclipse.embedcdt.managedbuild.cross.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.managedbuild.cross.riscv.core.Option;
import org.eclipse.embedcdt.managedbuild.cross.riscv.ui.Activator;
+import org.eclipse.embedcdt.managedbuild.cross.riscv.ui.preferences.ToolchainsFieldEditor;
import org.eclipse.embedcdt.ui.LabelFakeFieldEditor;
import org.eclipse.embedcdt.ui.XpackDirectoryNotStrictFieldEditor;
import org.eclipse.embedcdt.ui.preferences.ScopedPreferenceStoreWithoutDefaults;
@@ -54,7 +55,7 @@ public class WorkspaceToolchainsPathsPreferencesPage extends FieldEditorPreferen
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.managedbuild.cross.riscv.preferencePage.workspaceToolchainsPaths";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.preferencePage.workspaceToolchainsPaths";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/properties/ProjectToolchainsPathPropertiesPage.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/riscv/ui/properties/ProjectToolchainsPathPropertiesPage.java
similarity index 95%
rename from plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/properties/ProjectToolchainsPathPropertiesPage.java
rename to plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/riscv/ui/properties/ProjectToolchainsPathPropertiesPage.java
index 39a54e506..d7f474e37 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/properties/ProjectToolchainsPathPropertiesPage.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/riscv/ui/properties/ProjectToolchainsPathPropertiesPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.cross.riscv.ui.properties;
+package org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.properties;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +41,7 @@ public class ProjectToolchainsPathPropertiesPage extends FieldEditorPropertyPage
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.managedbuild.cross.riscv.properties.toolchainsPage";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.properties.toolchainsPage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/SetCrossCommandWizardOperation.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/SetCrossCommandWizardOperation.java
index 35a068d45..367bcba50 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/SetCrossCommandWizardOperation.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/SetCrossCommandWizardOperation.java
@@ -30,6 +30,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.SetCrossCommandWizardPage;
import org.eclipse.embedcdt.managedbuild.cross.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.managedbuild.cross.riscv.core.ToolchainDefinition;
import org.eclipse.jface.operation.IRunnableWithProgress;
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/TabToolchains.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/TabToolchains.java
index 3a3bb0630..e1a4028ef 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/TabToolchains.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.ui/src/org/eclipse/embedcdt/managedbuild/cross/riscv/ui/TabToolchains.java
@@ -39,18 +39,18 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.Messages;
+import org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.preferences.GlobalToolchainsPathsPreferencesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.preferences.WorkspaceToolchainsPathsPreferencesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.riscv.ui.properties.ProjectToolchainsPathPropertiesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.ui.preferences.BuildToolsGlobalPathsPreferencesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.ui.preferences.BuildToolsWorkspacePathsPreferencesPage;
+import org.eclipse.embedcdt.internal.managedbuild.cross.ui.properties.BuildToolsProjectPathPropertiesPage;
import org.eclipse.embedcdt.managedbuild.cross.core.GnuMcuMakefileGenerator;
import org.eclipse.embedcdt.managedbuild.cross.core.Utils;
import org.eclipse.embedcdt.managedbuild.cross.core.preferences.PersistentPreferences;
import org.eclipse.embedcdt.managedbuild.cross.riscv.core.IDs;
import org.eclipse.embedcdt.managedbuild.cross.riscv.core.Option;
import org.eclipse.embedcdt.managedbuild.cross.riscv.core.ToolchainDefinition;
-import org.eclipse.embedcdt.managedbuild.cross.riscv.ui.preferences.GlobalToolchainsPathsPreferencesPage;
-import org.eclipse.embedcdt.managedbuild.cross.riscv.ui.preferences.WorkspaceToolchainsPathsPreferencesPage;
-import org.eclipse.embedcdt.managedbuild.cross.riscv.ui.properties.ProjectToolchainsPathPropertiesPage;
-import org.eclipse.embedcdt.managedbuild.cross.ui.preferences.BuildToolsGlobalPathsPreferencesPage;
-import org.eclipse.embedcdt.managedbuild.cross.ui.preferences.BuildToolsWorkspacePathsPreferencesPage;
-import org.eclipse.embedcdt.managedbuild.cross.ui.properties.BuildToolsProjectPathPropertiesPage;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/META-INF/MANIFEST.MF
index e8bb8ad84..9e786d432 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/META-INF/MANIFEST.MF
@@ -25,6 +25,6 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %bundle.vendor
Bundle-Localization: plugin
-Export-Package: org.eclipse.embedcdt.managedbuild.cross.ui.preferences,
- org.eclipse.embedcdt.managedbuild.cross.ui.properties
+Export-Package: org.eclipse.embedcdt.internal.managedbuild.cross.ui.preferences,
+ org.eclipse.embedcdt.internal.managedbuild.cross.ui.properties
Automatic-Module-Name: org.eclipse.embedcdt.managedbuild.cross.ui
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/plugin.xml
index f00dda750..4c6cc7b2b 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/plugin.xml
@@ -20,22 +20,22 @@
-
+
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/managedbuild/cross/ui/preferences/BuildToolsGlobalPathsPreferencesPage.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/ui/preferences/BuildToolsGlobalPathsPreferencesPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/managedbuild/cross/ui/preferences/BuildToolsGlobalPathsPreferencesPage.java
rename to plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/ui/preferences/BuildToolsGlobalPathsPreferencesPage.java
index a373bf52d..cc4952361 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/managedbuild/cross/ui/preferences/BuildToolsGlobalPathsPreferencesPage.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/ui/preferences/BuildToolsGlobalPathsPreferencesPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.cross.ui.preferences;
+package org.eclipse.embedcdt.internal.managedbuild.cross.ui.preferences;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.embedcdt.internal.managedbuild.cross.ui.Messages;
@@ -43,7 +43,7 @@ public class BuildToolsGlobalPathsPreferencesPage extends FieldEditorPreferenceP
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.managedbuild.cross.ui.preferencePage.globalToolsPaths";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.cross.ui.preferencePage.globalToolsPaths";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/managedbuild/cross/ui/preferences/BuildToolsWorkspacePathsPreferencesPage.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/ui/preferences/BuildToolsWorkspacePathsPreferencesPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/managedbuild/cross/ui/preferences/BuildToolsWorkspacePathsPreferencesPage.java
rename to plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/ui/preferences/BuildToolsWorkspacePathsPreferencesPage.java
index 8b6c5f248..2720900d0 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/managedbuild/cross/ui/preferences/BuildToolsWorkspacePathsPreferencesPage.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/ui/preferences/BuildToolsWorkspacePathsPreferencesPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.cross.ui.preferences;
+package org.eclipse.embedcdt.internal.managedbuild.cross.ui.preferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.embedcdt.internal.managedbuild.cross.ui.Messages;
@@ -42,7 +42,7 @@ public class BuildToolsWorkspacePathsPreferencesPage extends FieldEditorPreferen
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.managedbuild.cross.ui.preferencePage.workspaceToolsPaths";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.cross.ui.preferencePage.workspaceToolsPaths";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/managedbuild/cross/ui/properties/BuildToolsProjectPathPropertiesPage.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/ui/properties/BuildToolsProjectPathPropertiesPage.java
similarity index 93%
rename from plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/managedbuild/cross/ui/properties/BuildToolsProjectPathPropertiesPage.java
rename to plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/ui/properties/BuildToolsProjectPathPropertiesPage.java
index 8a3d2cf38..ab768ad3b 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/managedbuild/cross/ui/properties/BuildToolsProjectPathPropertiesPage.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.ui/src/org/eclipse/embedcdt/internal/managedbuild/cross/ui/properties/BuildToolsProjectPathPropertiesPage.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.cross.ui.properties;
+package org.eclipse.embedcdt.internal.managedbuild.cross.ui.properties;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
@@ -31,7 +31,7 @@ public class BuildToolsProjectPathPropertiesPage extends FieldEditorPropertyPage
// ------------------------------------------------------------------------
- public static final String ID = "org.eclipse.embedcdt.managedbuild.cross.ui.properties.toolsPage";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.cross.ui.properties.toolsPage";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/META-INF/MANIFEST.MF
index 9958854b7..74496fdf1 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/META-INF/MANIFEST.MF
@@ -27,6 +27,6 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %bundle.vendor
Bundle-Localization: plugin
-Export-Package: org.eclipse.embedcdt.managedbuild.packs.ui,
- org.eclipse.embedcdt.managedbuild.packs.ui.views
+Export-Package: org.eclipse.embedcdt.internal.managedbuild.packs.ui.views,
+ org.eclipse.embedcdt.managedbuild.packs.ui
Automatic-Module-Name: org.eclipse.embedcdt.managedbuild.packs.ui
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/plugin.xml
index ac6887f68..fa206776a 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/plugin.xml
@@ -31,29 +31,29 @@
+ id="org.eclipse.embedcdt.internal.managedbuild.packs.ui.views.DocsView">
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/src/org/eclipse/embedcdt/managedbuild/packs/ui/views/DocsView.java b/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/src/org/eclipse/embedcdt/internal/managedbuild/packs/ui/views/DocsView.java
similarity index 99%
rename from plugins/org.eclipse.embedcdt.managedbuild.packs.ui/src/org/eclipse/embedcdt/managedbuild/packs/ui/views/DocsView.java
rename to plugins/org.eclipse.embedcdt.managedbuild.packs.ui/src/org/eclipse/embedcdt/internal/managedbuild/packs/ui/views/DocsView.java
index 1b7194483..4ac6bfc74 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/src/org/eclipse/embedcdt/managedbuild/packs/ui/views/DocsView.java
+++ b/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/src/org/eclipse/embedcdt/internal/managedbuild/packs/ui/views/DocsView.java
@@ -13,7 +13,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.managedbuild.packs.ui.views;
+package org.eclipse.embedcdt.internal.managedbuild.packs.ui.views;
import java.io.IOException;
import java.net.URL;
@@ -89,7 +89,7 @@ public class DocsView extends ViewPart implements IDataManagerListener, IPropert
/**
* The ID of the view as specified by the extension.
*/
- public static final String ID = "org.eclipse.embedcdt.managedbuild.packs.ui.views.DocsView";
+ public static final String ID = "org.eclipse.embedcdt.internal.managedbuild.packs.ui.views.DocsView";
public static final int AUTOEXPAND_LEVEL = 2;
diff --git a/plugins/org.eclipse.embedcdt.packs.core/plugin.xml b/plugins/org.eclipse.embedcdt.packs.core/plugin.xml
index 500b38a3d..b37f0e360 100644
--- a/plugins/org.eclipse.embedcdt.packs.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.packs.core/plugin.xml
@@ -30,7 +30,7 @@
diff --git a/plugins/org.eclipse.embedcdt.packs.core/src/org/eclipse/embedcdt/packs/core/data/DataUtils.java b/plugins/org.eclipse.embedcdt.packs.core/src/org/eclipse/embedcdt/packs/core/data/DataUtils.java
index 17d0942c9..5a38e4cfe 100644
--- a/plugins/org.eclipse.embedcdt.packs.core/src/org/eclipse/embedcdt/packs/core/data/DataUtils.java
+++ b/plugins/org.eclipse.embedcdt.packs.core/src/org/eclipse/embedcdt/packs/core/data/DataUtils.java
@@ -199,7 +199,7 @@ public static void makeFolderReadOnlyRecursive(File folder) {
}
}
- static final private String MARKER_ID = "org.eclipse.embedcdt.packs.marker";
+ static final private String MARKER_ID = "org.eclipse.embedcdt.packs.core.marker";
// Sample:
//
diff --git a/plugins/org.eclipse.embedcdt.packs.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.packs.ui/META-INF/MANIFEST.MF
index d3edc4660..86d03ff80 100644
--- a/plugins/org.eclipse.embedcdt.packs.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.embedcdt.packs.ui/META-INF/MANIFEST.MF
@@ -20,9 +20,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %bundle.vendor
Bundle-Localization: plugin
-Export-Package: org.eclipse.embedcdt.packs.ui,
+Export-Package: org.eclipse.embedcdt.internal.packs.ui.perspectives,
+ org.eclipse.embedcdt.packs.ui,
org.eclipse.embedcdt.packs.ui.handlers,
- org.eclipse.embedcdt.packs.ui.perspectives,
org.eclipse.embedcdt.packs.ui.preferences,
org.eclipse.embedcdt.packs.ui.views;x-friends:="org.eclipse.embedcdt.managedbuild.packs.ui"
Service-Component: OSGI-INF/org.eclipse.embedcdt.internal.packs.ui.MessageConsoles.xml
diff --git a/plugins/org.eclipse.embedcdt.packs.ui/plugin.xml b/plugins/org.eclipse.embedcdt.packs.ui/plugin.xml
index 1ddf10b33..18bafe9b4 100644
--- a/plugins/org.eclipse.embedcdt.packs.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.packs.ui/plugin.xml
@@ -34,72 +34,72 @@
@@ -109,7 +109,7 @@
locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
@@ -120,11 +120,11 @@
+ commandId="org.eclipse.embedcdt.packs.ui.commands.updateCommand">
+ commandId="org.eclipse.embedcdt.packs.ui.commands.showPerspectiveCommand">
diff --git a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/perspectives/PacksPerspective.java b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/perspectives/PacksPerspective.java
similarity index 85%
rename from plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/perspectives/PacksPerspective.java
rename to plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/perspectives/PacksPerspective.java
index b6e1fa786..ba146f465 100644
--- a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/perspectives/PacksPerspective.java
+++ b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/perspectives/PacksPerspective.java
@@ -12,8 +12,13 @@
* Liviu Ionescu - initial implementation.
*******************************************************************************/
-package org.eclipse.embedcdt.packs.ui.perspectives;
+package org.eclipse.embedcdt.internal.packs.ui.perspectives;
+import org.eclipse.embedcdt.internal.packs.ui.views.BoardsView;
+import org.eclipse.embedcdt.internal.packs.ui.views.DevicesView;
+import org.eclipse.embedcdt.internal.packs.ui.views.KeywordsView;
+import org.eclipse.embedcdt.internal.packs.ui.views.OutlineView;
+import org.eclipse.embedcdt.internal.packs.ui.views.PacksView;
import org.eclipse.ui.IFolderLayout;
import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveFactory;
@@ -29,7 +34,7 @@
*/
public class PacksPerspective implements IPerspectiveFactory {
- public static final String ID = "org.eclipse.embedcdt.packs.ui.perspectives.PacksPerspective";
+ public static final String ID = "org.eclipse.embedcdt.internal.packs.ui.perspectives.PacksPerspective";
private IPageLayout fFactory;
@@ -69,17 +74,17 @@ private void addViews() {
IFolderLayout topLeft = fFactory.createFolder("packsNav", // NON-NLS-1
IPageLayout.LEFT, 0.20f, fFactory.getEditorArea());
// topLeft.addView(IPageLayout.ID_RES_NAV);
- topLeft.addView("org.eclipse.embedcdt.packs.ui.views.DevicesView");
- topLeft.addView("org.eclipse.embedcdt.packs.ui.views.BoardsView");
- topLeft.addView("org.eclipse.embedcdt.packs.ui.views.KeywordsView");
+ topLeft.addView(DevicesView.ID);
+ topLeft.addView(BoardsView.ID);
+ topLeft.addView(KeywordsView.ID);
IFolderLayout topRight = fFactory.createFolder("packsOutline", // NON-NLS-1
IPageLayout.RIGHT, 0.66f, fFactory.getEditorArea());
- topRight.addView("org.eclipse.embedcdt.packs.ui.views.OutlineView");
- // topRight.addView("org.eclipse.embedcdt.packs.ui.views.PackagesView");
+ topRight.addView(OutlineView.ID);
+ // topRight.addView(PackagesView.ID);
// Leave 20% for the editor
- fFactory.addView("org.eclipse.embedcdt.packs.ui.views.PackagesView", IPageLayout.TOP, 0.8f,
+ fFactory.addView(PacksView.ID, IPageLayout.TOP, 0.8f,
fFactory.getEditorArea());
// factory.addFastView("org.eclipse.team.ccvs.ui.RepositoriesView",0.50f);
diff --git a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/BoardsView.java b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/BoardsView.java
similarity index 98%
rename from plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/BoardsView.java
rename to plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/BoardsView.java
index 3feab0bc5..c25bf781f 100644
--- a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/BoardsView.java
+++ b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/BoardsView.java
@@ -14,7 +14,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.packs.ui.views;
+package org.eclipse.embedcdt.internal.packs.ui.views;
import java.util.Collection;
import java.util.HashMap;
@@ -31,6 +31,7 @@
import org.eclipse.embedcdt.packs.core.tree.Property;
import org.eclipse.embedcdt.packs.core.tree.Type;
import org.eclipse.embedcdt.packs.ui.Activator;
+import org.eclipse.embedcdt.packs.ui.views.NodeViewContentProvider;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
@@ -58,7 +59,7 @@ public class BoardsView extends ViewPart implements IDataManagerListener {
/**
* The ID of the view as specified by the extension.
*/
- public static final String ID = "org.eclipse.embedcdt.packs.ui.views.BoardsView";
+ public static final String ID = "org.eclipse.embedcdt.internal.packs.ui.views.BoardsView";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/DevicesView.java b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/DevicesView.java
similarity index 98%
rename from plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/DevicesView.java
rename to plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/DevicesView.java
index b6bcdbc6f..13aeeaf99 100644
--- a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/DevicesView.java
+++ b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/DevicesView.java
@@ -14,7 +14,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.packs.ui.views;
+package org.eclipse.embedcdt.internal.packs.ui.views;
import java.util.Collection;
import java.util.HashMap;
@@ -31,6 +31,7 @@
import org.eclipse.embedcdt.packs.core.tree.Property;
import org.eclipse.embedcdt.packs.core.tree.Type;
import org.eclipse.embedcdt.packs.ui.Activator;
+import org.eclipse.embedcdt.packs.ui.views.NodeViewContentProvider;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
@@ -58,7 +59,7 @@ public class DevicesView extends ViewPart implements IDataManagerListener {
/**
* The ID of the view as specified by the extension.
*/
- public static final String ID = "org.eclipse.embedcdt.packs.ui.views.DevicesView";
+ public static final String ID = "org.eclipse.embedcdt.internal.packs.ui.views.DevicesView";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/KeywordsView.java b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/KeywordsView.java
similarity index 97%
rename from plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/KeywordsView.java
rename to plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/KeywordsView.java
index a39df13a4..b68f0cb28 100644
--- a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/KeywordsView.java
+++ b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/KeywordsView.java
@@ -14,7 +14,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.packs.ui.views;
+package org.eclipse.embedcdt.internal.packs.ui.views;
import java.util.HashSet;
import java.util.List;
@@ -29,6 +29,7 @@
import org.eclipse.embedcdt.packs.core.tree.Node;
import org.eclipse.embedcdt.packs.core.tree.Type;
import org.eclipse.embedcdt.packs.ui.Activator;
+import org.eclipse.embedcdt.packs.ui.views.NodeViewContentProvider;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
@@ -53,7 +54,7 @@ public class KeywordsView extends ViewPart implements IDataManagerListener {
/**
* The ID of the view as specified by the extension.
*/
- public static final String ID = "org.eclipse.embedcdt.packs.ui.views.KeywordsView";
+ public static final String ID = "org.eclipse.embedcdt.internal.packs.ui.views.KeywordsView";
// ------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/OutlineView.java b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/OutlineView.java
similarity index 99%
rename from plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/OutlineView.java
rename to plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/OutlineView.java
index 820b75866..fd62608c9 100644
--- a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/OutlineView.java
+++ b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/OutlineView.java
@@ -14,7 +14,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.packs.ui.views;
+package org.eclipse.embedcdt.internal.packs.ui.views;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -34,6 +34,7 @@
import org.eclipse.embedcdt.packs.core.tree.Type;
import org.eclipse.embedcdt.packs.ui.Activator;
import org.eclipse.embedcdt.packs.ui.IconUtils;
+import org.eclipse.embedcdt.packs.ui.views.NodeViewContentProvider;
import org.eclipse.embedcdt.ui.EclipseUiUtils;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuListener;
@@ -69,7 +70,7 @@
public class OutlineView extends ViewPart {
- public static final String ID = "org.eclipse.embedcdt.packs.ui.views.OutlineView";
+ public static final String ID = "org.eclipse.embedcdt.internal.packs.ui.views.OutlineView";
public static final int AUTOEXPAND_LEVEL = 0;
diff --git a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/PacksView.java b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/PacksView.java
similarity index 98%
rename from plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/PacksView.java
rename to plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/PacksView.java
index 31ccf957b..ff0f4a07c 100644
--- a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/views/PacksView.java
+++ b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/internal/packs/ui/views/PacksView.java
@@ -14,7 +14,7 @@
* Liviu Ionescu - UI part extraction.
*******************************************************************************/
-package org.eclipse.embedcdt.packs.ui.views;
+package org.eclipse.embedcdt.internal.packs.ui.views;
import java.io.File;
import java.util.Arrays;
@@ -47,6 +47,9 @@
import org.eclipse.embedcdt.packs.core.tree.Selector;
import org.eclipse.embedcdt.packs.core.tree.Type;
import org.eclipse.embedcdt.packs.ui.Activator;
+import org.eclipse.embedcdt.packs.ui.views.CopyExampleDialog;
+import org.eclipse.embedcdt.packs.ui.views.NodeViewContentProvider;
+import org.eclipse.embedcdt.packs.ui.views.PacksFilter;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
@@ -90,7 +93,7 @@ public class PacksView extends ViewPart implements IDataManagerListener {
/**
* The ID of the view as specified by the extension.
*/
- public static final String ID = "org.eclipse.embedcdt.packs.ui.views.PackagesView";
+ public static final String ID = "org.eclipse.embedcdt.internal.packs.ui.views.PacksView";
private static final int AUTOEXPAND_LEVEL = 2;
@@ -556,7 +559,7 @@ public void run() {
try {
// Lookup commmand with its ID
- Command command = commandService.getCommand("org.eclipse.embedcdt.packs.commands.updateCommand");
+ Command command = commandService.getCommand("org.eclipse.embedcdt.packs.ui.commands.updateCommand");
// Optionally pass a ExecutionEvent instance, default
// no-param arg creates blank event
diff --git a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/handlers/ShowPerspectiveHandler.java b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/handlers/ShowPerspectiveHandler.java
index a022bb8b3..990b23a0f 100644
--- a/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/handlers/ShowPerspectiveHandler.java
+++ b/plugins/org.eclipse.embedcdt.packs.ui/src/org/eclipse/embedcdt/packs/ui/handlers/ShowPerspectiveHandler.java
@@ -17,7 +17,7 @@
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.embedcdt.packs.ui.perspectives.PacksPerspective;
+import org.eclipse.embedcdt.internal.packs.ui.perspectives.PacksPerspective;
import org.eclipse.ui.IPerspectiveDescriptor;
import org.eclipse.ui.PlatformUI;
diff --git a/plugins/org.eclipse.embedcdt.templates.ad.ui/plugin.xml b/plugins/org.eclipse.embedcdt.templates.ad.ui/plugin.xml
index ad26b6609..91c2f96f2 100644
--- a/plugins/org.eclipse.embedcdt.templates.ad.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.templates.ad.ui/plugin.xml
@@ -17,13 +17,13 @@
-
+
diff --git a/plugins/org.eclipse.embedcdt.templates.cortexm.ui/plugin.xml b/plugins/org.eclipse.embedcdt.templates.cortexm.ui/plugin.xml
index 3cc1f166b..f04b08de2 100644
--- a/plugins/org.eclipse.embedcdt.templates.cortexm.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.templates.cortexm.ui/plugin.xml
@@ -17,13 +17,13 @@
-
+
diff --git a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/META-INF/MANIFEST.MF
index 8e06b02d1..084c95ce1 100644
--- a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundle.name
Bundle-SymbolicName: org.eclipse.embedcdt.templates.freescale.pe.ui;singleton:=true
Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.embedcdt.templates.freescale.pe.Activator
+Bundle-Activator: org.eclipse.embedcdt.templates.freescale.pe.ui.Activator
Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.0.0",
org.eclipse.embedcdt.templates.core;bundle-version="3.0.0",
org.eclipse.embedcdt.ui;bundle-version="6.0.0",
diff --git a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/plugin.xml b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/plugin.xml
index 99014671e..d3cb29e46 100644
--- a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/plugin.xml
@@ -17,37 +17,23 @@
-
+
-
-
+ processRunner="org.eclipse.embedcdt.templates.freescale.pe.ui.processes.RunProcessorExpertWizard">
diff --git a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/WizardPage.java b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/internal/templates/freescale/pe/ui/WizardPage.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/WizardPage.java
rename to plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/internal/templates/freescale/pe/ui/WizardPage.java
index d49ec856d..33d539dbe 100644
--- a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/WizardPage.java
+++ b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/internal/templates/freescale/pe/ui/WizardPage.java
@@ -12,7 +12,7 @@
* Liviu Ionescu - initial version
*******************************************************************************/
-package org.eclipse.embedcdt.templates.freescale.pe.ui;
+package org.eclipse.embedcdt.internal.templates.freescale.pe.ui;
import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPage;
import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
@@ -30,7 +30,7 @@ public class WizardPage extends MBSCustomPage {
private Composite composite;
public WizardPage() {
- pageID = "org.eclipse.embedcdt.templates.freescale.pe.ui.WizardPage";
+ pageID = "org.eclipse.embedcdt.internal.templates.freescale.pe.ui.WizardPage";
}
@Override
diff --git a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/Activator.java b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/Activator.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/Activator.java
rename to plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/Activator.java
index 10061e832..e1bc65107 100644
--- a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/Activator.java
+++ b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/Activator.java
@@ -12,7 +12,7 @@
* Liviu Ionescu - initial version
*******************************************************************************/
-package org.eclipse.embedcdt.templates.freescale.pe;
+package org.eclipse.embedcdt.templates.freescale.pe.ui;
import org.eclipse.embedcdt.ui.AbstractUIActivator;
import org.osgi.framework.BundleContext;
@@ -25,7 +25,7 @@ public class Activator extends AbstractUIActivator {
// ------------------------------------------------------------------------
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.embedcdt.templates.freescale.pe"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.embedcdt.templates.freescale.pe.ui"; //$NON-NLS-1$
@Override
public String getBundleId() {
diff --git a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/PEW.java b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/PEW.java
index 2722435bc..44df5beef 100644
--- a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/PEW.java
+++ b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/PEW.java
@@ -14,7 +14,6 @@
package org.eclipse.embedcdt.templates.freescale.pe.ui;
-import org.eclipse.embedcdt.templates.freescale.pe.Activator;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.INewWizard;
diff --git a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/WizardPageOperation.java b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/WizardPageOperation.java
index 8e63e2be0..e9409aa29 100644
--- a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/WizardPageOperation.java
+++ b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/WizardPageOperation.java
@@ -14,8 +14,6 @@
package org.eclipse.embedcdt.templates.freescale.pe.ui;
-import org.eclipse.embedcdt.templates.freescale.pe.Activator;
-
public class WizardPageOperation implements Runnable {
@Override
diff --git a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/processes/RunProcessorExpertWizard.java b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/processes/RunProcessorExpertWizard.java
similarity index 94%
rename from plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/processes/RunProcessorExpertWizard.java
rename to plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/processes/RunProcessorExpertWizard.java
index 2e2abf7bf..17ee3ff44 100644
--- a/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/processes/RunProcessorExpertWizard.java
+++ b/plugins/org.eclipse.embedcdt.templates.freescale.pe.ui/src/org/eclipse/embedcdt/templates/freescale/pe/ui/processes/RunProcessorExpertWizard.java
@@ -12,7 +12,7 @@
* Liviu Ionescu - initial version
*******************************************************************************/
-package org.eclipse.embedcdt.templates.freescale.pe.processes;
+package org.eclipse.embedcdt.templates.freescale.pe.ui.processes;
import org.eclipse.cdt.core.templateengine.TemplateCore;
import org.eclipse.cdt.core.templateengine.process.ProcessArgument;
@@ -20,7 +20,7 @@
import org.eclipse.cdt.core.templateengine.process.ProcessRunner;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.embedcdt.templates.freescale.pe.Activator;
+import org.eclipse.embedcdt.templates.freescale.pe.ui.Activator;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Display;
diff --git a/plugins/org.eclipse.embedcdt.templates.freescale.ui/plugin.xml b/plugins/org.eclipse.embedcdt.templates.freescale.ui/plugin.xml
index 0488bcc26..6dafa6667 100644
--- a/plugins/org.eclipse.embedcdt.templates.freescale.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.templates.freescale.ui/plugin.xml
@@ -17,13 +17,13 @@
-
+
diff --git a/plugins/org.eclipse.embedcdt.templates.sifive.ui/plugin.xml b/plugins/org.eclipse.embedcdt.templates.sifive.ui/plugin.xml
index e4e0ba499..1555a409d 100644
--- a/plugins/org.eclipse.embedcdt.templates.sifive.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.templates.sifive.ui/plugin.xml
@@ -17,13 +17,13 @@
-
+
diff --git a/plugins/org.eclipse.embedcdt.templates.stm.ui/plugin.xml b/plugins/org.eclipse.embedcdt.templates.stm.ui/plugin.xml
index 232d0be5a..3e19a2570 100644
--- a/plugins/org.eclipse.embedcdt.templates.stm.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.templates.stm.ui/plugin.xml
@@ -17,64 +17,64 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/plugins/org.eclipse.embedcdt.ui/plugin.xml b/plugins/org.eclipse.embedcdt.ui/plugin.xml
index be76a35c9..6dd991c6b 100644
--- a/plugins/org.eclipse.embedcdt.ui/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.ui/plugin.xml
@@ -34,7 +34,7 @@
-
+