Skip to content

Commit

Permalink
[#451] - move some classes to the internal namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
ilg-ul committed Dec 5, 2020
1 parent 8e02d45 commit bf1f704
Show file tree
Hide file tree
Showing 93 changed files with 327 additions and 301 deletions.
2 changes: 1 addition & 1 deletion plugins/org.eclipse.embedcdt.codered.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<viewShortcut id="org.eclipse.cdt.dsf.debug.ui.disassembly.view" />

<viewShortcut
id="org.eclipse.embedcdt.debug.gdbjtag.ui.views.PeripheralsView" />
id="org.eclipse.embedcdt.internal.debug.gdbjtag.ui.views.PeripheralsView" />

<showInPart id="org.eclipse.cdt.ui.includeBrowser" />
<showInPart id="org.eclipse.cdt.ui.CView" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,5 +240,12 @@ public AbstractCLIProcess call() throws CoreException {
return newProcess;
}

protected String getDefaultGDBPath()
{
// Currently returns 'gdb'.
String path = super.getDefaultGDBPath();
return path;
}

// ------------------------------------------------------------------------
}
18 changes: 9 additions & 9 deletions plugins/org.eclipse.embedcdt.debug.gdbjtag.jlink.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,36 @@
<launchConfigurationTypeImage
configTypeID="ilg.gnumcueclipse.debug.gdbjtag.jlink.launchConfigurationType"
icon="icons/obj16/c_app.gif"
id="org.eclipse.embedcdt.debug.gdbjtag.jlink.launchConfigurationTypeImage" />
id="org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.launchConfigurationTypeImage" />
</extension>

<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
<launchConfigurationTabGroup
class="org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.TabGroupLaunchConfiguration"
id="org.eclipse.embedcdt.debug.gdbjtag.jlink.launchConfigurationTabGroup"
id="org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.launchConfigurationTabGroup"
type="ilg.gnumcueclipse.debug.gdbjtag.jlink.launchConfigurationType" />
</extension>

<extension point="org.eclipse.ui.preferencePages">
<page
category="org.eclipse.embedcdt.ui.preferences.mcu"
class="org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.preferences.WorkspaceMcuPage"
id="org.eclipse.embedcdt.debug.gdbjtag.jlink.workspacePreferencePage"
class="org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.preferences.WorkspaceMcuPage"
id="org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.workspacePreferencePage"
name="%preferences.workspaceMcu">
</page>
<page
category="org.eclipse.embedcdt.ui.preferences.mcu"
class="org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.preferences.GlobalMcuPage"
id="org.eclipse.embedcdt.debug.gdbjtag.jlink.globalPreferencePage"
class="org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.preferences.GlobalMcuPage"
id="org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.globalPreferencePage"
name="%preferences.globalMcu">
</page>
</extension>

<extension point="org.eclipse.ui.propertyPages">
<page
category="org.eclipse.embedcdt.ui.properties.mcu"
class="org.eclipse.embedcdt.debug.gdbjtag.jlink.ui.properties.ProjectMcuPage"
id="org.eclipse.embedcdt.debug.gdbjtag.jlink.projectPropertiesPage"
class="org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.properties.ProjectMcuPage"
id="org.eclipse.embedcdt.internal.debug.gdbjtag.jlink.ui.projectPropertiesPage"
name="%properties.mcu">
<filter
name="projectNature"
Expand All @@ -58,7 +58,7 @@
<and>
<instanceof value="org.eclipse.core.resources.IProject">
</instanceof>
<test forcePluginActivation="true" property="org.eclipse.embedcdt.managedbuild.cross.isGnuMcu">
<test forcePluginActivation="true" property="org.eclipse.embedcdt.managedbuild.cross.core.isGnuMcu">
</test>
</and>
</enabledWhen>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";

// ------------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";

// ------------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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";

// ------------------------------------------------------------------------

Expand Down
16 changes: 8 additions & 8 deletions plugins/org.eclipse.embedcdt.debug.gdbjtag.openocd.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<launchConfigurationTypeImage
configTypeID="ilg.gnumcueclipse.debug.gdbjtag.openocd.launchConfigurationType"
icon="icons/obj16/c_app.gif"
id="org.eclipse.embedcdt.debug.gdbjtag.openocd.launchConfigurationTypeImage" />
id="org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.launchConfigurationTypeImage" />
</extension>

