Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2014-08-20 19:40:05 +0000
committerRoberto E. Escobar2014-09-29 22:58:25 +0000
commit69fdf4da2cb9fd3fcc50f472ed072201cce81e02 (patch)
treee3ff455323e795955d7f691cc6ac38ab0f4f5aaf
parentd0954450ad4de5faad38547d457ecbe42e077706 (diff)
downloadorg.eclipse.osee-69fdf4da2cb9fd3fcc50f472ed072201cce81e02.tar.gz
org.eclipse.osee-69fdf4da2cb9fd3fcc50f472ed072201cce81e02.tar.xz
org.eclipse.osee-69fdf4da2cb9fd3fcc50f472ed072201cce81e02.zip
bug[ats_ATS101308]: Resolve plugin.xml warnings and deprecated extensions
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AtsTest_Action_Suite.java2
-rw-r--r--plugins/org.eclipse.osee.ats/plugin.xml88
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveAction.java74
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveHandler.java31
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveAction.java74
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveHandler.java31
-rw-r--r--plugins/org.eclipse.osee.coverage/plugin.xml62
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveAction.java73
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveHandler.java30
-rw-r--r--plugins/org.eclipse.osee.define/plugin.xml66
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/OpenDefinePerspectiveHandler.java30
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml93
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenConfigDetailsHandler.java (renamed from plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenAtsPerspectiveActionTest.java)19
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenConfigDetailsWorkbenchAction.java72
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenOseePropertiesWorkbenchAction.java72
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenPropertiesHandler.java (renamed from plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenReviewPerspectiveActionTest.java)19
16 files changed, 347 insertions, 489 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AtsTest_Action_Suite.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AtsTest_Action_Suite.java
index 4d7ba2e95b2..4420b6c87a8 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AtsTest_Action_Suite.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AtsTest_Action_Suite.java
@@ -33,7 +33,6 @@ import org.junit.runners.Suite;
MyFavoritesActionTest.class,
MyWorldActionTest.class,
NewGoalTest.class,
- OpenAtsPerspectiveActionTest.class,
OpenChangeReportByIdActionTest.class,
OpenInArtifactEditorActionTest.class,
OpenInAtsWorkflowEditorActionTest.class,
@@ -46,7 +45,6 @@ import org.junit.runners.Suite;
OpenNewAtsWorldEditorActionTest.class,
OpenNewAtsWorldEditorSelectedActionTest.class,
OpenParentActionTest.class,
- OpenReviewPerspectiveActionTest.class,
OpenWorkflowByIdActionTest.class,
OpenWorldByIdActionTest.class,
RefreshDirtyActionTest.class,
diff --git a/plugins/org.eclipse.osee.ats/plugin.xml b/plugins/org.eclipse.osee.ats/plugin.xml
index 689fcd9fbbc..4ac31f570dd 100644
--- a/plugins/org.eclipse.osee.ats/plugin.xml
+++ b/plugins/org.eclipse.osee.ats/plugin.xml
@@ -571,34 +571,68 @@
classname="org.eclipse.osee.ats.review.ReviewNavigateViewItems">
</XCommonNavigateItem>
</extension>
- <extension point="org.eclipse.ui.actionSets">
- <actionSet
- label="OSEE ATS"
- visible="true"
- id="osee.ats.actionSet">
- <menu
- label="&amp;OSEE"
- id="osee.product.oseeMenu">
- <separator name="perspectives"/>
- <separator name="properties"/>
- </menu> <action
- class="org.eclipse.osee.ats.actions.OpenReviewPerspectiveAction"
- icon="images/review.gif"
- id="org.eclipse.osee.ats.actions.OpenReviewPerspectiveAction"
- label="OSEE &amp;Review"
- menubarPath="osee.product.oseeMenu/perspectives"
- tooltip="Open OSEE Review Perspective">
- </action>
- <action
- class="org.eclipse.osee.ats.actions.OpenAtsPerspectiveAction"
- icon="images/action.gif"
- id="org.eclipse.osee.ats.actions.OpenAtsPerspectiveAction"
- label="OSEE &amp;ATS"
- menubarPath="osee.product.oseeMenu/perspectives"
- tooltip="Open OSEE ATS Perspective">
- </action>
- </actionSet>
+
+
+ <extension
+ point="org.eclipse.ui.commands">
+ <category
+ name="OSEE Category"
+ id="osee.ats.product.commands.category">
+ </category>
+ <command
+ name="OSEE ATS"
+ categoryId="osee.ats.product.commands.category"
+ id="org.eclipse.osee.ats.actions.OpenAtsPerspective">
+ </command>
+ <command
+ name="OSEE Review"
+ categoryId="osee.ats.product.commands.category"
+ id="org.eclipse.osee.ats.actions.OpenReviewPerspective">
+ </command>
</extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ commandId="org.eclipse.osee.ats.actions.OpenAtsPerspective"
+ class="org.eclipse.osee.ats.actions.OpenAtsPerspectiveHandler">
+ </handler>
+ <handler
+ commandId="org.eclipse.osee.ats.actions.OpenReviewPerspective"
+ class="org.eclipse.osee.ats.actions.OpenReviewPerspectiveHandler">
+ </handler>
+ </extension>
+ <extension point="org.eclipse.ui.bindings">
+ <key
+ commandId="org.eclipse.osee.ats.actions.OpenAtsPerspective"
+ contextId="org.eclipse.ui.contexts.window"
+ sequence="M1+A"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </key>
+ </extension>
+ <extension point="org.eclipse.ui.commandImages">
+ <image commandId="org.eclipse.osee.ats.actions.OpenAtsPerspective" icon="images/action.gif"> </image>
+ <image commandId="org.eclipse.osee.ats.actions.OpenReviewPerspective" icon="images/review.gif"> </image>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="menu:org.eclipse.ui.main.menu?after=additions">
+ <menu
+ label="OSEE"
+ mnemonic="O"
+ id="osee.product.oseeMenu">
+ <command commandId="org.eclipse.osee.ats.actions.OpenAtsPerspective"
+ mnemonic="A"
+ id="org.eclipse.osee.ats.actions.OpenAtsPerspective">
+ </command>
+ <command commandId="org.eclipse.osee.ats.actions.OpenReviewPerspective"
+ mnemonic="R"
+ id="org.eclipse.osee.ats.actions.OpenReviewPerspective">
+ </command>
+ </menu>
+ </menuContribution>
+ </extension>
+
+
<extension
id="AtsTransitionListener"
name="AtsTransitionListener"
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveAction.java
deleted file mode 100644
index 0debf157e48..00000000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rights reserved. This program and the accompanying materials
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.osee.ats.internal.ATSPerspective;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Our sample action implements workbench action delegate. The action proxy will be created by the workbench and shown
- * in the UI. When the user tries to use the action, this delegate will be created and execution will be delegated to
- * it.
- *
- * @see IWorkbenchWindowActionDelegate
- */
-public class OpenAtsPerspectiveAction implements IWorkbenchWindowActionDelegate {
-
- public OpenAtsPerspectiveAction() {
- // do nothing
- }
-
- /**
- * The action has been activated. The argument of the method represents the 'real' action sitting in the workbench
- * UI.
- *
- * @see IWorkbenchWindowActionDelegate#run
- */
- @Override
- public void run(IAction action) {
- AWorkbench.openPerspective(ATSPerspective.ID);
- }
-
- /**
- * Selection in the workbench has been changed. We can change the state of the 'real' action here if we want, but
- * this can only happen after the delegate has been created.
- *
- * @see IWorkbenchWindowActionDelegate#selectionChanged
- */
- @Override
- public void selectionChanged(IAction action, ISelection selection) {
- // do nothing
- }
-
- /**
- * We can use this method to dispose of any system resources we previously allocated.
- *
- * @see IWorkbenchWindowActionDelegate#dispose
- */
- @Override
- public void dispose() {
- // do nothing
- }
-
- /**
- * We will cache window object in order to be able to provide parent shell for the message dialog.
- *
- * @see IWorkbenchWindowActionDelegate#init
- */
- @Override
- public void init(IWorkbenchWindow window) {
- // do nothing
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveHandler.java
new file mode 100644
index 00000000000..3b956f3eed4
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveHandler.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * 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:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.ats.actions;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.osee.ats.internal.ATSPerspective;
+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class OpenAtsPerspectiveHandler extends AbstractHandler {
+
+ public OpenAtsPerspectiveHandler() {
+ }
+
+ @Override
+ public Object execute(ExecutionEvent event) {
+ AWorkbench.openPerspective(ATSPerspective.ID);
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveAction.java
deleted file mode 100644
index 9f3d138b045..00000000000
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rights reserved. This program and the accompanying materials
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.osee.ats.review.ReviewPerspective;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Our sample action implements workbench action delegate. The action proxy will be created by the workbench and shown
- * in the UI. When the user tries to use the action, this delegate will be created and execution will be delegated to
- * it.
- *
- * @see IWorkbenchWindowActionDelegate
- */
-public class OpenReviewPerspectiveAction implements IWorkbenchWindowActionDelegate {
-
- public OpenReviewPerspectiveAction() {
- // do nothing
- }
-
- /**
- * The action has been activated. The argument of the method represents the 'real' action sitting in the workbench
- * UI.
- *
- * @see IWorkbenchWindowActionDelegate#run
- */
- @Override
- public void run(IAction action) {
- AWorkbench.openPerspective(ReviewPerspective.ID);
- }
-
- /**
- * Selection in the workbench has been changed. We can change the state of the 'real' action here if we want, but
- * this can only happen after the delegate has been created.
- *
- * @see IWorkbenchWindowActionDelegate#selectionChanged
- */
- @Override
- public void selectionChanged(IAction action, ISelection selection) {
- // do nothing
- }
-
- /**
- * We can use this method to dispose of any system resources we previously allocated.
- *
- * @see IWorkbenchWindowActionDelegate#dispose
- */
- @Override
- public void dispose() {
- // do nothing
- }
-
- /**
- * We will cache window object in order to be able to provide parent shell for the message dialog.
- *
- * @see IWorkbenchWindowActionDelegate#init
- */
- @Override
- public void init(IWorkbenchWindow window) {
- // do nothing
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveHandler.java
new file mode 100644
index 00000000000..1cd80393375
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenReviewPerspectiveHandler.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * 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:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.ats.actions;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.osee.ats.review.ReviewPerspective;
+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class OpenReviewPerspectiveHandler extends AbstractHandler {
+
+ public OpenReviewPerspectiveHandler() {
+ }
+
+ @Override
+ public Object execute(ExecutionEvent event) {
+ AWorkbench.openPerspective(ReviewPerspective.ID);
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.osee.coverage/plugin.xml b/plugins/org.eclipse.osee.coverage/plugin.xml
index bfc31f9fb84..33e3ca15acb 100644
--- a/plugins/org.eclipse.osee.coverage/plugin.xml
+++ b/plugins/org.eclipse.osee.coverage/plugin.xml
@@ -20,27 +20,47 @@
id="org.eclipse.osee.coverage.CoveragePerspective"
name="Coverage"/>
</extension>
- <extension point="org.eclipse.ui.actionSets">
- <actionSet
- label="OSEE Coverage"
- visible="true"
- id="osee.coverage.actionSet">
- <menu
- label="&amp;OSEE"
- id="osee.product.oseeMenu">
- <separator name="perspectives"/>
- <separator name="properties"/>
- </menu>
- <action
- class="org.eclipse.osee.coverage.internal.OpenCoveragePerspectiveAction"
- icon="images/coverage.gif"
- id="org.eclipse.osee.coverage.internal.OpenCoveragePerspectiveAction"
- label="OSEE &amp;Coverage"
- menubarPath="osee.product.oseeMenu/perspectives"
- tooltip="Open OSEE Coverage Perspective">
- </action>
- </actionSet>
- </extension>
+
+
+ <extension
+ point="org.eclipse.ui.commands">
+ <category
+ name="OSEE Category"
+ id="osee.product.commands.category">
+ </category>
+ <command
+ name="OSEE Coverage"
+ categoryId="osee.product.commands.category"
+ id="org.eclipse.osee.coverage.internal.OpenCoveragePerspective">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ commandId="org.eclipse.osee.coverage.internal.OpenCoveragePerspective"
+ class="org.eclipse.osee.coverage.internal.OpenCoveragePerspectiveHandler">
+ </handler>
+ </extension>
+ <extension point="org.eclipse.ui.commandImages">
+ <image commandId="org.eclipse.osee.coverage.internal.OpenCoveragePerspective" icon="images/coverage.gif"> </image>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="menu:org.eclipse.ui.main.menu?after=additions">
+ <menu
+ label="OSEE"
+ mnemonic="O"
+ id="osee.product.oseeMenu">
+ <command commandId="org.eclipse.osee.coverage.internal.OpenCoveragePerspective"
+ mnemonic="V"
+ id="org.eclipse.osee.coverage.internal.OpenCoveragePerspective">
+ </command>
+ </menu>
+ </menuContribution>
+ </extension>
+
+
+
<extension
point="org.eclipse.ui.perspectiveExtensions">
<perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveAction.java
deleted file mode 100644
index ed0e1baa002..00000000000
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rights reserved. This program and the accompanying materials
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.coverage.internal;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Our sample action implements workbench action delegate. The action proxy will be created by the workbench and shown
- * in the UI. When the user tries to use the action, this delegate will be created and execution will be delegated to
- * it.
- *
- * @see IWorkbenchWindowActionDelegate
- */
-public class OpenCoveragePerspectiveAction implements IWorkbenchWindowActionDelegate {
-
- public OpenCoveragePerspectiveAction() {
- // do nothing
- }
-
- /**
- * The action has been activated. The argument of the method represents the 'real' action sitting in the workbench
- * UI.
- *
- * @see IWorkbenchWindowActionDelegate#run
- */
- @Override
- public void run(IAction action) {
- AWorkbench.openPerspective(CoveragePerspectiveFactory.ID);
- }
-
- /**
- * Selection in the workbench has been changed. We can change the state of the 'real' action here if we want, but
- * this can only happen after the delegate has been created.
- *
- * @see IWorkbenchWindowActionDelegate#selectionChanged
- */
- @Override
- public void selectionChanged(IAction action, ISelection selection) {
- // do nothing
- }
-
- /**
- * We can use this method to dispose of any system resources we previously allocated.
- *
- * @see IWorkbenchWindowActionDelegate#dispose
- */
- @Override
- public void dispose() {
- // do nothing
- }
-
- /**
- * We will cache window object in order to be able to provide parent shell for the message dialog.
- *
- * @see IWorkbenchWindowActionDelegate#init
- */
- @Override
- public void init(IWorkbenchWindow window) {
- // do nothing
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveHandler.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveHandler.java
new file mode 100644
index 00000000000..f433c35023a
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveHandler.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * 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:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.coverage.internal;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class OpenCoveragePerspectiveHandler extends AbstractHandler {
+
+ public OpenCoveragePerspectiveHandler() {
+ }
+
+ @Override
+ public Object execute(ExecutionEvent event) {
+ AWorkbench.openPerspective(CoveragePerspectiveFactory.ID);
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.osee.define/plugin.xml b/plugins/org.eclipse.osee.define/plugin.xml
index 14485b79c33..f8b6aa8897f 100644
--- a/plugins/org.eclipse.osee.define/plugin.xml
+++ b/plugins/org.eclipse.osee.define/plugin.xml
@@ -206,27 +206,53 @@
className="org.eclipse.osee.define.traceability.report.PublishStdStpTraceability">
</Operation>
</extension>
- <extension point="org.eclipse.ui.actionSets">
- <actionSet
- label="OSEE Define"
- visible="true"
- id="osee.define.actionSet">
- <menu
- label="&amp;OSEE"
- id="osee.product.oseeMenu">
- <separator name="perspectives"/>
- <separator name="properties"/>
- </menu>
- <action
- class="org.eclipse.osee.define.internal.OpenDefinePerspectiveAction"
- icon="images/laser_16_16.gif"
- id="org.eclipse.osee.define.OpenDefinePerspectiveAction"
- label="OSEE &amp;Define"
- menubarPath="osee.product.oseeMenu/perspectives"
- tooltip="Open OSEE Define Perspective">
- </action>
- </actionSet>
+
+ <extension
+ point="org.eclipse.ui.commands">
+ <category
+ name="OSEE Category"
+ id="osee.product.commands.category">
+ </category>
+ <command
+ name="OSEE Define"
+ categoryId="osee.product.commands.category"
+ id="org.eclipse.osee.define.internal.OpenDefinePerspective">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ commandId="org.eclipse.osee.define.internal.OpenDefinePerspective"
+ class="org.eclipse.osee.define.internal.OpenDefinePerspectiveHandler">
+ </handler>
+ </extension>
+ <extension point="org.eclipse.ui.bindings">
+ <key
+ commandId="org.eclipse.osee.define.internal.OpenDefinePerspective"
+ contextId="org.eclipse.ui.contexts.window"
+ sequence="M1+D"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </key>
+ </extension>
+ <extension point="org.eclipse.ui.commandImages">
+ <image commandId="org.eclipse.osee.define.internal.OpenDefinePerspective" icon="images/laser_16_16.gif"> </image>
</extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="menu:org.eclipse.ui.main.menu?after=additions">
+ <menu
+ label="OSEE"
+ mnemonic="O"
+ id="osee.product.oseeMenu">
+ <command commandId="org.eclipse.osee.define.internal.OpenDefinePerspective"
+ mnemonic="D"
+ id="org.eclipse.osee.define.internal.OpenDefinePerspective">
+ </command>
+ </menu>
+ </menuContribution>
+ </extension>
+
+
<extension
id="org.eclipse.osee.define.blam.operation.PublishSystemLevelSSDD"
name="org.eclipse.osee.define.blam.operation.PublishSystemLevelSSDD"
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/OpenDefinePerspectiveHandler.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/OpenDefinePerspectiveHandler.java
new file mode 100644
index 00000000000..a4b273abc79
--- /dev/null
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/OpenDefinePerspectiveHandler.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * 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:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.define.internal;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class OpenDefinePerspectiveHandler extends AbstractHandler {
+
+ public OpenDefinePerspectiveHandler() {
+ }
+
+ @Override
+ public Object execute(ExecutionEvent event) {
+ AWorkbench.openPerspective(DefinePerspectiveFactory.ID);
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml b/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml
index c0641961d71..3c98d5791bc 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/plugin.xml
@@ -671,16 +671,6 @@
</with>
</enabledWhen>
</handler>
- <handler class="org.eclipse.osee.framework.ui.skynet.commandHandlers.change.GenericDiffHandler" commandId="org.eclipse.osee.framework.ui.skynet.changeReportView.genericDiff.command">
- <enabledWhen>
- <with
- variable="selection">
- <count
- value="+">
- </count>
- </with>
- </enabledWhen>
- </handler>
<handler class="org.eclipse.osee.framework.ui.skynet.commandHandlers.change.ViewChangeReportWasIsHandler" commandId="org.eclipse.osee.framework.ui.skynet.changeReportView.viewWordChangeReportWasIs.command">
<enabledWhen>
<with
@@ -1860,35 +1850,62 @@
name="User Management">
</perspective>
</extension>
- <extension point="org.eclipse.ui.actionSets">
- <actionSet
- label="OSEE"
- visible="true"
- id="osee.actionSet">
- <menu
- label="&amp;OSEE"
- id="osee.product.oseeMenu">
- <separator name="perspectives"/>
- <separator name="properties"/>
- </menu>
- <action
- class="org.eclipse.osee.framework.ui.skynet.action.OpenOseePropertiesWorkbenchAction"
- icon="images/gear.gif"
- id="org.eclipse.osee.framework.ui.skynet.action.OpenOseePropertiesWorkbenchAction"
- label="Properties"
- menubarPath="osee.product.oseeMenu/properties"
- tooltip="Open OSEE Properties">
- </action>
- <action
- class="org.eclipse.osee.framework.ui.skynet.action.OpenConfigDetailsWorkbenchAction"
- icon="images/gear.gif"
- id="org.eclipse.osee.framework.ui.skynet.action.OpenConfigDetailsAction"
- label="Configuration Details"
- menubarPath="osee.product.oseeMenu/properties"
- tooltip="Open OSEE Configuration Details">
- </action>
- </actionSet>
+
+ <extension
+ point="org.eclipse.ui.commands">
+ <category
+ name="OSEE Category"
+ id="osee.product.commands.category">
+ </category>
+ <command
+ name="Configuration Details"
+ categoryId="osee.product.commands.category"
+ id="org.eclipse.osee.framework.ui.skynet.action.OpenConfigDetails">
+ </command>
+ <command
+ name="Properties"
+ categoryId="osee.product.commands.category"
+ id="org.eclipse.osee.framework.ui.skynet.action.OpenOseeProperties">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ commandId="org.eclipse.osee.framework.ui.skynet.action.OpenConfigDetails"
+ class="org.eclipse.osee.framework.ui.skynet.action.OpenConfigDetailsHandler">
+ </handler>
+ <handler
+ commandId="org.eclipse.osee.framework.ui.skynet.action.OpenOseeProperties"
+ class="org.eclipse.osee.framework.ui.skynet.action.OpenPropertiesHandler">
+ </handler>
+ </extension>
+ <extension point="org.eclipse.ui.commandImages">
+ <image commandId="org.eclipse.osee.framework.ui.skynet.action.OpenConfigDetails" icon="images/gear.gif"> </image>
+ <image commandId="org.eclipse.osee.framework.ui.skynet.action.OpenOseeProperties" icon="images/gear.gif"> </image>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="menu:org.eclipse.ui.main.menu?after=additions">
+ <menu
+ label="OSEE"
+ mnemonic="O"
+ id="osee.product.oseeMenu">
+ <separator
+ name="other"
+ visible="true">
+ </separator>
+ <command commandId="org.eclipse.osee.framework.ui.skynet.action.OpenConfigDetails"
+ id="org.eclipse.osee.framework.ui.skynet.action.OpenConfigDetails">
+ </command>
+ <command commandId="org.eclipse.osee.framework.ui.skynet.action.OpenOseeProperties"
+ id="org.eclipse.osee.framework.ui.skynet.action.OpenOseeProperties">
+ </command>
+ </menu>
+ </menuContribution>
</extension>
+
+
+
<extension
point="org.eclipse.osee.framework.skynet.core.OseeValidator">
<OseeValidator
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenAtsPerspectiveActionTest.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenConfigDetailsHandler.java
index 3d430debade..d9fffb37ec7 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenAtsPerspectiveActionTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenConfigDetailsHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 Boeing.
+ * Copyright (c) 2014 Boeing.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,19 +8,22 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.ats.client.integration.tests.ats.actions;
+package org.eclipse.osee.framework.ui.skynet.action;
-import org.eclipse.osee.ats.actions.OpenAtsPerspectiveAction;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
/**
* @author Donald G. Dunne
*/
-public class OpenAtsPerspectiveActionTest extends AbstractAtsActionPerspectiveTest {
+public class OpenConfigDetailsHandler extends AbstractHandler {
- @Override
- public IWorkbenchWindowActionDelegate getPerspectiveAction() {
- return new OpenAtsPerspectiveAction();
+ public OpenConfigDetailsHandler() {
}
+ @Override
+ public Object execute(ExecutionEvent event) {
+ new OpenConfigDetailsAction().run();
+ return null;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenConfigDetailsWorkbenchAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenConfigDetailsWorkbenchAction.java
deleted file mode 100644
index 527c9bb82f4..00000000000
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenConfigDetailsWorkbenchAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rights reserved. This program and the accompanying materials
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Our sample action implements workbench action delegate. The action proxy will be created by the workbench and shown
- * in the UI. When the user tries to use the action, this delegate will be created and execution will be delegated to
- * it.
- *
- * @see IWorkbenchWindowActionDelegate
- */
-public class OpenConfigDetailsWorkbenchAction implements IWorkbenchWindowActionDelegate {
-
- public OpenConfigDetailsWorkbenchAction() {
- // do nothing
- }
-
- /**
- * The action has been activated. The argument of the method represents the 'real' action sitting in the workbench
- * UI.
- *
- * @see IWorkbenchWindowActionDelegate#run
- */
- @Override
- public void run(IAction action) {
- new OpenConfigDetailsAction().run();
- }
-
- /**
- * Selection in the workbench has been changed. We can change the state of the 'real' action here if we want, but
- * this can only happen after the delegate has been created.
- *
- * @see IWorkbenchWindowActionDelegate#selectionChanged
- */
- @Override
- public void selectionChanged(IAction action, ISelection selection) {
- // do nothing
- }
-
- /**
- * We can use this method to dispose of any system resources we previously allocated.
- *
- * @see IWorkbenchWindowActionDelegate#dispose
- */
- @Override
- public void dispose() {
- // do nothing
- }
-
- /**
- * We will cache window object in order to be able to provide parent shell for the message dialog.
- *
- * @see IWorkbenchWindowActionDelegate#init
- */
- @Override
- public void init(IWorkbenchWindow window) {
- // do nothing
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenOseePropertiesWorkbenchAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenOseePropertiesWorkbenchAction.java
deleted file mode 100644
index 4e65a7c633a..00000000000
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenOseePropertiesWorkbenchAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Boeing.
- * All rights reserved. This program and the accompanying materials
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Our sample action implements workbench action delegate. The action proxy will be created by the workbench and shown
- * in the UI. When the user tries to use the action, this delegate will be created and execution will be delegated to
- * it.
- *
- * @see IWorkbenchWindowActionDelegate
- */
-public class OpenOseePropertiesWorkbenchAction implements IWorkbenchWindowActionDelegate {
-
- public OpenOseePropertiesWorkbenchAction() {
- // do nothing
- }
-
- /**
- * The action has been activated. The argument of the method represents the 'real' action sitting in the workbench
- * UI.
- *
- * @see IWorkbenchWindowActionDelegate#run
- */
- @Override
- public void run(IAction action) {
- new OpenOseePropertiesAction().run();
- }
-
- /**
- * Selection in the workbench has been changed. We can change the state of the 'real' action here if we want, but
- * this can only happen after the delegate has been created.
- *
- * @see IWorkbenchWindowActionDelegate#selectionChanged
- */
- @Override
- public void selectionChanged(IAction action, ISelection selection) {
- // do nothing
- }
-
- /**
- * We can use this method to dispose of any system resources we previously allocated.
- *
- * @see IWorkbenchWindowActionDelegate#dispose
- */
- @Override
- public void dispose() {
- // do nothing
- }
-
- /**
- * We will cache window object in order to be able to provide parent shell for the message dialog.
- *
- * @see IWorkbenchWindowActionDelegate#init
- */
- @Override
- public void init(IWorkbenchWindow window) {
- // do nothing
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenReviewPerspectiveActionTest.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenPropertiesHandler.java
index c66376105b7..ada57622d59 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenReviewPerspectiveActionTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenPropertiesHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 Boeing.
+ * Copyright (c) 2014 Boeing.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,19 +8,22 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.ats.client.integration.tests.ats.actions;
+package org.eclipse.osee.framework.ui.skynet.action;
-import org.eclipse.osee.ats.actions.OpenReviewPerspectiveAction;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
/**
* @author Donald G. Dunne
*/
-public class OpenReviewPerspectiveActionTest extends AbstractAtsActionPerspectiveTest {
+public class OpenPropertiesHandler extends AbstractHandler {
- @Override
- public IWorkbenchWindowActionDelegate getPerspectiveAction() {
- return new OpenReviewPerspectiveAction();
+ public OpenPropertiesHandler() {
}
+ @Override
+ public Object execute(ExecutionEvent event) {
+ new OpenOseePropertiesAction().run();
+ return null;
+ }
}

Back to the top