diff options
author | donald.g.dunne | 2011-09-07 00:07:06 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2011-09-07 00:07:06 +0000 |
commit | f937c017929e425b1cf9532e83c1cfb52c881bdf (patch) | |
tree | 05ec96d6a270abe13b7568b1c8d2c70c1a2870e8 | |
parent | 1dcc430a78f5065c8b4a0cb4b63c7124f0b2e056 (diff) | |
download | org.eclipse.osee-0.9.9.v201109070002_SR1.tar.gz org.eclipse.osee-0.9.9.v201109070002_SR1.tar.xz org.eclipse.osee-0.9.9.v201109070002_SR1.zip |
refactor: Remove IActionable0.9.9.v201109070002_SR1
36 files changed, 36 insertions, 440 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java index 7879f9e6abb..12d894c21af 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java @@ -46,7 +46,6 @@ import org.eclipse.osee.framework.core.util.IWorkPage; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; @@ -87,7 +86,7 @@ import org.eclipse.ui.views.contentoutline.IContentOutlinePage; /** * @author Donald G. Dunne */ -public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEventHandler, ISelectedAtsArtifacts, IActionable, IAtsMetricsProvider, IXTaskViewer { +public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEventHandler, ISelectedAtsArtifacts, IAtsMetricsProvider, IXTaskViewer { public static final String EDITOR_ID = "org.eclipse.osee.ats.editor.SMAEditor"; private AbstractWorkflowArtifact awa; private SMAWorkFlowTab workFlowTab; @@ -555,11 +554,6 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent } @Override - public String getActionDescription() { - return null; - } - - @Override public Collection<? extends Artifact> getMetricsArtifacts() { return Arrays.asList(awa); } @@ -593,11 +587,6 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent } @Override - public IActionable getActionable() { - return this; - } - - @Override public Set<? extends Artifact> getSelectedSMAArtifacts() { return Collections.singleton(awa); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAGoalMembersSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAGoalMembersSection.java index 1929a23f54c..a680d410eb8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAGoalMembersSection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAGoalMembersSection.java @@ -45,7 +45,6 @@ import org.eclipse.osee.ats.world.WorldXViewer; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; @@ -350,11 +349,6 @@ public class SMAGoalMembersSection extends SectionPart implements ISelectedAtsAr } @Override - public IActionable getIActionable() { - return null; - } - - @Override public IWorldEditorProvider getWorldEditorProvider() { return null; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java index a873af5cc6e..37be41617e1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java @@ -59,7 +59,6 @@ import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; @@ -100,7 +99,7 @@ import org.eclipse.ui.progress.UIJob; /** * @author Donald G. Dunne */ -public class SMAWorkFlowTab extends FormPage implements IActionable { +public class SMAWorkFlowTab extends FormPage { private final AbstractWorkflowArtifact awa; private final List<SMAWorkFlowSection> sections = new ArrayList<SMAWorkFlowSection>(); private final List<StateXWidgetPage> statePages = new ArrayList<StateXWidgetPage>(); @@ -556,11 +555,6 @@ public class SMAWorkFlowTab extends FormPage implements IActionable { } } - @Override - public String getActionDescription() { - return "Workflow Tab"; - } - private Control control = null; private void storeScrollLocation() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java index d2449394de9..e3d5f63977c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java @@ -27,7 +27,6 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.ats.actions.MyFavoritesAction; import org.eclipse.osee.ats.actions.MyWorldAction; import org.eclipse.osee.ats.actions.NewAction; @@ -45,7 +44,6 @@ import org.eclipse.osee.framework.core.operation.CompositeOperation; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.plugin.xnavigate.IXNavigateEventListener; @@ -77,7 +75,7 @@ import org.eclipse.ui.progress.UIJob; /** * @author Donald G. Dunne */ -public class NavigateView extends ViewPart implements IActionable, IXNavigateEventListener { +public class NavigateView extends ViewPart implements IXNavigateEventListener { public static final String VIEW_ID = "org.eclipse.osee.ats.navigate.NavigateView"; private static final String INPUT = "filter"; @@ -262,15 +260,6 @@ public class NavigateView extends ViewPart implements IActionable, IXNavigateEve } @Override - public String getActionDescription() { - IStructuredSelection sel = (IStructuredSelection) xNavComp.getFilteredTree().getViewer().getSelection(); - if (sel.iterator().hasNext()) { - return String.format("Currently Selected - %s", ((XNavigateItem) sel.iterator().next()).getName()); - } - return ""; - } - - @Override public void saveState(IMemento memento) { super.saveState(memento); memento = memento.createChild(INPUT); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java index 753219f61bf..6518dba2509 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateView.java @@ -26,7 +26,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.ats.actions.OpenWorkflowByIdAction; import org.eclipse.osee.ats.core.config.AtsBulkLoad; import org.eclipse.osee.ats.core.util.AtsUtilCore; @@ -38,7 +37,6 @@ import org.eclipse.osee.framework.core.operation.CompositeOperation; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.plugin.xnavigate.IXNavigateEventListener; @@ -65,7 +63,7 @@ import org.eclipse.ui.progress.UIJob; /** * @author Donald G. Dunne */ -public class ReviewNavigateView extends ViewPart implements IActionable, IXNavigateEventListener { +public class ReviewNavigateView extends ViewPart implements IXNavigateEventListener { public static final String VIEW_ID = "org.eclipse.osee.ats.review.ReviewNavigateView"; private static final String INPUT = "filter"; @@ -225,15 +223,6 @@ public class ReviewNavigateView extends ViewPart implements IActionable, IXNavig } @Override - public String getActionDescription() { - IStructuredSelection sel = (IStructuredSelection) xNavComp.getFilteredTree().getViewer().getSelection(); - if (sel.iterator().hasNext()) { - return String.format("Currently Selected - %s", ((XNavigateItem) sel.iterator().next()).getName()); - } - return ""; - } - - @Override public void saveState(IMemento memento) { super.saveState(memento); memento = memento.createChild(INPUT); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/IXTaskViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/IXTaskViewer.java index 84b14f68e5a..9f59b1bd177 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/IXTaskViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/IXTaskViewer.java @@ -15,7 +15,6 @@ import org.eclipse.osee.ats.core.task.TaskArtifact; import org.eclipse.osee.ats.core.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.IWorkPage; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; /** @@ -67,6 +66,4 @@ public interface IXTaskViewer { */ public void handleRefreshAction() throws OseeCoreException; - public IActionable getActionable() throws OseeCoreException; - } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java index 1620d7839b3..169e489d7a9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java @@ -38,7 +38,6 @@ import org.eclipse.osee.framework.core.util.IWorkPage; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; @@ -58,7 +57,7 @@ import org.eclipse.ui.PartInitException; /** * @author Donald G. Dunne */ -public class TaskEditor extends AbstractArtifactEditor implements IActionable, IAtsMetricsProvider, IXTaskViewer { +public class TaskEditor extends AbstractArtifactEditor implements IAtsMetricsProvider, IXTaskViewer { public static final String EDITOR_ID = "org.eclipse.osee.ats.editor.TaskEditor"; private int mainPageIndex, metricsPageIndex; private TaskEditorXWidgetActionPage taskActionPage; @@ -389,16 +388,6 @@ public class TaskEditor extends AbstractArtifactEditor implements IActionable, I return tasks.iterator().next().getManHrsPerDayPreference(); } - @Override - public String getActionDescription() { - return taskActionPage.getActionDescription(); - } - - @Override - public IActionable getActionable() { - return this; - } - public boolean isLoading() { return loading; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorXWidgetActionPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorXWidgetActionPage.java index 7133c25690a..4b683224e48 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorXWidgetActionPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorXWidgetActionPage.java @@ -34,7 +34,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.OseeUiActivator; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; @@ -60,7 +59,7 @@ import org.eclipse.ui.forms.widgets.Section; /** * @author Donald G. Dunne */ -public class TaskEditorXWidgetActionPage extends AtsXWidgetActionFormPage implements IActionable { +public class TaskEditorXWidgetActionPage extends AtsXWidgetActionFormPage { private final TaskEditor taskEditor; private TaskComposite taskComposite; @@ -141,11 +140,6 @@ public class TaskEditorXWidgetActionPage extends AtsXWidgetActionFormPage implem } @Override - public String getActionDescription() { - return taskComposite.getActionDescription(); - } - - @Override protected void createToolBar(IToolBarManager toolBarManager) { super.createToolBar(toolBarManager); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskTabXWidgetActionPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskTabXWidgetActionPage.java index 685c0d111c3..1345c10fffa 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskTabXWidgetActionPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskTabXWidgetActionPage.java @@ -36,7 +36,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.OseeUiActivator; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; @@ -59,7 +58,7 @@ import org.eclipse.ui.forms.widgets.Section; /** * @author Donald G. Dunne */ -public class TaskTabXWidgetActionPage extends AtsXWidgetActionFormPage implements IActionable { +public class TaskTabXWidgetActionPage extends AtsXWidgetActionFormPage { private final SMAEditor smaEditor; private TaskComposite taskComposite; @@ -127,11 +126,6 @@ public class TaskTabXWidgetActionPage extends AtsXWidgetActionFormPage implement } @Override - public String getActionDescription() { - return taskComposite.getActionDescription(); - } - - @Override protected void createToolBar(IToolBarManager toolBarManager) { super.createToolBar(toolBarManager); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java index 3bd5e7d1403..5f9d612c79c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java @@ -271,14 +271,6 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, } @Override - public String getActionDescription() { - if (activeAwa != null) { - return String.format("Current Artifact - %s - %s", activeAwa.getGuid(), activeAwa.getName()); - } - return ""; - } - - @Override public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { processWindowActivated(); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditor.java index 2638900ae38..8af4688c922 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditor.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ats.world; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.swt.widgets.Menu; /** @@ -25,8 +24,6 @@ public interface IWorldEditor { public void reSearch() throws OseeCoreException; - public IActionable getIActionable(); - public IWorldEditorProvider getWorldEditorProvider() throws OseeCoreException; public void createToolBarPulldown(Menu menu); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java index b53f75e4b1a..940529d2f8e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java @@ -25,7 +25,6 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; @@ -47,7 +46,7 @@ import org.eclipse.ui.part.MultiPageEditorPart; /** * @author Donald G. Dunne */ -public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableEditor, IAtsMetricsProvider, IActionable { +public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableEditor, IAtsMetricsProvider { public static final String EDITOR_ID = "org.eclipse.osee.ats.world.WorldEditor"; private WorldXWidgetActionPage worldXWidgetActionPage; public static final int TITLE_MAX_LENGTH = 80; @@ -232,11 +231,6 @@ public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableE } @Override - public String getActionDescription() { - return null; - } - - @Override public double getManHoursPerDayPreference() throws OseeCoreException { return worldXWidgetActionPage.getWorldComposite().getManHoursPerDayPreference(); } @@ -261,11 +255,6 @@ public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableE } @Override - public IActionable getIActionable() { - return null; - } - - @Override public void doSaveAs() { // do nothing } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java index 4f327d60fdd..1275604a8e4 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java @@ -34,7 +34,6 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; @@ -54,7 +53,7 @@ import org.eclipse.ui.part.MultiPageEditorPart; /** * @author Donald G. Dunne */ -public class CoverageEditor extends FormEditor implements IActionable { +public class CoverageEditor extends FormEditor { public static final String EDITOR_ID = "org.eclipse.osee.coverage.editor.CoverageEditor"; private Integer startPage = null; private CoverageEditorImportTab coverageEditorImportTab = null; @@ -326,25 +325,6 @@ public class CoverageEditor extends FormEditor implements IActionable { }); } - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class adapter) { - if (IActionable.class.equals(adapter)) { - return new IActionable() { - @Override - public String getActionDescription() { - return ""; - } - }; - } - return super.getAdapter(adapter); - } - - @Override - public String getActionDescription() { - return null; - } - @Override public void doSaveAs() { // do nothing diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java index 88891ef6ad3..4bf3d0d3481 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateView.java @@ -13,19 +13,16 @@ package org.eclipse.osee.coverage.navigate; import java.util.logging.Level; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.coverage.help.ui.CoverageHelpContext; import org.eclipse.osee.coverage.internal.Activator; import org.eclipse.osee.coverage.util.CoverageUtil; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite; import org.eclipse.osee.framework.ui.skynet.widgets.XBranchSelectWidget; @@ -43,7 +40,7 @@ import org.eclipse.ui.part.ViewPart; /** * @author Donald G. Dunne */ -public class CoverageNavigateView extends ViewPart implements IActionable { +public class CoverageNavigateView extends ViewPart { public static final String VIEW_ID = "org.eclipse.osee.coverage.navigate.CoverageNavigateView"; private XNavigateComposite xNavComp; @@ -156,15 +153,6 @@ public class CoverageNavigateView extends ViewPart implements IActionable { toolbarManager.add(refreshAction); } - @Override - public String getActionDescription() { - IStructuredSelection sel = (IStructuredSelection) xNavComp.getFilteredTree().getViewer().getSelection(); - if (sel.iterator().hasNext()) { - return String.format("Currently Selected - %s", ((XNavigateItem) sel.iterator().next()).getName()); - } - return ""; - } - public void refresh() { Displays.ensureInDisplayThread(new Runnable() { diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java index 060d48b4467..5d8390f6c50 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java @@ -16,9 +16,7 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IRegistryEventListener; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.action.Action; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.help.ui.OseeHelpContext; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.plugin.xnavigate.IXNavigateEventListener; @@ -37,7 +35,7 @@ import org.eclipse.ui.part.ViewPart; * * @see ViewPart */ -public class DefineNavigateView extends ViewPart implements IActionable, IXNavigateEventListener { +public class DefineNavigateView extends ViewPart implements IXNavigateEventListener { public static final String VIEW_ID = "org.eclipse.osee.define.DefineNavigateView"; private XNavigateComposite xNavComp; @@ -112,13 +110,4 @@ public class DefineNavigateView extends ViewPart implements IActionable, IXNavig } - @Override - public String getActionDescription() { - IStructuredSelection sel = (IStructuredSelection) xNavComp.getFilteredTree().getViewer().getSelection(); - if (sel.iterator().hasNext()) { - return String.format("Currently Selected - %s", ((XNavigateItem) sel.iterator().next()).getName()); - } - return ""; - } - }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/IActionable.java b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/IActionable.java deleted file mode 100644 index b89651f4542..00000000000 --- a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/IActionable.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 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.plugin.core; - -/** - * @author Donald G. Dunne - */ -public interface IActionable { - - /** - * Provide description over and above the viewpart name and version to be used by ATS - */ - public String getActionDescription(); - -} diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java index 84419011a7a..4ab3052adbd 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java @@ -20,7 +20,6 @@ import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.skynet.core.event.model.BroadcastEvent; import org.eclipse.osee.framework.skynet.core.event.model.BroadcastEventType; @@ -39,7 +38,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TabFolder; -import org.eclipse.swt.widgets.TabItem; import org.eclipse.ui.part.ViewPart; /** @@ -48,7 +46,7 @@ import org.eclipse.ui.part.ViewPart; * @author Jeff C. Phillips */ -public class AdminView extends ViewPart implements IActionable { +public class AdminView extends ViewPart { public static final String VIEW_ID = "org.eclipse.osee.framework.ui.admin.AdminView"; private static Action saveAction; private TabFolder tabFolder; @@ -223,15 +221,4 @@ public class AdminView extends ViewPart implements IActionable { } } - @Override - public String getActionDescription() { - String desc = ""; - TabItem items[] = tabFolder.getSelection(); - if (items.length == 1) { - String tabName = items[0].getText(); - desc += String.format("Tab = %s ", tabName); - } - return desc; - } - }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/core/ODMEditor.java b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/core/ODMEditor.java index 86fe013e914..c245def3172 100644 --- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/core/ODMEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/core/ODMEditor.java @@ -44,7 +44,6 @@ import org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette; import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler; import org.eclipse.jface.action.IAction; import org.eclipse.jface.util.TransferDropTargetListener; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.ui.data.model.editor.action.ODMExportAction; import org.eclipse.osee.framework.ui.data.model.editor.action.ODMImportAction; @@ -109,13 +108,6 @@ public class ODMEditor extends GraphicalEditorWithFlyoutPalette { return ((ScalableFreeformRootEditPart) getGraphicalViewer().getRootEditPart()).getZoomManager(); } else if (adapter == IContentOutlinePage.class) { return getOverviewOutlinePage(); - } else if (adapter == IActionable.class) { - return new IActionable() { - @Override - public String getActionDescription() { - return "ODM Editor description here"; - } - }; } return super.getAdapter(adapter); } diff --git a/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/view/ServiceManagerView.java b/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/view/ServiceManagerView.java index 583f1a6b94b..8e7464a5251 100644 --- a/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/view/ServiceManagerView.java +++ b/plugins/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/view/ServiceManagerView.java @@ -11,7 +11,6 @@ package org.eclipse.osee.framework.ui.service.control.view; import org.apache.commons.lang.StringUtils; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.plugin.core.config.JiniLookupGroupConfig; import org.eclipse.osee.framework.ui.service.control.actions.HideLookupsAction; import org.eclipse.osee.framework.ui.service.control.actions.KillServiceAction; @@ -28,7 +27,7 @@ import org.eclipse.ui.part.ViewPart; /** * @author Roberto E. Escobar */ -public class ServiceManagerView extends ViewPart implements IActionable { +public class ServiceManagerView extends ViewPart { public static final String VIEW_ID = "org.eclipse.osee.framework.ui.service.control.view.ServiceManagerView"; private ManagerMain managerMain; @@ -66,11 +65,6 @@ public class ServiceManagerView extends ViewPart implements IActionable { } @Override - public String getActionDescription() { - return ""; - } - - @Override public void dispose() { super.dispose(); if (managerMain != null) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java index 3c5cc84cc16..2acd1b2b4c4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java @@ -63,7 +63,6 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.AccessPolicy; import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; @@ -157,7 +156,7 @@ import org.eclipse.ui.progress.UIJob; /** * @author Ryan D. Brooks */ -public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEventHandler, IRebuildMenuListener, IAccessControlEventListener, IBranchEventListener, IActionable, ISelectionProvider, IBranchProvider { +public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEventHandler, IRebuildMenuListener, IAccessControlEventListener, IBranchEventListener, ISelectionProvider, IBranchProvider { public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.ArtifactExplorer"; private static final String ROOT_GUID = "artifact.explorer.last.root_guid"; private static final String ROOT_BRANCH = "artifact.explorer.last.root_branch"; @@ -727,11 +726,8 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent try { ArtifactExplorer.revealArtifact(ArtifactQuery.getArtifactFromId(artifact.getArtId(), branch)); } catch (OseeCoreException ex) { - OseeLog.logf( - Activator.class, - OseeLevel.SEVERE_POPUP, - "Could not find Artifact \'%s\' on Branch \'%s\'", artifact.getName(), - branch.getName()); + OseeLog.logf(Activator.class, OseeLevel.SEVERE_POPUP, + "Could not find Artifact \'%s\' on Branch \'%s\'", artifact.getName(), branch.getName()); } } @@ -1008,8 +1004,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent artifactTransferData.add(artifact); } } - artifactClipboard.setArtifactsToClipboard(Activator.getInstance().getAccessPolicy(), - artifactTransferData); + artifactClipboard.setArtifactsToClipboard(Activator.getInstance().getAccessPolicy(), artifactTransferData); } } @@ -1325,11 +1320,6 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent } @Override - public String getActionDescription() { - return ""; - } - - @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { treeViewer.addSelectionChangedListener(listener); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java index 84219e763aa..a18a7e4f482 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java @@ -18,7 +18,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.SystemGroup; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -249,14 +248,7 @@ public class ArtifactEditor extends AbstractEventArtifactEditor { @SuppressWarnings("rawtypes") @Override public Object getAdapter(Class adapter) { - if (adapter == IActionable.class) { - return new IActionable() { - @Override - public String getActionDescription() { - return ""; - } - }; - } else if (adapter == IContentOutlinePage.class) { + if (adapter == IContentOutlinePage.class) { ArtifactEditorOutlinePage page = getOutlinePage(); page.setInput(this); return page; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java index 8a6c9400061..c1fc92f8093 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java @@ -25,7 +25,6 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; @@ -57,7 +56,7 @@ import org.eclipse.ui.PartInitException; /** * @author Donald G. Dunne */ -public class MassArtifactEditor extends AbstractArtifactEditor implements IActionable { +public class MassArtifactEditor extends AbstractArtifactEditor { public static final String EDITOR_ID = "org.eclipse.osee.framework.ui.skynet.massEditor.MassArtifactEditor"; private int artifactsPageIndex; private MassXViewer xViewer; @@ -292,11 +291,6 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio return xViewer.getArtifacts(); } - @Override - public String getActionDescription() { - return ""; - } - public static Collection<MassArtifactEditor> getEditors() { final List<MassArtifactEditor> editors = new ArrayList<MassArtifactEditor>(); Displays.pendInDisplayThread(new Runnable() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java index 8aaa1732525..ae30579f43c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java @@ -16,7 +16,6 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; import org.eclipse.osee.framework.ui.skynet.internal.Activator; @@ -71,20 +70,6 @@ public class BlamEditor extends FormEditor implements IDirtiableEditor { } } - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class adapter) { - if (adapter == IActionable.class) { - return new IActionable() { - @Override - public String getActionDescription() { - return ""; - } - }; - } - return super.getAdapter(adapter); - } - private VariableMap getBlamVariableMap() { return overviewPage.getInput(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java index b4efb8a3f5e..a89b96109aa 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java @@ -15,10 +15,8 @@ import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter; import org.eclipse.osee.framework.skynet.core.event.listener.IBranchEventListener; @@ -79,38 +77,6 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView OseeEventManager.addListener(eventRelay); } - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class adapter) { - if (adapter == IActionable.class) { - return new IActionable() { - @Override - public String getActionDescription() { - StringBuilder sb = new StringBuilder(); - ChangeUiData changeData = getEditorInput().getChangeData(); - TransactionDelta txDelta = changeData.getTxDelta(); - Branch branch1 = null; - Branch branch2 = null; - try { - branch1 = txDelta.getStartTx().getBranch(); - branch2 = txDelta.getEndTx().getBranch(); - } catch (OseeCoreException ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); - } - if (txDelta.areOnTheSameBranch()) { - sb.append(String.format("\nBranch - %s", branch1)); - sb.append(String.format("\nTransactions - %s", txDelta.toString())); - } else { - sb.append(String.format("\nBranch %s - %s Tx:[%s]", 1, branch1, txDelta.getStartTx().getId())); - sb.append(String.format("\nBranch %s - %s Tx:[%s]", 2, branch2, txDelta.getEndTx().getId())); - } - return sb.toString(); - } - }; - } - return super.getAdapter(adapter); - } - @Override public void doSave(IProgressMonitor monitor) { // method overridden only to satisfy its defining interface @@ -173,8 +139,7 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView branches[0] = changeUiData.getTxDelta().getStartTx().getBranch(); branches[1] = changeUiData.getTxDelta().getEndTx().getBranch(); } catch (OseeCoreException ex) { - OseeLog.log(Activator.class, Level.SEVERE, "Error obtaining change report branches for branch event", - ex); + OseeLog.log(Activator.class, Level.SEVERE, "Error obtaining change report branches for branch event", ex); } for (Branch branch : branches) { if (branch != null && branch.getGuid().equals(branchEvent.getBranchGuid())) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java index 7b585dce880..1447ab31d4a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java @@ -30,7 +30,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.UniversalGroup; @@ -72,7 +71,7 @@ import org.eclipse.ui.part.ViewPart; /** * @author Donald G. Dunne */ -public class GroupExplorer extends ViewPart implements IArtifactEventListener, IActionable, IRebuildMenuListener { +public class GroupExplorer extends ViewPart implements IArtifactEventListener, IRebuildMenuListener { public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.group.GroupExplorer"; private GroupTreeViewer treeViewer; private Artifact rootArt; @@ -397,11 +396,6 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I super.dispose(); } - @Override - public String getActionDescription() { - return ""; - } - private class NeedProjectMenuListener implements MenuListener { Collection<MenuItem> items; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java index 37dda361ed5..eb7e9937925 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java @@ -19,7 +19,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor; @@ -40,7 +39,7 @@ import org.eclipse.ui.part.MultiPageEditorPart; /** * @author Donald G. Dunne */ -public class ResultsEditor extends AbstractArtifactEditor implements IActionable { +public class ResultsEditor extends AbstractArtifactEditor { public static final String EDITOR_ID = "org.eclipse.osee.framework.ui.skynet.results.ResultsEditor"; private Integer startPage = null; @@ -131,11 +130,6 @@ public class ResultsEditor extends AbstractArtifactEditor implements IActionable return false; } - @Override - public String getActionDescription() { - return null; - } - public static void open(final String tabName, final String title, final String html) { ResultsEditor.open(new IResultsEditorProvider() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java index 87ee700b31e..64300f96047 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java @@ -26,13 +26,11 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.operation.CompositeOperation; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.skynet.core.SystemGroup; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.plugin.xnavigate.IXNavigateEventListener; @@ -61,7 +59,7 @@ import org.eclipse.ui.progress.UIJob; /** * @author Donald G. Dunne */ -public class UserNavigateView extends ViewPart implements IActionable, IXNavigateEventListener { +public class UserNavigateView extends ViewPart implements IXNavigateEventListener { public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.UserNavigateView"; private static final String INPUT = "filter"; @@ -218,15 +216,6 @@ public class UserNavigateView extends ViewPart implements IActionable, IXNavigat } @Override - public String getActionDescription() { - IStructuredSelection sel = (IStructuredSelection) xNavComp.getFilteredTree().getViewer().getSelection(); - if (sel.iterator().hasNext()) { - return String.format("Currently Selected - %s", ((XNavigateItem) sel.iterator().next()).getName()); - } - return ""; - } - - @Override public void saveState(IMemento memento) { super.saveState(memento); memento = memento.createChild(INPUT); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/GenericViewPart.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/GenericViewPart.java index c8b6a9bf243..fde650f282b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/GenericViewPart.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/GenericViewPart.java @@ -10,17 +10,16 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.widgets; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.part.ViewPart; /** * This class provides "general" functionality to widgets having the need to override ViewPart methods and * providing blank functionality. Subclasses must call setFocusWidget() in their implementation for createPartControl <br/> - * + * * @author Karol M. Wilk */ -public abstract class GenericViewPart extends ViewPart implements IActionable { +public abstract class GenericViewPart extends ViewPart { private Control focusWidget; @Override @@ -30,11 +29,6 @@ public abstract class GenericViewPart extends ViewPart implements IActionable { } } - @Override - public String getActionDescription() { - return ""; - } - /** * @param general way to handle a widget that will be called when a focus event is received */ diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/GenericXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/GenericXWidget.java index b8b8db20cd3..093b1a58d66 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/GenericXWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/GenericXWidget.java @@ -10,10 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.widgets; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.swt.widgets.Control; -public abstract class GenericXWidget extends XWidget implements IActionable { +public abstract class GenericXWidget extends XWidget { public GenericXWidget() { this(""); @@ -35,11 +34,6 @@ public abstract class GenericXWidget extends XWidget implements IActionable { } @Override - public String getActionDescription() { - return ""; - } - - @Override public boolean isEmpty() { return false; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java index 29bd7ad4e6f..b30c45eda77 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java @@ -289,16 +289,6 @@ public class XHistoryWidget extends GenericXWidget { } } - @Override - public String getActionDescription() { - StringBuffer sb = new StringBuffer(); - if (artifact != null) { - sb.append("\nHistory : "); - sb.append(artifact.getName()); - } - return sb.toString(); - } - public Artifact getArtifact() { return artifact; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java index a721a13aef5..0c2016c0e1d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.logging.Level; -import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -35,7 +34,6 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -52,8 +50,8 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil; import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService; import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor; -import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider; import org.eclipse.osee.framework.ui.skynet.internal.Activator; +import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.skynet.widgets.GenericXWidget; @@ -73,7 +71,7 @@ import org.eclipse.swt.widgets.Tree; * @author Donald G. Dunne * @author Theron Virgin */ -public class MergeXWidget extends GenericXWidget implements IAdaptable { +public class MergeXWidget extends GenericXWidget { private static final String COMPLETE_COMMIT_ACTION_ID = "complete.commit.action.id"; private static final String REFRESH_ACTION_ID = "refresh.action.id"; private MergeXViewer mergeXViewer; @@ -474,15 +472,6 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { } - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class adapter) { - if (IActionable.class.equals(adapter)) { - return new MergeViewerActionable(); - } - return null; - } - private Action getCompleteCommitAction() { if (completeCommitAction == null) { completeCommitAction = new CompleteCommitAction(); @@ -519,30 +508,6 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { manager.update(true); } - private final class MergeViewerActionable implements IActionable { - @Override - public String getActionDescription() { - StringBuilder sb = new StringBuilder(); - if (sourceBranch != null) { - sb.append("\nSource Branch: "); - sb.append(sourceBranch); - } - if (destBranch != null) { - sb.append("\nDestination Branch: "); - sb.append(destBranch); - } - if (tranId != null) { - sb.append("\nTransactionId: "); - sb.append(tranId); - } - if (commitTrans != null) { - sb.append("\nCommit TransactionId: "); - sb.append(commitTrans); - } - return sb.toString(); - } - } - private final class CompleteCommitAction extends Action { public CompleteCommitAction() { super(); diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/view/MessageView.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/view/MessageView.java index c336c32c928..e7a30fec96a 100644 --- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/view/MessageView.java +++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/view/MessageView.java @@ -32,7 +32,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -79,7 +78,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; -public class MessageView extends ViewPart implements IActionable, IMessageDictionaryListener { +public class MessageView extends ViewPart implements IMessageDictionaryListener { protected TreeViewer treeViewer; protected Text searchText; protected MessageViewLabelProvider labelProvider; @@ -519,11 +518,6 @@ public class MessageView extends ViewPart implements IActionable, IMessageDictio } @Override - public String getActionDescription() { - return ""; - } - - @Override public void onDictionaryLoaded(final IMessageDictionary dictionary) { Displays.pendInDisplayThread(new Runnable() { @Override diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java index 130216924a3..4395ddae272 100644 --- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java +++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java @@ -52,7 +52,6 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.benchmark.Benchmark; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; @@ -125,7 +124,7 @@ import org.osgi.framework.Bundle; * * @author Ken J. Aguilar */ -public final class WatchView extends ViewPart implements IActionable, IMessageDictionaryListener, ITestConnectionListener, IOteMessageClientView { +public final class WatchView extends ViewPart implements IMessageDictionaryListener, ITestConnectionListener, IOteMessageClientView { private MessageXViewer treeViewer; private final ClientMessageServiceTracker msgServiceTracker; @@ -684,12 +683,9 @@ public final class WatchView extends ViewPart implements IActionable, IMessageDi } try { if (Benchmark.isBenchmarkingEnabled()) { - OseeLog.logf( - Activator.class, - Level.INFO, - "%s: # samples=%d, max=%d, min=%d, avg=%d", benchMark.getName(), - benchMark.getTotalSamples(), benchMark.getLongestSample(), benchMark.getShortestSample(), - benchMark.getAverage()); + OseeLog.logf(Activator.class, Level.INFO, "%s: # samples=%d, max=%d, min=%d, avg=%d", benchMark.getName(), + benchMark.getTotalSamples(), benchMark.getLongestSample(), benchMark.getShortestSample(), + benchMark.getAverage()); } } catch (Throwable t) { OseeLog.log(Activator.class, Level.WARNING, "Exception during disconnect", t); @@ -915,11 +911,6 @@ public final class WatchView extends ViewPart implements IActionable, IMessageDi return treeViewer; } - @Override - public String getActionDescription() { - return ""; - } - public void updateMenuActions(final IMenuManager mm) { final IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection(); diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditor.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditor.java index 7bd19d7263b..88b177becb7 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditor.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditor.java @@ -29,7 +29,6 @@ import org.eclipse.osee.connection.service.IServiceConnector; import org.eclipse.osee.framework.jdk.core.type.IPropertyStore; import org.eclipse.osee.framework.jdk.core.type.PropertyStore; import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -63,7 +62,7 @@ import org.eclipse.ui.part.MultiPageEditorPart; * <li>Source Page * </ul> */ -public abstract class TestManagerEditor extends MultiPageEditorPart implements IActionable, ITestConnectionListener { +public abstract class TestManagerEditor extends MultiPageEditorPart implements ITestConnectionListener { private static final Image errorImage = ImageManager.getImage(OteTestManagerImage.ERROR); public static final String namespace = "org.eclipse.osee.ote.ui.test.manager.editors.TestManagerEditor"; @@ -488,36 +487,6 @@ public abstract class TestManagerEditor extends MultiPageEditorPart implements I } @Override - public String getActionDescription() { - String version = - (String) Platform.getBundle("org.eclipse.osee.ote.ui.test.manager").getHeaders().get("Bundle-Version"); - String serverVersion = ""; - try { - serverVersion = (String) Platform.getBundle("org.eclipse.osee.ote.core").getHeaders().get("Bundle-Version"); - } catch (Exception ex) { - // do nothing - } - StringBuilder builder = new StringBuilder(); - builder.append("Problem found on OSEE TM Version: "); - builder.append(version); - builder.append("\nServer Version: "); - builder.append(serverVersion); - builder.append("\nTM File: "); - builder.append(getTitle()); - builder.append("\n"); - builder.append("OFP: \""); - builder.append(pageManager.getScriptPage().getOFP()); - builder.append("\"\n"); - builder.append("Scripts: \n"); - builder.append(pageManager.getScriptPage().getScripts()); - builder.append("\n"); - - builder.append(getPropertyStore().toString()); - - return builder.toString(); - } - - @Override public void onConnectionLost(IServiceConnector connector) { connectedEnv = null; connector = null; diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java index 7b809c42a39..96cb5292aa1 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java @@ -12,7 +12,6 @@ package org.eclipse.osee.ote.ui.test.manager.pages; import java.util.HashMap; import java.util.Map; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.ote.service.ConnectionEvent; import org.eclipse.osee.ote.ui.test.manager.core.TestManagerEditor; @@ -25,7 +24,7 @@ import org.eclipse.swt.widgets.Label; /** * @author David Diepenbrock */ -public class OverviewPage extends TestManagerPage implements IActionable { +public class OverviewPage extends TestManagerPage { private static final String pageName = "Overview"; private static final String release = ""; @@ -126,11 +125,6 @@ public class OverviewPage extends TestManagerPage implements IActionable { } @Override - public String getActionDescription() { - return ""; - } - - @Override public boolean areSettingsValidForRun() { return true; } diff --git a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java index c775ca81de4..a1d8cfdb680 100644 --- a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java +++ b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java @@ -16,12 +16,9 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IRegistryEventListener; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.action.Action; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.SWT; @@ -33,7 +30,7 @@ import org.eclipse.ui.part.ViewPart; * * @see ViewPart */ -public class OteNavigateView extends ViewPart implements IActionable { +public class OteNavigateView extends ViewPart { public static final String VIEW_ID = "org.eclipse.osee.ote.ui.navigate.OteNavigateView"; private XNavigateComposite xNavComp; @@ -102,15 +99,6 @@ public class OteNavigateView extends ViewPart implements IActionable { } - @Override - public String getActionDescription() { - IStructuredSelection sel = (IStructuredSelection) xNavComp.getFilteredTree().getViewer().getSelection(); - if (sel.iterator().hasNext()) { - return String.format("Currently Selected - %s", ((XNavigateItem) sel.iterator().next()).getName()); - } - return ""; - } - public void refresh() { Displays.ensureInDisplayThread(new Runnable() { @Override |