<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
Expand All @@ -32,22 +32,22 @@
<extension point="org.eclipse.ui.preferencePages">
<page
category="org.eclipse.embedcdt.ui.preferences.mcu"
class="org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.preferences.WorkspaceMcuPage"
id="org.eclipse.embedcdt.debug.gdbjtag.openocd.workspacePreferencePage"
class="org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.preferences.WorkspaceMcuPage"
id="org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.workspacePreferencePage"
name="%preferences.workspaceMcu">
</page>
<page
category="org.eclipse.embedcdt.ui.preferences.mcu"
class="org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.preferences.GlobalMcuPage"
id="org.eclipse.embedcdt.debug.gdbjtag.openocd.globalPreferencePage"
class="org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.preferences.GlobalMcuPage"
id="org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.globalPreferencePage"
name="%preferences.globalMcu">
</page>
</extension>
<extension point="org.eclipse.ui.propertyPages">
<page
category="org.eclipse.embedcdt.ui.properties.mcu"
class="org.eclipse.embedcdt.debug.gdbjtag.openocd.ui.properties.ProjectMcuPage"
id="org.eclipse.embedcdt.debug.gdbjtag.openocd.projectPropertiesPage"
class="org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.properties.ProjectMcuPage"
id="org.eclipse.embedcdt.internal.debug.gdbjtag.openocd.ui.projectPropertiesPage"
name="%properties.mcu">
<filter
name="projectNature"
Expand All @@ -57,7 +57,7 @@
<and>
<instanceof value="org.eclipse.core.resources.IProject">
</instanceof>
<test forcePluginActivation="true" property="org.eclipse.embedcdt.managedbuild.cross.isGnuMcu">
<test forcePluginActivation="true" property="org.eclipse.embedcdt.managedbuild.cross.core.isGnuMcu">
</test>
</and>
</enabledWhen>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";

// ------------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";

// ------------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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";

// ------------------------------------------------------------------------

Expand Down
16 changes: 8 additions & 8 deletions plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<launchConfigurationTypeImage
configTypeID="ilg.gnumcueclipse.debug.gdbjtag.pyocd.launchConfigurationType"
icon="icons/obj16/c_app.gif"
id="org.eclipse.embedcdt.debug.gdbjtag.pyocd.launchConfigurationTypeImage" />
id="org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.launchConfigurationTypeImage" />
</extension>

<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
Expand All @@ -32,22 +32,22 @@
<extension point="org.eclipse.ui.preferencePages">
<page
category="org.eclipse.embedcdt.ui.preferences.mcu"
class="org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.preferences.WorkspaceMcuPage"
id="org.eclipse.embedcdt.debug.gdbjtag.pyocd.workspacePreferencePage"
class="org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.preferences.WorkspaceMcuPage"
id="org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.workspacePreferencePage"
name="%preferences.workspaceMcu">
</page>
<page
category="org.eclipse.embedcdt.ui.preferences.mcu"
class="org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.preferences.GlobalMcuPage"
id="org.eclipse.embedcdt.debug.gdbjtag.pyocd.globalPreferencePage"
class="org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.preferences.GlobalMcuPage"
id="org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.globalPreferencePage"
name="%preferences.globalMcu">
</page>
</extension>
<extension point="org.eclipse.ui.propertyPages">
<page
category="org.eclipse.embedcdt.ui.properties.mcu"
class="org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui.properties.ProjectMcuPage"
id="org.eclipse.embedcdt.debug.gdbjtag.pyocd.projectPropertiesPage"
class="org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.properties.ProjectMcuPage"
id="org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.ui.projectPropertiesPage"
name="%properties.mcu">
<filter
name="projectNature"
Expand All @@ -57,7 +57,7 @@
<and>
<instanceof value="org.eclipse.core.resources.IProject">
</instanceof>
<test forcePluginActivation="true" property="org.eclipse.embedcdt.managedbuild.cross.isGnuMcu">
<test forcePluginActivation="true" property="org.eclipse.embedcdt.managedbuild.cross.core.isGnuMcu">
</test>
</and>
</enabledWhen>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";

// ------------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";

// ------------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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";

// ------------------------------------------------------------------------

Expand Down
Loading

0 comments on commit bf1f704

Please sign in to comment.