diff --git a/org.fortiss.tooling.base/trunk/plugin.xml b/org.fortiss.tooling.base/trunk/plugin.xml
index b2692d6901bae2c9bcded75882c2d762d64a1a98..07699c94ad72c7be3b198095968ed4786eb8e7e2 100644
--- a/org.fortiss.tooling.base/trunk/plugin.xml
+++ b/org.fortiss.tooling.base/trunk/plugin.xml
@@ -16,5 +16,11 @@
class="org.fortiss.tooling.base.model.BasePackage"
genModel="model/base.genmodel"/>
</extension>
+ <extension
+ point="org.unicase.ecp.model.ecpModelPackage">
+ <modelPackage
+ modelPackage="http://www.fortiss.org/tooling/base">
+ </modelPackage>
+ </extension>
</plugin>
diff --git a/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
index 0aa3a2b2b2d253bcc66a52f521833dbe3a441664..df3627d230e1e0360801f523fb6d69af483714de 100644
--- a/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui;visibility:=reexport,
org.conqat.ide.commons;bundle-version="2.7.0";visibility:=reexport,
org.conqat.ide.commons.ui;bundle-version="2.7.0";visibility:=reexport,
org.unicase.workspace;bundle-version="1.0.0",
- org.unicase.ecp.model;bundle-version="1.0.0",
+ org.unicase.ecp.model;bundle-version="1.0.0";visibility:=reexport,
org.unicase.ecpemfstorebridge;bundle-version="1.0.0",
org.unicase.ui.common;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.fortiss.tooling.kernel/trunk/icons/server.png b/org.fortiss.tooling.kernel/trunk/icons/server.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e472dd74433e92014ba5198172235eadc404aec
Binary files /dev/null and b/org.fortiss.tooling.kernel/trunk/icons/server.png differ
diff --git a/org.fortiss.tooling.kernel/trunk/plugin.xml b/org.fortiss.tooling.kernel/trunk/plugin.xml
index 1e7a37459d194d4cd1a700cdb99a2cc3aed760d8..1187435ba168bfba74af4df904f3ccd4ba675355 100644
--- a/org.fortiss.tooling.kernel/trunk/plugin.xml
+++ b/org.fortiss.tooling.kernel/trunk/plugin.xml
@@ -4,15 +4,6 @@
<extension-point id="modelElementHandler" name="Model Element Handler" schema="schema/modelElementHandler.exsd"/>
<extension-point id="modelPrototypeProvider" name="Model Prototype Provider" schema="schema/modelPrototypeProvider.exsd"/>
<extension-point id="modelElementCompositor" name="Model Element Compositor" schema="schema/modelElementCompositor.exsd"/>
- <extension
- point="org.eclipse.ui.views">
- <view
- class="org.fortiss.tooling.kernel.internal.navigator.NavigatorViewPart"
- id="org.fortiss.tooling.kernel.model.navigator"
- name="Model Navigator"
- restorable="true">
- </view>
- </extension>
<extension
point="org.eclipse.emf.ecore.generated_package">
<package
@@ -22,18 +13,13 @@
</package>
</extension>
<extension
- point="org.fortiss.tooling.kernel.modelElementHandler">
- <modelElementHandler
- handler="org.fortiss.tooling.kernel.internal.handler.ProjectSpaceModelElementHandler"
- modelElementClass="org.unicase.workspace.ProjectSpace">
- </modelElementHandler>
- </extension>
- <extension
- point="org.fortiss.tooling.kernel.modelElementCompositor">
- <modelElementCompositor
- compositor="org.fortiss.tooling.kernel.internal.compose.ProjectSpaceCompositor"
- modelElementClass="org.unicase.workspace.ProjectSpace">
- </modelElementCompositor>
+ point="org.eclipse.ui.views">
+ <view
+ class="org.fortiss.tooling.kernel.internal.navigator.NavigatorViewPart"
+ id="org.fortiss.tooling.kernel.model.navigator"
+ name="Model Navigator"
+ restorable="true">
+ </view>
</extension>
<extension
point="org.eclipse.ui.menus">
@@ -56,16 +42,68 @@
</iterate>
</with>
</visibleWhen>
+ <dynamic
+ class="org.fortiss.tooling.kernel.internal.navigator.NewMenu"
+ id="org.fortiss.tooling.kernel.model.navigator.newmenu.content">
+ </dynamic>
+ </menu>
+ <menu
+ icon="icons/server.png"
+ id="org.fortiss.tooling.kernel.model.navigator.repositorymenu"
+ label="Repository">
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeMenuSelection">
+ <iterate>
+ <adapt
+ type="org.unicase.workspace.ProjectSpace">
+ </adapt>
+ </iterate>
+ </with>
+ </visibleWhen>
+ <command
+ commandId="org.unicase.workspace.ui.commitProject"
+ label="Commit..."
+ style="push">
+ </command>
+ <command
+ commandId="org.unicase.workspace.ui.updateProject"
+ label="Update to HEAD"
+ style="push">
+ </command>
+ <command
+ commandId="org.unicase.workspace.ui.updateProjectVersion"
+ label="Update to Version..."
+ style="push">
+ </command>
+ <command
+ commandId="org.unicase.workspace.ui.revert"
+ label="Revert"
+ style="push">
+ </command>
</menu>
</menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="popup:org.fortiss.tooling.kernel.model.navigator.newmenu">
- <dynamic
- class="org.fortiss.tooling.kernel.internal.navigator.NewMenu"
- id="org.fortiss.tooling.kernel.model.navigator.newmenu.content">
- </dynamic>
- </menuContribution>
+ </extension>
+ <extension
+ point="org.unicase.ecp.model.ecpModelPackage">
+ <modelPackage
+ modelPackage="http://www.fortiss.org/tooling/kernel">
+ </modelPackage>
+ </extension>
+ <extension
+ point="org.fortiss.tooling.kernel.modelElementHandler">
+ <modelElementHandler
+ handler="org.fortiss.tooling.kernel.internal.handler.ProjectSpaceModelElementHandler"
+ modelElementClass="org.unicase.workspace.ProjectSpace">
+ </modelElementHandler>
+ </extension>
+ <extension
+ point="org.fortiss.tooling.kernel.modelElementCompositor">
+ <modelElementCompositor
+ compositor="org.fortiss.tooling.kernel.internal.compose.ProjectSpaceCompositor"
+ modelElementClass="org.unicase.workspace.ProjectSpace">
+ </modelElementCompositor>
</extension>
</plugin>
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java
index 01aaabf289cdbd9f4337687278d749a5c8c9d68d..9a8e7f35247931fa7bc9041f72f976b12bd1eda7 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java
@@ -190,31 +190,6 @@ public final class NavigatorViewPart extends ViewPart implements
/** Creates the context menu. */
private void createContextMenu() {
menuManager = new MenuManager("#PopupMenu");
- // menuManager.setRemoveAllWhenShown(true);
- // IMenuListener listener = new IMenuListener() {
- // @Override
- // public void menuAboutToShow(IMenuManager m) {
- // ISelection selection = PlatformUI.getWorkbench()
- // .getActiveWorkbenchWindow().getSelectionService()
- // .getSelection();
- // EObject selectedObject = EObjectSelectionUtils
- // .getFirstElement(selection);
- //
- // IContextMenuService.INSTANCE.fillNavigatorContextMenu(m,
- // selectedObject);
- // }
- // };
- //
- // final MenuManager newMenuManager = new MenuManager("New ...",
- // ToolingKernelActivator.getImageDescriptor("icons/add.png"),
- // NewMenu.MENU_ID);
- // // newMenuManager.setRemoveAllWhenShown(true);
- // newMenu = new NewMenu();
- // newMenuManager.add(newMenu);
- //
- // menuManager.addMenuListener(listener);
-
- // menuManager.add(newMenuManager);
Separator repositorySection = new Separator("repository");
repositorySection.setVisible(true);