Rename the 'root' plugin for 'rcp'
Change-Id: I2cb92c92be30353df5d980421dda57f4fb07bc55
Signed-off-by: Jonathan Dumont <jonathan.dumont@all4tec.net>
diff --git a/core/org.polarsys.esf.core.rcp/META-INF/MANIFEST.MF b/core/org.polarsys.esf.core.rcp/META-INF/MANIFEST.MF
index a374ab2..151cfc2 100644
--- a/core/org.polarsys.esf.core.rcp/META-INF/MANIFEST.MF
+++ b/core/org.polarsys.esf.core.rcp/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.polarsys.esf.core.rcp;singleton:=true
Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.polarsys.esf.core.root.CoreRootActivator$Implementation
+Bundle-Activator: org.polarsys.esf.core.rcp.CoreRootActivator$Implementation
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
diff --git a/core/org.polarsys.esf.core.rcp/plugin.xml b/core/org.polarsys.esf.core.rcp/plugin.xml
index 2d98f1d..58f07ed 100644
--- a/core/org.polarsys.esf.core.rcp/plugin.xml
+++ b/core/org.polarsys.esf.core.rcp/plugin.xml
@@ -7,7 +7,7 @@
point="org.eclipse.core.runtime.applications">
<application>
<run
- class="org.polarsys.esf.core.root.Application">
+ class="org.polarsys.esf.core.rcp.Application">
</run>
</application>
</extension>
@@ -16,7 +16,7 @@
name="%Product-name"
point="org.eclipse.core.runtime.products">
<product
- application="org.polarsys.esf.core.root.application"
+ application="org.polarsys.esf.core.rcp.application"
name="Eclipse Safety Framework">
<property
name="appName"
@@ -24,7 +24,7 @@
</property>
<property
name="windowImages"
- value="platform:/plugin/org.polarsys.esf.core.ui/icons/logos/icon_esf_16x16.png,platform:/plugin/org.polarsys.esf.core.ui/icons/logos/icon_esf_32x32.png,platform:/plugin/org.polarsys.esf.core.ui/icons/logos/icon_esf_48x48.png,platform:/plugin/org.polarsys.esf.core.ui/icons/logos/icon_esf_64x64.png,platform:/plugin/org.polarsys.esf.core.ui/icons/logos/icon_esf_128x128.png">
+ value="platform:/plugin/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_16x16.png,platform:/plugin/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_32x32.png,platform:/plugin/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_48x48.png,platform:/plugin/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_64x64.png,platform:/plugin/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_128x128.png">
</property>
<property
name="startupForegroundColor"
@@ -38,24 +38,20 @@
name="startupProgressRect"
value="0,315,500,15">
</property>
- <property
- name="preferenceCustomization"
- value="plugin_customization.ini">
- </property>
<property
name="aboutImage"
- value="platform:/plugin/org.polarsys.esf.core.ui/icons/about/logo_about.png">
+ value="platform:/plugin/org.polarsys.esf.core.ui/src/main/resources/icons/about/logo_about.png">
</property>
<property name="cssTheme" value="org.eclipse.e4.ui.css.theme.e4_default"/>
<property name="applicationCSSResources" value="platform:/plugin/org.eclipse.platform/images/"/>
<property
- name="aboutText"
- value="%Product-about">
- </property>
- <property
name="applicationXMI"
value="org.eclipse.platform/LegacyIDE.e4xmi">
</property>
+ <property
+ name="preferenceCustomization"
+ value="plugin_customization.ini">
+ </property>
</product>
</extension>
@@ -65,7 +61,7 @@
point="org.eclipse.core.resources.natures">
<runtime>
<run
- class="org.polarsys.esf.core.root.nature.ESFProjectNature">
+ class="org.polarsys.esf.core.rcp.nature.ESFProjectNature">
</run>
</runtime>
<content-type
@@ -78,7 +74,7 @@
<extension
point="org.eclipse.ui.bindings">
<scheme
- id="org.polarsys.esf.core.root.scheme"
+ id="org.polarsys.esf.core.rcp.scheme"
name="ESF Scheme">
</scheme>
</extension>
@@ -86,230 +82,230 @@
<key
commandId="org.eclipse.ui.newWizard"
sequence="M1+N"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.file.close"
sequence="M1+W"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.file.close"
sequence="M1+F4"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.file.closeAll"
sequence="M1+M2+W"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.file.closeAll"
sequence="M1+M2+F4"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.file.save"
sequence="M1+S"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.file.saveAll"
sequence="M1+M2+S"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.rename"
sequence="F2"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.file.print"
sequence="M1+P"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.file.properties"
sequence="M3+CR"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.file.properties"
platform="cocoa"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M1+I"/>
<key
commandId="org.eclipse.ui.file.properties"
platform="carbon"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M1+I"/>
<key
commandId="org.eclipse.ui.file.refresh"
sequence="F5"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.undo"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M1+Z"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.redo"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M1+Y"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.redo"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M1+M2+Z"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
platform="carbon"/>
<key
commandId="org.eclipse.ui.edit.cut"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M1+X"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.copy"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M1+C"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.paste"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M1+V"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.selectAll"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M1+A"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.delete"
sequence="DEL"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.findReplace"
sequence="M1+F"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.navigate.next"
sequence="M1+."
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.navigate.previous"
sequence="M1+,"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.navigate.backwardHistory"
sequence="M3+ARROW_LEFT"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
platform="carbon"
commandId="org.eclipse.ui.navigate.backwardHistory"
sequence="COMMAND+["
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
platform="carbon"
commandId="org.eclipse.ui.navigate.backwardHistory"
sequence="COMMAND+ALT+ARROW_LEFT"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.navigate.forwardHistory"
sequence="M3+ARROW_RIGHT"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
platform="carbon"
commandId="org.eclipse.ui.navigate.forwardHistory"
sequence="COMMAND+]"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
platform="carbon"
commandId="org.eclipse.ui.navigate.forwardHistory"
sequence="COMMAND+ALT+ARROW_RIGHT"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.switchToEditor"
sequence="M1+M2+E"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.showSystemMenu"
sequence="M3+-"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.showSystemMenu"
platform="carbon"
sequence="M1+M2+F10"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.showViewMenu"
sequence="M1+F10"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.activateEditor"
sequence="F12"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<!-- F12 is the Dashboard on carbon -->
<key
commandId="org.eclipse.ui.window.activateEditor"
platform="carbon"
sequence="M1+F12"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.maximizePart"
sequence="M1+M"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<!-- Cmd+M is used for Minimize Window in cocoa -->
<key
commandId="org.eclipse.ui.window.maximizePart"
platform="cocoa"
sequence="M4+M"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.nextEditor"
sequence="M1+F6"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.previousEditor"
sequence="M1+M2+F6"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.nextView"
sequence="M1+F7"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.previousView"
sequence="M1+M2+F7"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.nextPerspective"
sequence="M1+F8"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.window.previousPerspective"
sequence="M1+M2+F8"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.navigate.previous"
platform="carbon"
sequence="M1+M2+."
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.cut"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M2+DEL"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.copy"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M1+INSERT"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.paste"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
sequence="M2+INSERT"
- schemeId="org.polarsys.esf.core.root.scheme" />
+ schemeId="org.polarsys.esf.core.rcp.scheme" />
<key
commandId="org.eclipse.ui.edit.text.contentAssist.proposals"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="CTRL+SPACE"/> <!-- Command+SPACE+* is reserved on carbon, hardcode to CTRL -->
<key
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="CTRL+M2+SPACE"/> <!-- Command+SPACE+* is reserved on carbon, hardcode to CTRL -->
<!-- Special content assist key bindings for the Chinese language to prevent conflict with IME -->
@@ -317,17 +313,17 @@
locale="zh"
commandId="org.eclipse.ui.edit.text.contentAssist.proposals"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+/"/>
<key
locale="zh"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+?"/>
<key
locale="zh"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M2+M3+?"/>
<!-- Content assist key binding for the Japanese language to prevent conflict with IME on GTK -->
@@ -336,19 +332,19 @@
platform="gtk"
commandId="org.eclipse.ui.edit.text.contentAssist.proposals"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+/"/>
<key
locale="ja"
platform="gtk"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+?"/>
<key
locale="ja"
platform="gtk"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M2+M3+?"/>
<!-- Content assist key binding for the Korean language to prevent conflict with IME on GTK -->
@@ -357,19 +353,19 @@
platform="gtk"
commandId="org.eclipse.ui.edit.text.contentAssist.proposals"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+/"/>
<key
locale="ko"
platform="gtk"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+?"/>
<key
locale="ko"
platform="gtk"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M2+M3+?"/>
<!-- Content assist key binding for the Japanese language to prevent conflict with IME on Motif -->
@@ -378,19 +374,19 @@
platform="motif"
commandId="org.eclipse.ui.edit.text.contentAssist.proposals"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+/"/>
<key
locale="ja"
platform="motif"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+?"/>
<key
locale="ja"
platform="motif"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M2+M3+?"/>
<!-- Content assist key binding for the Korean language to prevent conflict with IME on Motif -->
@@ -399,19 +395,19 @@
platform="motif"
commandId="org.eclipse.ui.edit.text.contentAssist.proposals"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+/"/>
<key
locale="ko"
platform="motif"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+?"/>
<key
locale="ko"
platform="motif"
commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M2+M3+?"/>
<key
@@ -519,35 +515,35 @@
<key
commandId="org.eclipse.ui.navigate.collapseAll"
contextId="org.eclipse.ui.contexts.window"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M1+M2+NUMPAD_DIVIDE">
</key>
<key
commandId="org.eclipse.ui.navigate.expandAll"
contextId="org.eclipse.ui.contexts.window"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M1+M2+NUMPAD_MULTIPLY">
</key>
<key
commandId="org.eclipse.ui.navigate.nextSubTab"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+PAGE_DOWN">
</key>
<key
commandId="org.eclipse.ui.navigate.previousSubTab"
contextId="org.eclipse.ui.contexts.dialogAndWindow"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+PAGE_UP">
</key>
<key
commandId="org.eclipse.ui.part.nextPage"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M3+F7">
</key>
<key
commandId="org.eclipse.ui.part.previousPage"
- schemeId="org.polarsys.esf.core.root.scheme"
+ schemeId="org.polarsys.esf.core.rcp.scheme"
sequence="M2+M3+F7">
</key>
</extension>
diff --git a/core/org.polarsys.esf.core.rcp/plugin_customization.ini b/core/org.polarsys.esf.core.rcp/plugin_customization.ini
index cf6f95e..1300cc4 100644
--- a/core/org.polarsys.esf.core.rcp/plugin_customization.ini
+++ b/core/org.polarsys.esf.core.rcp/plugin_customization.ini
@@ -17,4 +17,4 @@
org.eclipse.ui/OPEN_NEW_PERSPECTIVE=OPEN_PERSPECTIVE_WINDOW
org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
org.eclipse.ui/SHOW_OTHER_IN_PERSPECTIVE_MENU=true
-org.eclipse.ui/KEY_CONFIGURATION_ID=org.polarsys.esf.core.root.scheme
+org.eclipse.ui/KEY_CONFIGURATION_ID=org.polarsys.esf.core.rcp.scheme
diff --git a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/Application.java b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/Application.java
similarity index 99%
rename from core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/Application.java
rename to core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/Application.java
index 6be8c03..9591192 100644
--- a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/Application.java
+++ b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/Application.java
@@ -8,7 +8,7 @@
* Contributors:
* Jonathan Dumont (ALL4TEC) - initial API and implementation
******************************************************************************/
-package org.polarsys.esf.core.root;
+package org.polarsys.esf.core.rcp;
import java.net.URL;
diff --git a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/ApplicationActionBarAdvisor.java b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/ApplicationActionBarAdvisor.java
similarity index 94%
rename from core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/ApplicationActionBarAdvisor.java
rename to core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/ApplicationActionBarAdvisor.java
index 0b299ae..3ac4066 100644
--- a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/ApplicationActionBarAdvisor.java
+++ b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/ApplicationActionBarAdvisor.java
@@ -4,11 +4,11 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Jonathan Dumont (ALL4TEC) - initial API and implementation
******************************************************************************/
-package org.polarsys.esf.core.root;
+package org.polarsys.esf.core.rcp;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.GroupMarker;
@@ -30,13 +30,13 @@
/**
* This class allow the manual build of the main menu and of the buttons bar.
- *
+ *
* <p>
* It's generally used to define the menu's main structure, by displaying the standard items used in Eclipse framework
* ('Exit', 'About', 'Preferences', ...). Custom actions can be added can be added by coding them manually, but it's
* advisable to use the extensions points 'org.eclipse.ui.menus' with the commands.
* </p>
- *
+ *
* @author $Author: jdumont $
* @version $Revision: 83 $
*/
@@ -45,32 +45,32 @@
/** Label of the menu File. */
private static final String MENU_FILE_LABEL = CoreRootActivator.getMessages().getString(
- "ApplicationActionBarAdvisor.file"); //$NON-NLS-N$
+ "ApplicationActionBarAdvisor.file");
/** Label of the menu Edit. */
private static final String MENU_EDIT_LABEL = CoreRootActivator.getMessages().getString(
- "ApplicationActionBarAdvisor.edit"); //$NON-NLS-N$
+ "ApplicationActionBarAdvisor.edit");
/** Label of the menu Window. */
private static final String MENU_WINDOW_LABEL = CoreRootActivator.getMessages().getString(
- "ApplicationActionBarAdvisor.window"); //$NON-NLS-N$
+ "ApplicationActionBarAdvisor.window");
/** Label of the menu Window. */
private static final String MENU_SHOWVIEW_LABEL = CoreRootActivator.getMessages().getString(
- "ApplicationActionBarAdvisor.window.showview"); //$NON-NLS-N$
+ "ApplicationActionBarAdvisor.window.showview");
/** Label of the menu Window. */
private static final String MENU_OPENPERSPECTIVE_LABEL = CoreRootActivator.getMessages().getString(
- "ApplicationActionBarAdvisor.window.openperspective"); //$NON-NLS-N$
+ "ApplicationActionBarAdvisor.window.openperspective");
/** Label of the menu Help. */
private static final String MENU_HELP_LABEL = CoreRootActivator.getMessages().getString(
- "ApplicationActionBarAdvisor.help"); //$NON-NLS-N$
+ "ApplicationActionBarAdvisor.help");
/** Label of the New menu. */
private static final String MENU_FILE_NEW_LABEL = CoreRootActivator.getMessages().getString(
- "ApplicationActionBarAdvisor.file.new"); //$NON-NLS-N$
-
+ "ApplicationActionBarAdvisor.file.new");
+
/** Views short list contribution. */
private ContributionItem mShowViewsContribution = null;
@@ -85,10 +85,10 @@
/** Help search action. */
private IWorkbenchAction mHelpSearchAction = null;
-
+
/** Dynamic help action. */
private IWorkbenchAction mDynamicHelpAction = null;
-
+
/** Lock toolbar action. */
private IWorkbenchAction mLockToolBarAction = null;
@@ -97,7 +97,7 @@
/**
* Default constructor.
- *
+ *
* @param pConfigurer The action bar configurer
*/
public ApplicationActionBarAdvisor(final IActionBarConfigurer pConfigurer) {
@@ -106,10 +106,10 @@
/**
* @see org.eclipse.ui.application.ActionBarAdvisor#makeActions(org.eclipse.ui.IWorkbenchWindow)
- *
- * Method used to build the actions to add to the menu and to the toolbar.
+ *
+ * Method used to build the actions to add to the menu and to the toolbar.
* NB : The ActionFactory class is used to get the standard actions
- *
+ *
* @param pWindow The workbench window
*/
@Override
@@ -143,10 +143,10 @@
mHelpSearchAction = ActionFactory.HELP_SEARCH.create(pWindow);
register(mHelpSearchAction);
- // The dynamic help action is created and registered as an action
+ // The dynamic help action is created and registered as an action
mDynamicHelpAction = ActionFactory.DYNAMIC_HELP.create(pWindow);
register(mDynamicHelpAction);
-
+
// The lock tool bar is created and registered as an action to be used
// in the cool bar context menu
mLockToolBarAction = ActionFactory.LOCK_TOOL_BAR.create(pWindow);
@@ -178,9 +178,9 @@
/**
* @see org.eclipse.ui.application.ActionBarAdvisor#fillMenuBar(org.eclipse.jface.action.IMenuManager)
- *
+ *
* Method used to build add the content to the menu bar given in parameter.
- *
+ *
* @param pMenuBar The menu bar to fill
*/
@Override
@@ -202,9 +202,9 @@
// Add the group marker used by open text file menu
vEditMenu.add(new GroupMarker(IWorkbenchActionConstants.FIND_EXT));
-
+
pMenuBar.add(vEditMenu);
-
+
/*
* Separator to prepare the menu insertion, for example from EMF, etc.
*/
@@ -230,10 +230,10 @@
*/
createHelpMenu(pMenuBar);
}
-
+
/**
* Create the help menu and its content.
- *
+ *
* @param pMenuBar The parent menu manager which will contain the help menu
*/
private void createHelpMenu(final IMenuManager pMenuBar) {
@@ -245,7 +245,7 @@
vHelpMenuMgr.add(mHelpContentsAction);
vHelpMenuMgr.add(mHelpSearchAction);
vHelpMenuMgr.add(mDynamicHelpAction);
-
+
// Then add the standard group marker and separator used by external contributions
vHelpMenuMgr.add(new Separator(IWorkbenchActionConstants.HELP_START));
vHelpMenuMgr.add(new GroupMarker("group.main.ext")); //$NON-NLS-1$
@@ -254,7 +254,7 @@
vHelpMenuMgr.add(new GroupMarker("group.updates")); //$NON-NLS-1$
vHelpMenuMgr.add(new GroupMarker(IWorkbenchActionConstants.HELP_END));
vHelpMenuMgr.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
-
+
// Finally, add the About group at the bottom
vHelpMenuMgr.add(new Separator("group.about")); //$NON-NLS-1$
}
diff --git a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/ApplicationWorkbenchAdvisor.java b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/ApplicationWorkbenchAdvisor.java
similarity index 97%
rename from core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/ApplicationWorkbenchAdvisor.java
rename to core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/ApplicationWorkbenchAdvisor.java
index a7bc395..1031598 100644
--- a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/ApplicationWorkbenchAdvisor.java
+++ b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/ApplicationWorkbenchAdvisor.java
@@ -4,11 +4,11 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Jonathan Dumont (ALL4TEC) - initial API and implementation
******************************************************************************/
-package org.polarsys.esf.core.root;
+package org.polarsys.esf.core.rcp;
import org.eclipse.ui.application.IWorkbenchConfigurer;
import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
@@ -16,14 +16,14 @@
import org.polarsys.esf.core.framework.workbenchadvisor.AbstractWorkbenchAdvisorWithImages;
/**
- * First class to be called during the workbench initialisation.
+ * First class to be called during the workbench initialisation.
* It allows the customisation of some methods linked to
* the Workbench life cycle.
- *
+ *
* <p>
* It's in this class that the default perspective ID is defined.
* </p>
- *
+ *
* @author $Author: jdumont $
* @version $Revision: 90 $
*/
@@ -41,7 +41,7 @@
/**
* @see org.eclipse.ui.application.WorkbenchAdvisor#createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer)
- *
+ *
* @param pConfigurer The configuration class
* @return WorkbenchWindowAdvisor The created object
*/
@@ -52,7 +52,7 @@
/**
* @see org.eclipse.ui.application.WorkbenchAdvisor#getInitialWindowPerspectiveId()
- *
+ *
* Method used to get the initial perspective id, which will be opened with the application
* @return String Id of the default perspective
*/
@@ -63,7 +63,7 @@
/**
* @see org.eclipse.ui.application.WorkbenchAdvisor#initialize(org.eclipse.ui.application.IWorkbenchConfigurer)
- *
+ *
* Method used to initialise the ApplicationWorkbench with some specific configurations.
* @param pConfigurer The configuration class
*/
diff --git a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/ApplicationWorkbenchWindowAdvisor.java b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/ApplicationWorkbenchWindowAdvisor.java
similarity index 98%
rename from core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/ApplicationWorkbenchWindowAdvisor.java
rename to core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/ApplicationWorkbenchWindowAdvisor.java
index ce9ff4e..98bbc14 100644
--- a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/ApplicationWorkbenchWindowAdvisor.java
+++ b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/ApplicationWorkbenchWindowAdvisor.java
@@ -8,7 +8,7 @@
* Contributors:
* Jonathan Dumont (ALL4TEC) - initial API and implementation
******************************************************************************/
-package org.polarsys.esf.core.root;
+package org.polarsys.esf.core.rcp;
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.application.ActionBarAdvisor;
diff --git a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/CoreRootActivator.java b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/CoreRootActivator.java
similarity index 96%
rename from core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/CoreRootActivator.java
rename to core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/CoreRootActivator.java
index bd01739..2a2a244 100644
--- a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/CoreRootActivator.java
+++ b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/CoreRootActivator.java
@@ -4,11 +4,11 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Jonathan Dumont (ALL4TEC) - initial API and implementation
******************************************************************************/
-package org.polarsys.esf.core.root;
+package org.polarsys.esf.core.rcp;
import java.util.ResourceBundle;
@@ -20,19 +20,19 @@
import org.polarsys.esf.core.common.messages.Messages;
/**
- *
+ *
* The activator class controls the plug-in life cycle.
* It also provide an access to utility methods.
- *
+ *
* @author $Author: jdumont $
* @version $Revision: 83 $
- *
+ *
*/
public class CoreRootActivator
extends EMFPlugin {
/** The plug-in ID. */
- public static final String PLUGIN_ID = "org.polarsys.esf.core.root"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.polarsys.esf.core.rcp"; //$NON-NLS-1$
/** /** The singleton instance of this class. */
private static final CoreRootActivator INSTANCE = new CoreRootActivator();
@@ -52,7 +52,7 @@
/**
* Returns the singleton instance of the Eclipse plugin.
- *
+ *
* @return The singleton instance
*/
public static Implementation getPlugin() {
@@ -61,7 +61,7 @@
/**
* Returns the singleton instance of the Eclipse plugin.
- *
+ *
* @return The singleton instance
*/
@Override
@@ -78,7 +78,7 @@
/**
* Create an Error status with the data given in parameter and log it.
- *
+ *
* @param pMessage The message to log
* @param pException The exception to log
*/
@@ -92,7 +92,7 @@
/**
* Create a Warning status with the data given in parameter and log it.
- *
+ *
* @param pMessage The message to log
* @param pException The exception to log
*/
@@ -106,7 +106,7 @@
/**
* Create an Info status with the data given in parameter and log it.
- *
+ *
* @param pMessage The message to log
* @param pException The exception to log
*/
diff --git a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/nature/ESFProjectNature.java b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/nature/ESFProjectNature.java
similarity index 96%
rename from core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/nature/ESFProjectNature.java
rename to core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/nature/ESFProjectNature.java
index 6094755..0a509ae 100644
--- a/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/root/nature/ESFProjectNature.java
+++ b/core/org.polarsys.esf.core.rcp/src/main/java/org/polarsys/esf/core/rcp/nature/ESFProjectNature.java
@@ -4,11 +4,11 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Jonathan Dumont (ALL4TEC) - initial API and implementation
******************************************************************************/
-package org.polarsys.esf.core.root.nature;
+package org.polarsys.esf.core.rcp.nature;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectNature;
@@ -16,7 +16,7 @@
/**
* Configure ESF nature for project in workspace.
- *
+ *
* @author $Author: jdumont $
* @version $Revision: 83 $
*/
diff --git a/releng/org.polarsys.esf.product/esf.product b/releng/org.polarsys.esf.product/esf.product
index 84d7103..fb1c557 100644
--- a/releng/org.polarsys.esf.product/esf.product
+++ b/releng/org.polarsys.esf.product/esf.product
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse Safety Framework" uid="esf" id="org.polarsys.esf.core.root.esf" application="org.polarsys.esf.core.root.application" version="0.7.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Safety Framework" uid="esf" id="org.polarsys.esf.core.rcp.esf" application="org.polarsys.esf.core.rcp.application" version="0.7.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
- <image path="/org.polarsys.esf.core.ui/icons/about/logo_about.png"/>
+ <image path="/org.polarsys.esf.core.ui/src/main/resources/icons/about/logo_about.png"/>
</aboutInfo>
<configIni use="default">
@@ -17,10 +17,10 @@
</vmArgsMac>
</launcherArgs>
- <windowImages i16="/org.polarsys.esf.core.ui/icons/logos/icon_esf_16x16.png" i32="/org.polarsys.esf.core.ui/icons/logos/icon_esf_32x32.png" i48="/org.polarsys.esf.core.ui/icons/logos/icon_esf_48x48.png" i64="/org.polarsys.esf.core.ui/icons/logos/icon_esf_64x64.png" i128="/org.polarsys.esf.core.ui/icons/logos/icon_esf_128x128.png"/>
+ <windowImages i16="/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_16x16.png" i32="/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_32x32.png" i48="/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_48x48.png" i64="/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_64x64.png" i128="/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_128x128.png"/>
<splash
- location="org.polarsys.esf.core.root"
+ location="org.polarsys.esf.core.rcp"
startupProgressRect="0,315,500,15"
startupMessageRect="5,295,470,20"
startupForegroundColor="FFFFFF" />
@@ -32,6 +32,7 @@
</win>
</launcher>
+
<vm>
</vm>
@@ -39,7 +40,7 @@
</plugins>
<features>
- <feature id="org.polarsys.esf.core" version="0.7.0.qualifier"/>
+ <feature id="org.polarsys.esf.core.releng" version="0.7.0.qualifier"/>
</features>
<configurations>