From 55ff9c7a38a1b2f85ee38da031da23ba61648f24 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Wed, 16 Feb 2011 17:17:11 +0000
Subject: [PATCH] registered ecore models
---
org.fortiss.tooling.base/trunk/plugin.xml | 6 ++
.../trunk/META-INF/MANIFEST.MF | 2 +-
.../trunk/icons/server.png | Bin 0 -> 3153 bytes
org.fortiss.tooling.kernel/trunk/plugin.xml | 96 ++++++++++++------
.../internal/navigator/NavigatorViewPart.java | 25 -----
5 files changed, 74 insertions(+), 55 deletions(-)
create mode 100644 org.fortiss.tooling.kernel/trunk/icons/server.png
diff --git a/org.fortiss.tooling.base/trunk/plugin.xml b/org.fortiss.tooling.base/trunk/plugin.xml
index b2692d690..07699c94a 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 0aa3a2b2b..df3627d23 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
GIT binary patch
literal 3153
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
literal 0
HcmV?d00001
diff --git a/org.fortiss.tooling.kernel/trunk/plugin.xml b/org.fortiss.tooling.kernel/trunk/plugin.xml
index 1e7a37459..1187435ba 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 01aaabf28..9a8e7f352 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);
--
GitLab