diff options
| author | rescobar | 2010-07-20 22:21:21 +0000 |
|---|---|---|
| committer | rescobar | 2010-07-20 22:21:21 +0000 |
| commit | 7e155fbfbdbc49d8606741b6a9a2bcc0ad550c42 (patch) | |
| tree | fbb9dfc0b591cf5a9178884360a1420c83ac3938 /plugins | |
| parent | eab9e4bfa3e9c490485d3c4ec8247aaff41c675a (diff) | |
| download | org.eclipse.osee-7e155fbfbdbc49d8606741b6a9a2bcc0ad550c42.tar.gz org.eclipse.osee-7e155fbfbdbc49d8606741b6a9a2bcc0ad550c42.tar.xz org.eclipse.osee-7e155fbfbdbc49d8606741b6a9a2bcc0ad550c42.zip | |
Displays cleanup
Diffstat (limited to 'plugins')
365 files changed, 8433 insertions, 8386 deletions
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java index b1eb7478b13..99c0b1d5289 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java @@ -22,28 +22,28 @@ import org.eclipse.osee.ats.artifact.ATSAttributes; import org.eclipse.osee.ats.artifact.ActionArtifact;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
+import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState;
import org.eclipse.osee.ats.artifact.TeamWorkflowManager;
import org.eclipse.osee.ats.artifact.VersionArtifact;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState;
import org.eclipse.osee.ats.config.demo.artifact.DemoCodeTeamWorkflowArtifact;
import org.eclipse.osee.ats.config.demo.config.DemoDatabaseConfig;
import org.eclipse.osee.ats.config.demo.config.DemoDbActionData;
+import org.eclipse.osee.ats.config.demo.config.DemoDbActionData.CreateReview;
import org.eclipse.osee.ats.config.demo.config.DemoDbGroups;
import org.eclipse.osee.ats.config.demo.config.DemoDbReviews;
import org.eclipse.osee.ats.config.demo.config.DemoDbTasks;
import org.eclipse.osee.ats.config.demo.config.DemoDbUtil;
-import org.eclipse.osee.ats.config.demo.config.DemoDbActionData.CreateReview;
import org.eclipse.osee.ats.config.demo.config.DemoDbUtil.SoftwareRequirementStrs;
import org.eclipse.osee.ats.config.demo.internal.OseeAtsConfigDemoActivator;
import org.eclipse.osee.ats.config.demo.util.DemoTeams;
import org.eclipse.osee.ats.config.demo.util.DemoTeams.Team;
import org.eclipse.osee.ats.util.ActionManager;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
+import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.FavoritesManager;
import org.eclipse.osee.ats.util.SubscribeManager;
-import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.SystemUser;
@@ -73,14 +73,14 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.utility.DbUtil;
import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.plugin.util.Result;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportOperationFactory;
import org.eclipse.osee.framework.ui.skynet.util.ChangeType;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.eclipse.osee.support.test.util.TestUtil;
-import org.eclipse.swt.widgets.Display;
/**
* Run from the ATS Navigator after the DB is configured for "OSEE Demo Database", this class will populate the database
@@ -113,7 +113,7 @@ public class PopulateDemoActions extends XNavigateItemAction { if (AtsUtil.isProductionDb()) {
throw new IllegalStateException("PopulateDemoActions should not be run on production DB");
}
- if (DbUtil.isDbInit() || !prompt || prompt && MessageDialog.openConfirm(Display.getCurrent().getActiveShell(),
+ if (DbUtil.isDbInit() || !prompt || prompt && MessageDialog.openConfirm(Displays.getActiveShell(),
getName(), getName())) {
SevereLoggingMonitor monitorLog = TestUtil.severeLoggingStart();
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java index e6c95c47eb6..596af94d545 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.ats.config.demo.config;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java index ca252fa60e3..7ed3bc93145 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.ats.config.demo.config;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java index e91b47cfb41..9f3d5812c99 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java @@ -29,8 +29,8 @@ import org.eclipse.osee.ats.world.search.ArtifactTypeSearchItem; import org.eclipse.osee.ats.world.search.ArtifactTypeWithInheritenceSearchItem; import org.eclipse.osee.ats.world.search.NextVersionSearchItem; import org.eclipse.osee.ats.world.search.TeamWorldSearchItem; -import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem; import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption; +import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem; import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DoesNotWorkItemDemo.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DoesNotWorkItemDemo.java index 925361ca79e..f4c1c198b0b 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DoesNotWorkItemDemo.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DoesNotWorkItemDemo.java @@ -29,10 +29,10 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Result; -import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.support.test.util.DemoUsers; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -49,7 +49,7 @@ public class DoesNotWorkItemDemo extends WorldXNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) throws Exception { - if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) { + if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) { return; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/AccessControlAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/AccessControlAction.java index d3fd71268f9..686b971b7b8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/AccessControlAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/AccessControlAction.java @@ -15,8 +15,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.artifact.StateMachineArtifact; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.access.PolicyDialog; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -33,7 +33,7 @@ public class AccessControlAction extends Action { @Override public void run() { - PolicyDialog pd = new PolicyDialog(Display.getCurrent().getActiveShell(), sma); + PolicyDialog pd = new PolicyDialog(Displays.getActiveShell(), sma); pd.open(); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/EmailActionAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/EmailActionAction.java index af8483cac85..5ff155192b2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/EmailActionAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/EmailActionAction.java @@ -20,8 +20,8 @@ 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.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -44,7 +44,7 @@ public class EmailActionAction extends Action { ArtifactEmailWizard ew = new ArtifactEmailWizard( ((StateMachineArtifact) selectedAtsArtifacts.getSelectedSMAArtifacts().iterator().next())); - WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), ew); + WizardDialog dialog = new WizardDialog(Displays.getActiveShell(), ew); dialog.create(); dialog.open(); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java index 33267831d23..b7fe1eaab87 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java @@ -25,8 +25,8 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -52,7 +52,7 @@ public class PrivilegedEditAction extends Action { new ReadOnlyHyperlinkListener(sma).linkActivated(null); } if (sma.getEditor().isPriviledgedEditModeEnabled()) { - if (MessageDialog.openQuestion(Display.getCurrent().getActiveShell(), "Diable Privileged Edit", + if (MessageDialog.openQuestion(Displays.getActiveShell(), "Diable Privileged Edit", "Privileged Edit Mode Enabled.\n\nDisable?\n\nNote: (changes will be saved)")) { sma.getEditor().setPriviledgedEditMode(false); } @@ -74,7 +74,7 @@ public class PrivilegedEditAction extends Action { } MessageDialog ed = new MessageDialog( - Display.getCurrent().getActiveShell(), + Displays.getActiveShell(), "Privileged Edit", null, "The following users have the ability to edit this " + sma.getArtifactTypeName() + " in case of emergency.\n\n" + sb.toString(), diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ReloadAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ReloadAction.java index 2eb044fc798..e1fc1b00f79 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ReloadAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ReloadAction.java @@ -26,8 +26,8 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -55,7 +55,7 @@ public class ReloadAction extends Action { relatedArts.addAll(((TaskableStateMachineArtifact) sma).getTaskArtifacts()); } if (!MessageDialog.openConfirm( - Display.getCurrent().getActiveShell(), + Displays.getActiveShell(), "Reload Action (Experimental)", "Experimental Only...Use at own risk!\n\nThis operation will remove artifacts from cache and reload.\nUnsaved changes will be lost.\n\nReload [" + relatedArts.size() + "] artifacts?")) { return; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java index 2b75845047f..76690b28ed0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java @@ -28,173 +28,175 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
public class ArtifactSelectWizardPage extends WizardPage {
- private ListViewer artTypeList;
- private ListViewer artList;
- private Artifact selectedArtifact;
- private boolean showArtData = false;
-
- public ArtifactSelectWizardPage() {
- super("Select an Artifact");
- }
-
- public void createControl(Composite parent) {
- setTitle("Select an Artifact");
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- composite.setLayout(gl);
- GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true);
- composite.setLayoutData(gd);
-
- Composite leftComp = new Composite(composite, SWT.NONE);
-
- leftComp.setLayout(new GridLayout());
- gd = new GridData(GridData.FILL, GridData.FILL, true, true);
- leftComp.setLayoutData(gd);
-
- (new Label(leftComp, SWT.NONE)).setText("Artifact Type");
-
- try {
- artTypeList = new ListViewer(leftComp, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL);
- artTypeList.setContentProvider(new ArrayContentProvider());
- artTypeList.setLabelProvider(new ArtTypeLabelProvider());
-
- gd = new GridData(GridData.FILL, GridData.FILL, true, true);
- gd.heightHint = 300;
- gd.widthHint = 200;
- artTypeList.getControl().setLayoutData(gd);
- artTypeList.setInput(ArtifactTypeManager.getValidArtifactTypes(AtsUtil.getAtsBranch()));
- artTypeList.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- ArtifactType desc = (ArtifactType) selection.getFirstElement();
- try {
- artList.setInput(ArtifactQuery.getArtifactListFromType(desc, AtsUtil.getAtsBranch()));
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
- }
- });
- artTypeList.setSorter(new ViewerSorter() {
- @SuppressWarnings("unchecked")
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- return getComparator().compare(((ArtifactType) e1).getName(), ((ArtifactType) e2).getName());
- }
- });
-
- Composite rightComp = new Composite(composite, SWT.NONE);
-
- rightComp.setLayout(new GridLayout());
- gd = new GridData(GridData.FILL, GridData.FILL, true, true);
- rightComp.setLayoutData(gd);
-
- Label lab = new Label(rightComp, SWT.NONE);
- lab.setText("Artifact (click here for artifact data)");
- lab.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE));
- lab.addListener(SWT.MouseUp, new Listener() {
- public void handleEvent(Event event) {
- showArtData = !showArtData;
- artList.refresh();
- }
- });
-
- artList = new ListViewer(rightComp, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL);
- artList.setContentProvider(new ArrayContentProvider());
- artList.setLabelProvider(new ArtifactDescriptiveLabelProvider());
-
- artList.setSorter(new ViewerSorter() {
- @SuppressWarnings("unchecked")
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- return getComparator().compare(((Artifact) e1).getName(), ((Artifact) e2).getName());
- }
- });
- gd = new GridData(GridData.FILL, GridData.FILL, true, true);
- gd.heightHint = 300;
- gd.widthHint = 200;
- artList.getControl().setLayoutData(gd);
- artList.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- selectedArtifact = (Artifact) selection.getFirstElement();
- }
- });
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
-
- setControl(composite);
- }
-
- public Artifact getSelectedArtifact() {
- return selectedArtifact;
- }
-
- public class ArtifactDescriptiveLabelProvider implements ILabelProvider {
-
- public Image getImage(Object arg0) {
- return null;
- }
-
- public String getText(Object arg0) {
- Artifact art = (Artifact) arg0;
- if (showArtData)
- return String.format("%s - (%s %s %s)", art.getName(), art.getArtId(), art.getHumanReadableId(),
- art.getGuid());
- else
- return art.getName();
- }
-
- public void addListener(ILabelProviderListener arg0) {
- }
-
- public void dispose() {
- }
-
- public boolean isLabelProperty(Object arg0, String arg1) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener arg0) {
- }
- }
-
- public static class ArtTypeLabelProvider implements ILabelProvider {
-
- public Image getImage(Object arg0) {
- return null;
- }
-
- public String getText(Object arg0) {
- return ((ArtifactType) arg0).getName();
- }
-
- public void addListener(ILabelProviderListener arg0) {
- }
-
- public void dispose() {
- }
-
- public boolean isLabelProperty(Object arg0, String arg1) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener arg0) {
- }
- }
+ private ListViewer artTypeList;
+ private ListViewer artList;
+ private Artifact selectedArtifact;
+ private boolean showArtData = false;
+
+ public ArtifactSelectWizardPage() {
+ super("Select an Artifact");
+ }
+
+ public void createControl(Composite parent) {
+ setTitle("Select an Artifact");
+
+ Composite composite = new Composite(parent, SWT.NONE);
+ GridLayout gl = new GridLayout();
+ gl.numColumns = 2;
+ composite.setLayout(gl);
+ GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true);
+ composite.setLayoutData(gd);
+
+ Composite leftComp = new Composite(composite, SWT.NONE);
+
+ leftComp.setLayout(new GridLayout());
+ gd = new GridData(GridData.FILL, GridData.FILL, true, true);
+ leftComp.setLayoutData(gd);
+
+ (new Label(leftComp, SWT.NONE)).setText("Artifact Type");
+
+ try {
+ artTypeList = new ListViewer(leftComp, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL);
+ artTypeList.setContentProvider(new ArrayContentProvider());
+ artTypeList.setLabelProvider(new ArtTypeLabelProvider());
+
+ gd = new GridData(GridData.FILL, GridData.FILL, true, true);
+ gd.heightHint = 300;
+ gd.widthHint = 200;
+ artTypeList.getControl().setLayoutData(gd);
+ artTypeList.setInput(ArtifactTypeManager.getValidArtifactTypes(AtsUtil.getAtsBranch()));
+ artTypeList.addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ ArtifactType desc = (ArtifactType) selection.getFirstElement();
+ try {
+ artList.setInput(ArtifactQuery.getArtifactListFromType(desc, AtsUtil.getAtsBranch()));
+ } catch (Exception ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+ }
+ });
+ artTypeList.setSorter(new ViewerSorter() {
+ @SuppressWarnings("unchecked")
+ @Override
+ public int compare(Viewer viewer, Object e1, Object e2) {
+ return getComparator().compare(((ArtifactType) e1).getName(), ((ArtifactType) e2).getName());
+ }
+ });
+
+ Composite rightComp = new Composite(composite, SWT.NONE);
+
+ rightComp.setLayout(new GridLayout());
+ gd = new GridData(GridData.FILL, GridData.FILL, true, true);
+ rightComp.setLayoutData(gd);
+
+ Label lab = new Label(rightComp, SWT.NONE);
+ lab.setText("Artifact (click here for artifact data)");
+ lab.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE));
+ lab.addListener(SWT.MouseUp, new Listener() {
+ @Override
+ public void handleEvent(Event event) {
+ showArtData = !showArtData;
+ artList.refresh();
+ }
+ });
+
+ artList = new ListViewer(rightComp, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL);
+ artList.setContentProvider(new ArrayContentProvider());
+ artList.setLabelProvider(new ArtifactDescriptiveLabelProvider());
+
+ artList.setSorter(new ViewerSorter() {
+ @SuppressWarnings("unchecked")
+ @Override
+ public int compare(Viewer viewer, Object e1, Object e2) {
+ return getComparator().compare(((Artifact) e1).getName(), ((Artifact) e2).getName());
+ }
+ });
+ gd = new GridData(GridData.FILL, GridData.FILL, true, true);
+ gd.heightHint = 300;
+ gd.widthHint = 200;
+ artList.getControl().setLayoutData(gd);
+ artList.addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ selectedArtifact = (Artifact) selection.getFirstElement();
+ }
+ });
+ } catch (Exception ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+
+ setControl(composite);
+ }
+
+ public Artifact getSelectedArtifact() {
+ return selectedArtifact;
+ }
+
+ public class ArtifactDescriptiveLabelProvider implements ILabelProvider {
+
+ public Image getImage(Object arg0) {
+ return null;
+ }
+
+ public String getText(Object arg0) {
+ Artifact art = (Artifact) arg0;
+ if (showArtData) {
+ return String.format("%s - (%s %s %s)", art.getName(), art.getArtId(), art.getHumanReadableId(),
+ art.getGuid());
+ } else {
+ return art.getName();
+ }
+ }
+
+ public void addListener(ILabelProviderListener arg0) {
+ }
+
+ public void dispose() {
+ }
+
+ public boolean isLabelProperty(Object arg0, String arg1) {
+ return false;
+ }
+
+ public void removeListener(ILabelProviderListener arg0) {
+ }
+ }
+
+ public static class ArtTypeLabelProvider implements ILabelProvider {
+
+ public Image getImage(Object arg0) {
+ return null;
+ }
+
+ public String getText(Object arg0) {
+ return ((ArtifactType) arg0).getName();
+ }
+
+ public void addListener(ILabelProviderListener arg0) {
+ }
+
+ public void dispose() {
+ }
+
+ public boolean isLabelProperty(Object arg0, String arg1) {
+ return false;
+ }
+
+ public void removeListener(ILabelProviderListener arg0) {
+ }
+ }
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java index 2f6bf420ff9..684bff13def 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java @@ -26,7 +26,7 @@ import org.eclipse.osee.ats.actions.wizard.IAtsTeamWorkflow; import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
-import org.eclipse.osee.ats.util.AtsPriority.PriorityType; +import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java index 753546b3afd..e97077fa000 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java @@ -19,7 +19,7 @@ import java.util.Set; import org.eclipse.osee.ats.config.AtsCacheManager;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
import org.eclipse.osee.ats.util.AtsFolderUtil;
-import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder; +import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder;
import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.framework.core.enums.Active;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java index 1aa4af8ed7c..52681fd5f5b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java @@ -37,7 +37,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactListDialog;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Donald G. Dunne
@@ -197,7 +197,7 @@ public class GoalArtifact extends StateMachineArtifact { if (goals.size() == 1) {
goal = (GoalArtifact) goals.iterator().next();
} else if (goals.size() > 1) {
- ArtifactListDialog dialog = new ArtifactListDialog(Display.getCurrent().getActiveShell());
+ ArtifactListDialog dialog = new ArtifactListDialog(Displays.getActiveShell());
dialog.setTitle("Select Goal");
dialog.setMessage("Artifact has multiple Goals\n\nSelect Goal to change order");
dialog.setArtifacts(goals);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java index bda62c5f56d..b929f2d8878 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java @@ -22,7 +22,7 @@ import org.eclipse.osee.ats.config.AtsCacheManager; import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
import org.eclipse.osee.ats.util.AtsFolderUtil;
-import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder; +import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder;
import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.widgets.commit.ICommitConfigArtifact;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java index 7eefb25c1a8..6b4645fa9f2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java @@ -52,7 +52,7 @@ import org.eclipse.osee.framework.ui.skynet.util.ChangeType; import org.eclipse.osee.framework.ui.skynet.widgets.IBranchArtifact;
import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Donald G. Dunne
@@ -426,7 +426,7 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement sb.append("\nTeam: " + getTeamDefinition().getName()); sb.append("\nto\nActionable Item(s): " + selectedAia); sb.append("\nTeam: " + newTeamDef.getName()); - if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Confirm Convert", sb.toString())) { + if (MessageDialog.openConfirm(Displays.getActiveShell(), "Confirm Convert", sb.toString())) { Set<ActionableItemArtifact> toProcess = new HashSet<ActionableItemArtifact>(); toProcess.add(selectedAia); toReturn = actionableItemsTx(AtsUtil.getAtsBranch(), toProcess, newTeamDef); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java index 26eee49a2e9..c25edaf3f5c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java @@ -10,21 +10,21 @@ *******************************************************************************/ package org.eclipse.osee.ats.config;
-import java.util.Collections;
-import java.util.logging.Level;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.AtsFolderUtil;
-import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder;
+import java.util.Collections; +import java.util.logging.Level; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.AtsFolderUtil; +import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder; import org.eclipse.osee.ats.util.AtsRelationTypes; -import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
+import org.eclipse.osee.framework.core.enums.CoreRelationTypes; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.relation.RelationManager; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAActionableItemHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAActionableItemHeader.java index af4d9f1a9b3..1f68673ce53 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAActionableItemHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAActionableItemHeader.java @@ -28,7 +28,6 @@ import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.events.IHyperlinkListener; @@ -95,7 +94,7 @@ public class SMAActionableItemHeader extends Composite implements IFrameworkTran if (!sma.isCancelled() && !sma.isCompleted()) { if (teamWf.getParentActionArtifact().getActionableItems().isEmpty()) { label.setText(" " + "Error: No Actionable Items identified."); - label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + label.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); } else { StringBuffer sb = new StringBuffer(teamWf.getActionableItemsDam().getActionableItemsStr()); if (teamWf.getParentActionArtifact().getTeamWorkFlowArtifacts().size() > 1) { @@ -107,18 +106,18 @@ public class SMAActionableItemHeader extends Composite implements IFrameworkTran } } label.setText(sb.toString().replaceFirst(", $", "")); - label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK)); + label.setForeground(Displays.getSystemColor(SWT.COLOR_BLACK)); } label.update(); layout(); } else { if (teamWf.getParentActionArtifact().getActionableItems().isEmpty()) { label.setText(" " + "Error: No Actionable Items identified."); - label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + label.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); } else { label.setText(" " + teamWf.getParentActionArtifact().getWorldViewActionableItems()); label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK)); + label.setForeground(Displays.getSystemColor(SWT.COLOR_BLACK)); } label.update(); layout(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAAssigneesHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAAssigneesHeader.java index a7286ee0f7d..8463b342a39 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAAssigneesHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAAssigneesHeader.java @@ -8,105 +8,105 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.editor;
-
-import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.PromptChangeUtil;
-import org.eclipse.osee.framework.core.data.SystemUser;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-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.skynet.core.UserManager;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.osee.framework.ui.swt.ALayout;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * @author Donald G. Dunne
- */
-public class SMAAssigneesHeader extends Composite {
-
- private static String TARGET_VERSION = "Assignee(s):";
- Label valueLabel;
-
- public SMAAssigneesHeader(Composite parent, int style, final StateMachineArtifact sma, XFormToolkit toolkit, final boolean isEditable) {
- super(parent, style);
- setLayoutData(new GridData());
- setLayout(ALayout.getZeroMarginLayout(2, false));
- toolkit.adapt(this);
-
- try {
- if (!sma.isCancelled() && !sma.isCompleted()) {
- Hyperlink link = toolkit.createHyperlink(this, TARGET_VERSION, SWT.NONE);
- link.addHyperlinkListener(new IHyperlinkListener() {
-
- public void linkEntered(HyperlinkEvent e) {
- }
-
- public void linkExited(HyperlinkEvent e) {
- }
-
- public void linkActivated(HyperlinkEvent e) {
- try {
- if (!isEditable && !sma.getStateMgr().getAssignees().contains(
- UserManager.getUser(SystemUser.UnAssigned)) && !sma.getStateMgr().getAssignees().contains(
- UserManager.getUser())) {
- AWorkbench.popup(
- "ERROR",
- "You must be assigned to modify assignees.\nContact current Assignee or Select Priviledged Edit for Authorized Overriders.");
- return;
- }
- if (PromptChangeUtil.promptChangeAssignees(sma, false)) {
- sma.getEditor().doSave(null);
- }
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
- });
- } else {
- Label origLabel = toolkit.createLabel(this, TARGET_VERSION);
- origLabel.setLayoutData(new GridData());
- }
-
- valueLabel = toolkit.createLabel(this, "Not Set");
- valueLabel.setLayoutData(new GridData());
- updateLabel(sma);
-
- } catch (OseeCoreException ex) {
- Label errorLabel = toolkit.createLabel(this, "Error: " + ex.getLocalizedMessage());
- errorLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex);
- }
-
- }
-
- private void updateLabel(StateMachineArtifact sma) throws OseeCoreException {
- String value = "";
- try {
- if (sma.getStateMgr().getAssignees().isEmpty()) {
- value = "Error: State has no assignees";
- } else {
- valueLabel.setToolTipText(sma.getStateMgr().getAssigneesStr());
- value = sma.getStateMgr().getAssigneesStr();
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- value = ex.getLocalizedMessage();
- valueLabel.setToolTipText(value);
- }
- valueLabel.setText(Strings.truncate(value, 150, true));
- valueLabel.getParent().layout();
- }
-
-}
+package org.eclipse.osee.ats.editor; + +import org.eclipse.osee.ats.artifact.StateMachineArtifact; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.PromptChangeUtil; +import org.eclipse.osee.framework.core.data.SystemUser; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +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.skynet.core.UserManager; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.skynet.XFormToolkit; +import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.forms.events.HyperlinkEvent; +import org.eclipse.ui.forms.events.IHyperlinkListener; +import org.eclipse.ui.forms.widgets.Hyperlink; + +/** + * @author Donald G. Dunne + */ +public class SMAAssigneesHeader extends Composite { + + private static String TARGET_VERSION = "Assignee(s):"; + Label valueLabel; + + public SMAAssigneesHeader(Composite parent, int style, final StateMachineArtifact sma, XFormToolkit toolkit, final boolean isEditable) { + super(parent, style); + setLayoutData(new GridData()); + setLayout(ALayout.getZeroMarginLayout(2, false)); + toolkit.adapt(this); + + try { + if (!sma.isCancelled() && !sma.isCompleted()) { + Hyperlink link = toolkit.createHyperlink(this, TARGET_VERSION, SWT.NONE); + link.addHyperlinkListener(new IHyperlinkListener() { + + public void linkEntered(HyperlinkEvent e) { + } + + public void linkExited(HyperlinkEvent e) { + } + + public void linkActivated(HyperlinkEvent e) { + try { + if (!isEditable && !sma.getStateMgr().getAssignees().contains( + UserManager.getUser(SystemUser.UnAssigned)) && !sma.getStateMgr().getAssignees().contains( + UserManager.getUser())) { + AWorkbench.popup( + "ERROR", + "You must be assigned to modify assignees.\nContact current Assignee or Select Priviledged Edit for Authorized Overriders."); + return; + } + if (PromptChangeUtil.promptChangeAssignees(sma, false)) { + sma.getEditor().doSave(null); + } + } catch (Exception ex) { + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } + } + }); + } else { + Label origLabel = toolkit.createLabel(this, TARGET_VERSION); + origLabel.setLayoutData(new GridData()); + } + + valueLabel = toolkit.createLabel(this, "Not Set"); + valueLabel.setLayoutData(new GridData()); + updateLabel(sma); + + } catch (OseeCoreException ex) { + Label errorLabel = toolkit.createLabel(this, "Error: " + ex.getLocalizedMessage()); + errorLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex); + } + + } + + private void updateLabel(StateMachineArtifact sma) throws OseeCoreException { + String value = ""; + try { + if (sma.getStateMgr().getAssignees().isEmpty()) { + value = "Error: State has no assignees"; + } else { + valueLabel.setToolTipText(sma.getStateMgr().getAssigneesStr()); + value = sma.getStateMgr().getAssigneesStr(); + } + } catch (OseeCoreException ex) { + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); + value = ex.getLocalizedMessage(); + valueLabel.setToolTipText(value); + } + valueLabel.setText(Strings.truncate(value, 150, true)); + valueLabel.getParent().layout(); + } + +} 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 adddd23234f..83a8a8a2f7f 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 @@ -72,8 +72,8 @@ import org.eclipse.osee.framework.ui.skynet.OseeContributionItem; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
import org.eclipse.osee.framework.ui.swt.ImageManager;
@@ -83,7 +83,6 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.ToolBar;
@@ -359,7 +358,7 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent Label label = new Label(composite, SWT.NONE);
label.setText(" NOTE: Changes made on this page MUST be saved through save icon on this page");
- label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ label.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
attributesComposite = new AttributesComposite(this, composite, SWT.NONE, sma);
attributesPageIndex = addPage(composite);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorEventManager.java index 3acfc2f1c63..a90d74dcd31 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorEventManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorEventManager.java @@ -10,27 +10,27 @@ *******************************************************************************/ package org.eclipse.osee.ats.editor;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import org.eclipse.osee.ats.artifact.ActionArtifact;
-import org.eclipse.osee.ats.artifact.ReviewSMArtifact;
-import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.artifact.TaskArtifact;
-import org.eclipse.osee.ats.artifact.TaskableStateMachineArtifact;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.util.widgets.ReviewManager;
-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.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
-import org.eclipse.osee.framework.skynet.core.event2.filter.IEventFilter;
+import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import org.eclipse.osee.ats.artifact.ActionArtifact; +import org.eclipse.osee.ats.artifact.ReviewSMArtifact; +import org.eclipse.osee.ats.artifact.StateMachineArtifact; +import org.eclipse.osee.ats.artifact.TaskArtifact; +import org.eclipse.osee.ats.artifact.TaskableStateMachineArtifact; +import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.widgets.ReviewManager; +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.skynet.core.event.OseeEventManager; +import org.eclipse.osee.framework.skynet.core.event.Sender; +import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent; +import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener; +import org.eclipse.osee.framework.skynet.core.event2.filter.IEventFilter; import org.eclipse.osee.framework.ui.swt.Displays; /**
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAHistorySection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAHistorySection.java index 018485f40ca..d7f146f5617 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAHistorySection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAHistorySection.java @@ -15,8 +15,8 @@ import org.eclipse.osee.ats.internal.AtsPlugin; 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.ui.skynet.render.PresentationType; -import org.eclipse.osee.framework.ui.skynet.render.RendererManager; +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.results.html.XResultsComposite;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAOriginatorHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAOriginatorHeader.java index 2a4279e023e..b6043662f4a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAOriginatorHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAOriginatorHeader.java @@ -8,84 +8,84 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.editor;
-
-import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.PromptChangeUtil;
-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.ui.skynet.XFormToolkit;
-import org.eclipse.osee.framework.ui.swt.ALayout;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * @author Donald G. Dunne
- */
-public class SMAOriginatorHeader extends Composite {
-
- private static String ORIGINATOR = "Originator:";
- private Label origLabel;
-
- public SMAOriginatorHeader(Composite parent, int style, final StateMachineArtifact sma, XFormToolkit toolkit) {
- super(parent, style);
- setLayoutData(new GridData());
- setLayout(ALayout.getZeroMarginLayout(2, false));
- toolkit.adapt(this);
-
- try {
- if (!sma.isCancelled() && !sma.isCompleted()) {
- Hyperlink link = toolkit.createHyperlink(this, ORIGINATOR, SWT.NONE);
- link.addHyperlinkListener(new IHyperlinkListener() {
-
- public void linkEntered(HyperlinkEvent e) {
- }
-
- public void linkExited(HyperlinkEvent e) {
- }
-
- public void linkActivated(HyperlinkEvent e) {
- try {
- if (PromptChangeUtil.promptChangeOriginator(sma)) {
- origLabel.setText(sma.getOriginator().getName());
- origLabel.getParent().layout();
- sma.getEditor().onDirtied();
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
- });
- if (sma.getOriginator() == null) {
- Label errorLabel = toolkit.createLabel(this, "Error: No originator identified.");
- errorLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- } else {
- origLabel = toolkit.createLabel(this, sma.getOriginator().getName());
- origLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- }
- } else {
- if (sma.getOriginator() == null) {
- Label errorLabel = toolkit.createLabel(this, "Error: No originator identified.");
- errorLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- } else {
- Label origLabel = toolkit.createLabel(this, ORIGINATOR + sma.getOriginator().getName());
- origLabel.setLayoutData(new GridData());
- }
- }
- } catch (OseeCoreException ex) {
- Label errorLabel = toolkit.createLabel(this, "Error: " + ex.getLocalizedMessage());
- errorLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex);
- }
-
- }
-
-}
+package org.eclipse.osee.ats.editor; + +import org.eclipse.osee.ats.artifact.StateMachineArtifact; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.PromptChangeUtil; +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.ui.skynet.XFormToolkit; +import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.forms.events.HyperlinkEvent; +import org.eclipse.ui.forms.events.IHyperlinkListener; +import org.eclipse.ui.forms.widgets.Hyperlink; + +/** + * @author Donald G. Dunne + */ +public class SMAOriginatorHeader extends Composite { + + private static String ORIGINATOR = "Originator:"; + private Label origLabel; + + public SMAOriginatorHeader(Composite parent, int style, final StateMachineArtifact sma, XFormToolkit toolkit) { + super(parent, style); + setLayoutData(new GridData()); + setLayout(ALayout.getZeroMarginLayout(2, false)); + toolkit.adapt(this); + + try { + if (!sma.isCancelled() && !sma.isCompleted()) { + Hyperlink link = toolkit.createHyperlink(this, ORIGINATOR, SWT.NONE); + link.addHyperlinkListener(new IHyperlinkListener() { + + public void linkEntered(HyperlinkEvent e) { + } + + public void linkExited(HyperlinkEvent e) { + } + + public void linkActivated(HyperlinkEvent e) { + try { + if (PromptChangeUtil.promptChangeOriginator(sma)) { + origLabel.setText(sma.getOriginator().getName()); + origLabel.getParent().layout(); + sma.getEditor().onDirtied(); + } + } catch (OseeCoreException ex) { + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } + } + }); + if (sma.getOriginator() == null) { + Label errorLabel = toolkit.createLabel(this, "Error: No originator identified."); + errorLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); + } else { + origLabel = toolkit.createLabel(this, sma.getOriginator().getName()); + origLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + } + } else { + if (sma.getOriginator() == null) { + Label errorLabel = toolkit.createLabel(this, "Error: No originator identified."); + errorLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); + } else { + Label origLabel = toolkit.createLabel(this, ORIGINATOR + sma.getOriginator().getName()); + origLabel.setLayoutData(new GridData()); + } + } + } catch (OseeCoreException ex) { + Label errorLabel = toolkit.createLabel(this, "Error: " + ex.getLocalizedMessage()); + errorLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex); + } + + } + +} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java index 10abe40114c..4fa2e6ffb05 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java @@ -8,88 +8,88 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.editor;
-
-import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.ats.util.PromptChangeUtil;
-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.ui.skynet.XFormToolkit;
-import org.eclipse.osee.framework.ui.swt.ALayout;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * @author Donald G. Dunne
- */
-public class SMATargetedVersionHeader extends Composite {
-
- private static String TARGET_VERSION = "Target Version:";
- Label valueLabel;
-
- public SMATargetedVersionHeader(Composite parent, int style, final StateMachineArtifact sma, XFormToolkit toolkit) {
- super(parent, style);
- setLayoutData(new GridData());
- setLayout(ALayout.getZeroMarginLayout(2, false));
- toolkit.adapt(this);
-
- try {
- if (!sma.isCancelled() && !sma.isCompleted()) {
- Hyperlink link = toolkit.createHyperlink(this, TARGET_VERSION, SWT.NONE);
- link.addHyperlinkListener(new IHyperlinkListener() {
-
- public void linkEntered(HyperlinkEvent e) {
- }
-
- public void linkExited(HyperlinkEvent e) {
- }
-
- public void linkActivated(HyperlinkEvent e) {
- try {
- if (PromptChangeUtil.promptChangeVersion(sma,
- AtsUtil.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, false)) {
- updateLabel(sma);
- sma.getEditor().onDirtied();
- }
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
- });
- } else {
- Label origLabel = toolkit.createLabel(this, TARGET_VERSION);
- origLabel.setLayoutData(new GridData());
- }
-
- valueLabel = toolkit.createLabel(this, "Not Set");
- valueLabel.setLayoutData(new GridData());
- updateLabel(sma);
-
- } catch (OseeCoreException ex) {
- Label errorLabel = toolkit.createLabel(this, "Error: " + ex.getLocalizedMessage());
- errorLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex);
- }
-
- }
-
- private void updateLabel(StateMachineArtifact sma) throws OseeCoreException {
- String value = "Not Set";
- if (sma.getTargetedForVersion() != null) {
- value = sma.getTargetedForVersion().getName();
- }
- valueLabel.setText(value);
- valueLabel.getParent().layout();
- }
-
-}
+package org.eclipse.osee.ats.editor; + +import org.eclipse.osee.ats.artifact.StateMachineArtifact; +import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.PromptChangeUtil; +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.ui.skynet.XFormToolkit; +import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.forms.events.HyperlinkEvent; +import org.eclipse.ui.forms.events.IHyperlinkListener; +import org.eclipse.ui.forms.widgets.Hyperlink; + +/** + * @author Donald G. Dunne + */ +public class SMATargetedVersionHeader extends Composite { + + private static String TARGET_VERSION = "Target Version:"; + Label valueLabel; + + public SMATargetedVersionHeader(Composite parent, int style, final StateMachineArtifact sma, XFormToolkit toolkit) { + super(parent, style); + setLayoutData(new GridData()); + setLayout(ALayout.getZeroMarginLayout(2, false)); + toolkit.adapt(this); + + try { + if (!sma.isCancelled() && !sma.isCompleted()) { + Hyperlink link = toolkit.createHyperlink(this, TARGET_VERSION, SWT.NONE); + link.addHyperlinkListener(new IHyperlinkListener() { + + public void linkEntered(HyperlinkEvent e) { + } + + public void linkExited(HyperlinkEvent e) { + } + + public void linkActivated(HyperlinkEvent e) { + try { + if (PromptChangeUtil.promptChangeVersion(sma, + AtsUtil.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, false)) { + updateLabel(sma); + sma.getEditor().onDirtied(); + } + } catch (Exception ex) { + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } + } + }); + } else { + Label origLabel = toolkit.createLabel(this, TARGET_VERSION); + origLabel.setLayoutData(new GridData()); + } + + valueLabel = toolkit.createLabel(this, "Not Set"); + valueLabel.setLayoutData(new GridData()); + updateLabel(sma); + + } catch (OseeCoreException ex) { + Label errorLabel = toolkit.createLabel(this, "Error: " + ex.getLocalizedMessage()); + errorLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex); + } + + } + + private void updateLabel(StateMachineArtifact sma) throws OseeCoreException { + String value = "Not Set"; + if (sma.getTargetedForVersion() != null) { + value = sma.getTargetedForVersion().getName(); + } + valueLabel.setText(value); + valueLabel.getParent().layout(); + } + +} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java index 2c9163b10f5..b8f36dd6862 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java @@ -68,6 +68,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinitionLabelProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinitionViewSorter;
import org.eclipse.osee.framework.ui.swt.ALayout;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.FontManager;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.SWT;
@@ -77,7 +78,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -94,786 +94,788 @@ import org.eclipse.ui.forms.widgets.Section; */
public class SMAWorkFlowSection extends SectionPart {
- private XComboViewer transitionToStateCombo;
- private Button transitionButton;
- private Label transitionAssigneesLabel;
- protected final StateMachineArtifact sma;
- private final AtsWorkPage atsWorkPage;
- private final boolean isEditable, isCurrentState, isGlobalEditable;
- private final XFormToolkit toolkit;
- private Composite mainComp;
- private final List<XWidget> allXWidgets = new ArrayList<XWidget>();
- private boolean sectionCreated = false;
- Section section;
-
- public SMAWorkFlowSection(Composite parent, XFormToolkit toolkit, int style, AtsWorkPage page, StateMachineArtifact sma) throws OseeCoreException {
- super(parent, toolkit, style | Section.TWISTIE | Section.TITLE_BAR);
- this.toolkit = toolkit;
- this.atsWorkPage = page;
- this.sma = sma;
-
- isEditable = isEditable(sma, page);
- isGlobalEditable =
- !sma.isReadOnly() && sma.isAccessControlWrite() && sma.getEditor().isPriviledgedEditModeEnabled();
- isCurrentState = sma.isCurrentState(page.getName());
- // parent.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_CYAN));
- }
-
- @Override
- public void initialize(final IManagedForm form) {
- super.initialize(form);
-
- section = getSection();
- try {
- section.setText(getCurrentStateTitle());
- if (sma.isCurrentState(atsWorkPage.getName())) {
- section.setTitleBarForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GREEN));
- section.setBackground(AtsUtil.ACTIVE_COLOR);
- }
- section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- // section.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_MAGENTA));
-
- boolean isCurrentSectionExpanded = sma.isCurrentSectionExpanded(atsWorkPage.getName());
-
- if (isCurrentSectionExpanded) {
- createSection(section);
- }
- // Only load when users selects section
- section.addListener(SWT.Activate, new Listener() {
-
- public void handleEvent(Event e) {
- try {
- createSection(section);
- } catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex);
- }
- }
- });
-
- section.layout();
- section.setExpanded(isCurrentSectionExpanded);
- } catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
-
- private synchronized void createSection(Section section) throws OseeCoreException {
- if (sectionCreated) return;
-
- mainComp = toolkit.createClientContainer(section, 2);
- mainComp.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING));
- mainComp.setLayout(ALayout.getZeroMarginLayout(1, false));
- // mainComp.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_YELLOW));
- mainComp.layout();
-
- SMAWorkFlowTab.createStateNotesHeader(mainComp, toolkit, sma, 2, atsWorkPage.getName());
-
- Composite workComp = createWorkArea(mainComp, atsWorkPage, toolkit);
-
- if (isCurrentState) {
- createCurrentPageTransitionLine(mainComp, atsWorkPage, toolkit);
- }
-
- GridData gridData = new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING);
- gridData.widthHint = 400;
- workComp.setLayoutData(gridData);
- sectionCreated = true;
- }
-
- protected Composite createWorkArea(Composite comp, AtsWorkPage atsWorkPage, XFormToolkit toolkit) throws OseeCoreException {
-
- atsWorkPage.generateLayoutDatas(sma);
-
- // Create Page
- Composite workComp = toolkit.createContainer(comp, 1);
- workComp.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING));
- // workComp.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GREEN));
-
- createMetricsHeader(workComp);
-
- // Add any dynamic XWidgets declared for page by IAtsStateItem extensions
- for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
- for (XWidget xWidget : item.getDynamicXWidgetsPreBody(sma)) {
- xWidget.createWidgets(workComp, 2);
- allXWidgets.add(xWidget);
- }
- }
-
- if (atsWorkPage.isCompleteCancelledState()) {
- Composite completeComp = new Composite(workComp, SWT.None);
- GridLayout layout = new GridLayout(1, false);
- completeComp.setLayout(layout);
- completeComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- if (atsWorkPage.isCancelledPage()) {
- createCancelledPageWidgets(completeComp);
- } else if (atsWorkPage.isCompletePage()) {
- createCompletedPageWidgets(completeComp);
- }
- }
-
- // Create dynamic XWidgets
- DynamicXWidgetLayout dynamicXWidgetLayout =
- atsWorkPage.createBody(getManagedForm(), workComp, sma, xModListener, isEditable || isGlobalEditable);
- allXWidgets.addAll(dynamicXWidgetLayout.getXWidgets());
-
- // Add any dynamic XWidgets declared for page by IAtsStateItem extensions
- for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
- for (XWidget xWidget : item.getDynamicXWidgetsPostBody(sma)) {
- xWidget.createWidgets(workComp, 2);
- allXWidgets.add(xWidget);
- }
- }
-
- createTaskFooter(workComp, atsWorkPage.getName());
- createReviewFooter(workComp, atsWorkPage.getName());
-
- // Set all XWidget labels to bold font
- for (XWidget xWidget : allXWidgets) {
- if (xWidget.getLabelWidget() != null) {
- SMAEditor.setLabelFonts(xWidget.getLabelWidget(), FontManager.getDefaultLabelFont());
- }
- }
-
- // Check extension points for page creation
- for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
- Result result = item.pageCreated(toolkit, atsWorkPage, sma, xModListener, isEditable || isGlobalEditable);
- if (result.isFalse()) {
- result.popup();
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error in page creation => " + result.getText());
- }
- }
-
- return workComp;
- }
-
- private void createCancelledPageWidgets(Composite parent) throws OseeCoreException {
- XWidget xWidget = null;
- xWidget = new XLabelValue("Cancelled from State", sma.getLog().getCancelledFromState());
- xWidget.createWidgets(parent, 1);
- allXWidgets.add(xWidget);
-
- if (sma.getEditor().isPriviledgedEditModeEnabled()) {
- xWidget = new XCancellationReasonTextWidget(sma);
- xWidget.addXModifiedListener(xModListener);
- } else {
- xWidget = new XLabelValue("Cancellation Reason", sma.getLog().getCancellationReason());
- }
- xWidget.createWidgets(parent, 1);
- allXWidgets.add(xWidget);
- }
-
- private void createCompletedPageWidgets(Composite parent) throws OseeCoreException {
- XWidget xWidget = null;
- xWidget = new XLabelValue("Completed from State", sma.getLog().getCompletedFromState());
- xWidget.createWidgets(parent, 1);
- allXWidgets.add(xWidget);
- }
-
- private void createMetricsHeader(Composite parent) throws OseeCoreException {
- if (!atsWorkPage.isCompleteCancelledState()) {
- Composite comp = new Composite(parent, SWT.None);
- GridLayout layout = ALayout.getZeroMarginLayout(4, false);
- layout.marginLeft = 2;
- comp.setLayout(layout);
- comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- allXWidgets.add(new StatePercentCompleteXWidget(getManagedForm(), atsWorkPage, sma, comp, 2, xModListener,
- isCurrentState));
- allXWidgets.add(new StateHoursSpentXWidget(getManagedForm(), atsWorkPage, sma, comp, 2, xModListener,
- isCurrentState));
- }
- }
-
- private void createReviewFooter(Composite parent, String forStateName) throws OseeCoreException {
- if (isShowReviewInfo() && sma.isTeamWorkflow()) {
- Composite comp = new Composite(parent, SWT.None);
- GridLayout layout = new GridLayout(1, false);
- comp.setLayout(layout);
- comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- allXWidgets.add(new ReviewInfoXWidget(getManagedForm(), toolkit, (TeamWorkFlowArtifact) sma, forStateName,
- comp, 1));
- }
- }
-
- private void createTaskFooter(Composite parent, String forStateName) throws OseeCoreException {
- if (isShowTaskInfo()) {
- Composite comp = new Composite(parent, SWT.None);
- GridLayout layout = new GridLayout(6, false);
- comp.setLayout(layout);
- comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- allXWidgets.add(new TaskInfoXWidget(getManagedForm(), ((TaskableStateMachineArtifact) sma), forStateName,
- comp, 2));
- }
- }
-
- protected boolean isShowTaskInfo() throws OseeCoreException {
- return sma.isTaskable();
- }
-
- protected boolean isShowReviewInfo() throws OseeCoreException {
- return sma.isTeamWorkflow();
- }
-
- public Result isXWidgetSavable() throws OseeCoreException {
- for (XWidget widget : allXWidgets) {
- if (widget instanceof IArtifactWidget) {
- IStatus status = widget.isValid();
- if (!status.isOK()) {
- return new Result(false, status.getMessage());
- }
- }
- }
- return Result.TrueResult;
- }
-
- @Override
- public String toString() {
- return atsWorkPage + " for " + getSma();
- }
-
- public Result isXWidgetDirty() throws OseeCoreException {
- for (XWidget widget : allXWidgets) {
- if (widget instanceof IArtifactWidget) {
- Result result = ((IArtifactWidget) widget).isDirty();
- if (result.isTrue()) {
- return result;
- }
- }
- }
- return Result.FalseResult;
- }
-
- public void getDirtyIArtifactWidgets(List<IArtifactWidget> widgets) throws OseeCoreException {
- for (XWidget widget : allXWidgets) {
- if (widget instanceof IArtifactWidget) {
- if (((IArtifactWidget) widget).isDirty().isTrue()) {
- widgets.add((IArtifactWidget) widget);
- }
- }
- }
- }
-
- private String getCurrentStateTitle() throws OseeCoreException {
- StringBuffer sb = new StringBuffer(atsWorkPage.getName());
- if (isEditable && !sma.isCompleted() && !sma.isCancelled()) {
- sb.append(" - Current State");
- }
- if (sma.isCancelled()) {
- LogItem item = sma.getLog().getStateEvent(LogType.StateCancelled);
- if (item == null) {
- throw new OseeStateException("ats.Log: Cancelled state has no logItem for " + sma.getHumanReadableId());
- }
- if (item.getState().equals(atsWorkPage.getName())) {
- sb.append(" - Cancelled");
- if (!item.getMsg().equals("")) {
- sb.append(" - Reason: " + item.getMsg());
- }
- }
- }
- if (isCurrentState) {
- if (sma.isCompleted()) {
- sb.append(" - ");
- sb.append(sma.getWorldViewCompletedDateStr());
- LogItem item = sma.getLog().getStateEvent(LogType.StateEntered, atsWorkPage.getName());
- sb.append(" by " + item.getUser().getName());
- } else if (sma.isCancelled()) {
- sb.append(" - ");
- sb.append(sma.getWorldViewCancelledDateStr());
- LogItem item = sma.getLog().getStateEvent(LogType.StateEntered, atsWorkPage.getName());
- sb.append(" by " + item.getUser().getName());
- }
- if (sma.getStateMgr().getAssignees().size() > 0) {
- sb.append(" assigned to ");
- sb.append(sma.getStateMgr().getAssigneesStr(80));
- }
- } else {
- LogItem item = sma.getLog().getStateEvent(LogType.StateComplete, atsWorkPage.getName());
- if (item != null) {
- sb.append(" - State Completed " + item.getDate(XDate.MMDDYYHHMM));
- sb.append(" by " + item.getUser().getName());
- }
- }
- return sb.toString();
- }
-
- @Override
- public void dispose() {
- super.dispose();
- for (XWidget xWidget : allXWidgets) {
- xWidget.dispose();
- }
- atsWorkPage.dispose();
- }
-
- final SMAWorkFlowSection fSection = this;
- final XModifiedListener xModListener = new XModifiedListener() {
- public void widgetModified(XWidget xWidget) {
- try {
- if (sma.isDeleted()) {
- return;
- }
- // Notify extensions of widget modified
- for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
- try {
- item.widgetModified(fSection, xWidget);
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
- }
- updateTransitionToState();
- updateTransitionToAssignees();
- sma.getEditor().onDirtied();
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
- }
- };
-
- @Override
- public void refresh() {
- super.refresh();
- try {
- if (Widgets.isAccessible(transitionAssigneesLabel)) {
- WorkPageDefinition toWorkPage = (WorkPageDefinition) transitionToStateCombo.getSelected();
- if (toWorkPage == null) {
- transitionAssigneesLabel.setText("");
- } else {
- transitionAssigneesLabel.setText(sma.getTransitionAssigneesStr());
- }
- transitionAssigneesLabel.getParent().layout();
- }
- sma.getEditor().onDirtied();
- for (XWidget xWidget : allXWidgets) {
- xWidget.refresh();
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
- }
-
- private void handleChangeTransitionAssignees() throws OseeCoreException {
- WorkPageDefinition toWorkPage = (WorkPageDefinition) transitionToStateCombo.getSelected();
- if (toWorkPage == null) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "No Transition State Selected");
- return;
- }
- if (toWorkPage.isCancelledPage() || toWorkPage.isCompletePage()) {
- AWorkbench.popup("ERROR", "No Assignees in Completed and Cancelled states");
- return;
- }
- UserCheckTreeDialog uld = new UserCheckTreeDialog();
- uld.setMessage("Select users to transition to.");
- uld.setInitialSelections(sma.getTransitionAssignees());
- if (sma.getParentTeamWorkflow() != null) {
- uld.setTeamMembers(sma.getParentTeamWorkflow().getTeamDefinition().getMembersAndLeads());
- }
- if (uld.open() != 0) {
- return;
- }
- Collection<User> users = uld.getUsersSelected();
- if (users.isEmpty()) {
- AWorkbench.popup("ERROR", "Must have at least one assignee");
- return;
- }
- sma.setTransitionAssignees(users);
- refresh();
- sma.getEditor().onDirtied();
- }
-
- private void createCurrentPageTransitionLine(Composite parent, AtsWorkPage atsWorkPage, XFormToolkit toolkit) throws OseeCoreException {
- Composite comp = toolkit.createComposite(parent, SWT.NONE);
- comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- comp.setLayout(new GridLayout(5, false));
- comp.setBackground(AtsUtil.ACTIVE_COLOR);
-
- transitionButton = toolkit.createButton(comp, "Transition", SWT.PUSH);
- transitionButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleTransition();
- }
- });
- transitionButton.setBackground(AtsUtil.ACTIVE_COLOR);
-
- Label label = toolkit.createLabel(comp, "to");
- label.setBackground(AtsUtil.ACTIVE_COLOR);
-
- transitionToStateCombo = new XComboViewer("Transition To State Combo");
- transitionToStateCombo.setDisplayLabel(false);
- ArrayList<Object> allPages = new ArrayList<Object>();
- for (WorkPageDefinition nextPage : sma.getToWorkPages()) {
- allPages.add(nextPage);
- }
- transitionToStateCombo.setInput(allPages);
- transitionToStateCombo.setLabelProvider(new WorkPageDefinitionLabelProvider());
- transitionToStateCombo.setContentProvider(new ArrayContentProvider());
- transitionToStateCombo.setSorter(new WorkPageDefinitionViewSorter());
-
- transitionToStateCombo.createWidgets(comp, 1);
-
- // Set default page from workflow default
- ArrayList<Object> defaultPage = new ArrayList<Object>();
- if (atsWorkPage.getDefaultToPage() != null) {
- defaultPage.add(atsWorkPage.getDefaultToPage());
- transitionToStateCombo.setSelected(defaultPage);
- }
- if (atsWorkPage.isCancelledPage()) {
- LogItem item = sma.getLog().getStateEvent(LogType.StateCancelled);
- if (item != null) {
- defaultPage.add(sma.getWorkPageDefinitionByName(item.getState()));
- transitionToStateCombo.setSelected(defaultPage);
- }
- }
- // Update transition based on state items
- updateTransitionToState();
-
- transitionToStateCombo.getCombo().setVisibleItemCount(20);
- transitionToStateCombo.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- try {
- updateTransitionToAssignees();
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
- }
- });
-
- Hyperlink assigneesLabelLink = toolkit.createHyperlink(comp, "Next State Assignee(s)", SWT.NONE);
- assigneesLabelLink.addHyperlinkListener(new IHyperlinkListener() {
-
- public void linkEntered(HyperlinkEvent e) {
- }
-
- public void linkExited(HyperlinkEvent e) {
- }
-
- public void linkActivated(HyperlinkEvent e) {
- try {
- handleChangeTransitionAssignees();
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
-
- });
- assigneesLabelLink.setBackground(AtsUtil.ACTIVE_COLOR);
-
- transitionAssigneesLabel =
- toolkit.createLabel(comp, Strings.truncate(sma.getTransitionAssigneesStr(), 100, true));
- transitionAssigneesLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- transitionAssigneesLabel.setBackground(AtsUtil.ACTIVE_COLOR);
-
- }
-
- public void updateTransitionToAssignees() throws OseeCoreException {
- Collection<User> assignees = null;
- // Determine if the is an override set of assigness
- for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
- assignees = item.getOverrideTransitionToAssignees(this);
- if (assignees != null) {
- break;
- }
- }
- // If override set and isn't the same as already selected, update
- if (assignees != null && !sma.getTransitionAssignees().equals(assignees)) {
- sma.setTransitionAssignees(assignees);
- sma.getEditor().onDirtied();
- }
- refresh();
- }
-
- public void updateTransitionToState() throws OseeCoreException {
- // Determine if there is a transitionToStateOverride for this page
- String transitionStateOverride = null;
- for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
- transitionStateOverride = item.getOverrideTransitionToStateName(this);
- if (transitionStateOverride != null) {
- break;
- }
- }
- if (transitionStateOverride != null) {
- // Return if override state is same as selected
- if (((WorkPageDefinition) transitionToStateCombo.getSelected()).getName().equals(transitionStateOverride)) {
- return;
- }
- // Find page corresponding to override state name
- for (WorkPageDefinition toWorkPageDefinition : sma.getToWorkPages()) {
- if (toWorkPageDefinition.getPageName().equals(transitionStateOverride)) {
- // Reset selection
- ArrayList<Object> defaultPage = new ArrayList<Object>();
- defaultPage.add(toWorkPageDefinition);
- transitionToStateCombo.setSelected(defaultPage);
- return;
- }
- }
- }
- }
-
- public void setTransitionToStateSelection(String stateName) throws OseeCoreException {
- ArrayList<Object> allPages = new ArrayList<Object>();
- for (WorkPageDefinition nextPage : sma.getToWorkPages()) {
- if (nextPage.getPageName().equals(stateName)) {
- allPages.add(nextPage);
- }
- }
- transitionToStateCombo.setSelected(allPages);
- }
-
- private void handleTransition() {
-
- try {
-
- if (!isEditable && !sma.getStateMgr().getAssignees().contains(UserManager.getUser(SystemUser.UnAssigned))) {
- AWorkbench.popup(
- "ERROR",
- "You must be assigned to transition this workflow.\nContact Assignee or Select Priviledged Edit for Authorized Overriders.");
- return;
- }
- // As a convenience, if assignee is UnAssigned and user selects to transition, make user current assignee
- if (sma.getStateMgr().getAssignees().contains(UserManager.getUser(SystemUser.UnAssigned))) {
- sma.getStateMgr().removeAssignee(UserManager.getUser(SystemUser.UnAssigned));
- sma.getStateMgr().addAssignee(UserManager.getUser());
- }
- if (sma.isTeamWorkflow() && ((TeamWorkFlowArtifact) sma).getBranchMgr().isWorkingBranchInWork()) {
-
- if (((WorkPageDefinition) transitionToStateCombo.getSelected()).getPageName().equals(
- DefaultTeamState.Cancelled.name())) {
- AWorkbench.popup("Transition Blocked",
- "Working Branch exists.\n\nPlease delete working branch before transition to cancel.");
- return;
- }
- if (((TeamWorkFlowArtifact) sma).getBranchMgr().isBranchInCommit()) {
- AWorkbench.popup("Transition Blocked",
- "Working Branch is being Committed.\n\nPlease wait till commit completes to transition.");
- return;
- }
- if (!atsWorkPage.isAllowTransitionWithWorkingBranch()) {
- AWorkbench.popup("Transition Blocked",
- "Working Branch exists.\n\nPlease commit or delete working branch before transition.");
- return;
- }
-
- }
-
- sma.setInTransition(true);
- sma.getEditor().doSave(null);
-
- // Get transition to state
- WorkPageDefinition toWorkPageDefinition = (WorkPageDefinition) transitionToStateCombo.getSelected();
-
- if (toWorkPageDefinition == null) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "No Transition State Selected");
- return;
- }
- if (toWorkPageDefinition.getPageName().equals(DefaultTeamState.Cancelled.name())) {
- EntryDialog cancelDialog = new EntryDialog("Cancellation Reason", "Enter cancellation reason.");
- if (cancelDialog.open() != 0) {
- return;
- }
- SkynetTransaction transaction =
- new SkynetTransaction(AtsUtil.getAtsBranch(), "ATS Transition to Cancelled");
- Result result = sma.transitionToCancelled(cancelDialog.getEntry(), transaction, TransitionOption.Persist);
- transaction.execute();
- if (result.isFalse()) {
- result.popup();
- return;
- }
- sma.setInTransition(false);
- sma.getEditor().refreshPages();
- return;
- }
-
- // Validate assignees
- if (sma.getStateMgr().getAssignees().contains(UserManager.getUser(SystemUser.OseeSystem)) || sma.getStateMgr().getAssignees().contains(
- UserManager.getUser(SystemUser.Guest)) || sma.getStateMgr().getAssignees().contains(
- UserManager.getUser(SystemUser.UnAssigned))) {
- AWorkbench.popup("Transition Blocked",
- "Can not transition with \"Guest\", \"UnAssigned\" or \"OseeSystem\" user as assignee.");
- return;
- }
-
- // Get transition to assignees
- Collection<User> toAssignees;
- if (toWorkPageDefinition.isCancelledPage() || toWorkPageDefinition.isCompletePage()) {
- toAssignees = new HashSet<User>();
- } else {
- toAssignees = sma.getTransitionAssignees();
- }
-
- // If this is a return transition, don't require page/tasks to be complete
- if (!sma.isReturnPage(toWorkPageDefinition)) {
-
- // Validate XWidgets for transition
- Result result = atsWorkPage.isPageComplete();
- if (result.isFalse()) {
- result.popup();
- return;
- }
-
- // Loop through this state's tasks to confirm complete
- if (sma.isTaskable()) {
- if (sma instanceof TaskableStateMachineArtifact) {
- for (TaskArtifact taskArt : ((TaskableStateMachineArtifact) sma).getTaskArtifactsFromCurrentState()) {
- if (taskArt.isInWork()) {
- AWorkbench.popup(
- "Transition Blocked",
- "Task Not Complete\n\nTitle: " + taskArt.getName() + "\n\nHRID: " + taskArt.getHumanReadableId());
- return;
- }
- }
- }
- }
-
- // Don't transition without targeted version if so configured
- if (sma.teamDefHasWorkRule(AtsWorkDefinitions.RuleWorkItemId.atsRequireTargetedVersion.name()) || sma.getWorkPageDefinition().hasWorkRule(
- AtsWorkDefinitions.RuleWorkItemId.atsRequireTargetedVersion.name())) {
- if (sma.getWorldViewTargetedVersion() == null && !toWorkPageDefinition.isCancelledPage()) {
- AWorkbench.popup("Transition Blocked",
- "Actions must be targeted for a Version.\nPlease set \"Target Version\" before transition.");
- return;
- }
- }
-
- // Loop through this state's blocking reviews to confirm complete
- if (sma.isTeamWorkflow()) {
- for (ReviewSMArtifact reviewArt : ReviewManager.getReviewsFromCurrentState((TeamWorkFlowArtifact) sma)) {
- if (reviewArt.getReviewBlockType() == ReviewBlockType.Transition && !reviewArt.isCancelledOrCompleted()) {
- AWorkbench.popup("Transition Blocked", "All Blocking Reviews must be completed before transition.");
- return;
- }
- }
- }
-
- // Check extension points for valid transition
- for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
- try {
- result =
- item.transitioning(sma, sma.getStateMgr().getCurrentStateName(),
- toWorkPageDefinition.getPageName(), toAssignees);
- if (result.isFalse()) {
- result.popup();
- return;
- }
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
- }
-
- // Ask for metrics for this page (store in state versus task?)
- if (!handlePopulateStateMetrics()) {
- return;
- }
- }
-
- // Persist must be done prior and separate from transition
- sma.persist();
-
- // Perform transition separate from persist of previous changes to state machine artifact
- SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "ATS Transition");
- Result result =
- sma.transition(toWorkPageDefinition.getPageName(), toAssignees, transaction, TransitionOption.Persist);
- transaction.execute();
- if (result.isFalse()) {
- result.popup();
- return;
- }
- } catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- } finally {
- sma.setInTransition(false);
- }
- }
-
- public boolean isCurrentState() {
- return isCurrentState;
- }
-
- public boolean handlePopulateStateMetrics() throws OseeCoreException {
-
- // Page has the ability to override the autofill of the metrics
- if (!atsWorkPage.isRequireStateHoursSpentPrompt() && sma.getStateMgr().getHoursSpent() == 0) {
- // First, try to autofill if it's only been < 5 min since creation
- double minSinceCreation = getCreationToNowDateDeltaMinutes();
- // System.out.println("minSinceCreation *" + minSinceCreation + "*");
- double hoursSinceCreation = minSinceCreation / 60.0;
- if (hoursSinceCreation < 0.02) {
- hoursSinceCreation = 0.02;
- }
- // System.out.println("hoursSinceCreation *" + hoursSinceCreation + "*");
- if (minSinceCreation < 5) {
- sma.getStateMgr().updateMetrics(hoursSinceCreation, 100, true);
- return true;
- }
- }
-
- // Otherwise, open dialog to ask for hours complete
- String msg =
- sma.getStateMgr().getCurrentStateName() + " State\n\n" + AtsUtil.doubleToI18nString(sma.getStateMgr().getHoursSpent()) + " hours already spent on this state.\n" + "Enter the additional number of hours you spent on this state.";
- SMAStatusDialog tsd =
- new SMAStatusDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "Enter Hours Spent",
- msg, false, Arrays.asList(sma));
- int result = tsd.open();
- if (result == 0) {
- sma.getStateMgr().updateMetrics(tsd.getHours().getFloat(), 100, true);
- return true;
- }
- return false;
- }
-
- public int getCreationToNowDateDeltaMinutes() throws OseeCoreException {
- Date createDate = sma.getLog().getStateEvent(LogType.StateEntered, atsWorkPage.getName()).getDate();
- long createDateLong = createDate.getTime();
- Date date = new Date();
- float diff = date.getTime() - createDateLong;
- // System.out.println("diff *" + diff + "*");
- Float min = diff / 60000;
- // System.out.println("min *" + min + "*");
- return min.intValue();
- }
-
- public XComboViewer getTransitionToStateCombo() {
- return transitionToStateCombo;
- }
-
- public StateMachineArtifact getSma() {
- return sma;
- }
-
- public AtsWorkPage getPage() {
- return atsWorkPage;
- }
-
- public Composite getMainComp() {
- return mainComp;
- }
-
- public List<XWidget> getXWidgets(Class<?> clazz) {
- List<XWidget> widgets = new ArrayList<XWidget>();
- for (XWidget widget : allXWidgets) {
- if (clazz.isInstance(widget)) {
- widgets.add(widget);
- }
- }
- return widgets;
- }
-
- public static boolean isEditable(StateMachineArtifact sma, AtsWorkPage page) throws OseeCoreException {
- // must be writeable
- return !sma.isReadOnly() &&
- // and access control writeable
- sma.isAccessControlWrite() &&
- // and current state
- (page == null || sma.isCurrentState(page.getName())) &&
- // and one of these
- //
- // page is define to allow anyone to edit
- (sma.getWorkPageDefinition().hasWorkRule(AtsWorkDefinitions.RuleWorkItemId.atsAllowEditToAll.name()) ||
- // team definition has allowed anyone to edit
- sma.teamDefHasWorkRule(AtsWorkDefinitions.RuleWorkItemId.atsAllowEditToAll.name()) ||
- // priviledged edit mode is on
- sma.getEditor().isPriviledgedEditModeEnabled() ||
- // current user is assigned
- sma.isAssigneeMe() ||
- // current user is ats admin
- AtsUtil.isAtsAdmin());
- }
+ private XComboViewer transitionToStateCombo;
+ private Button transitionButton;
+ private Label transitionAssigneesLabel;
+ protected final StateMachineArtifact sma;
+ private final AtsWorkPage atsWorkPage;
+ private final boolean isEditable, isCurrentState, isGlobalEditable;
+ private final XFormToolkit toolkit;
+ private Composite mainComp;
+ private final List<XWidget> allXWidgets = new ArrayList<XWidget>();
+ private boolean sectionCreated = false;
+ Section section;
+
+ public SMAWorkFlowSection(Composite parent, XFormToolkit toolkit, int style, AtsWorkPage page, StateMachineArtifact sma) throws OseeCoreException {
+ super(parent, toolkit, style | Section.TWISTIE | Section.TITLE_BAR);
+ this.toolkit = toolkit;
+ this.atsWorkPage = page;
+ this.sma = sma;
+
+ isEditable = isEditable(sma, page);
+ isGlobalEditable =
+ !sma.isReadOnly() && sma.isAccessControlWrite() && sma.getEditor().isPriviledgedEditModeEnabled();
+ isCurrentState = sma.isCurrentState(page.getName());
+ // parent.setBackground(Displays.getSystemColor(SWT.COLOR_CYAN));
+ }
+
+ @Override
+ public void initialize(final IManagedForm form) {
+ super.initialize(form);
+
+ section = getSection();
+ try {
+ section.setText(getCurrentStateTitle());
+ if (sma.isCurrentState(atsWorkPage.getName())) {
+ section.setTitleBarForeground(Displays.getSystemColor(SWT.COLOR_DARK_GREEN));
+ section.setBackground(AtsUtil.ACTIVE_COLOR);
+ }
+ section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ // section.setBackground(Displays.getSystemColor(SWT.COLOR_MAGENTA));
+
+ boolean isCurrentSectionExpanded = sma.isCurrentSectionExpanded(atsWorkPage.getName());
+
+ if (isCurrentSectionExpanded) {
+ createSection(section);
+ }
+ // Only load when users selects section
+ section.addListener(SWT.Activate, new Listener() {
+
+ public void handleEvent(Event e) {
+ try {
+ createSection(section);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE, ex);
+ }
+ }
+ });
+
+ section.layout();
+ section.setExpanded(isCurrentSectionExpanded);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ }
+
+ private synchronized void createSection(Section section) throws OseeCoreException {
+ if (sectionCreated) {
+ return;
+ }
+
+ mainComp = toolkit.createClientContainer(section, 2);
+ mainComp.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING));
+ mainComp.setLayout(ALayout.getZeroMarginLayout(1, false));
+ // mainComp.setBackground(Displays.getSystemColor(SWT.COLOR_DARK_YELLOW));
+ mainComp.layout();
+
+ SMAWorkFlowTab.createStateNotesHeader(mainComp, toolkit, sma, 2, atsWorkPage.getName());
+
+ Composite workComp = createWorkArea(mainComp, atsWorkPage, toolkit);
+
+ if (isCurrentState) {
+ createCurrentPageTransitionLine(mainComp, atsWorkPage, toolkit);
+ }
+
+ GridData gridData = new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING);
+ gridData.widthHint = 400;
+ workComp.setLayoutData(gridData);
+ sectionCreated = true;
+ }
+
+ protected Composite createWorkArea(Composite comp, AtsWorkPage atsWorkPage, XFormToolkit toolkit) throws OseeCoreException {
+
+ atsWorkPage.generateLayoutDatas(sma);
+
+ // Create Page
+ Composite workComp = toolkit.createContainer(comp, 1);
+ workComp.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING));
+ // workComp.setBackground(Displays.getSystemColor(SWT.COLOR_GREEN));
+
+ createMetricsHeader(workComp);
+
+ // Add any dynamic XWidgets declared for page by IAtsStateItem extensions
+ for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
+ for (XWidget xWidget : item.getDynamicXWidgetsPreBody(sma)) {
+ xWidget.createWidgets(workComp, 2);
+ allXWidgets.add(xWidget);
+ }
+ }
+
+ if (atsWorkPage.isCompleteCancelledState()) {
+ Composite completeComp = new Composite(workComp, SWT.None);
+ GridLayout layout = new GridLayout(1, false);
+ completeComp.setLayout(layout);
+ completeComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ if (atsWorkPage.isCancelledPage()) {
+ createCancelledPageWidgets(completeComp);
+ } else if (atsWorkPage.isCompletePage()) {
+ createCompletedPageWidgets(completeComp);
+ }
+ }
+
+ // Create dynamic XWidgets
+ DynamicXWidgetLayout dynamicXWidgetLayout =
+ atsWorkPage.createBody(getManagedForm(), workComp, sma, xModListener, isEditable || isGlobalEditable);
+ allXWidgets.addAll(dynamicXWidgetLayout.getXWidgets());
+
+ // Add any dynamic XWidgets declared for page by IAtsStateItem extensions
+ for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
+ for (XWidget xWidget : item.getDynamicXWidgetsPostBody(sma)) {
+ xWidget.createWidgets(workComp, 2);
+ allXWidgets.add(xWidget);
+ }
+ }
+
+ createTaskFooter(workComp, atsWorkPage.getName());
+ createReviewFooter(workComp, atsWorkPage.getName());
+
+ // Set all XWidget labels to bold font
+ for (XWidget xWidget : allXWidgets) {
+ if (xWidget.getLabelWidget() != null) {
+ SMAEditor.setLabelFonts(xWidget.getLabelWidget(), FontManager.getDefaultLabelFont());
+ }
+ }
+
+ // Check extension points for page creation
+ for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
+ Result result = item.pageCreated(toolkit, atsWorkPage, sma, xModListener, isEditable || isGlobalEditable);
+ if (result.isFalse()) {
+ result.popup();
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error in page creation => " + result.getText());
+ }
+ }
+
+ return workComp;
+ }
+
+ private void createCancelledPageWidgets(Composite parent) throws OseeCoreException {
+ XWidget xWidget = null;
+ xWidget = new XLabelValue("Cancelled from State", sma.getLog().getCancelledFromState());
+ xWidget.createWidgets(parent, 1);
+ allXWidgets.add(xWidget);
+
+ if (sma.getEditor().isPriviledgedEditModeEnabled()) {
+ xWidget = new XCancellationReasonTextWidget(sma);
+ xWidget.addXModifiedListener(xModListener);
+ } else {
+ xWidget = new XLabelValue("Cancellation Reason", sma.getLog().getCancellationReason());
+ }
+ xWidget.createWidgets(parent, 1);
+ allXWidgets.add(xWidget);
+ }
+
+ private void createCompletedPageWidgets(Composite parent) throws OseeCoreException {
+ XWidget xWidget = null;
+ xWidget = new XLabelValue("Completed from State", sma.getLog().getCompletedFromState());
+ xWidget.createWidgets(parent, 1);
+ allXWidgets.add(xWidget);
+ }
+
+ private void createMetricsHeader(Composite parent) throws OseeCoreException {
+ if (!atsWorkPage.isCompleteCancelledState()) {
+ Composite comp = new Composite(parent, SWT.None);
+ GridLayout layout = ALayout.getZeroMarginLayout(4, false);
+ layout.marginLeft = 2;
+ comp.setLayout(layout);
+ comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ allXWidgets.add(new StatePercentCompleteXWidget(getManagedForm(), atsWorkPage, sma, comp, 2, xModListener,
+ isCurrentState));
+ allXWidgets.add(new StateHoursSpentXWidget(getManagedForm(), atsWorkPage, sma, comp, 2, xModListener,
+ isCurrentState));
+ }
+ }
+
+ private void createReviewFooter(Composite parent, String forStateName) throws OseeCoreException {
+ if (isShowReviewInfo() && sma.isTeamWorkflow()) {
+ Composite comp = new Composite(parent, SWT.None);
+ GridLayout layout = new GridLayout(1, false);
+ comp.setLayout(layout);
+ comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ allXWidgets.add(new ReviewInfoXWidget(getManagedForm(), toolkit, (TeamWorkFlowArtifact) sma, forStateName,
+ comp, 1));
+ }
+ }
+
+ private void createTaskFooter(Composite parent, String forStateName) throws OseeCoreException {
+ if (isShowTaskInfo()) {
+ Composite comp = new Composite(parent, SWT.None);
+ GridLayout layout = new GridLayout(6, false);
+ comp.setLayout(layout);
+ comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ allXWidgets.add(new TaskInfoXWidget(getManagedForm(), ((TaskableStateMachineArtifact) sma), forStateName,
+ comp, 2));
+ }
+ }
+
+ protected boolean isShowTaskInfo() throws OseeCoreException {
+ return sma.isTaskable();
+ }
+
+ protected boolean isShowReviewInfo() throws OseeCoreException {
+ return sma.isTeamWorkflow();
+ }
+
+ public Result isXWidgetSavable() throws OseeCoreException {
+ for (XWidget widget : allXWidgets) {
+ if (widget instanceof IArtifactWidget) {
+ IStatus status = widget.isValid();
+ if (!status.isOK()) {
+ return new Result(false, status.getMessage());
+ }
+ }
+ }
+ return Result.TrueResult;
+ }
+
+ @Override
+ public String toString() {
+ return atsWorkPage + " for " + getSma();
+ }
+
+ public Result isXWidgetDirty() throws OseeCoreException {
+ for (XWidget widget : allXWidgets) {
+ if (widget instanceof IArtifactWidget) {
+ Result result = ((IArtifactWidget) widget).isDirty();
+ if (result.isTrue()) {
+ return result;
+ }
+ }
+ }
+ return Result.FalseResult;
+ }
+
+ public void getDirtyIArtifactWidgets(List<IArtifactWidget> widgets) throws OseeCoreException {
+ for (XWidget widget : allXWidgets) {
+ if (widget instanceof IArtifactWidget) {
+ if (((IArtifactWidget) widget).isDirty().isTrue()) {
+ widgets.add((IArtifactWidget) widget);
+ }
+ }
+ }
+ }
+
+ private String getCurrentStateTitle() throws OseeCoreException {
+ StringBuffer sb = new StringBuffer(atsWorkPage.getName());
+ if (isEditable && !sma.isCompleted() && !sma.isCancelled()) {
+ sb.append(" - Current State");
+ }
+ if (sma.isCancelled()) {
+ LogItem item = sma.getLog().getStateEvent(LogType.StateCancelled);
+ if (item == null) {
+ throw new OseeStateException("ats.Log: Cancelled state has no logItem for " + sma.getHumanReadableId());
+ }
+ if (item.getState().equals(atsWorkPage.getName())) {
+ sb.append(" - Cancelled");
+ if (!item.getMsg().equals("")) {
+ sb.append(" - Reason: " + item.getMsg());
+ }
+ }
+ }
+ if (isCurrentState) {
+ if (sma.isCompleted()) {
+ sb.append(" - ");
+ sb.append(sma.getWorldViewCompletedDateStr());
+ LogItem item = sma.getLog().getStateEvent(LogType.StateEntered, atsWorkPage.getName());
+ sb.append(" by " + item.getUser().getName());
+ } else if (sma.isCancelled()) {
+ sb.append(" - ");
+ sb.append(sma.getWorldViewCancelledDateStr());
+ LogItem item = sma.getLog().getStateEvent(LogType.StateEntered, atsWorkPage.getName());
+ sb.append(" by " + item.getUser().getName());
+ }
+ if (sma.getStateMgr().getAssignees().size() > 0) {
+ sb.append(" assigned to ");
+ sb.append(sma.getStateMgr().getAssigneesStr(80));
+ }
+ } else {
+ LogItem item = sma.getLog().getStateEvent(LogType.StateComplete, atsWorkPage.getName());
+ if (item != null) {
+ sb.append(" - State Completed " + item.getDate(XDate.MMDDYYHHMM));
+ sb.append(" by " + item.getUser().getName());
+ }
+ }
+ return sb.toString();
+ }
+
+ @Override
+ public void dispose() {
+ super.dispose();
+ for (XWidget xWidget : allXWidgets) {
+ xWidget.dispose();
+ }
+ atsWorkPage.dispose();
+ }
+
+ final SMAWorkFlowSection fSection = this;
+ final XModifiedListener xModListener = new XModifiedListener() {
+ public void widgetModified(XWidget xWidget) {
+ try {
+ if (sma.isDeleted()) {
+ return;
+ }
+ // Notify extensions of widget modified
+ for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
+ try {
+ item.widgetModified(fSection, xWidget);
+ } catch (Exception ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+ }
+ updateTransitionToState();
+ updateTransitionToAssignees();
+ sma.getEditor().onDirtied();
+ } catch (Exception ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+ }
+ };
+
+ @Override
+ public void refresh() {
+ super.refresh();
+ try {
+ if (Widgets.isAccessible(transitionAssigneesLabel)) {
+ WorkPageDefinition toWorkPage = (WorkPageDefinition) transitionToStateCombo.getSelected();
+ if (toWorkPage == null) {
+ transitionAssigneesLabel.setText("");
+ } else {
+ transitionAssigneesLabel.setText(sma.getTransitionAssigneesStr());
+ }
+ transitionAssigneesLabel.getParent().layout();
+ }
+ sma.getEditor().onDirtied();
+ for (XWidget xWidget : allXWidgets) {
+ xWidget.refresh();
+ }
+ } catch (OseeCoreException ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+ }
+
+ private void handleChangeTransitionAssignees() throws OseeCoreException {
+ WorkPageDefinition toWorkPage = (WorkPageDefinition) transitionToStateCombo.getSelected();
+ if (toWorkPage == null) {
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "No Transition State Selected");
+ return;
+ }
+ if (toWorkPage.isCancelledPage() || toWorkPage.isCompletePage()) {
+ AWorkbench.popup("ERROR", "No Assignees in Completed and Cancelled states");
+ return;
+ }
+ UserCheckTreeDialog uld = new UserCheckTreeDialog();
+ uld.setMessage("Select users to transition to.");
+ uld.setInitialSelections(sma.getTransitionAssignees());
+ if (sma.getParentTeamWorkflow() != null) {
+ uld.setTeamMembers(sma.getParentTeamWorkflow().getTeamDefinition().getMembersAndLeads());
+ }
+ if (uld.open() != 0) {
+ return;
+ }
+ Collection<User> users = uld.getUsersSelected();
+ if (users.isEmpty()) {
+ AWorkbench.popup("ERROR", "Must have at least one assignee");
+ return;
+ }
+ sma.setTransitionAssignees(users);
+ refresh();
+ sma.getEditor().onDirtied();
+ }
+
+ private void createCurrentPageTransitionLine(Composite parent, AtsWorkPage atsWorkPage, XFormToolkit toolkit) throws OseeCoreException {
+ Composite comp = toolkit.createComposite(parent, SWT.NONE);
+ comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ comp.setLayout(new GridLayout(5, false));
+ comp.setBackground(AtsUtil.ACTIVE_COLOR);
+
+ transitionButton = toolkit.createButton(comp, "Transition", SWT.PUSH);
+ transitionButton.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ handleTransition();
+ }
+ });
+ transitionButton.setBackground(AtsUtil.ACTIVE_COLOR);
+
+ Label label = toolkit.createLabel(comp, "to");
+ label.setBackground(AtsUtil.ACTIVE_COLOR);
+
+ transitionToStateCombo = new XComboViewer("Transition To State Combo");
+ transitionToStateCombo.setDisplayLabel(false);
+ ArrayList<Object> allPages = new ArrayList<Object>();
+ for (WorkPageDefinition nextPage : sma.getToWorkPages()) {
+ allPages.add(nextPage);
+ }
+ transitionToStateCombo.setInput(allPages);
+ transitionToStateCombo.setLabelProvider(new WorkPageDefinitionLabelProvider());
+ transitionToStateCombo.setContentProvider(new ArrayContentProvider());
+ transitionToStateCombo.setSorter(new WorkPageDefinitionViewSorter());
+
+ transitionToStateCombo.createWidgets(comp, 1);
+
+ // Set default page from workflow default
+ ArrayList<Object> defaultPage = new ArrayList<Object>();
+ if (atsWorkPage.getDefaultToPage() != null) {
+ defaultPage.add(atsWorkPage.getDefaultToPage());
+ transitionToStateCombo.setSelected(defaultPage);
+ }
+ if (atsWorkPage.isCancelledPage()) {
+ LogItem item = sma.getLog().getStateEvent(LogType.StateCancelled);
+ if (item != null) {
+ defaultPage.add(sma.getWorkPageDefinitionByName(item.getState()));
+ transitionToStateCombo.setSelected(defaultPage);
+ }
+ }
+ // Update transition based on state items
+ updateTransitionToState();
+
+ transitionToStateCombo.getCombo().setVisibleItemCount(20);
+ transitionToStateCombo.addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ try {
+ updateTransitionToAssignees();
+ } catch (Exception ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+ }
+ });
+
+ Hyperlink assigneesLabelLink = toolkit.createHyperlink(comp, "Next State Assignee(s)", SWT.NONE);
+ assigneesLabelLink.addHyperlinkListener(new IHyperlinkListener() {
+
+ public void linkEntered(HyperlinkEvent e) {
+ }
+
+ public void linkExited(HyperlinkEvent e) {
+ }
+
+ public void linkActivated(HyperlinkEvent e) {
+ try {
+ handleChangeTransitionAssignees();
+ } catch (Exception ex) {
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ }
+
+ });
+ assigneesLabelLink.setBackground(AtsUtil.ACTIVE_COLOR);
+
+ transitionAssigneesLabel =
+ toolkit.createLabel(comp, Strings.truncate(sma.getTransitionAssigneesStr(), 100, true));
+ transitionAssigneesLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ transitionAssigneesLabel.setBackground(AtsUtil.ACTIVE_COLOR);
+
+ }
+
+ public void updateTransitionToAssignees() throws OseeCoreException {
+ Collection<User> assignees = null;
+ // Determine if the is an override set of assigness
+ for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
+ assignees = item.getOverrideTransitionToAssignees(this);
+ if (assignees != null) {
+ break;
+ }
+ }
+ // If override set and isn't the same as already selected, update
+ if (assignees != null && !sma.getTransitionAssignees().equals(assignees)) {
+ sma.setTransitionAssignees(assignees);
+ sma.getEditor().onDirtied();
+ }
+ refresh();
+ }
+
+ public void updateTransitionToState() throws OseeCoreException {
+ // Determine if there is a transitionToStateOverride for this page
+ String transitionStateOverride = null;
+ for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
+ transitionStateOverride = item.getOverrideTransitionToStateName(this);
+ if (transitionStateOverride != null) {
+ break;
+ }
+ }
+ if (transitionStateOverride != null) {
+ // Return if override state is same as selected
+ if (((WorkPageDefinition) transitionToStateCombo.getSelected()).getName().equals(transitionStateOverride)) {
+ return;
+ }
+ // Find page corresponding to override state name
+ for (WorkPageDefinition toWorkPageDefinition : sma.getToWorkPages()) {
+ if (toWorkPageDefinition.getPageName().equals(transitionStateOverride)) {
+ // Reset selection
+ ArrayList<Object> defaultPage = new ArrayList<Object>();
+ defaultPage.add(toWorkPageDefinition);
+ transitionToStateCombo.setSelected(defaultPage);
+ return;
+ }
+ }
+ }
+ }
+
+ public void setTransitionToStateSelection(String stateName) throws OseeCoreException {
+ ArrayList<Object> allPages = new ArrayList<Object>();
+ for (WorkPageDefinition nextPage : sma.getToWorkPages()) {
+ if (nextPage.getPageName().equals(stateName)) {
+ allPages.add(nextPage);
+ }
+ }
+ transitionToStateCombo.setSelected(allPages);
+ }
+
+ private void handleTransition() {
+
+ try {
+
+ if (!isEditable && !sma.getStateMgr().getAssignees().contains(UserManager.getUser(SystemUser.UnAssigned))) {
+ AWorkbench.popup(
+ "ERROR",
+ "You must be assigned to transition this workflow.\nContact Assignee or Select Priviledged Edit for Authorized Overriders.");
+ return;
+ }
+ // As a convenience, if assignee is UnAssigned and user selects to transition, make user current assignee
+ if (sma.getStateMgr().getAssignees().contains(UserManager.getUser(SystemUser.UnAssigned))) {
+ sma.getStateMgr().removeAssignee(UserManager.getUser(SystemUser.UnAssigned));
+ sma.getStateMgr().addAssignee(UserManager.getUser());
+ }
+ if (sma.isTeamWorkflow() && ((TeamWorkFlowArtifact) sma).getBranchMgr().isWorkingBranchInWork()) {
+
+ if (((WorkPageDefinition) transitionToStateCombo.getSelected()).getPageName().equals(
+ DefaultTeamState.Cancelled.name())) {
+ AWorkbench.popup("Transition Blocked",
+ "Working Branch exists.\n\nPlease delete working branch before transition to cancel.");
+ return;
+ }
+ if (((TeamWorkFlowArtifact) sma).getBranchMgr().isBranchInCommit()) {
+ AWorkbench.popup("Transition Blocked",
+ "Working Branch is being Committed.\n\nPlease wait till commit completes to transition.");
+ return;
+ }
+ if (!atsWorkPage.isAllowTransitionWithWorkingBranch()) {
+ AWorkbench.popup("Transition Blocked",
+ "Working Branch exists.\n\nPlease commit or delete working branch before transition.");
+ return;
+ }
+
+ }
+
+ sma.setInTransition(true);
+ sma.getEditor().doSave(null);
+
+ // Get transition to state
+ WorkPageDefinition toWorkPageDefinition = (WorkPageDefinition) transitionToStateCombo.getSelected();
+
+ if (toWorkPageDefinition == null) {
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "No Transition State Selected");
+ return;
+ }
+ if (toWorkPageDefinition.getPageName().equals(DefaultTeamState.Cancelled.name())) {
+ EntryDialog cancelDialog = new EntryDialog("Cancellation Reason", "Enter cancellation reason.");
+ if (cancelDialog.open() != 0) {
+ return;
+ }
+ SkynetTransaction transaction =
+ new SkynetTransaction(AtsUtil.getAtsBranch(), "ATS Transition to Cancelled");
+ Result result = sma.transitionToCancelled(cancelDialog.getEntry(), transaction, TransitionOption.Persist);
+ transaction.execute();
+ if (result.isFalse()) {
+ result.popup();
+ return;
+ }
+ sma.setInTransition(false);
+ sma.getEditor().refreshPages();
+ return;
+ }
+
+ // Validate assignees
+ if (sma.getStateMgr().getAssignees().contains(UserManager.getUser(SystemUser.OseeSystem)) || sma.getStateMgr().getAssignees().contains(
+ UserManager.getUser(SystemUser.Guest)) || sma.getStateMgr().getAssignees().contains(
+ UserManager.getUser(SystemUser.UnAssigned))) {
+ AWorkbench.popup("Transition Blocked",
+ "Can not transition with \"Guest\", \"UnAssigned\" or \"OseeSystem\" user as assignee.");
+ return;
+ }
+
+ // Get transition to assignees
+ Collection<User> toAssignees;
+ if (toWorkPageDefinition.isCancelledPage() || toWorkPageDefinition.isCompletePage()) {
+ toAssignees = new HashSet<User>();
+ } else {
+ toAssignees = sma.getTransitionAssignees();
+ }
+
+ // If this is a return transition, don't require page/tasks to be complete
+ if (!sma.isReturnPage(toWorkPageDefinition)) {
+
+ // Validate XWidgets for transition
+ Result result = atsWorkPage.isPageComplete();
+ if (result.isFalse()) {
+ result.popup();
+ return;
+ }
+
+ // Loop through this state's tasks to confirm complete
+ if (sma.isTaskable()) {
+ if (sma instanceof TaskableStateMachineArtifact) {
+ for (TaskArtifact taskArt : ((TaskableStateMachineArtifact) sma).getTaskArtifactsFromCurrentState()) {
+ if (taskArt.isInWork()) {
+ AWorkbench.popup(
+ "Transition Blocked",
+ "Task Not Complete\n\nTitle: " + taskArt.getName() + "\n\nHRID: " + taskArt.getHumanReadableId());
+ return;
+ }
+ }
+ }
+ }
+
+ // Don't transition without targeted version if so configured
+ if (sma.teamDefHasWorkRule(AtsWorkDefinitions.RuleWorkItemId.atsRequireTargetedVersion.name()) || sma.getWorkPageDefinition().hasWorkRule(
+ AtsWorkDefinitions.RuleWorkItemId.atsRequireTargetedVersion.name())) {
+ if (sma.getWorldViewTargetedVersion() == null && !toWorkPageDefinition.isCancelledPage()) {
+ AWorkbench.popup("Transition Blocked",
+ "Actions must be targeted for a Version.\nPlease set \"Target Version\" before transition.");
+ return;
+ }
+ }
+
+ // Loop through this state's blocking reviews to confirm complete
+ if (sma.isTeamWorkflow()) {
+ for (ReviewSMArtifact reviewArt : ReviewManager.getReviewsFromCurrentState((TeamWorkFlowArtifact) sma)) {
+ if (reviewArt.getReviewBlockType() == ReviewBlockType.Transition && !reviewArt.isCancelledOrCompleted()) {
+ AWorkbench.popup("Transition Blocked", "All Blocking Reviews must be completed before transition.");
+ return;
+ }
+ }
+ }
+
+ // Check extension points for valid transition
+ for (IAtsStateItem item : sma.getStateItems().getStateItems(atsWorkPage.getId())) {
+ try {
+ result =
+ item.transitioning(sma, sma.getStateMgr().getCurrentStateName(),
+ toWorkPageDefinition.getPageName(), toAssignees);
+ if (result.isFalse()) {
+ result.popup();
+ return;
+ }
+ } catch (Exception ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+ }
+
+ // Ask for metrics for this page (store in state versus task?)
+ if (!handlePopulateStateMetrics()) {
+ return;
+ }
+ }
+
+ // Persist must be done prior and separate from transition
+ sma.persist();
+
+ // Perform transition separate from persist of previous changes to state machine artifact
+ SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "ATS Transition");
+ Result result =
+ sma.transition(toWorkPageDefinition.getPageName(), toAssignees, transaction, TransitionOption.Persist);
+ transaction.execute();
+ if (result.isFalse()) {
+ result.popup();
+ return;
+ }
+ } catch (Exception ex) {
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ } finally {
+ sma.setInTransition(false);
+ }
+ }
+
+ public boolean isCurrentState() {
+ return isCurrentState;
+ }
+
+ public boolean handlePopulateStateMetrics() throws OseeCoreException {
+
+ // Page has the ability to override the autofill of the metrics
+ if (!atsWorkPage.isRequireStateHoursSpentPrompt() && sma.getStateMgr().getHoursSpent() == 0) {
+ // First, try to autofill if it's only been < 5 min since creation
+ double minSinceCreation = getCreationToNowDateDeltaMinutes();
+ // System.out.println("minSinceCreation *" + minSinceCreation + "*");
+ double hoursSinceCreation = minSinceCreation / 60.0;
+ if (hoursSinceCreation < 0.02) {
+ hoursSinceCreation = 0.02;
+ }
+ // System.out.println("hoursSinceCreation *" + hoursSinceCreation + "*");
+ if (minSinceCreation < 5) {
+ sma.getStateMgr().updateMetrics(hoursSinceCreation, 100, true);
+ return true;
+ }
+ }
+
+ // Otherwise, open dialog to ask for hours complete
+ String msg =
+ sma.getStateMgr().getCurrentStateName() + " State\n\n" + AtsUtil.doubleToI18nString(sma.getStateMgr().getHoursSpent()) + " hours already spent on this state.\n" + "Enter the additional number of hours you spent on this state.";
+ SMAStatusDialog tsd =
+ new SMAStatusDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ "Enter Hours Spent", msg, false, Arrays.asList(sma));
+ int result = tsd.open();
+ if (result == 0) {
+ sma.getStateMgr().updateMetrics(tsd.getHours().getFloat(), 100, true);
+ return true;
+ }
+ return false;
+ }
+
+ public int getCreationToNowDateDeltaMinutes() throws OseeCoreException {
+ Date createDate = sma.getLog().getStateEvent(LogType.StateEntered, atsWorkPage.getName()).getDate();
+ long createDateLong = createDate.getTime();
+ Date date = new Date();
+ float diff = date.getTime() - createDateLong;
+ // System.out.println("diff *" + diff + "*");
+ Float min = diff / 60000;
+ // System.out.println("min *" + min + "*");
+ return min.intValue();
+ }
+
+ public XComboViewer getTransitionToStateCombo() {
+ return transitionToStateCombo;
+ }
+
+ public StateMachineArtifact getSma() {
+ return sma;
+ }
+
+ public AtsWorkPage getPage() {
+ return atsWorkPage;
+ }
+
+ public Composite getMainComp() {
+ return mainComp;
+ }
+
+ public List<XWidget> getXWidgets(Class<?> clazz) {
+ List<XWidget> widgets = new ArrayList<XWidget>();
+ for (XWidget widget : allXWidgets) {
+ if (clazz.isInstance(widget)) {
+ widgets.add(widget);
+ }
+ }
+ return widgets;
+ }
+
+ public static boolean isEditable(StateMachineArtifact sma, AtsWorkPage page) throws OseeCoreException {
+ // must be writeable
+ return !sma.isReadOnly() &&
+ // and access control writeable
+ sma.isAccessControlWrite() &&
+ // and current state
+ (page == null || sma.isCurrentState(page.getName())) &&
+ // and one of these
+ //
+ // page is define to allow anyone to edit
+ (sma.getWorkPageDefinition().hasWorkRule(AtsWorkDefinitions.RuleWorkItemId.atsAllowEditToAll.name()) ||
+ // team definition has allowed anyone to edit
+ sma.teamDefHasWorkRule(AtsWorkDefinitions.RuleWorkItemId.atsAllowEditToAll.name()) ||
+ // priviledged edit mode is on
+ sma.getEditor().isPriviledgedEditModeEnabled() ||
+ // current user is assigned
+ sma.isAssigneeMe() ||
+ // current user is ats admin
+ AtsUtil.isAtsAdmin());
+ }
}
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 406439fa1e2..535b4736da8 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 @@ -81,7 +81,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.IMessage;
@@ -361,7 +360,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable { gd.widthHint = 100;
headerComp.setLayoutData(gd);
headerComp.setLayout(ALayout.getZeroMarginLayout(1, false));
- // mainComp.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ // mainComp.setBackground(Displays.getSystemColor(SWT.COLOR_RED));
// Display relations
try {
@@ -413,7 +412,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable { // Create Privileged Edit label
if (sma.getEditor().isPriviledgedEditModeEnabled()) {
Label label = toolkit.createLabel(comp, PRIVILEGED_EDIT);
- label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ label.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
label.setToolTipText("Priviledged Edit Mode is Enabled. Editing any field in any state is authorized. Select icon to disable");
}
@@ -641,7 +640,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable { toolkit.createLabel(
comp,
"This is a historical version of this " + sma.getArtifactTypeName() + " and can not be edited; Select \"Open Latest\" to view/edit latest version.");
- label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ label.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java index f201a394924..cf1fd319303 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java @@ -48,7 +48,6 @@ import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -298,7 +297,7 @@ public class ReviewInfoXWidget extends XLabelValueBase implements IFrameworkTran @Override
public void handleEvent(Event event) {
if (event.button == 3) {
- if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Auto Complete Reviews",
+ if (!MessageDialog.openConfirm(Displays.getActiveShell(), "Auto Complete Reviews",
"ATS Admin\n\nAuto Complete Reviews?")) {
return;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java index 52e761fba2f..8b61d4a4f73 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java @@ -32,7 +32,6 @@ import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.ui.forms.IManagedForm;
@@ -130,7 +129,7 @@ public class TaskInfoXWidget extends XLabelValueBase implements IFrameworkTransa @Override
public void handleEvent(Event event) {
if (event.button == 3) {
- if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Auto Complete Tasks",
+ if (!MessageDialog.openConfirm(Displays.getActiveShell(), "Auto Complete Tasks",
"ATS Admin\n\nAuto Complete Tasks?")) {
return;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportPage.java index aa9b00dd08c..497c98b5d11 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportPage.java @@ -23,14 +23,14 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox;
import org.eclipse.osee.framework.ui.skynet.widgets.XFileTextWithSelectionDialog;
-import org.eclipse.osee.framework.ui.skynet.widgets.XFileTextWithSelectionDialog.Type; +import org.eclipse.osee.framework.ui.skynet.widgets.XFileTextWithSelectionDialog.Type;
import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;
import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.dialogs.WizardDataTransferPage;
@@ -39,124 +39,124 @@ import org.eclipse.ui.dialogs.WizardDataTransferPage; * @author Donald G. Dunne
*/
public class AtsExportPage extends WizardDataTransferPage {
- private List<XCheckBox> checkBoxes = new ArrayList<XCheckBox>();
- private XFileTextWithSelectionDialog xFileSel;
- private String fileLocation;
- private Collection<ExportOption> selectedExportOptions = new ArrayList<ExportOption>();
- private final Collection<? extends Artifact> artifacts;
-
- public AtsExportPage(IStructuredSelection selection) throws OseeCoreException {
- super("Main");
- this.artifacts = AtsExportManager.getSmaArts(selection);
- }
-
- public AtsExportPage(Collection<? extends Artifact> artifacts) {
- super("Main");
- this.artifacts = artifacts;
- }
-
- @Override
- protected boolean allowNewContainerName() {
- return false;
- }
-
- @Override
- public void handleEvent(Event event) {
-
- }
-
- @Override
- public void createControl(Composite parent) {
- initializeDialogUnits(parent);
- setTitle("Export ATS Artifacts");
- setMessage("Select export options and export location.");
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
- composite.setFont(parent.getFont());
-
- Label label = new Label(composite, SWT.NONE);
- if (artifacts.isEmpty()) {
- label.setText("Error: No ATS Artifacts input. Close wizard and re-perform selection.");
- label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- } else {
- label.setText("Selected " + artifacts.size() + " ATS Artifact to export.");
- }
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- label.setLayoutData(gridData);
-
- XModifiedListener modifyListener = new XModifiedListener() {
- @Override
- public void widgetModified(XWidget widget) {
- handleModified();
- }
- };
-
- List<ExportOption> validExportOptions = new ArrayList<ExportOption>();
- validExportOptions.addAll(Arrays.asList(ExportOption.values()));
- validExportOptions.remove(ExportOption.POPUP_DIALOG);
- validExportOptions.remove(ExportOption.NONE);
-
- for (ExportOption exportOption : validExportOptions) {
- XCheckBox checkBox = new XCheckBox(exportOption.name());
- checkBox.setLabelAfter(true);
- checkBox.createWidgets(composite, 2);
- if (selectedExportOptions.contains(exportOption)) {
- checkBox.set(true);
- }
- checkBox.addXModifiedListener(modifyListener);
- checkBoxes.add(checkBox);
- }
-
- xFileSel = new XFileTextWithSelectionDialog("Export Location", Type.Directory);
- xFileSel.createWidgets(composite, 2);
- xFileSel.addXModifiedListener(modifyListener);
-
- setPageComplete(determinePageCompletion());
- setControl(composite);
- }
-
- public Result isEntryValid() {
- if (artifacts.isEmpty()) {
- return new Result("No Artifacts selected. Cancel wizard and try again.");
- }
- if (!selectedExportOptions.contains(ExportOption.AS_HTML_TO_FILE) && !selectedExportOptions.contains(ExportOption.AS_HTML_TO_RESULT_EDITOR) && !selectedExportOptions.contains(ExportOption.AS_PDF)) {
- return new Result("Must select at least one export AS_ option.");
- }
- if (!selectedExportOptions.contains(ExportOption.MERGE_INTO_SINGLE_FILE) && !selectedExportOptions.contains(ExportOption.SAVE_INTO_SEPARATE_FILES)) {
- return new Result("Must select \"MERGE_INTO_SINGLE_FILE\" or \"SAVE_INTO_SEPARATE_FILES\"");
- }
- if (selectedExportOptions.contains(ExportOption.AS_HTML_TO_FILE) || selectedExportOptions.contains(ExportOption.AS_PDF)) {
- if (xFileSel.get().equals("")) {
- return new Result(
- "Must select \"Export Location\" for \"" + ExportOption.AS_HTML_TO_FILE + "\" or \"" + ExportOption.AS_PDF + "\" options.");
- }
- if (!(new File(xFileSel.get())).isDirectory()) {
- return new Result("Invalid Directory");
- }
- }
- return Result.TrueResult;
- }
-
- public void handleModified() {
- for (XCheckBox checkBox : checkBoxes) {
- ExportOption exportOption = ExportOption.valueOf(checkBox.getLabel());
- if (checkBox.isSelected()) {
- selectedExportOptions.add(exportOption);
- } else {
- selectedExportOptions.remove(exportOption);
- }
- }
- fileLocation = xFileSel.get();
- }
-
- public Collection<ExportOption> getSelectedExportOptions() {
- return selectedExportOptions;
- }
-
- public String getFileLocation() {
- return fileLocation;
- }
+ private final List<XCheckBox> checkBoxes = new ArrayList<XCheckBox>();
+ private XFileTextWithSelectionDialog xFileSel;
+ private String fileLocation;
+ private final Collection<ExportOption> selectedExportOptions = new ArrayList<ExportOption>();
+ private final Collection<? extends Artifact> artifacts;
+
+ public AtsExportPage(IStructuredSelection selection) throws OseeCoreException {
+ super("Main");
+ this.artifacts = AtsExportManager.getSmaArts(selection);
+ }
+
+ public AtsExportPage(Collection<? extends Artifact> artifacts) {
+ super("Main");
+ this.artifacts = artifacts;
+ }
+
+ @Override
+ protected boolean allowNewContainerName() {
+ return false;
+ }
+
+ @Override
+ public void handleEvent(Event event) {
+
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+ initializeDialogUnits(parent);
+ setTitle("Export ATS Artifacts");
+ setMessage("Select export options and export location.");
+ Composite composite = new Composite(parent, SWT.NULL);
+ composite.setLayout(new GridLayout(2, false));
+ composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
+ composite.setFont(parent.getFont());
+
+ Label label = new Label(composite, SWT.NONE);
+ if (artifacts.isEmpty()) {
+ label.setText("Error: No ATS Artifacts input. Close wizard and re-perform selection.");
+ label.setBackground(Displays.getSystemColor(SWT.COLOR_RED));
+ } else {
+ label.setText("Selected " + artifacts.size() + " ATS Artifact to export.");
+ }
+ GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+ gridData.horizontalSpan = 2;
+ label.setLayoutData(gridData);
+
+ XModifiedListener modifyListener = new XModifiedListener() {
+ @Override
+ public void widgetModified(XWidget widget) {
+ handleModified();
+ }
+ };
+
+ List<ExportOption> validExportOptions = new ArrayList<ExportOption>();
+ validExportOptions.addAll(Arrays.asList(ExportOption.values()));
+ validExportOptions.remove(ExportOption.POPUP_DIALOG);
+ validExportOptions.remove(ExportOption.NONE);
+
+ for (ExportOption exportOption : validExportOptions) {
+ XCheckBox checkBox = new XCheckBox(exportOption.name());
+ checkBox.setLabelAfter(true);
+ checkBox.createWidgets(composite, 2);
+ if (selectedExportOptions.contains(exportOption)) {
+ checkBox.set(true);
+ }
+ checkBox.addXModifiedListener(modifyListener);
+ checkBoxes.add(checkBox);
+ }
+
+ xFileSel = new XFileTextWithSelectionDialog("Export Location", Type.Directory);
+ xFileSel.createWidgets(composite, 2);
+ xFileSel.addXModifiedListener(modifyListener);
+
+ setPageComplete(determinePageCompletion());
+ setControl(composite);
+ }
+
+ public Result isEntryValid() {
+ if (artifacts.isEmpty()) {
+ return new Result("No Artifacts selected. Cancel wizard and try again.");
+ }
+ if (!selectedExportOptions.contains(ExportOption.AS_HTML_TO_FILE) && !selectedExportOptions.contains(ExportOption.AS_HTML_TO_RESULT_EDITOR) && !selectedExportOptions.contains(ExportOption.AS_PDF)) {
+ return new Result("Must select at least one export AS_ option.");
+ }
+ if (!selectedExportOptions.contains(ExportOption.MERGE_INTO_SINGLE_FILE) && !selectedExportOptions.contains(ExportOption.SAVE_INTO_SEPARATE_FILES)) {
+ return new Result("Must select \"MERGE_INTO_SINGLE_FILE\" or \"SAVE_INTO_SEPARATE_FILES\"");
+ }
+ if (selectedExportOptions.contains(ExportOption.AS_HTML_TO_FILE) || selectedExportOptions.contains(ExportOption.AS_PDF)) {
+ if (xFileSel.get().equals("")) {
+ return new Result(
+ "Must select \"Export Location\" for \"" + ExportOption.AS_HTML_TO_FILE + "\" or \"" + ExportOption.AS_PDF + "\" options.");
+ }
+ if (!(new File(xFileSel.get())).isDirectory()) {
+ return new Result("Invalid Directory");
+ }
+ }
+ return Result.TrueResult;
+ }
+
+ public void handleModified() {
+ for (XCheckBox checkBox : checkBoxes) {
+ ExportOption exportOption = ExportOption.valueOf(checkBox.getLabel());
+ if (checkBox.isSelected()) {
+ selectedExportOptions.add(exportOption);
+ } else {
+ selectedExportOptions.remove(exportOption);
+ }
+ }
+ fileLocation = xFileSel.get();
+ }
+
+ public Collection<ExportOption> getSelectedExportOptions() {
+ return selectedExportOptions;
+ }
+
+ public String getFileLocation() {
+ return fileLocation;
+ }
}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsEditorHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsEditorHandler.java index 8eae7b1d42a..743e9957e3a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsEditorHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsEditorHandler.java @@ -16,7 +16,7 @@ import org.eclipse.osee.ats.editor.AtsWorkflowRenderer; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsExportHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsExportHandler.java index 7b1bc03de0d..187b8c9cafe 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsExportHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsExportHandler.java @@ -16,7 +16,7 @@ import org.eclipse.osee.ats.export.AtsExportRenderer; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsTaskEditorHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsTaskEditorHandler.java index 5de525141cf..add0273d8c7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsTaskEditorHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsTaskEditorHandler.java @@ -16,7 +16,7 @@ import org.eclipse.osee.ats.editor.AtsTaskEditorRenderer; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorkflowConfigEditorHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorkflowConfigEditorHandler.java index 4f39b5f5d87..6c1a58787a2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorkflowConfigEditorHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorkflowConfigEditorHandler.java @@ -16,7 +16,7 @@ import org.eclipse.osee.ats.editor.AtsWorkflowRenderer; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorldEditorHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorldEditorHandler.java index 7f0300082ea..d5b67ff3a11 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorldEditorHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/handlers/AtsWorldEditorHandler.java @@ -16,7 +16,7 @@ import org.eclipse.osee.ats.editor.AtsWorldEditorRenderer; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java index ce57fe2956d..4042cc295a0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.ats.health;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -80,7 +80,7 @@ import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.skynet.util.ElapsedTime;
import org.eclipse.osee.framework.ui.skynet.util.email.EmailUtil;
import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Donald G. Dunne
@@ -104,7 +104,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { @Override
public void run(TableLoadOption... tableLoadOptions) {
- if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) {
+ if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) {
return;
}
Jobs.startJob(new Report(getName()), true);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java index 7ced8542884..2e77b7aaaff 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReportByHrid.java @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java index 4763c00c1ff..321ab559289 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java @@ -53,13 +53,12 @@ import org.eclipse.osee.framework.skynet.core.revision.ChangeData; import org.eclipse.osee.framework.skynet.core.revision.ChangeData.KindType;
import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.compare.CompareHandler;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.widgets.Display;
/**
* This test will validate the change report data that is returned for the ATS configured actions with committed
@@ -91,7 +90,7 @@ public class ValidateChangeReports extends XNavigateItemAction { @Override
public void run(TableLoadOption... tableLoadOptions) {
- if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) {
+ if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) {
return;
}
Jobs.startJob(new Report(getName()), true);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java index 5aac45d054a..fc0caf2ccc0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java @@ -48,8 +48,9 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.skynet.OseeContributionItem;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -58,7 +59,6 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
@@ -621,7 +621,7 @@ public class HyperView extends ViewPart implements IPartListener { PolylineConnection c = new PolylineConnection();
c.setLineWidth(2);
if (hvi.isRelationDirty()) {
- c.setForegroundColor(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE));
+ c.setForegroundColor(Displays.getSystemColor(SWT.COLOR_BLUE));
}
c.setSourceAnchor(source);
c.setTargetAnchor(target);
@@ -656,7 +656,7 @@ public class HyperView extends ViewPart implements IPartListener { @Override
public void widgetSelected(SelectionEvent e) {
try {
- if (MessageDialog.openQuestion(Display.getCurrent().getActiveShell(), "Delete Link",
+ if (MessageDialog.openQuestion(Displays.getActiveShell(), "Delete Link",
"Delete Link\n\n" + hvi.getLink().toString() + "\n\nAre you sure?")) { Artifact artA = hvi.getLink().getArtifactA();
hvi.getLink().delete(true);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/OseeAtsServiceImpl.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/OseeAtsServiceImpl.java index 139ab72bc20..7b0d501ea58 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/OseeAtsServiceImpl.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/OseeAtsServiceImpl.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ats.internal;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.ats.IOseeAtsService;
-import org.eclipse.osee.framework.ui.skynet.ats.OseeEditor;
+import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.ats.IOseeAtsService; +import org.eclipse.osee.framework.ui.skynet.ats.OseeEditor; /**
* @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java index 635c76b8695..46c4c57753f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java @@ -45,9 +45,9 @@ import org.eclipse.osee.ats.world.search.MultipleHridSearchOperation; import org.eclipse.osee.ats.world.search.MyFavoritesGoalsSearchItem;
import org.eclipse.osee.ats.world.search.MyFavoritesSearchItem;
import org.eclipse.osee.ats.world.search.MyGoalWorkflowItem;
-import org.eclipse.osee.ats.world.search.MyGoalWorkflowItem.GoalSearchState; +import org.eclipse.osee.ats.world.search.MyGoalWorkflowItem.GoalSearchState;
import org.eclipse.osee.ats.world.search.MyReviewWorkflowItem;
-import org.eclipse.osee.ats.world.search.MyReviewWorkflowItem.ReviewState; +import org.eclipse.osee.ats.world.search.MyReviewWorkflowItem.ReviewState;
import org.eclipse.osee.ats.world.search.MySubscribedSearchItem;
import org.eclipse.osee.ats.world.search.MyWorldSearchItem;
import org.eclipse.osee.ats.world.search.NextVersionSearchItem;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItemsOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItemsOperation.java index 3f7bdf22b42..ade5f72240e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItemsOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItemsOperation.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.ats.navigate;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
+import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.framework.core.operation.AbstractOperation; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java index d3c3492a28a..393ef087379 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java @@ -20,12 +20,12 @@ import org.eclipse.osee.ats.artifact.ATSAttributes; import org.eclipse.osee.ats.artifact.ActionArtifact;
import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
import org.eclipse.osee.ats.artifact.StateMachineArtifact.TransitionOption;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState;
-import org.eclipse.osee.ats.artifact.VersionArtifact; +import org.eclipse.osee.ats.artifact.VersionArtifact;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
-import org.eclipse.osee.ats.util.AtsPriority.PriorityType; +import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.world.WorldXNavigateItemAction;
@@ -39,11 +39,11 @@ import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.util.ChangeType;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Donald G. Dunne
@@ -67,7 +67,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { return;
}
MessageDialog dialog =
- new MessageDialog(Display.getCurrent().getActiveShell(), getName(), null,
+ new MessageDialog(Displays.getActiveShell(), getName(), null,
getName() + "\n\nSelect Source or Destination Client", MessageDialog.QUESTION, new String[] {
"Source Client", "Destination Client - Start", "Destination Client - End", "Cancel"}, 2);
int result = dialog.open();
@@ -115,7 +115,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { // Wait for destination client to start
if (!MessageDialog.openConfirm(
- Display.getCurrent().getActiveShell(),
+ Displays.getActiveShell(),
getName(),
"Launch \"Destination Client - Start\" test, enter \"" + actionArt.getName().replaceFirst("tt ", "") + "\" and press Ok")) {
return;
@@ -179,7 +179,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { // Wait for destination client to end
if (!MessageDialog.openConfirm(
- Display.getCurrent().getActiveShell(),
+ Displays.getActiveShell(),
getName(),
"Launch \"Destination Client - End\" test, enter \"" + actionArt.getName().replaceFirst("tt ", "") + "\" and press Ok")) {
return;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsXNavigateItemLauncher.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsXNavigateItemLauncher.java index d7076997ef0..bec67f9e51f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsXNavigateItemLauncher.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsXNavigateItemLauncher.java @@ -10,24 +10,24 @@ *******************************************************************************/ package org.eclipse.osee.ats.navigate;
-import java.util.Collection;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.task.TaskEditor;
-import org.eclipse.osee.ats.task.TaskEditorParameterSearchItem;
-import org.eclipse.osee.ats.task.TaskEditorParameterSearchItemProvider;
-import org.eclipse.osee.ats.world.WorldEditor;
-import org.eclipse.osee.ats.world.WorldEditorParameterSearchItem;
-import org.eclipse.osee.ats.world.WorldEditorParameterSearchItemProvider;
-import org.eclipse.osee.ats.world.WorldEditorUISearchItemProvider;
-import org.eclipse.osee.ats.world.search.WorldSearchItem;
-import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView;
+import java.util.Collection; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.task.TaskEditor; +import org.eclipse.osee.ats.task.TaskEditorParameterSearchItem; +import org.eclipse.osee.ats.task.TaskEditorParameterSearchItemProvider; +import org.eclipse.osee.ats.world.WorldEditor; +import org.eclipse.osee.ats.world.WorldEditorParameterSearchItem; +import org.eclipse.osee.ats.world.WorldEditorParameterSearchItemProvider; +import org.eclipse.osee.ats.world.WorldEditorUISearchItemProvider; +import org.eclipse.osee.ats.world.search.WorldSearchItem; +import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView; import org.eclipse.osee.ats.world.search.WorldUISearchItem; -import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
+import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.Collections; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; /**
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/BarChartExample.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/BarChartExample.java index aa875215612..423f5edd181 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/BarChartExample.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/BarChartExample.java @@ -38,7 +38,7 @@ import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl; import org.eclipse.osee.ats.AtsImage;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorProvider;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CompareEditorExample.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CompareEditorExample.java index 21b32d9b070..585d041674f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CompareEditorExample.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CompareEditorExample.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.compare.CompareHandler; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -35,7 +35,7 @@ public class CompareEditorExample extends XNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException { - if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) return; + if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) return; CompareHandler compareHandler = new CompareHandler("Now is the time", "Now was the time"); compareHandler.compare(); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java index a56decb48e8..7d044a8f8ab 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ConfigureDBForAts.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLo import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -41,9 +41,9 @@ public class ConfigureDBForAts extends XNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) { - if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Configure DB for ATS", + if (!MessageDialog.openConfirm(Displays.getActiveShell(), "Configure DB for ATS", "Configure DB for ATS " + pluginId)) return; - if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Configure DB for ATS", + if (!MessageDialog.openConfirm(Displays.getActiveShell(), "Configure DB for ATS", "This will break things really bad if ATS is alread configured for this item. Are you sure?")) return; Jobs.startJob(new Report(getName()), true); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java index f7871bb4497..c461cc91001 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java @@ -33,7 +33,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLo import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.util.ChangeType; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -50,7 +50,7 @@ public class CreateGoalTestArtifacts extends XNavigateItemAction { AWorkbench.popup("Can't be run on production"); return; } - if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) return; + if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) return; SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), getName()); GoalArtifact oteGoal = GoalArtifact.createGoal("OTE"); GoalArtifact atsGoal = GoalArtifact.createGoal("ATS"); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java index 649f13ec05c..6b2ef9ac5a5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java @@ -33,7 +33,7 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage; 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.dialog.EntryDialog; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -64,7 +64,7 @@ public class CreateNewVersionItem extends XNavigateItemAction { return; } EntryDialog ed = - new EntryDialog(Display.getCurrent().getActiveShell(), "Create New Version", null, "Enter Version Name", + new EntryDialog(Displays.getActiveShell(), "Create New Version", null, "Enter Version Name", MessageDialog.QUESTION, new String[] {"OK", "Cancel"}, 0); if (ed.open() == 0) { String newVer = ed.getEntry(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java index 9cee390e642..b8e3a4546d2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java @@ -23,7 +23,7 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.config.AtsCacheManager;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
-import org.eclipse.osee.ats.util.AtsPriority.PriorityType; +import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.VersionMetrics;
import org.eclipse.osee.ats.util.VersionTeamMetrics;
@@ -36,14 +36,14 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations;
import org.eclipse.osee.framework.ui.skynet.util.ChangeType;
import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Donald G. Dunne
@@ -93,7 +93,7 @@ public class FirstTimeQualityMetricReportItem extends XNavigateItemAction { useTeamDef = (TeamDefinitionArtifact) ld.getResult()[0];
} else
return;
- } else if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) return;
+ } else if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) return;
ReportJob job = new ReportJob(getName(), useTeamDef);
job.setUser(true);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java index 81fd2a9172d..5c4def831ad 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java @@ -29,14 +29,14 @@ 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.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations;
import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Donald G. Dunne
@@ -68,7 +68,7 @@ public class GenerateFullVersionReportItem extends XNavigateItemAction { public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException {
TeamDefinitionArtifact teamDef = getTeamDefinition();
if (teamDef == null) return;
- if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) return;
+ if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) return;
PublishReportJob job = new PublishReportJob(teamDef);
job.setUser(true);
job.setPriority(Job.LONG);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java index 2a683a26637..05b4902d3fd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateGuid.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.navigate; import org.eclipse.osee.ats.AtsImage;
import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java index 743ab57cd74..c82f654ceb5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateReviewParticipationReport.java @@ -27,7 +27,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.User;
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.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor;
@@ -39,7 +39,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.XViewe import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.XViewerArtifactTypeColumn;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.XViewerGuidColumn;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.XViewerHridColumn;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* Donald G. Dunne
@@ -54,7 +54,7 @@ public class GenerateReviewParticipationReport extends XNavigateItemAction { @Override
public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException {
- UserListDialog ld = new UserListDialog(Display.getCurrent().getActiveShell());
+ UserListDialog ld = new UserListDialog(Displays.getActiveShell());
int result = ld.open();
if (result == 0) {
if (ld.getResult().length == 0) {
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 ba69c9c86d6..2fb6fd8b416 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 @@ -56,11 +56,11 @@ import org.eclipse.osee.framework.ui.skynet.action.ExpandAllAction; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
import org.eclipse.osee.framework.ui.skynet.util.LoadingComposite;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IMemento;
@@ -160,9 +160,9 @@ public class NavigateView extends ViewPart implements IActionable { }
if (!str.equals("")) {
if (AtsUtil.isAtsAdmin()) {
- label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ label.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
} else {
- label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE));
+ label.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE));
}
}
label.setText(str);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java index 7c5c76fbf18..e9c71c7ca7a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/PublishFullVersionReportItem.java @@ -28,12 +28,12 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.FileDialog;
/**
@@ -67,7 +67,7 @@ public class PublishFullVersionReportItem extends XNavigateItemAction { public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException {
String usePublishToFilename = publishToFilename;
if (usePublishToFilename == null) {
- final FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell().getShell(), SWT.SAVE);
+ final FileDialog dialog = new FileDialog(Displays.getActiveShell().getShell(), SWT.SAVE);
dialog.setFilterExtensions(new String[] {"*.html"});
usePublishToFilename = dialog.open();
if (usePublishToFilename == null) return;
@@ -90,7 +90,7 @@ public class PublishFullVersionReportItem extends XNavigateItemAction { useTeamDef = (TeamDefinitionArtifact) ld.getResult()[0];
} else
return;
- } else if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) return;
+ } else if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) return;
String title = useTeamDef.getName() + " Version Report";
PublishReportJob job = new PublishReportJob(title, teamDef, usePublishToFilename);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java index bb76858aa33..758cf1816f9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java @@ -32,7 +32,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLo import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -80,7 +80,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { if (errorStr != null) AWorkbench.popup("ERROR", errorStr); if (errorStr != null && !AtsUtil.isAtsAdmin()) return; - else if (errorStr != null && !MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Override", + else if (errorStr != null && !MessageDialog.openConfirm(Displays.getActiveShell(), "Override", "ATS Admin Enabled - Override completed condition and release anyway?")) { return; } @@ -90,7 +90,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { verArt.setNextVersion(false); verArt.persist(); - if (MessageDialog.openQuestion(Display.getCurrent().getActiveShell(), "Select NEW Next Release Version", + if (MessageDialog.openQuestion(Displays.getActiveShell(), "Select NEW Next Release Version", "Release Complete.\n\nSelect NEW Next Release Version?")) { ld = new VersionListDialog("Select Next Release Version", "Select New Next Release Version", diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java index 3a0385e567b..e1663269694 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UpdateAtsWorkItemDefinitions.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -36,8 +36,8 @@ public class UpdateAtsWorkItemDefinitions extends XNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException { - if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) return; - if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), + if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) return; + if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), "This could break lots of things, are you SURE?")) return; XResultData xResultData = new XResultData(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationCheckTreeDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationCheckTreeDialog.java index bae48a53bdb..7a4b9c922a0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationCheckTreeDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationCheckTreeDialog.java @@ -21,6 +21,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -28,7 +29,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; /** @@ -40,7 +40,7 @@ public class AtsNotificationCheckTreeDialog extends CheckedTreeSelectionDialog { private boolean sendNotifications; public AtsNotificationCheckTreeDialog() { - super(Display.getCurrent().getActiveShell(), labelProvider, treeContentProvider); + super(Displays.getActiveShell(), labelProvider, treeContentProvider); setTitle("Select ATS Notifications"); setMessage("Select Desired ATS Notifications"); try { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java index 03d5d41b91b..1782e4f9335 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java @@ -31,7 +31,6 @@ import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.widgets.Display;
/**
* @author Megumi Telles
@@ -107,7 +106,7 @@ public class PurgeUser extends AbstractBlam { }
private void confirmDeletionOfArtifact(final User fromUser) throws OseeCoreException {
- if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Persist Confirmation",
+ if (MessageDialog.openConfirm(Displays.getActiveShell(), "Persist Confirmation",
"Do you wish to delete the duplicate User: " + fromUser.getName() + "?")) {
deleteArtifact(fromUser);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/ITaskAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/ITaskAction.java index 39972cabe40..1b2ba6dc721 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/ITaskAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/ITaskAction.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.ats.task;
-import java.util.Collection;
-import org.eclipse.osee.ats.artifact.TaskArtifact;
+import java.util.Collection; +import org.eclipse.osee.ats.artifact.TaskArtifact; /**
* @author Megumi Telles
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskComposite.java index 45bb9ddeaba..9e7f3056334 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskComposite.java @@ -34,8 +34,8 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.IWorldViewerEventHandler;
import org.eclipse.osee.ats.world.WorldContentProvider;
import org.eclipse.osee.ats.world.WorldLabelProvider;
-import org.eclipse.osee.ats.world.WorldXViewerEventManager;
import org.eclipse.osee.ats.world.WorldXViewer;
+import org.eclipse.osee.ats.world.WorldXViewerEventManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -49,6 +49,7 @@ import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer; import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
import org.eclipse.osee.framework.ui.swt.ALayout;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DragSource;
@@ -62,7 +63,6 @@ import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.Tree;
@@ -209,7 +209,7 @@ public class TaskComposite extends Composite implements IWorldViewerEventHandler public TaskArtifact handleNewTask() {
TaskArtifact taskArt = null;
EntryDialog ed =
- new EntryDialog(Display.getCurrent().getActiveShell(), "Create New Task", null,
+ new EntryDialog(Displays.getActiveShell(), "Create New Task", null,
"Enter Task Title/Description", MessageDialog.QUESTION, new String[] {"OK", "Cancel"}, 0);
if (ed.open() == 0) {
try {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java index 55faeecbdc9..b44e0b43ad5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java @@ -21,7 +21,7 @@ import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.world.search.ActionableItemWorldSearchItem;
import org.eclipse.osee.ats.world.search.TeamWorldSearchItem;
import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption;
-import org.eclipse.osee.ats.world.search.UserRelatedToAtsObjectSearch; +import org.eclipse.osee.ats.world.search.UserRelatedToAtsObjectSearch;
import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitJob.java index f68ca1fdcc3..84c1f4fc135 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitJob.java @@ -32,7 +32,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.commandHandlers.branch.commit.CommitHandler; import org.eclipse.osee.framework.ui.swt.Displays; -import org.eclipse.swt.widgets.Display; public class AtsBranchCommitJob extends Job { private final boolean commitPopup; @@ -85,7 +84,7 @@ public class AtsBranchCommitJob extends Job { Displays.pendInDisplayThread(new Runnable() { @Override public void run() { - if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), + if (MessageDialog.openConfirm(Displays.getActiveShell(), "Override State Validation", tempResult.getText() + "\n\nYou are set as Admin, OVERRIDE this?")) { adminOverride = true; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java index 84a246fdf11..24f4089794a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java @@ -73,7 +73,7 @@ import org.eclipse.osee.framework.ui.skynet.util.filteredTree.SimpleCheckFiltere import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkRuleDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeView;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.ui.PlatformUI;
/**
@@ -652,7 +652,7 @@ public class AtsBranchManager { }
// Retrieve parent branch to create working branch from
if (popup && !MessageDialog.openConfirm(
- Display.getCurrent().getActiveShell(), + Displays.getActiveShell(), "Create Working Branch", "Create a working branch from parent branch\n\n\"" + parentBranch.getName() + "\"?\n\n" + "NOTE: Working branches are necessary when OSEE Artifact changes " + "are made during implementation.")) { return Result.FalseResult;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java index a1f21f8a3c8..adb4883354a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java @@ -33,7 +33,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.HtmlDialog; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -68,7 +68,7 @@ public class AtsDeleteManager { if (deleteOptions.contains(DeleteOption.Prompt)) { MessageDialogWithToggle md = MessageDialogWithToggle.openOkCancelConfirm( - Display.getCurrent().getActiveShell(), + Displays.getActiveShell(), "Delete/Purge ATS Object", "Prepare to Delete/Purge ATS Object\n\n" + artBuilder.toString().replaceFirst("\n$", "") + "\n\nAnd ALL its ATS children.\n(Artifacts will be retrieved for confirmation)\nAre You Sure?", "Purge", false, null, null); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java index 15247122ada..183135ef512 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java @@ -78,7 +78,6 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.ToolBar;
@@ -346,7 +345,7 @@ public final class AtsUtil { }
public static TeamWorkFlowArtifact promptSelectTeamWorkflow(ActionArtifact actArt) throws OseeCoreException {
- ListDialog ld = new ListDialog(Display.getCurrent().getActiveShell());
+ ListDialog ld = new ListDialog(Displays.getActiveShell());
ld.setContentProvider(new ArrayContentProvider());
ld.setLabelProvider(new TeamWorkflowLabelProvider());
ld.setTitle("Select Team Workflow");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java index c6419f7676d..3d2764f2518 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java @@ -18,7 +18,7 @@ import java.util.HashSet; import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set; +import java.util.Set;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -54,12 +54,12 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.util.ElapsedTime;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Donald G. Dunne
@@ -72,7 +72,7 @@ public class DoesNotWorkItemAts extends XNavigateItemAction { @Override
public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException {
- if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) {
+ if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) {
return;
}
convertAtsStateNotesAndDefectItemsUserIds();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java index 1117eb04434..cf07a0972a6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.osee.ats.artifact.ATSAttributes;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.artifact.StateMachineArtifact.TransitionOption; +import org.eclipse.osee.ats.artifact.StateMachineArtifact.TransitionOption;
import org.eclipse.osee.ats.artifact.TaskArtifact;
import org.eclipse.osee.ats.artifact.TaskableStateMachineArtifact;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java index bb793cf1705..b040589dbcd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.logging.Level;
import org.eclipse.osee.ats.artifact.ATSArtifact;
import org.eclipse.osee.ats.artifact.ATSLog;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType; +import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
import org.eclipse.osee.ats.artifact.TaskArtifact;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java index 442c75ac823..0c49279917f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java @@ -10,43 +10,43 @@ *******************************************************************************/ package org.eclipse.osee.ats.util;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.ats.artifact.ATSAttributes;
-import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.artifact.VersionArtifact;
-import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.widgets.dialog.AtsPriorityDialog;
-import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog;
-import org.eclipse.osee.ats.world.search.GoalSearchItem;
-import org.eclipse.osee.framework.core.data.SystemUser;
-import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.UniversalGroup;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPromptChange;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactCheckTreeDialog;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ChangeTypeDialog;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.DateSelectionDialog;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserCheckTreeDialog;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserGroupsCheckTreeDialog;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog;
-import org.eclipse.swt.widgets.Display;
+import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.ats.artifact.ATSAttributes; +import org.eclipse.osee.ats.artifact.StateMachineArtifact; +import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; +import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.artifact.VersionArtifact; +import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.widgets.dialog.AtsPriorityDialog; +import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog; +import org.eclipse.osee.ats.world.search.GoalSearchItem; +import org.eclipse.osee.framework.core.data.SystemUser; +import org.eclipse.osee.framework.core.enums.CoreRelationTypes; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.User; +import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.UniversalGroup; +import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPromptChange; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactCheckTreeDialog; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ChangeTypeDialog; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.DateSelectionDialog; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserCheckTreeDialog; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserGroupsCheckTreeDialog; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog; +import org.eclipse.osee.framework.ui.swt.Displays; /**
* @author Donald G. Dunne
@@ -155,7 +155,7 @@ public class PromptChangeUtil { }
public static boolean promptChangeOriginator(final Collection<? extends StateMachineArtifact> smas) throws OseeCoreException {
- UserListDialog ld = new UserListDialog(Display.getCurrent().getActiveShell(), "Select New Originator");
+ UserListDialog ld = new UserListDialog(Displays.getActiveShell(), "Select New Originator");
int result = ld.open();
if (result == 0) {
User selectedUser = ld.getSelection();
@@ -185,7 +185,7 @@ public class PromptChangeUtil { if (teamArt.isReleased() || teamArt.isVersionLocked()) {
String error =
"Team Workflow\n \"" + teamArt.getName() + "\"\n targeted version is locked or already released.";
- if (AtsUtil.isAtsAdmin() && !MessageDialog.openConfirm(Display.getCurrent().getActiveShell(),
+ if (AtsUtil.isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(),
"Change Version", error + "\n\nOverride?")) {
return false;
} else if (!AtsUtil.isAtsAdmin()) {
@@ -223,7 +223,7 @@ public class PromptChangeUtil { //now check selected version
if (newVersion.isVersionLocked()) {
String error = "Version \"" + newVersion.getFullDisplayName() + "\" is locked or already released.";
- if (AtsUtil.isAtsAdmin() && !MessageDialog.openConfirm(Display.getCurrent().getActiveShell(),
+ if (AtsUtil.isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(),
"Change Version", error + "\n\nOverride?")) {
return false;
} else if (!AtsUtil.isAtsAdmin()) {
@@ -261,7 +261,7 @@ public class PromptChangeUtil { return false;
}
}
- final ChangeTypeDialog dialog = new ChangeTypeDialog(Display.getCurrent().getActiveShell());
+ final ChangeTypeDialog dialog = new ChangeTypeDialog(Displays.getActiveShell());
try {
if (teams.size() == 1) {
dialog.setSelected(teams.iterator().next().getChangeType());
@@ -294,7 +294,7 @@ public class PromptChangeUtil { public static boolean promptChangePoints(final Collection<? extends TeamWorkFlowArtifact> teams, boolean persist) throws OseeStateException {
- final ChangePointDialog dialog = new ChangePointDialog(Display.getCurrent().getActiveShell());
+ final ChangePointDialog dialog = new ChangePointDialog(Displays.getActiveShell());
try {
if (teams.size() == 1) {
dialog.setSelected(teams.iterator().next().getWorldViewPoint());
@@ -339,7 +339,7 @@ public class PromptChangeUtil { return false;
}
}
- final AtsPriorityDialog ald = new AtsPriorityDialog(Display.getCurrent().getActiveShell());
+ final AtsPriorityDialog ald = new AtsPriorityDialog(Displays.getActiveShell());
try {
if (teams.size() == 1) {
ald.setSelected(teams.iterator().next().getPriority());
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java index 46071f516d2..8ef25463ef1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java @@ -19,7 +19,7 @@ import java.util.HashSet; import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set; +import java.util.Set;
import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.artifact.VersionArtifact;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/XCancellationReasonTextWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/XCancellationReasonTextWidget.java index 7aebebbc40d..4b63ae2dd06 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/XCancellationReasonTextWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/XCancellationReasonTextWidget.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.ats.util;
-import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget;
-import org.eclipse.osee.framework.ui.skynet.widgets.XText;
-import org.eclipse.osee.framework.ui.swt.Widgets;
+import org.eclipse.osee.ats.artifact.StateMachineArtifact; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget; +import org.eclipse.osee.framework.ui.skynet.widgets.XText; +import org.eclipse.osee.framework.ui.swt.Widgets; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XCurrentStateDam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XCurrentStateDam.java index a31a7b9ef24..62a2d3ce8d8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XCurrentStateDam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XCurrentStateDam.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.util.widgets; import java.util.Date;
import java.util.Set;
import org.eclipse.osee.ats.artifact.ATSAttributes;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType; +import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
import org.eclipse.osee.ats.util.AtsUtil;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranchEnablement.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranchEnablement.java index e0df7cd04fb..ea268760b03 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranchEnablement.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranchEnablement.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.ats.util.widgets;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.widgets.XWorkingBranch.BranchStatus;
-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.ats.artifact.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.widgets.XWorkingBranch.BranchStatus; +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; public class XWorkingBranchEnablement {
boolean populated = false;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java index 5dc53240501..a3daf9f1e1a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java @@ -22,8 +22,8 @@ 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.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.TreeItem;
/**
@@ -104,7 +104,7 @@ public class CommitXManager extends XViewer { } else if (commitStatus == CommitStatus.Committed_With_Merge) {
destBranch = configArt.getParentBranch();
MessageDialog dialog =
- new MessageDialog(Display.getCurrent().getActiveShell(), "Select Report", null,
+ new MessageDialog(Displays.getActiveShell(), "Select Report", null,
"Both Change Report and Merge Manager exist.\n\nSelect to open.", MessageDialog.QUESTION,
new String[] {"Show Change Report", "Show Merge Manager", "Cancel"}, 0);
int result = dialog.open();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java index 2bd0f869dcd..3d654c8bf35 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java @@ -53,7 +53,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -112,7 +111,7 @@ public class XCommitManager extends XWidget implements IArtifactWidget, IMergeBr @Override
public void handleEvent(Event event) {
if (event.button == 3) {
- if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Auto Commit Branches",
+ if (!MessageDialog.openConfirm(Displays.getActiveShell(), "Auto Commit Branches",
"ATS Admin\n\nAuto Commit Branches?")) {
return;
}
@@ -180,7 +179,7 @@ public class XCommitManager extends XWidget implements IArtifactWidget, IMergeBr extraInfoLabel = new Label(leftComp, SWT.NONE);
extraInfoLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
extraInfoLabel.setText("");
- extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
Composite rightComp = new Composite(bComp, SWT.NONE);
rightComp.setLayout(new GridLayout());
@@ -275,7 +274,7 @@ public class XCommitManager extends XWidget implements IArtifactWidget, IMergeBr if (infoStr == null && currentString != null || infoStr != null && currentString == null || !infoStr.equals(currentString)) {
extraInfoLabel.setText("Double-click item to perform Action");
}
- extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(color));
+ extraInfoLabel.setForeground(Displays.getSystemColor(color));
}
}
});
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java index ad8f810598a..3ed9c333c7e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java @@ -19,7 +19,7 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator;
import org.eclipse.nebula.widgets.xviewer.IXViewerFactory;
import org.eclipse.nebula.widgets.xviewer.XPromptChange;
-import org.eclipse.nebula.widgets.xviewer.XPromptChange.Option; +import org.eclipse.nebula.widgets.xviewer.XPromptChange.Option;
import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.util.EnumStringSingleSelectionDialog;
@@ -33,10 +33,10 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;
@@ -465,7 +465,7 @@ public class DefectXViewer extends XViewer { modified = setLocation(defectItems, loc);
}
} else if (xCol.equals(DefectXViewerFactory.User_Col)) {
- UserListDialog ld = new UserListDialog(Display.getCurrent().getActiveShell(), "Select New User");
+ UserListDialog ld = new UserListDialog(Displays.getActiveShell(), "Select New User");
int result = ld.open();
if (result == 0) {
modified = setUser(defectItems, ld.getSelection());
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java index 5738edc2eae..50545cc2d26 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java @@ -66,7 +66,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -145,7 +144,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IArtifact GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 3;
sash.setLayoutData(gd);
- sash.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));
+ sash.setBackground(Displays.getSystemColor(SWT.COLOR_GRAY));
sash.addListener(SWT.MouseUp, new Listener() {
public void handleEvent(Event e) {
Rectangle treeRect = xViewer.getTree().getClientArea();
@@ -268,7 +267,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IArtifact extraInfoLabel = new Label(labelComp, SWT.NONE);
extraInfoLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
extraInfoLabel.setText("");
- extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
refreshActionEnablement();
}
@@ -348,7 +347,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IArtifact public void handleImportDefectsViaList() {
try {
EntryDialog ed =
- new EntryDialog(Display.getCurrent().getActiveShell(), "Create Defects", null,
+ new EntryDialog(Displays.getActiveShell(), "Create Defects", null,
"Enter task titles, one per line.", MessageDialog.QUESTION, new String[] {"OK", "Cancel"}, 0);
ed.setFillVertically(true);
if (ed.open() == 0) {
@@ -408,7 +407,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IArtifact public void handleNewDefect() {
EntryDialog ed =
- new EntryDialog(Display.getCurrent().getActiveShell(), "Create New Defect", null,
+ new EntryDialog(Displays.getActiveShell(), "Create New Defect", null,
"Enter Defect Description", MessageDialog.QUESTION, new String[] {"OK", "Cancel"}, 0);
if (ed.open() == 0) {
try {
@@ -471,21 +470,21 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IArtifact try {
if (isRequiredEntry() && xViewer.getTree().getItemCount() == 0) {
extraInfoLabel.setText("At least one defect entry is required. Select \"New Defect\" to add.");
- extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
return new Status(IStatus.ERROR, getClass().getSimpleName(), "At least one defect entry is required");
}
if (reviewArt != null) {
for (DefectItem item : reviewArt.getDefectManager().getDefectItems()) {
if (item.isClosed() == false || item.getDisposition() == Disposition.None || item.getSeverity() == Severity.None && item.getDisposition() != Disposition.Duplicate && item.getDisposition() != Disposition.Reject) {
extraInfoLabel.setText("All items must be marked for severity, disposition and closed. Select icon in cell or right-click to update field.");
- extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
return new Status(IStatus.ERROR, getClass().getSimpleName(),
"Review not complete until all items are marked for severity, disposition and closed");
}
}
}
extraInfoLabel.setText("Select \"New Defect\" to add. Select icon in cell or right-click to update field.");
- extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK));
+ extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_BLACK));
} catch (Exception ex) {
OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
return new Status(IStatus.ERROR, getClass().getSimpleName(),
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java index 92e95fd7000..cc65e47953e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java @@ -19,6 +19,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.util.ArtifactDescriptiveLabelProvider; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -26,7 +27,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; /** @@ -42,7 +42,7 @@ public class ActionActionableItemListDialog extends CheckedTreeSelectionDialog { boolean showAction = false; public ActionActionableItemListDialog(Active active) { - super(Display.getCurrent().getActiveShell(), new ArtifactDescriptiveLabelProvider(), new AITreeContentProvider( + super(Displays.getActiveShell(), new ArtifactDescriptiveLabelProvider(), new AITreeContentProvider( active)); setTitle("Select Actionable Items"); setMessage("Select Actionable Items"); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java index 9d858b2995b..f436a72e6ea 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java @@ -19,6 +19,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactListDialog; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -26,7 +27,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -41,7 +41,7 @@ public class ActionTeamListDialog extends ArtifactListDialog { boolean showAction = false; public ActionTeamListDialog(Active active) { - super(Display.getCurrent().getActiveShell()); + super(Displays.getActiveShell()); setTitle("Select Team(s)"); setMessage("Select Team(s)"); ArrayList<Artifact> arts = new ArrayList<Artifact>(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java index bf949a76252..4d133678c64 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.util.ArtifactDescriptiveLabelProvider; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; /** @@ -28,7 +28,7 @@ import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; public class ActionableItemListDialog extends CheckedTreeSelectionDialog { public ActionableItemListDialog(Active active) { - super(Display.getCurrent().getActiveShell(), new ArtifactDescriptiveLabelProvider(), new AITreeContentProvider( + super(Displays.getActiveShell(), new ArtifactDescriptiveLabelProvider(), new AITreeContentProvider( active)); setTitle("Select Actionable Item(s)"); setMessage("Select Actionable Item(s)"); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SMAStatusDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SMAStatusDialog.java index 7e002d61dc8..b809bd14853 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SMAStatusDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SMAStatusDialog.java @@ -22,6 +22,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.widgets.XFloat; import org.eclipse.osee.framework.ui.skynet.widgets.XPercent; import org.eclipse.osee.framework.ui.skynet.widgets.XRadioButton; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; @@ -29,7 +30,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; @@ -67,7 +67,7 @@ public class SMAStatusDialog extends MessageDialog { if (sma instanceof TaskArtifact) hasTask = true; statusLabel = new Label(parent, SWT.NONE); - statusLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + statusLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); updateStatusLabel(); if (smas.size() > 1) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListDialog.java index 3d7e5866fb8..916576731cd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListDialog.java @@ -15,9 +15,9 @@ import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.ui.plugin.util.StringLabelProvider; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.ListDialog; /** @@ -26,7 +26,7 @@ import org.eclipse.ui.dialogs.ListDialog; public class StateListDialog extends ListDialog { public StateListDialog(String title, String message, Collection<String> values) { - super(Display.getCurrent().getActiveShell()); + super(Displays.getActiveShell()); setInput(values); setTitle(title); setMessage(message); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionDialog.java index 84608fda6b2..559d544e316 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionDialog.java @@ -16,10 +16,10 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Display; public class TeamDefinitionDialog extends org.eclipse.ui.dialogs.ListDialog { public TeamDefinitionDialog(String title, String message) { - super(Display.getCurrent().getActiveShell()); + super(Displays.getActiveShell()); this.setTitle(title); this.setMessage(message); this.setContentProvider(new ArrayContentProvider() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java index 99c26791754..d08af9a4737 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java @@ -22,6 +22,7 @@ import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.skynet.util.ArtifactDescriptiveLabelProvider; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -29,7 +30,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; /** @@ -46,7 +46,7 @@ public class TeamDefinitionTreeWithChildrenDialog extends CheckedTreeSelectionDi } public TeamDefinitionTreeWithChildrenDialog(Active active, Collection<TeamDefinitionArtifact> teamDefinitionArtifacts) throws OseeCoreException { - super(Display.getCurrent().getActiveShell(), new ArtifactDescriptiveLabelProvider(), + super(Displays.getActiveShell(), new ArtifactDescriptiveLabelProvider(), new TeamDefinitionTreeContentProvider(active)); setTitle("Select Team Definition"); setMessage("Select Team Definition"); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java index aa325455fac..ed13494d8eb 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java @@ -23,6 +23,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.ArtifactViewerSorter; import org.eclipse.osee.framework.ui.skynet.util.ArtifactDescriptiveLabelProvider; import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -30,7 +31,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.SelectionDialog; /** @@ -46,7 +46,7 @@ public class TeamVersionListDialog extends SelectionDialog { private final TeamDefinitionArtifact teamDef; public TeamVersionListDialog(Active active) { - super(Display.getCurrent().getActiveShell()); + super(Displays.getActiveShell()); this.active = active; this.teamDef = null; setTitle("Select Version"); @@ -54,7 +54,7 @@ public class TeamVersionListDialog extends SelectionDialog { } public TeamVersionListDialog(TeamDefinitionArtifact teamDef, Active active) { - super(Display.getCurrent().getActiveShell()); + super(Displays.getActiveShell()); this.teamDef = teamDef; this.active = active; setTitle("Select Version"); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/UserCommunityListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/UserCommunityListDialog.java index d32eb13bdf7..3aa60f6ca0b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/UserCommunityListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/UserCommunityListDialog.java @@ -16,9 +16,9 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.UserCommunity; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Display; public class UserCommunityListDialog extends org.eclipse.ui.dialogs.ListDialog { public UserCommunityListDialog() { - super(Display.getCurrent().getActiveShell()); + super(Displays.getActiveShell()); this.setTitle("Select User Community"); this.setMessage("Select User Community"); this.setContentProvider(new ArrayContentProvider() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java index cea1a1ece17..dd1d3e62e42 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java @@ -14,9 +14,9 @@ import java.util.Collection; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameReverseSorter; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Display; public class VersionListDialog extends org.eclipse.ui.dialogs.ListDialog { public VersionListDialog(String title, String message, Collection<VersionArtifact> verArts) { - super(Display.getCurrent().getActiveShell()); + super(Displays.getActiveShell()); this.setTitle(title); this.setMessage(message); this.setContentProvider(new ArrayContentProvider() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java index 60020656406..e8f91e36a3c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java @@ -31,10 +31,10 @@ import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;
@@ -223,7 +223,7 @@ public class UserRoleXViewer extends XViewer { } else if (xCol.equals(UserRoleXViewerFactory.Completed_Col)) {
modified = setCompleted(userRoles);
} else if (xCol.equals(UserRoleXViewerFactory.User_Col)) {
- UserListDialog ld = new UserListDialog(Display.getCurrent().getActiveShell(), "Select New User");
+ UserListDialog ld = new UserListDialog(Displays.getActiveShell(), "Select New User");
int result = ld.open();
if (result == 0) {
modified = setUser(userRoles, ld.getSelection());
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java index 4cec274a3a7..aa6fec6fb2a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java @@ -60,7 +60,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; @@ -134,7 +133,7 @@ public class XUserRoleViewer extends XWidget implements IArtifactWidget, IArtifa GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.heightHint = 3; sash.setLayoutData(gd); - sash.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY)); + sash.setBackground(Displays.getSystemColor(SWT.COLOR_GRAY)); sash.addListener(SWT.MouseUp, new Listener() { public void handleEvent(Event e) { Rectangle treeRect = xViewer.getTree().getClientArea(); @@ -244,7 +243,7 @@ public class XUserRoleViewer extends XWidget implements IArtifactWidget, IArtifa extraInfoLabel = new Label(labelComp, SWT.NONE); extraInfoLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); extraInfoLabel.setText(""); - extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); refreshActionEnablement(); } @@ -364,17 +363,17 @@ public class XUserRoleViewer extends XWidget implements IArtifactWidget, IArtifa try { if (isRequiredEntry() && xViewer.getTree().getItemCount() == 0) { extraInfoLabel.setText("At least one role entry is required. Select \"New Role\" to add."); - extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); return new Status(IStatus.ERROR, getClass().getSimpleName(), "At least one role entry is required"); } IStatus result = reviewArt.isUserRoleValid(getClass().getSimpleName()); if (!result.isOK()) { extraInfoLabel.setText(result.getMessage() + " - Select \"New Role\" to add. Select icon in cell to update value."); - extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); return result; } extraInfoLabel.setText("Select \"New Role\" to add. Select icon in cell to update value."); - extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK)); + extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_BLACK)); } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); return new Status(IStatus.ERROR, getClass().getSimpleName(), diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java index 9b39b56f5af..cd0eb5f88f5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java @@ -23,8 +23,8 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Connection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Connection.java index 2353aa1135c..161311d7525 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Connection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/Connection.java @@ -14,9 +14,9 @@ import org.eclipse.draw2d.Graphics; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.Result;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
/**
* A connection between two distinct shapes.
@@ -25,140 +25,140 @@ import org.eclipse.swt.widgets.Display; */
public class Connection extends ModelElement {
- /** True, if the connection is attached to its endpoints. */
- private boolean isConnected;
- private int lineStyle = Graphics.LINE_SOLID;
- /** Connection's source endpoint. */
- private Shape source;
- /** Connection's target endpoint. */
- private Shape target;
-
- /**
- * Create a (solid) connection between two distinct shapes.
- *
- * @param source a source endpoint for this connection (non null)
- * @param target a target endpoint for this connection (non null)
- * @throws IllegalArgumentException if any of the parameters are null or source == target
- * @see #setLineStyle(int)
- */
- public Connection(Shape source, Shape target) {
- reconnect(source, target);
- }
-
- public Color getForegroundColor() {
- return Display.getCurrent().getSystemColor(SWT.COLOR_BLACK);
- }
-
- @Override
- public String toString() {
- return "Connection";
- }
-
- /**
- * Disconnect this connection from the shapes it is attached to.
- */
- public void disconnect() {
- if (isConnected) {
- source.removeConnection(this);
- target.removeConnection(this);
- isConnected = false;
- }
- }
-
- /**
- * Returns the line drawing style of this connection.
- *
- * @return an int value (Graphics.LINE_DASH or Graphics.LINE_SOLID)
- */
- public int getLineStyle() {
- return lineStyle;
- }
-
- @Override
- public Result validForSave() throws OseeCoreException {
- System.err.println("Add Connection validations.");
- return Result.TrueResult;
- }
-
- /**
- * Returns the source endpoint of this connection.
- *
- * @return a non-null Shape instance
- */
- public Shape getSource() {
- return source;
- }
-
- /**
- * Returns the target endpoint of this connection.
- *
- * @return a non-null Shape instance
- */
- public Shape getTarget() {
- return target;
- }
-
- /**
- * Reconnect this connection. The connection will reconnect with the shapes it was previously attached to.
- */
- public void reconnect() {
- if (!isConnected) {
- source.addConnection(this);
- target.addConnection(this);
- isConnected = true;
- }
- }
-
- /**
- * Reconnect to a different source and/or target shape. The connection will disconnect from its current attachments
- * and reconnect to the new source and target.
- *
- * @param newSource a new source endpoint for this connection (non null)
- * @param newTarget a new target endpoint for this connection (non null)
- * @throws IllegalArgumentException if any of the paramers are null or newSource == newTarget
- */
- public void reconnect(Shape newSource, Shape newTarget) {
- if (newSource == null || newTarget == null || newSource == newTarget) {
- throw new IllegalArgumentException();
- }
- disconnect();
- this.source = newSource;
- this.target = newTarget;
- reconnect();
- }
-
- /**
- * Set the line drawing style of this connection.
- *
- * @param lineStyle one of following values: Graphics.LINE_DASH or Graphics.LINE_SOLID
- * @see Graphics#LINE_DASH
- * @see Graphics#LINE_SOLID
- * @throws IllegalArgumentException if lineStyle does not have one of the above values
- */
- public void setLineStyle(int lineStyle) {
- if (lineStyle != Graphics.LINE_DASH && lineStyle != Graphics.LINE_SOLID) {
- throw new IllegalArgumentException();
- }
- this.lineStyle = lineStyle;
- }
-
- /**
- * @return the label
- */
- public String getLabel() {
- return "Connection";
- }
-
- /**
- * @return the lineWidth
- */
- public int getLineWidth() {
- return 2;
- }
-
- @Override
- public Result doSave(SkynetTransaction transaction) throws OseeCoreException {
- return Result.TrueResult;
- }
+ /** True, if the connection is attached to its endpoints. */
+ private boolean isConnected;
+ private int lineStyle = Graphics.LINE_SOLID;
+ /** Connection's source endpoint. */
+ private Shape source;
+ /** Connection's target endpoint. */
+ private Shape target;
+
+ /**
+ * Create a (solid) connection between two distinct shapes.
+ *
+ * @param source a source endpoint for this connection (non null)
+ * @param target a target endpoint for this connection (non null)
+ * @throws IllegalArgumentException if any of the parameters are null or source == target
+ * @see #setLineStyle(int)
+ */
+ public Connection(Shape source, Shape target) {
+ reconnect(source, target);
+ }
+
+ public Color getForegroundColor() {
+ return Displays.getSystemColor(SWT.COLOR_BLACK);
+ }
+
+ @Override
+ public String toString() {
+ return "Connection";
+ }
+
+ /**
+ * Disconnect this connection from the shapes it is attached to.
+ */
+ public void disconnect() {
+ if (isConnected) {
+ source.removeConnection(this);
+ target.removeConnection(this);
+ isConnected = false;
+ }
+ }
+
+ /**
+ * Returns the line drawing style of this connection.
+ *
+ * @return an int value (Graphics.LINE_DASH or Graphics.LINE_SOLID)
+ */
+ public int getLineStyle() {
+ return lineStyle;
+ }
+
+ @Override
+ public Result validForSave() throws OseeCoreException {
+ System.err.println("Add Connection validations.");
+ return Result.TrueResult;
+ }
+
+ /**
+ * Returns the source endpoint of this connection.
+ *
+ * @return a non-null Shape instance
+ */
+ public Shape getSource() {
+ return source;
+ }
+
+ /**
+ * Returns the target endpoint of this connection.
+ *
+ * @return a non-null Shape instance
+ */
+ public Shape getTarget() {
+ return target;
+ }
+
+ /**
+ * Reconnect this connection. The connection will reconnect with the shapes it was previously attached to.
+ */
+ public void reconnect() {
+ if (!isConnected) {
+ source.addConnection(this);
+ target.addConnection(this);
+ isConnected = true;
+ }
+ }
+
+ /**
+ * Reconnect to a different source and/or target shape. The connection will disconnect from its current attachments
+ * and reconnect to the new source and target.
+ *
+ * @param newSource a new source endpoint for this connection (non null)
+ * @param newTarget a new target endpoint for this connection (non null)
+ * @throws IllegalArgumentException if any of the paramers are null or newSource == newTarget
+ */
+ public void reconnect(Shape newSource, Shape newTarget) {
+ if (newSource == null || newTarget == null || newSource == newTarget) {
+ throw new IllegalArgumentException();
+ }
+ disconnect();
+ this.source = newSource;
+ this.target = newTarget;
+ reconnect();
+ }
+
+ /**
+ * Set the line drawing style of this connection.
+ *
+ * @param lineStyle one of following values: Graphics.LINE_DASH or Graphics.LINE_SOLID
+ * @see Graphics#LINE_DASH
+ * @see Graphics#LINE_SOLID
+ * @throws IllegalArgumentException if lineStyle does not have one of the above values
+ */
+ public void setLineStyle(int lineStyle) {
+ if (lineStyle != Graphics.LINE_DASH && lineStyle != Graphics.LINE_SOLID) {
+ throw new IllegalArgumentException();
+ }
+ this.lineStyle = lineStyle;
+ }
+
+ /**
+ * @return the label
+ */
+ public String getLabel() {
+ return "Connection";
+ }
+
+ /**
+ * @return the lineWidth
+ */
+ public int getLineWidth() {
+ return 2;
+ }
+
+ @Override
+ public Result doSave(SkynetTransaction transaction) throws OseeCoreException {
+ return Result.TrueResult;
+ }
}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/DefaultTransitionConnection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/DefaultTransitionConnection.java index 1a1afd628ad..81f36666783 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/DefaultTransitionConnection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/DefaultTransitionConnection.java @@ -10,9 +10,9 @@ *******************************************************************************/
package org.eclipse.osee.ats.workflow.editor.model;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
/**
* @author Donald G. Dunne
@@ -29,7 +29,7 @@ public class DefaultTransitionConnection extends TransitionConnection { @Override
public Color getForegroundColor() {
- return Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GREEN);
+ return Displays.getSystemColor(SWT.COLOR_DARK_GREEN);
}
@Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/TransitionConnection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/TransitionConnection.java index 889978accae..873eaef7f51 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/TransitionConnection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/TransitionConnection.java @@ -13,9 +13,9 @@ package org.eclipse.osee.ats.workflow.editor.model; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.Result;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
@@ -40,7 +40,7 @@ public class TransitionConnection extends Connection { @Override
public Color getForegroundColor() {
- return Display.getCurrent().getSystemColor(SWT.COLOR_BLACK);
+ return Displays.getSystemColor(SWT.COLOR_BLACK);
}
@Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java index 93a8a203b1a..bcda113d7e8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkPageShape.java @@ -23,7 +23,7 @@ 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.Result;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemAttributes;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java index 9f20577f834..5a4989d0f8e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java @@ -23,9 +23,9 @@ 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.Result;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition.TransitionType; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition.TransitionType;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemAttributes;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java index a14d3f11f11..9790490ba69 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java @@ -31,13 +31,13 @@ import org.eclipse.osee.framework.logging.OseeLog; 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;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition.TransitionType;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory; -import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
+import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java index 60418b08f26..e5f87276516 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddDecisionReviewRule.java @@ -14,9 +14,9 @@ import java.util.Arrays; import java.util.Collection;
import java.util.logging.Level;
import org.eclipse.osee.ats.artifact.ATSLog.LogType;
-import org.eclipse.osee.ats.artifact.DecisionReviewArtifact; +import org.eclipse.osee.ats.artifact.DecisionReviewArtifact;
import org.eclipse.osee.ats.artifact.ReviewSMArtifact.ReviewBlockType;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.widgets.ReviewManager;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java index 4c86b24eaa0..6d7dd534755 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsAddPeerToPeerReviewRule.java @@ -15,9 +15,9 @@ import java.util.Date; import java.util.logging.Level;
import org.eclipse.osee.ats.artifact.ATSAttributes;
import org.eclipse.osee.ats.artifact.ATSLog.LogType;
-import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; +import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
import org.eclipse.osee.ats.artifact.ReviewSMArtifact.ReviewBlockType;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.widgets.ReviewManager;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java index 5e17e937674..122a9bbd9a7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancellationReasonStateWorkItem.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.ats.workflow.item;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType; +import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java index 01e7c05ffe1..58bb09cf7b1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCancelledFromStateWorkItem.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.ats.workflow.item;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType; +import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java index 35482c0a55b..713aae13f13 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsCompletedFromStateWorkItem.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.ats.workflow.item;
-import org.eclipse.osee.ats.artifact.ATSLog.LogType; +import org.eclipse.osee.ats.artifact.ATSLog.LogType;
import org.eclipse.osee.ats.artifact.LogItem;
import org.eclipse.osee.ats.artifact.StateMachineArtifact;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java index 8dd86451af7..1762bc190d2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java @@ -22,7 +22,7 @@ import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.util.AtsFolderUtil;
import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder;
-import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.widgets.XWorkingBranch;
import org.eclipse.osee.ats.util.widgets.commit.XCommitManager;
import org.eclipse.osee.ats.workflow.flow.DecisionWorkflowDefinition;
@@ -44,7 +44,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayou import org.eclipse.osee.framework.ui.skynet.widgets.workflow.IWorkDefinitionProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkRuleDefinition;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java index e819883f6b0..4ce9dbef205 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java @@ -51,7 +51,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; import org.osgi.framework.Bundle; /** @@ -94,7 +94,7 @@ public class LoadAIsAndTeamsAction { } private void run() throws OseeCoreException { - if (prompt && !MessageDialog.openQuestion(Display.getCurrent().getActiveShell(), "Import ATS Config?", + if (prompt && !MessageDialog.openQuestion(Displays.getActiveShell(), "Import ATS Config?", "Importing ATS Config from ActionableItems.vue.\n\nAre you sure?")) { return; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java index fde1cacaf2a..464341cf96a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java @@ -34,6 +34,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; import org.eclipse.osee.framework.ui.skynet.widgets.xbargraph.XBarGraphLine;
import org.eclipse.osee.framework.ui.skynet.widgets.xbargraph.XBarGraphTable;
import org.eclipse.osee.framework.ui.swt.ALayout;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.events.SelectionAdapter;
@@ -44,7 +45,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
/**
@@ -52,341 +52,346 @@ import org.eclipse.swt.widgets.Label; */
public class AtsMetricsComposite extends ScrolledComposite {
- private Composite toolBarComposite;
- private Composite metricsComposite;
- private final IAtsMetricsProvider iAtsMetricsProvider;
- private final Color BACKGROUND_COLOR = Display.getCurrent().getSystemColor(SWT.COLOR_WHITE);
- private final Color FOREGROUND_COLOR = Display.getCurrent().getSystemColor(SWT.COLOR_BLUE);
- private final Composite mainComp;
- private boolean refreshedOnce = true;
- private XDate estimatedReleaseXDate;
-
- /**
- * @param iAtsMetricsProvider
- * @param parent
- * @param style
- */
- public AtsMetricsComposite(IAtsMetricsProvider iAtsMetricsProvider, Composite parent, int style) {
- super(parent, style | SWT.V_SCROLL | SWT.H_SCROLL);
- this.iAtsMetricsProvider = iAtsMetricsProvider;
-
- setLayout(new GridLayout(1, true));
- setLayoutData(new GridData(GridData.FILL_BOTH));
-
- mainComp = new Composite(this, SWT.NONE);
- mainComp.setLayout(new GridLayout());
- mainComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- adapt(mainComp);
-
- if (!DbConnectionExceptionComposite.dbConnectionIsOk(mainComp)) {
- return;
- }
-
- adapt(this);
- creatToolBar(mainComp);
-
- setContent(mainComp);
- setExpandHorizontal(true);
- setExpandVertical(true);
- layout();
- }
-
- private void creatToolBar(Composite composite) {
- toolBarComposite = new Composite(composite, SWT.NONE);
- toolBarComposite.setLayoutData(new GridData(SWT.NONE, SWT.NONE, true, false, 1, 1));
- toolBarComposite.setLayout(new GridLayout(4, false));
- adapt(toolBarComposite);
-
- Button refresh = new Button(toolBarComposite, SWT.PUSH);
- refresh.setText("Display/Refresh Metrics");
- refresh.setToolTipText("Recalculate and Update Metrics");
- refresh.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- try {
- handleUpdateMetrics();
- } catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
- }
- });
- adapt(refresh);
-
- estimatedReleaseXDate = new XDate("Estimated Release Date - Override");
- estimatedReleaseXDate.createWidgets(toolBarComposite, 2);
- adapt(estimatedReleaseXDate.getLabelWidget());
-
- if (!refreshedOnce) {
- Label label = new Label(toolBarComposite, SWT.NONE);
- label.setText(" Last Updated: " + XDate.getDateNow(XDate.MMDDYYHHMM));
- adapt(label);
- }
-
- }
-
- public void handleUpdateMetrics() throws OseeCoreException {
- refreshedOnce = false;
- if (metricsComposite != null) {
- metricsComposite.dispose();
- }
- metricsComposite = new Composite(mainComp, SWT.NONE);
- metricsComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
- metricsComposite.setLayout(ALayout.getZeroMarginLayout(1, true));
- adapt(metricsComposite);
-
- addSpace();
-
- try {
- if (estimatedReleaseXDate.getDate() == null && iAtsMetricsProvider.getMetricsVersionArtifact() != null && iAtsMetricsProvider.getMetricsVersionArtifact().getEstimatedReleaseDate() != null) {
- estimatedReleaseXDate.setDate(iAtsMetricsProvider.getMetricsVersionArtifact().getEstimatedReleaseDate());
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
-
- SMAMetrics sMet =
- new SMAMetrics(iAtsMetricsProvider.getMetricsArtifacts(), iAtsMetricsProvider.getMetricsVersionArtifact(),
- iAtsMetricsProvider.getManHoursPerDayPreference(), getEstimatedReleaseDate());
- createOverviewChart(sMet, metricsComposite);
- addSpace();
- createHoursRemainingByAssigneesChart(sMet, metricsComposite);
- addSpace();
- createCompletedByAssigneesChart(sMet, metricsComposite);
-
- mainComp.layout();
- computeScrollSize();
- }
-
- private Date getEstimatedReleaseDate() throws OseeCoreException {
- if (estimatedReleaseXDate != null && estimatedReleaseXDate.getDate() != null) {
- return estimatedReleaseXDate.getDate();
- }
- if (iAtsMetricsProvider.getMetricsVersionArtifact() != null) {
- return iAtsMetricsProvider.getMetricsVersionArtifact().getEstimatedReleaseDate();
- }
- // Try to find an estimated release date from one of the workflows
- for (Artifact art : iAtsMetricsProvider.getMetricsArtifacts()) {
- if (art instanceof TeamWorkFlowArtifact) {
- VersionArtifact verArt = ((TeamWorkFlowArtifact) art).getWorldViewTargetedVersion();
- if (verArt != null) {
- if (verArt.getEstimatedReleaseDate() != null) {
- return verArt.getEstimatedReleaseDate();
- }
- }
- }
- }
- return null;
- }
-
- public void computeScrollSize() {
- this.computeScrollSize(mainComp);
- }
-
- private void computeScrollSize(Composite viewableArea) {
- this.setMinSize(viewableArea.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- }
-
- private void addSpace() {
- Label label = new Label(metricsComposite, SWT.NONE);
- label.setText(" ");
- adapt(label);
- }
-
- public void createOverviewChart(SMAMetrics sMet, Composite parent) throws OseeCoreException {
- List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>();
-
- lines.add(XBarGraphLine.getTextLine("Loaded", sMet.toStringObjectBreakout()));
- lines.add(XBarGraphLine.getTextLineRedIfTrue("Workflows", String.format(
- "Estimates off %d workflows with %d having 0 estimates.", sMet.getNumSMAs(), sMet.getNumNotEstimated()),
- sMet.getNumNotEstimated() > 0));
-
- lines.add(XBarGraphLine.getPercentLine(
- "By Workflow Percents (" + sMet.getCummulativeWorkflowPercentComplete() + "/" + sMet.getNumTeamWfs() + ")",
- (int) sMet.getPercentCompleteByWorkflowPercents()));
- lines.add(XBarGraphLine.getPercentLine(
- "By Number of Workflows (" + sMet.getCompletedWorkflows().size() + "/" + sMet.getNumSMAs() + ")",
- (int) sMet.getPercentCompleteByWorkflow()));
-
- lines.add(XBarGraphLine.getTextLine("Estimated Hours: ", String.format("%5.2f Hours", sMet.getEstHours())));
- lines.add(XBarGraphLine.getTextLine("Remaining Hours: ", String.format(
- "%5.2f Hours = (Estimated hours %5.2f - (Estimated hours %5.2f x Percent Complete %5.2f))",
- sMet.getHrsRemainFromEstimates(), sMet.getEstHours(), sMet.getEstHours(),
- sMet.getPercentCompleteByWorkflowPercents())));
- lines.add(XBarGraphLine.getTextLine("Hours Spent: ", String.format("%5.2f Hours", sMet.getHrsSpent())));
- lines.add(XBarGraphLine.getTextLine("Hours Per Man Day Preference: ", String.format("%5.2f Hours per Day",
- sMet.getHoursPerManDay())));
- lines.add(XBarGraphLine.getTextLine("Work Days Needed: ", String.format(
- "%5.2f Days = Remaining Hours %5.2f / Hours Per Day of %5.2f", sMet.getManDaysNeeded(),
- sMet.getHrsRemainFromEstimates(), sMet.getHoursPerManDay())));
-
- try {
- lines.add(new XBarGraphLine(
- "Targeted Version",
- 0,
- iAtsMetricsProvider.getMetricsVersionArtifact() == null ? "Not Set" : iAtsMetricsProvider.getMetricsVersionArtifact().getName()));
- lines.add(new XBarGraphLine(
- "Targeted Version - Estimated Release Date",
- 0,
- iAtsMetricsProvider.getMetricsVersionArtifact() == null ? "Not Set" : iAtsMetricsProvider.getMetricsVersionArtifact().getSoleAttributeValueAsString(
- ATSAttributes.ESTIMATED_RELEASE_DATE_ATTRIBUTE.getStoreName(), "Not Set")));
- lines.add(new XBarGraphLine("Metrics Estimated Release Date", 0,
- getEstimatedReleaseDate() == null ? "Not Set" : getEstimatedReleaseDate().toString()));
- lines.add(new XBarGraphLine("Work-Days Till Release", 0,
- getEstimatedReleaseDate() == null ? "Estimated Release Date Not Set" : sMet.getDaysTillRelStr()));
- double hoursTillRelease = sMet.getHoursTillRel();
- lines.add(new XBarGraphLine("Hours Till Release", 0,
- getEstimatedReleaseDate() == null ? "Estimated Release Date Not Set" : sMet.getHoursTillRelStr()));
- double hoursRemainingFromEstimates = sMet.getHrsRemainFromEstimates();
- int percent = 0;
- if (hoursTillRelease != 0) {
- percent = (int) (hoursRemainingFromEstimates / hoursTillRelease);
- }
- if (sMet.getEstRelDate() == null) {
- lines.add(new XBarGraphLine("Release Effort Remaining", 0, "Estimated Release Date Not Set"));
- } else if (hoursRemainingFromEstimates > hoursTillRelease) {
- lines.add(new XBarGraphLine("Release Effort Remaining", XBarGraphLine.DEFAULT_RED_FOREGROUND,
- XBarGraphLine.DEFAULT_RED_BACKGROUND, 100, String.format(
- "%5.2f hours exceeds remaining release hours %5.2f; Over by %5.2f hours.",
- hoursRemainingFromEstimates, hoursTillRelease, hoursRemainingFromEstimates - hoursTillRelease)));
- } else {
- lines.add(new XBarGraphLine("Release Effort Remaining", XBarGraphLine.DEFAULT_GREEN_FOREGROUND,
- XBarGraphLine.DEFAULT_GREEN_BACKGROUND, SWT.COLOR_WHITE, SWT.COLOR_WHITE, percent, String.format(
- "%5.2f remaining work hours", hoursRemainingFromEstimates), String.format(
- "%5.2f release remaining hours", hoursRemainingFromEstimates)));
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
-
- XBarGraphTable table = new XBarGraphTable("Overview", "", "", lines);
- table.setHeaderVisible(false);
- table.setFillHorizontally(true);
- table.createWidgets(parent, 1);
- adapt(table);
- }
-
- public void createCompletedByAssigneesChart(SMAMetrics sMet, Composite parent) {
- List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>();
- for (User user : sMet.getAssigneesAssignedOrCompleted()) {
- try {
- int numCompleted = sMet.getUserToCompletedSmas(user).size();
- double cummulativePercentComplete = numCompleted * 100;
- int numInWork = sMet.getUserToAssignedSmas(user).size();
- // Since table is loaded with arts and also shows children, don't want to count artifacts twice
- Set<Artifact> processedArts = new HashSet<Artifact>();
- if (sMet.getUserToAssignedSmas().getValues(user) != null) {
- for (Artifact sma : sMet.getUserToAssignedSmas().getValues(user)) {
- if (!processedArts.contains(sma) && !sMet.getUserToCompletedSmas().containsValue(sma)) {
- cummulativePercentComplete += ((StateMachineArtifact) sma).getWorldViewPercentCompleteTotal();
- processedArts.add(sma);
- }
- }
- }
- int numTotal = numCompleted + numInWork;
- int percentCompleteByNumber = 0;
- if (numCompleted == numTotal) {
- percentCompleteByNumber = 100;
- } else if (numCompleted != 0 && numTotal != 0) {
- double percent = ((double) numCompleted / (double) numTotal) * 100.0;
- percentCompleteByNumber = (int) percent;
- }
- int percentCompleteByPercents = 0;
- if (cummulativePercentComplete == 0) {
- percentCompleteByPercents = 0;
-
- } else if (numTotal == 0) {
- percentCompleteByPercents = 100;
- } else {
- double percent = cummulativePercentComplete / numTotal;
- percentCompleteByPercents = (int) percent;
- }
- lines.add(XBarGraphLine.getPercentLineBlueGreen(
- user.getName() + " by Percents (" + cummulativePercentComplete + "/" + numTotal + ")",
- percentCompleteByPercents));
- lines.add(XBarGraphLine.getPercentLineBlueGreen(
- user.getName() + " by Number of Workflows (" + numCompleted + "/" + numTotal + ")",
- percentCompleteByNumber));
- } catch (Exception ex) {
- lines.add(XBarGraphLine.getTextLine(user.getName(), "Exception: " + ex.getLocalizedMessage()));
- }
- }
- XBarGraphTable table =
- new XBarGraphTable("Completed by Assignee per Assigned Workflow (Team, Task and Review)", "User",
- "Percent Complete", lines);
- table.setFillHorizontally(true);
- table.createWidgets(parent, 1);
- adapt(table);
- }
-
- public void createHoursRemainingByAssigneesChart(SMAMetrics sMet, Composite parent) throws OseeCoreException {
- List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>();
- Double hoursRemain = null;
- if (sMet.getEstRelDate() != null) {
- hoursRemain = sMet.getHoursTillRel();
- }
- for (User user : sMet.getAssigneesAssignedOrCompleted()) {
- try {
- double userHoursRemain = 0;
- for (TeamWorkFlowArtifact team : sMet.getTeamArts()) {
- Collection<User> users = team.getStateMgr().getAssignees();
- if (users.contains(user)) {
- double hours = team.getRemainHoursTotal();
- if (hours > 0) {
- userHoursRemain += hours / users.size();
- }
- }
- }
- if (sMet.getEstRelDate() == null) {
- lines.add(new XBarGraphLine(user.getName(), (int) userHoursRemain, String.format(
- "%5.2f - (Estimated release date not set)", userHoursRemain)));
- } else if (hoursRemain == null) {
- lines.add(new XBarGraphLine(user.getName(), (int) userHoursRemain, String.format("%5.2f",
- userHoursRemain)));
- } else {
- if (userHoursRemain == 0.0) {
- lines.add(new XBarGraphLine(user.getName(), XBarGraphLine.DEFAULT_GREEN_FOREGROUND,
- XBarGraphLine.DEFAULT_GREEN_BACKGROUND, 100, "No Estimated Hours Remain"));
- } else if (userHoursRemain > hoursRemain) {
- lines.add(new XBarGraphLine(user.getName(), XBarGraphLine.DEFAULT_RED_FOREGROUND,
- XBarGraphLine.DEFAULT_RED_BACKGROUND,
- (((int) userHoursRemain) > 1 ? (int) userHoursRemain : 1), String.format(
- "%5.2f - Exceeds release remaining hours %5.2f.", userHoursRemain, hoursRemain)));
- } else {
- lines.add(new XBarGraphLine(user.getName(), XBarGraphLine.DEFAULT_GREEN_FOREGROUND,
- XBarGraphLine.DEFAULT_GREEN_BACKGROUND, (int) userHoursRemain, String.format(
- "%5.2f - Within remaining hours %5.2f.", userHoursRemain, hoursRemain)));
- }
- }
- } catch (OseeCoreException ex) {
- lines.add(new XBarGraphLine(user.getName(), 0, "Exception: " + ex.getLocalizedMessage()));
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
- }
- XBarGraphTable table =
- new XBarGraphTable(
- "Hours Remaining by Assignee (green = within remaining hours; red = exceeds remaining hours till release)",
- "User", "Hours Remaining", lines);
- table.setFillHorizontally(true);
- table.createWidgets(parent, 1);
- adapt(table);
- }
-
- public void disposeComposite() {
- }
-
- public void adapt(XWidget xWidget) {
- adapt(xWidget.getControl());
- adapt(xWidget.getLabelWidget());
- }
-
- public void adapt(Control control) {
- if (control == null) return;
- control.setBackground(BACKGROUND_COLOR);
- control.setForeground(FOREGROUND_COLOR);
- }
-
- public void adapt(Composite composite) {
- composite.setBackground(BACKGROUND_COLOR);
- }
+ private Composite toolBarComposite;
+ private Composite metricsComposite;
+ private final IAtsMetricsProvider iAtsMetricsProvider;
+ private final Color BACKGROUND_COLOR = Displays.getSystemColor(SWT.COLOR_WHITE);
+ private final Color FOREGROUND_COLOR = Displays.getSystemColor(SWT.COLOR_BLUE);
+ private final Composite mainComp;
+ private boolean refreshedOnce = true;
+ private XDate estimatedReleaseXDate;
+
+ /**
+ * @param iAtsMetricsProvider
+ * @param parent
+ * @param style
+ */
+ public AtsMetricsComposite(IAtsMetricsProvider iAtsMetricsProvider, Composite parent, int style) {
+ super(parent, style | SWT.V_SCROLL | SWT.H_SCROLL);
+ this.iAtsMetricsProvider = iAtsMetricsProvider;
+
+ setLayout(new GridLayout(1, true));
+ setLayoutData(new GridData(GridData.FILL_BOTH));
+
+ mainComp = new Composite(this, SWT.NONE);
+ mainComp.setLayout(new GridLayout());
+ mainComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ adapt(mainComp);
+
+ if (!DbConnectionExceptionComposite.dbConnectionIsOk(mainComp)) {
+ return;
+ }
+
+ adapt(this);
+ creatToolBar(mainComp);
+
+ setContent(mainComp);
+ setExpandHorizontal(true);
+ setExpandVertical(true);
+ layout();
+ }
+
+ private void creatToolBar(Composite composite) {
+ toolBarComposite = new Composite(composite, SWT.NONE);
+ toolBarComposite.setLayoutData(new GridData(SWT.NONE, SWT.NONE, true, false, 1, 1));
+ toolBarComposite.setLayout(new GridLayout(4, false));
+ adapt(toolBarComposite);
+
+ Button refresh = new Button(toolBarComposite, SWT.PUSH);
+ refresh.setText("Display/Refresh Metrics");
+ refresh.setToolTipText("Recalculate and Update Metrics");
+ refresh.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ try {
+ handleUpdateMetrics();
+ } catch (OseeCoreException ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+ }
+ });
+ adapt(refresh);
+
+ estimatedReleaseXDate = new XDate("Estimated Release Date - Override");
+ estimatedReleaseXDate.createWidgets(toolBarComposite, 2);
+ adapt(estimatedReleaseXDate.getLabelWidget());
+
+ if (!refreshedOnce) {
+ Label label = new Label(toolBarComposite, SWT.NONE);
+ label.setText(" Last Updated: " + XDate.getDateNow(XDate.MMDDYYHHMM));
+ adapt(label);
+ }
+
+ }
+
+ public void handleUpdateMetrics() throws OseeCoreException {
+ refreshedOnce = false;
+ if (metricsComposite != null) {
+ metricsComposite.dispose();
+ }
+ metricsComposite = new Composite(mainComp, SWT.NONE);
+ metricsComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ metricsComposite.setLayout(ALayout.getZeroMarginLayout(1, true));
+ adapt(metricsComposite);
+
+ addSpace();
+
+ try {
+ if (estimatedReleaseXDate.getDate() == null && iAtsMetricsProvider.getMetricsVersionArtifact() != null && iAtsMetricsProvider.getMetricsVersionArtifact().getEstimatedReleaseDate() != null) {
+ estimatedReleaseXDate.setDate(iAtsMetricsProvider.getMetricsVersionArtifact().getEstimatedReleaseDate());
+ }
+ } catch (OseeCoreException ex) {
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+
+ SMAMetrics sMet =
+ new SMAMetrics(iAtsMetricsProvider.getMetricsArtifacts(),
+ iAtsMetricsProvider.getMetricsVersionArtifact(),
+ iAtsMetricsProvider.getManHoursPerDayPreference(), getEstimatedReleaseDate());
+ createOverviewChart(sMet, metricsComposite);
+ addSpace();
+ createHoursRemainingByAssigneesChart(sMet, metricsComposite);
+ addSpace();
+ createCompletedByAssigneesChart(sMet, metricsComposite);
+
+ mainComp.layout();
+ computeScrollSize();
+ }
+
+ private Date getEstimatedReleaseDate() throws OseeCoreException {
+ if (estimatedReleaseXDate != null && estimatedReleaseXDate.getDate() != null) {
+ return estimatedReleaseXDate.getDate();
+ }
+ if (iAtsMetricsProvider.getMetricsVersionArtifact() != null) {
+ return iAtsMetricsProvider.getMetricsVersionArtifact().getEstimatedReleaseDate();
+ }
+ // Try to find an estimated release date from one of the workflows
+ for (Artifact art : iAtsMetricsProvider.getMetricsArtifacts()) {
+ if (art instanceof TeamWorkFlowArtifact) {
+ VersionArtifact verArt = ((TeamWorkFlowArtifact) art).getWorldViewTargetedVersion();
+ if (verArt != null) {
+ if (verArt.getEstimatedReleaseDate() != null) {
+ return verArt.getEstimatedReleaseDate();
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ public void computeScrollSize() {
+ this.computeScrollSize(mainComp);
+ }
+
+ private void computeScrollSize(Composite viewableArea) {
+ this.setMinSize(viewableArea.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+ }
+
+ private void addSpace() {
+ Label label = new Label(metricsComposite, SWT.NONE);
+ label.setText(" ");
+ adapt(label);
+ }
+
+ public void createOverviewChart(SMAMetrics sMet, Composite parent) throws OseeCoreException {
+ List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>();
+
+ lines.add(XBarGraphLine.getTextLine("Loaded", sMet.toStringObjectBreakout()));
+ lines.add(XBarGraphLine.getTextLineRedIfTrue(
+ "Workflows",
+ String.format("Estimates off %d workflows with %d having 0 estimates.", sMet.getNumSMAs(),
+ sMet.getNumNotEstimated()), sMet.getNumNotEstimated() > 0));
+
+ lines.add(XBarGraphLine.getPercentLine(
+ "By Workflow Percents (" + sMet.getCummulativeWorkflowPercentComplete() + "/" + sMet.getNumTeamWfs() + ")",
+ (int) sMet.getPercentCompleteByWorkflowPercents()));
+ lines.add(XBarGraphLine.getPercentLine(
+ "By Number of Workflows (" + sMet.getCompletedWorkflows().size() + "/" + sMet.getNumSMAs() + ")",
+ (int) sMet.getPercentCompleteByWorkflow()));
+
+ lines.add(XBarGraphLine.getTextLine("Estimated Hours: ", String.format("%5.2f Hours", sMet.getEstHours())));
+ lines.add(XBarGraphLine.getTextLine("Remaining Hours: ", String.format(
+ "%5.2f Hours = (Estimated hours %5.2f - (Estimated hours %5.2f x Percent Complete %5.2f))",
+ sMet.getHrsRemainFromEstimates(), sMet.getEstHours(), sMet.getEstHours(),
+ sMet.getPercentCompleteByWorkflowPercents())));
+ lines.add(XBarGraphLine.getTextLine("Hours Spent: ", String.format("%5.2f Hours", sMet.getHrsSpent())));
+ lines.add(XBarGraphLine.getTextLine("Hours Per Man Day Preference: ",
+ String.format("%5.2f Hours per Day", sMet.getHoursPerManDay())));
+ lines.add(XBarGraphLine.getTextLine("Work Days Needed: ", String.format(
+ "%5.2f Days = Remaining Hours %5.2f / Hours Per Day of %5.2f", sMet.getManDaysNeeded(),
+ sMet.getHrsRemainFromEstimates(), sMet.getHoursPerManDay())));
+
+ try {
+ lines.add(new XBarGraphLine(
+ "Targeted Version",
+ 0,
+ iAtsMetricsProvider.getMetricsVersionArtifact() == null ? "Not Set" : iAtsMetricsProvider.getMetricsVersionArtifact().getName()));
+ lines.add(new XBarGraphLine(
+ "Targeted Version - Estimated Release Date",
+ 0,
+ iAtsMetricsProvider.getMetricsVersionArtifact() == null ? "Not Set" : iAtsMetricsProvider.getMetricsVersionArtifact().getSoleAttributeValueAsString(
+ ATSAttributes.ESTIMATED_RELEASE_DATE_ATTRIBUTE.getStoreName(), "Not Set")));
+ lines.add(new XBarGraphLine("Metrics Estimated Release Date", 0,
+ getEstimatedReleaseDate() == null ? "Not Set" : getEstimatedReleaseDate().toString()));
+ lines.add(new XBarGraphLine("Work-Days Till Release", 0,
+ getEstimatedReleaseDate() == null ? "Estimated Release Date Not Set" : sMet.getDaysTillRelStr()));
+ double hoursTillRelease = sMet.getHoursTillRel();
+ lines.add(new XBarGraphLine("Hours Till Release", 0,
+ getEstimatedReleaseDate() == null ? "Estimated Release Date Not Set" : sMet.getHoursTillRelStr()));
+ double hoursRemainingFromEstimates = sMet.getHrsRemainFromEstimates();
+ int percent = 0;
+ if (hoursTillRelease != 0) {
+ percent = (int) (hoursRemainingFromEstimates / hoursTillRelease);
+ }
+ if (sMet.getEstRelDate() == null) {
+ lines.add(new XBarGraphLine("Release Effort Remaining", 0, "Estimated Release Date Not Set"));
+ } else if (hoursRemainingFromEstimates > hoursTillRelease) {
+ lines.add(new XBarGraphLine("Release Effort Remaining", XBarGraphLine.DEFAULT_RED_FOREGROUND,
+ XBarGraphLine.DEFAULT_RED_BACKGROUND, 100, String.format(
+ "%5.2f hours exceeds remaining release hours %5.2f; Over by %5.2f hours.",
+ hoursRemainingFromEstimates, hoursTillRelease,
+ hoursRemainingFromEstimates - hoursTillRelease)));
+ } else {
+ lines.add(new XBarGraphLine("Release Effort Remaining", XBarGraphLine.DEFAULT_GREEN_FOREGROUND,
+ XBarGraphLine.DEFAULT_GREEN_BACKGROUND, SWT.COLOR_WHITE, SWT.COLOR_WHITE, percent, String.format(
+ "%5.2f remaining work hours", hoursRemainingFromEstimates), String.format(
+ "%5.2f release remaining hours", hoursRemainingFromEstimates)));
+ }
+ } catch (OseeCoreException ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+
+ XBarGraphTable table = new XBarGraphTable("Overview", "", "", lines);
+ table.setHeaderVisible(false);
+ table.setFillHorizontally(true);
+ table.createWidgets(parent, 1);
+ adapt(table);
+ }
+
+ public void createCompletedByAssigneesChart(SMAMetrics sMet, Composite parent) {
+ List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>();
+ for (User user : sMet.getAssigneesAssignedOrCompleted()) {
+ try {
+ int numCompleted = sMet.getUserToCompletedSmas(user).size();
+ double cummulativePercentComplete = numCompleted * 100;
+ int numInWork = sMet.getUserToAssignedSmas(user).size();
+ // Since table is loaded with arts and also shows children, don't want to count artifacts twice
+ Set<Artifact> processedArts = new HashSet<Artifact>();
+ if (sMet.getUserToAssignedSmas().getValues(user) != null) {
+ for (Artifact sma : sMet.getUserToAssignedSmas().getValues(user)) {
+ if (!processedArts.contains(sma) && !sMet.getUserToCompletedSmas().containsValue(sma)) {
+ cummulativePercentComplete += ((StateMachineArtifact) sma).getWorldViewPercentCompleteTotal();
+ processedArts.add(sma);
+ }
+ }
+ }
+ int numTotal = numCompleted + numInWork;
+ int percentCompleteByNumber = 0;
+ if (numCompleted == numTotal) {
+ percentCompleteByNumber = 100;
+ } else if (numCompleted != 0 && numTotal != 0) {
+ double percent = ((double) numCompleted / (double) numTotal) * 100.0;
+ percentCompleteByNumber = (int) percent;
+ }
+ int percentCompleteByPercents = 0;
+ if (cummulativePercentComplete == 0) {
+ percentCompleteByPercents = 0;
+
+ } else if (numTotal == 0) {
+ percentCompleteByPercents = 100;
+ } else {
+ double percent = cummulativePercentComplete / numTotal;
+ percentCompleteByPercents = (int) percent;
+ }
+ lines.add(XBarGraphLine.getPercentLineBlueGreen(
+ user.getName() + " by Percents (" + cummulativePercentComplete + "/" + numTotal + ")",
+ percentCompleteByPercents));
+ lines.add(XBarGraphLine.getPercentLineBlueGreen(
+ user.getName() + " by Number of Workflows (" + numCompleted + "/" + numTotal + ")",
+ percentCompleteByNumber));
+ } catch (Exception ex) {
+ lines.add(XBarGraphLine.getTextLine(user.getName(), "Exception: " + ex.getLocalizedMessage()));
+ }
+ }
+ XBarGraphTable table =
+ new XBarGraphTable("Completed by Assignee per Assigned Workflow (Team, Task and Review)", "User",
+ "Percent Complete", lines);
+ table.setFillHorizontally(true);
+ table.createWidgets(parent, 1);
+ adapt(table);
+ }
+
+ public void createHoursRemainingByAssigneesChart(SMAMetrics sMet, Composite parent) throws OseeCoreException {
+ List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>();
+ Double hoursRemain = null;
+ if (sMet.getEstRelDate() != null) {
+ hoursRemain = sMet.getHoursTillRel();
+ }
+ for (User user : sMet.getAssigneesAssignedOrCompleted()) {
+ try {
+ double userHoursRemain = 0;
+ for (TeamWorkFlowArtifact team : sMet.getTeamArts()) {
+ Collection<User> users = team.getStateMgr().getAssignees();
+ if (users.contains(user)) {
+ double hours = team.getRemainHoursTotal();
+ if (hours > 0) {
+ userHoursRemain += hours / users.size();
+ }
+ }
+ }
+ if (sMet.getEstRelDate() == null) {
+ lines.add(new XBarGraphLine(user.getName(), (int) userHoursRemain, String.format(
+ "%5.2f - (Estimated release date not set)", userHoursRemain)));
+ } else if (hoursRemain == null) {
+ lines.add(new XBarGraphLine(user.getName(), (int) userHoursRemain, String.format("%5.2f",
+ userHoursRemain)));
+ } else {
+ if (userHoursRemain == 0.0) {
+ lines.add(new XBarGraphLine(user.getName(), XBarGraphLine.DEFAULT_GREEN_FOREGROUND,
+ XBarGraphLine.DEFAULT_GREEN_BACKGROUND, 100, "No Estimated Hours Remain"));
+ } else if (userHoursRemain > hoursRemain) {
+ lines.add(new XBarGraphLine(user.getName(), XBarGraphLine.DEFAULT_RED_FOREGROUND,
+ XBarGraphLine.DEFAULT_RED_BACKGROUND,
+ (((int) userHoursRemain) > 1 ? (int) userHoursRemain : 1), String.format(
+ "%5.2f - Exceeds release remaining hours %5.2f.", userHoursRemain, hoursRemain)));
+ } else {
+ lines.add(new XBarGraphLine(user.getName(), XBarGraphLine.DEFAULT_GREEN_FOREGROUND,
+ XBarGraphLine.DEFAULT_GREEN_BACKGROUND, (int) userHoursRemain, String.format(
+ "%5.2f - Within remaining hours %5.2f.", userHoursRemain, hoursRemain)));
+ }
+ }
+ } catch (OseeCoreException ex) {
+ lines.add(new XBarGraphLine(user.getName(), 0, "Exception: " + ex.getLocalizedMessage()));
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ }
+ }
+ XBarGraphTable table =
+ new XBarGraphTable(
+ "Hours Remaining by Assignee (green = within remaining hours; red = exceeds remaining hours till release)",
+ "User", "Hours Remaining", lines);
+ table.setFillHorizontally(true);
+ table.createWidgets(parent, 1);
+ adapt(table);
+ }
+
+ public void disposeComposite() {
+ }
+
+ public void adapt(XWidget xWidget) {
+ adapt(xWidget.getControl());
+ adapt(xWidget.getLabelWidget());
+ }
+
+ public void adapt(Control control) {
+ if (control == null) {
+ return;
+ }
+ control.setBackground(BACKGROUND_COLOR);
+ control.setForeground(FOREGROUND_COLOR);
+ }
+
+ public void adapt(Composite composite) {
+ composite.setBackground(BACKGROUND_COLOR);
+ }
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java index 8805871c649..d9985509015 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java @@ -168,7 +168,7 @@ public abstract class AtsXWidgetActionFormPage extends FormPage { saveButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Save Default Parameters", + if (MessageDialog.openConfirm(Displays.getActiveShell(), "Save Default Parameters", "Save current parameters as default?")) { handleSaveButtonPressed(); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewerEventHandler.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewerEventHandler.java index 5c23ac777dc..1f487411b20 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewerEventHandler.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewerEventHandler.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.world;
-import java.util.Collection;
+import java.util.Collection; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java index 5174c400150..48142c23d4e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java @@ -47,7 +47,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
/**
* @author Donald G. Dunne
@@ -147,7 +146,7 @@ public class WorldComposite extends ScrolledComposite implements IWorldViewerEve worldXViewer.updateStatusLabel();
if (otherArts.size() > 0) {
if (MessageDialog.openConfirm(
- Display.getCurrent().getActiveShell(),
+ Displays.getActiveShell(),
"Open in Artifact Editor?",
otherArts.size() + " Non-WorldView Artifacts were returned from request.\n\nOpen in Artifact Editor?")) {
RendererManager.openInJob(otherArts, PresentationType.GENERALIZED_EDIT);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java index 2b6d3866879..654d550f3bf 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java @@ -23,7 +23,7 @@ import org.eclipse.osee.ats.world.search.NextVersionSearchItem; import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
-import org.eclipse.osee.ats.world.search.WorldUISearchItem; +import org.eclipse.osee.ats.world.search.WorldUISearchItem;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java index e14027a3599..f13d7302ea4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java @@ -25,11 +25,11 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
public class WorldLabelProvider extends XViewerLabelProvider {
@@ -83,7 +83,7 @@ public class WorldLabelProvider extends XViewerLabelProvider { TaskArtifact taskArt = (TaskArtifact) element;
TaskResOptionDefinition def = taskArt.getTaskResolutionOptionDefinition(taskArt.getWorldViewResolution());
if (def != null) {
- return Display.getCurrent().getSystemColor(def.getColorInt());
+ return Displays.getSystemColor(def.getColorInt());
}
}
for (IAtsWorldEditorItem item : AtsWorldEditorItems.getItems()) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewerEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewerEventManager.java index a4b93a771da..d1a22dea7ca 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewerEventManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewerEventManager.java @@ -10,25 +10,25 @@ *******************************************************************************/ package org.eclipse.osee.ats.world;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Level;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.osee.ats.artifact.StateMachineArtifact;
-import org.eclipse.osee.ats.internal.AtsPlugin;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
-import org.eclipse.osee.framework.skynet.core.event2.filter.IEventFilter;
+import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.logging.Level; +import org.eclipse.jface.viewers.IContentProvider; +import org.eclipse.osee.ats.artifact.StateMachineArtifact; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; +import org.eclipse.osee.framework.skynet.core.event.Sender; +import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent; +import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact; +import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType; +import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener; +import org.eclipse.osee.framework.skynet.core.event2.filter.IEventFilter; import org.eclipse.osee.framework.ui.swt.Displays; /**
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java index 7b5557c999d..ee5196a5534 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java @@ -84,7 +84,6 @@ import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;
@@ -620,7 +619,7 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IArt }
if (art != null) {
ArtifactEmailWizard ew = new ArtifactEmailWizard((StateMachineArtifact) art);
- WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), ew);
+ WizardDialog dialog = new WizardDialog(Displays.getActiveShell(), ew);
dialog.create();
dialog.open();
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java index a92d76e6d98..7ef691e1615 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.nebula.widgets.xviewer.XViewerSorter; +import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
import org.eclipse.osee.ats.artifact.ATSAttributes;
import org.eclipse.osee.ats.artifact.GoalArtifact;
import org.eclipse.osee.ats.internal.AtsPlugin;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java index 1ea3c21941f..cf1e7509e9a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.UniversalGroup;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.GroupListDialog;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Donald G. Dunne
@@ -97,7 +97,7 @@ public class GroupWorldSearchItem extends WorldUISearchItem { if (groupName != null) return;
if (group != null) return;
if (searchType == SearchType.ReSearch && selectedGroup != null) return;
- GroupListDialog gld = new GroupListDialog(Display.getCurrent().getActiveShell());
+ GroupListDialog gld = new GroupListDialog(Displays.getActiveShell());
int result = gld.open();
if (result == 0) {
selectedGroup = gld.getSelection();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchData.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchData.java index 2d7077fb3ec..ef874218ddc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchData.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchData.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.ats.world.search;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.ats.util.AtsEditor;
-import org.eclipse.osee.ats.world.IWorldEditorConsumer;
-import org.eclipse.osee.ats.world.WorldEditor;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
+import java.util.ArrayList; +import java.util.List; +import org.eclipse.osee.ats.util.AtsEditor; +import org.eclipse.osee.ats.world.IWorldEditorConsumer; +import org.eclipse.osee.ats.world.WorldEditor; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.jdk.core.util.Strings; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java index c7ad923ecd1..5b4c730edd2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java @@ -50,7 +50,6 @@ 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.util.filteredTree.SimpleCheckFilteredTreeDialog; import org.eclipse.osee.framework.ui.swt.Displays; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.ListDialog; /** @@ -157,7 +156,7 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { - MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Open Change Reports", + MessageDialog.openInformation(Displays.getActiveShell(), "Open Change Reports", "No change report exists for " + enteredIds); } }); @@ -176,7 +175,7 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW if (resultAtsArts.size() == 1) { artifact = resultAtsArts.iterator().next(); } else { - ListDialog ld = new ListDialog(Display.getCurrent().getActiveShell()); + ListDialog ld = new ListDialog(Displays.getActiveShell()); ld.setContentProvider(new ArrayContentProvider()); ld.setLabelProvider(new SmaWorkflowLabelProvider()); ld.setTitle("Select Workflow"); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchUi.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchUi.java index 286b9aea696..9ce15f521e6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchUi.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchUi.java @@ -21,7 +21,6 @@ import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryCheckDialog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.swt.Displays; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -73,7 +72,7 @@ public class MultipleHridSearchUi { "Include ArtIds"); } else { ed = - new EntryDialog(Display.getCurrent().getActiveShell(), data.getName(), null, + new EntryDialog(Displays.getActiveShell(), data.getName(), null, "Enter Legacy ID, Guid or HRID (comma separated)", MessageDialog.QUESTION, new String[] { "OK", "Cancel"}, 0); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java index dd8f6e4c122..ce31f82fdce 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java @@ -16,10 +16,10 @@ import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.KeyedImage; import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Display; /** * @author Donald G. Dunne @@ -105,7 +105,7 @@ public abstract class UserSearchItem extends WorldUISearchItem { if (searchType == SearchType.ReSearch && selectedUser != null) { return; } - UserListDialog ld = new UserListDialog(Display.getCurrent().getActiveShell()); + UserListDialog ld = new UserListDialog(Displays.getActiveShell()); int result = ld.open(); if (result == 0) { selectedUser = ld.getSelection(); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java index fba3fedd87b..dedb60c51a4 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java @@ -10,31 +10,31 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageOption;
-import org.eclipse.osee.coverage.model.CoverageOptionManager;
-import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
-import org.eclipse.osee.coverage.store.CoverageOptionManagerStore;
-import org.eclipse.osee.coverage.store.CoverageOptionManagerStore.StoreLocation;
+import java.util.HashSet; +import java.util.Set; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageOption; +import org.eclipse.osee.coverage.model.CoverageOptionManager; +import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; +import org.eclipse.osee.coverage.store.CoverageOptionManagerStore; +import org.eclipse.osee.coverage.store.CoverageOptionManagerStore.StoreLocation; import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; -import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;
-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.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog; +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.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; +import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* @author Donald G. Dunne
@@ -74,7 +74,7 @@ public class ConfigureCoverageMethodsAction extends Action { StoreLocation storeLocation = optionsStore.getStoreLocation();
if (storeLocation == StoreLocation.None) {
MessageDialog localGlobalDialog =
- new MessageDialog(Display.getCurrent().getActiveShell(), "Question", null,
+ new MessageDialog(Displays.getActiveShell(), "Question", null,
"No Custom Coverage Methods Configured, Configure Now?", MessageDialog.WARNING,
new String[] {"Save local to Coverage Pacakge", "Save globally for Branch", "Cancel"}, 0);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java index 1e7d2f6e354..465c72ef24c 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java @@ -10,26 +10,26 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.model.ICoverageUnitProvider;
-import org.eclipse.osee.coverage.store.OseeCoverageUnitStore;
-import org.eclipse.osee.coverage.util.ISaveable;
-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.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.widgets.Display;
+import java.util.ArrayList; +import java.util.List; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.model.ICoverageUnitProvider; +import org.eclipse.osee.coverage.store.OseeCoverageUnitStore; +import org.eclipse.osee.coverage.util.ISaveable; +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.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.osee.framework.ui.swt.ImageManager; /**
* @author Donald G. Dunne
@@ -68,7 +68,7 @@ public class DeleteCoverUnitAction extends Action { result.popup();
return;
}
- if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Delete Coverage Unit",
+ if (MessageDialog.openConfirm(Displays.getActiveShell(), "Delete Coverage Unit",
"Delete Coverage Units")) {
try {
SkynetTransaction transaction =
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java index 4a858572295..30ed627c210 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java @@ -10,23 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoveragePackage;
-import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;
-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.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.CheckBoxDialog;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog; +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.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.CheckBoxDialog; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditAssigneesAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditAssigneesAction.java index 9d46de8dd1c..c4089f03f64 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditAssigneesAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditAssigneesAction.java @@ -10,27 +10,27 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.store.OseeCoverageUnitStore;
-import org.eclipse.osee.coverage.util.ISaveable;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-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.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.utility.UsersByIds;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserCheckTreeDialog;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.store.OseeCoverageUnitStore; +import org.eclipse.osee.coverage.util.ISaveable; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +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.skynet.core.User; +import org.eclipse.osee.framework.skynet.core.utility.UsersByIds; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserCheckTreeDialog; +import org.eclipse.osee.framework.ui.swt.ImageManager; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageMethodAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageMethodAction.java index 245365825c2..a2abe3ddcea 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageMethodAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageMethodAction.java @@ -10,24 +10,24 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.editor.xcover.CoverageXViewer;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.CoverageOption;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.util.ISaveable;
-import org.eclipse.osee.coverage.util.dialog.CoverageMethodListDialog;
-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.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import java.util.HashSet; +import java.util.Set; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.editor.xcover.CoverageXViewer; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoverageOption; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.util.ISaveable; +import org.eclipse.osee.coverage.util.dialog.CoverageMethodListDialog; +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.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.swt.ImageManager; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageNotesAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageNotesAction.java index 06b91ebefc4..f8d4e5d35ff 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageNotesAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditCoverageNotesAction.java @@ -10,23 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.util.ISaveable;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-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.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import java.util.HashSet; +import java.util.Set; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.util.ISaveable; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +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.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; +import org.eclipse.osee.framework.ui.swt.ImageManager; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditRationaleAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditRationaleAction.java index b79ee96f02a..e4a8be2facd 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditRationaleAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/EditRationaleAction.java @@ -10,23 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.util.ISaveable;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-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.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import java.util.HashSet; +import java.util.Set; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.util.ISaveable; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +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.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; +import org.eclipse.osee.framework.ui.swt.ImageManager; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/GenerateDetailedCoverageReportAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/GenerateDetailedCoverageReportAction.java index 2d65c00bdcd..715055e685b 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/GenerateDetailedCoverageReportAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/GenerateDetailedCoverageReportAction.java @@ -10,37 +10,37 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.osee.coverage.editor.CoverageEditorOverviewTab;
-import org.eclipse.osee.coverage.editor.xcover.CoverageLabelProvider;
-import org.eclipse.osee.coverage.editor.xcover.CoverageXViewerFactory;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.CoveragePackageBase;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.util.TableWriterAdaptor;
-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.util.OseeData;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Display;
-import com.lowagie.text.Table;
+import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.osee.coverage.editor.CoverageEditorOverviewTab; +import org.eclipse.osee.coverage.editor.xcover.CoverageLabelProvider; +import org.eclipse.osee.coverage.editor.xcover.CoverageXViewerFactory; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoveragePackageBase; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.util.TableWriterAdaptor; +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.util.OseeData; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.widgets.XDate; +import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.swt.program.Program; +import com.lowagie.text.Table; /**
* @author Donald G. Dunne
@@ -64,7 +64,7 @@ public class GenerateDetailedCoverageReportAction extends Action { @Override
public void run() {
- if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getText(), getText())) {
+ if (!MessageDialog.openConfirm(Displays.getActiveShell(), getText(), getText())) {
return;
}
try {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ICoveragePackageHandler.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ICoveragePackageHandler.java index 784f9fdb364..49f8d74bdb4 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ICoveragePackageHandler.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ICoveragePackageHandler.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import org.eclipse.osee.coverage.model.CoveragePackageBase;
+import org.eclipse.osee.coverage.model.CoveragePackageBase; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ISelectedCoverageEditorItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ISelectedCoverageEditorItem.java index 9cc9cd55324..703a9ba9c52 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ISelectedCoverageEditorItem.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ISelectedCoverageEditorItem.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import java.util.Collection;
-import org.eclipse.osee.coverage.model.ICoverage;
+import java.util.Collection; +import org.eclipse.osee.coverage.model.ICoverage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/LinkWithImportItemAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/LinkWithImportItemAction.java index 463d9f11fca..b2871af2b39 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/LinkWithImportItemAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/LinkWithImportItemAction.java @@ -10,23 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.editor.xmerge.XCoverageMergeViewer;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.merge.MatchItem;
-import org.eclipse.osee.coverage.merge.MergeItemGroup;
-import org.eclipse.osee.coverage.merge.MergeManager;
-import org.eclipse.osee.coverage.model.CoveragePackage;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.util.CoverageImage;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.editor.xmerge.XCoverageMergeViewer; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.merge.MatchItem; +import org.eclipse.osee.coverage.merge.MergeItemGroup; +import org.eclipse.osee.coverage.merge.MergeManager; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.util.CoverageImage; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java index b15423946c9..712751f27f4 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java @@ -10,24 +10,24 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.editor.CoverageEditor;
-import org.eclipse.osee.coverage.editor.CoverageEditorInput;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
-import org.eclipse.osee.coverage.model.CoveragePackage;
-import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;
-import org.eclipse.osee.coverage.util.CoverageImage;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-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.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.editor.CoverageEditor; +import org.eclipse.osee.coverage.editor.CoverageEditorInput; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; +import org.eclipse.osee.coverage.util.CoverageImage; +import org.eclipse.osee.coverage.util.CoverageUtil; +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.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java index db216457021..2b1ec6254b3 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/OpenCoveragePackageAction.java @@ -10,22 +10,22 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.editor.CoverageEditor;
-import org.eclipse.osee.coverage.editor.CoverageEditorInput;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;
-import org.eclipse.osee.coverage.util.CoverageImage;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog;
-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.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.editor.CoverageEditor; +import org.eclipse.osee.coverage.editor.CoverageEditorInput; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; +import org.eclipse.osee.coverage.util.CoverageImage; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog; +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.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/SaveImportRecordAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/SaveImportRecordAction.java index 3e36d5c23b7..f6f91824fa3 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/SaveImportRecordAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/SaveImportRecordAction.java @@ -10,20 +10,20 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.util.ISaveable;
-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.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.util.ISaveable; +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.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.osee.framework.ui.swt.ImageManager; /**
* @author Donald G. Dunne
@@ -50,7 +50,7 @@ public class SaveImportRecordAction extends Action { result.popup();
return;
}
- if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Save Coverage Import Record",
+ if (MessageDialog.openConfirm(Displays.getActiveShell(), "Save Coverage Import Record",
"Overwrite coverage import record with current import information?")) {
try {
SkynetTransaction transaction =
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ShowMergeDetailsAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ShowMergeDetailsAction.java index 031ab414abf..fdc5aa51dc2 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ShowMergeDetailsAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ShowMergeDetailsAction.java @@ -10,24 +10,24 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.editor.xmerge.XCoverageMergeViewer;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.merge.MatchItem;
-import org.eclipse.osee.coverage.merge.MergeItem;
-import org.eclipse.osee.coverage.merge.MergeItemGroup;
-import org.eclipse.osee.coverage.merge.MergeManager;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.model.CoveragePackage;
-import org.eclipse.osee.coverage.model.ICoverage;
-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.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.editor.xmerge.XCoverageMergeViewer; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.merge.MatchItem; +import org.eclipse.osee.coverage.merge.MergeItem; +import org.eclipse.osee.coverage.merge.MergeItemGroup; +import org.eclipse.osee.coverage.merge.MergeManager; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.model.ICoverage; +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.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.swt.ImageManager; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ViewSourceAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ViewSourceAction.java index 8df1d50a148..f426489f13b 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ViewSourceAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ViewSourceAction.java @@ -10,21 +10,21 @@ *******************************************************************************/ package org.eclipse.osee.coverage.action;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.AHTML;
-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.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.AHTML; +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.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; +import org.eclipse.osee.framework.ui.swt.ImageManager; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/blam/AbstractCoverageBlam.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/blam/AbstractCoverageBlam.java index 8ca5e757f66..4802be2e051 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/blam/AbstractCoverageBlam.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/blam/AbstractCoverageBlam.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.coverage.blam;
-import org.eclipse.osee.coverage.editor.CoverageEditor;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
+import org.eclipse.osee.coverage.editor.CoverageEditor; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorHandler.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorHandler.java index 4fd7765728a..e6329e2be2b 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorHandler.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorHandler.java @@ -15,7 +15,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers.AbstractEditorHandler;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java index 066872d5b00..0d7eb26a138 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java @@ -10,53 +10,53 @@ *******************************************************************************/ package org.eclipse.osee.coverage.editor;
-import java.util.logging.Level;
-import org.eclipse.core.runtime.AssertionFailedException;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.osee.coverage.CoverageManager;
-import org.eclipse.osee.coverage.blam.AbstractCoverageBlam;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.model.CoveragePackage;
-import org.eclipse.osee.coverage.model.CoveragePackageBase;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-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.ui.plugin.util.ArrayTreeContentProvider;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
-import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamInputSection;
-import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamOutputSection;
-import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamUsageSection;
-import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer;
-import org.eclipse.osee.framework.ui.swt.ALayout;
+import java.util.logging.Level; +import org.eclipse.core.runtime.AssertionFailedException; +import org.eclipse.core.runtime.jobs.IJobChangeEvent; +import org.eclipse.core.runtime.jobs.JobChangeAdapter; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.osee.coverage.CoverageManager; +import org.eclipse.osee.coverage.blam.AbstractCoverageBlam; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.model.CoveragePackageBase; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.jdk.core.util.Collections; +import org.eclipse.osee.framework.jdk.core.util.Lib; +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.ui.plugin.util.ArrayTreeContentProvider; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; +import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamInputSection; +import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamOutputSection; +import org.eclipse.osee.framework.ui.skynet.blam.sections.BlamUsageSection; +import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; +import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; -import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.osee.framework.ui.swt.Widgets;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.osee.framework.ui.swt.Widgets; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.forms.editor.FormEditor; +import org.eclipse.ui.forms.editor.FormPage; +import org.eclipse.ui.forms.widgets.ScrolledForm; +import org.eclipse.ui.forms.widgets.Section; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorLoadingTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorLoadingTab.java index 57c167ef7ea..50393564281 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorLoadingTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorLoadingTab.java @@ -10,21 +10,21 @@ *******************************************************************************/ package org.eclipse.osee.coverage.editor;
-import org.eclipse.osee.coverage.util.CoverageImage;
-import org.eclipse.osee.framework.ui.skynet.action.RefreshAction;
-import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.results.html.XResultsComposite;
-import org.eclipse.osee.framework.ui.swt.ALayout;
+import org.eclipse.osee.coverage.util.CoverageImage; +import org.eclipse.osee.framework.ui.skynet.action.RefreshAction; +import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler; +import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.html.XResultsComposite; +import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; -import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.forms.editor.FormEditor; +import org.eclipse.ui.forms.editor.FormPage; +import org.eclipse.ui.forms.widgets.ScrolledForm; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java index 8368c0b3234..e9b98c17afe 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java @@ -10,36 +10,36 @@ *******************************************************************************/ package org.eclipse.osee.coverage.editor;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.osee.coverage.action.GenerateDetailedCoverageReportAction;
-import org.eclipse.osee.coverage.action.ICoveragePackageHandler;
-import org.eclipse.osee.coverage.model.CoverageOption;
-import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
-import org.eclipse.osee.coverage.model.CoveragePackageBase;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.framework.jdk.core.util.AHTML;
-import org.eclipse.osee.framework.ui.skynet.action.RefreshAction;
-import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler;
-import org.eclipse.osee.framework.ui.skynet.action.browser.BrowserPrintAction;
-import org.eclipse.osee.framework.ui.skynet.action.browser.IBrowserActionHandler;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.skynet.results.html.XResultsComposite;
-import org.eclipse.osee.framework.ui.swt.ALayout;
+import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.eclipse.osee.coverage.action.GenerateDetailedCoverageReportAction; +import org.eclipse.osee.coverage.action.ICoveragePackageHandler; +import org.eclipse.osee.coverage.model.CoverageOption; +import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; +import org.eclipse.osee.coverage.model.CoveragePackageBase; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.framework.jdk.core.util.AHTML; +import org.eclipse.osee.framework.ui.skynet.action.RefreshAction; +import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler; +import org.eclipse.osee.framework.ui.skynet.action.browser.BrowserPrintAction; +import org.eclipse.osee.framework.ui.skynet.action.browser.IBrowserActionHandler; +import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.skynet.results.html.XResultsComposite; +import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; -import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.swt.SWT; +import org.eclipse.swt.browser.Browser; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.forms.editor.FormEditor; +import org.eclipse.ui.forms.editor.FormPage; +import org.eclipse.ui.forms.widgets.ScrolledForm; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageXViewer.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageXViewer.java index 60ff12c7335..9bdca3a49ff 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageXViewer.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/CoverageXViewer.java @@ -44,8 +44,8 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.util.ElapsedTime; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; @@ -248,7 +248,7 @@ public class CoverageXViewer extends XViewer implements ISelectedCoverageEditorI // ICoverage coverageItem = (ICoverage) coverageItems.toArray()[0]; if (isEditable(coverageItems).isFalse()) { - MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Coverage Item", + MessageDialog.openInformation(Displays.getActiveShell(), "Coverage Item", "Read-Only Field - One or more selected Coverage Items is Read-Only"); } } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/XCoverageViewer.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/XCoverageViewer.java index 867b0e14684..47fec994597 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/XCoverageViewer.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xcover/XCoverageViewer.java @@ -27,11 +27,11 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.forms.widgets.ScrolledForm; @@ -41,190 +41,208 @@ import org.eclipse.ui.forms.widgets.ScrolledForm; */ public class XCoverageViewer extends XWidget { - protected CoverageXViewer xViewer; - public final static String normalColor = "#EEEEEE"; - private Label extraInfoLabel; - private Tree tree; - private final Collection<TableType> tableTypes; - private final ISaveable saveable; - private final CoverageOptionManager coverageOptionManager; - public static enum TableType { - Package, Merge, Import - }; - - public XCoverageViewer(ISaveable saveable, CoverageOptionManager coverageOptionManager, TableType tableType, TableType... types) { - super("Coverage Items"); - this.saveable = saveable; - this.coverageOptionManager = coverageOptionManager; - this.tableTypes = Collections.getAggregate(types); - this.tableTypes.add(tableType); - } - - @Override - protected void createControls(Composite parent, int horizontalSpan) { - // Create Text Widgets - if (isDisplayLabel() && !getLabel().equals("")) { - labelWidget = new Label(parent, SWT.NONE); - labelWidget.setText(getLabel() + ":"); - if (getToolTip() != null) { - labelWidget.setToolTipText(getToolTip()); - } - } - - Composite mainComp = new Composite(parent, SWT.BORDER); - mainComp.setLayoutData(new GridData(GridData.FILL_BOTH)); - mainComp.setLayout(ALayout.getZeroMarginLayout()); - if (toolkit != null) toolkit.paintBordersFor(mainComp); - - createTaskActionBar(mainComp); - - xViewer = new CoverageXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, this); - xViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH)); - - xViewer.setContentProvider(new CoverageContentProvider(xViewer)); - xViewer.setLabelProvider(new CoverageLabelProvider(xViewer)); - - if (toolkit != null) toolkit.adapt(xViewer.getStatusLabel(), false, false); - - // NOTE: Don't adapt the tree using xToolkit cause will loose xViewer's context menu - updateExtraLabel(); - } - - public void updateExtraLabel() { - extraInfoLabel.setText(""); - } - - public void setXviewerTree(boolean expand) { - tree = xViewer.getTree(); - GridData gridData = new GridData(GridData.FILL_BOTH); - gridData.widthHint = 50; - tree.setLayout(ALayout.getZeroMarginLayout()); - tree.setLayoutData(gridData); - tree.setHeaderVisible(true); - tree.setLinesVisible(true); - } - - public void createTaskActionBar(Composite parent) { - - // Button composite for state transitions, etc - Composite composite = new Composite(parent, SWT.NONE); - composite.setLayout(ALayout.getZeroMarginLayout()); - composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - extraInfoLabel = new Label(composite, SWT.NONE); - extraInfoLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - extraInfoLabel.setText(""); - extraInfoLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); - - } - - public ScrolledForm getForm(Composite composite) { - ScrolledForm form = null; - if (composite == null) return null; - if (composite instanceof ScrolledForm) return (ScrolledForm) composite; - if (!(composite instanceof ScrolledForm)) { - form = getForm(composite.getParent()); - } - return form; - } - - public void loadTable(Collection<ICoverage> items) { - try { - xViewer.setInput(items); - xViewer.refresh(); - } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); - } - } - - @SuppressWarnings("unchecked") - public ArrayList<ICoverage> getSelectedCoverageItems() { - ArrayList<ICoverage> items = new ArrayList<ICoverage>(); - if (xViewer == null) return items; - if (xViewer.getSelection().isEmpty()) return items; - Iterator i = ((IStructuredSelection) xViewer.getSelection()).iterator(); - while (i.hasNext()) { - Object obj = i.next(); - items.add((ICoverage) obj); - } - return items; - } - - @Override - public Control getControl() { - return xViewer.getTree(); - } - - @Override - public void dispose() { - xViewer.dispose(); - } - - @Override - public void setFocus() { - xViewer.getTree().setFocus(); - } - - @Override - public void refresh() { - if (xViewer == null || xViewer.getTree() == null || xViewer.getTree().isDisposed()) return; - xViewer.refresh(); - } - - @Override - public IStatus isValid() { - return Status.OK_STATUS; - } - - @Override - public void setXmlData(String str) { - } - - @Override - public String getXmlData() { - return null; - } - - @Override - public String toHTML(String labelFont) { - if (getXViewer().getTree().getItemCount() == 0) return ""; - StringBuffer html = new StringBuffer(); - html.append(AHTML.addSpace(1) + AHTML.getLabelStr(AHTML.LABEL_FONT, "Coverage")); - return html.toString(); - } - - @Override - public String getReportData() { - return null; - } - - public CoverageXViewer getXViewer() { - return xViewer; - } - - @Override - public Object getData() { - return xViewer.getInput(); - } - - @Override - public Control getErrorMessageControl() { - return labelWidget; - } - - public boolean isType(TableType tableType) { - if (tableTypes.contains(tableType)) { - return true; - } - return false; - } - - public ISaveable getSaveable() { - return saveable; - } - - public CoverageOptionManager getCoverageOptionManager() { - return coverageOptionManager; - } + protected CoverageXViewer xViewer; + public final static String normalColor = "#EEEEEE"; + private Label extraInfoLabel; + private Tree tree; + private final Collection<TableType> tableTypes; + private final ISaveable saveable; + private final CoverageOptionManager coverageOptionManager; + public static enum TableType { + Package, + Merge, + Import + }; + + public XCoverageViewer(ISaveable saveable, CoverageOptionManager coverageOptionManager, TableType tableType, TableType... types) { + super("Coverage Items"); + this.saveable = saveable; + this.coverageOptionManager = coverageOptionManager; + this.tableTypes = Collections.getAggregate(types); + this.tableTypes.add(tableType); + } + + @Override + protected void createControls(Composite parent, int horizontalSpan) { + // Create Text Widgets + if (isDisplayLabel() && !getLabel().equals("")) { + labelWidget = new Label(parent, SWT.NONE); + labelWidget.setText(getLabel() + ":"); + if (getToolTip() != null) { + labelWidget.setToolTipText(getToolTip()); + } + } + + Composite mainComp = new Composite(parent, SWT.BORDER); + mainComp.setLayoutData(new GridData(GridData.FILL_BOTH)); + mainComp.setLayout(ALayout.getZeroMarginLayout()); + if (toolkit != null) { + toolkit.paintBordersFor(mainComp); + } + + createTaskActionBar(mainComp); + + xViewer = new CoverageXViewer(mainComp, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION, this); + xViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH)); + + xViewer.setContentProvider(new CoverageContentProvider(xViewer)); + xViewer.setLabelProvider(new CoverageLabelProvider(xViewer)); + + if (toolkit != null) { + toolkit.adapt(xViewer.getStatusLabel(), false, false); + } + + // NOTE: Don't adapt the tree using xToolkit cause will loose xViewer's context menu + updateExtraLabel(); + } + + public void updateExtraLabel() { + extraInfoLabel.setText(""); + } + + public void setXviewerTree(boolean expand) { + tree = xViewer.getTree(); + GridData gridData = new GridData(GridData.FILL_BOTH); + gridData.widthHint = 50; + tree.setLayout(ALayout.getZeroMarginLayout()); + tree.setLayoutData(gridData); + tree.setHeaderVisible(true); + tree.setLinesVisible(true); + } + + public void createTaskActionBar(Composite parent) { + + // Button composite for state transitions, etc + Composite composite = new Composite(parent, SWT.NONE); + composite.setLayout(ALayout.getZeroMarginLayout()); + composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + extraInfoLabel = new Label(composite, SWT.NONE); + extraInfoLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + extraInfoLabel.setText(""); + extraInfoLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); + + } + + public ScrolledForm getForm(Composite composite) { + ScrolledForm form = null; + if (composite == null) { + return null; + } + if (composite instanceof ScrolledForm) { + return (ScrolledForm) composite; + } + if (!(composite instanceof ScrolledForm)) { + form = getForm(composite.getParent()); + } + return form; + } + + public void loadTable(Collection<ICoverage> items) { + try { + xViewer.setInput(items); + xViewer.refresh(); + } catch (Exception ex) { + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } + } + + @SuppressWarnings("unchecked") + public ArrayList<ICoverage> getSelectedCoverageItems() { + ArrayList<ICoverage> items = new ArrayList<ICoverage>(); + if (xViewer == null) { + return items; + } + if (xViewer.getSelection().isEmpty()) { + return items; + } + Iterator i = ((IStructuredSelection) xViewer.getSelection()).iterator(); + while (i.hasNext()) { + Object obj = i.next(); + items.add((ICoverage) obj); + } + return items; + } + + @Override + public Control getControl() { + return xViewer.getTree(); + } + + @Override + public void dispose() { + xViewer.dispose(); + } + + @Override + public void setFocus() { + xViewer.getTree().setFocus(); + } + + @Override + public void refresh() { + if (xViewer == null || xViewer.getTree() == null || xViewer.getTree().isDisposed()) { + return; + } + xViewer.refresh(); + } + + @Override + public IStatus isValid() { + return Status.OK_STATUS; + } + + @Override + public void setXmlData(String str) { + } + + @Override + public String getXmlData() { + return null; + } + + @Override + public String toHTML(String labelFont) { + if (getXViewer().getTree().getItemCount() == 0) { + return ""; + } + StringBuffer html = new StringBuffer(); + html.append(AHTML.addSpace(1) + AHTML.getLabelStr(AHTML.LABEL_FONT, "Coverage")); + return html.toString(); + } + + @Override + public String getReportData() { + return null; + } + + public CoverageXViewer getXViewer() { + return xViewer; + } + + @Override + public Object getData() { + return xViewer.getInput(); + } + + @Override + public Control getErrorMessageControl() { + return labelWidget; + } + + public boolean isType(TableType tableType) { + if (tableTypes.contains(tableType)) { + return true; + } + return false; + } + + public ISaveable getSaveable() { + return saveable; + } + + public CoverageOptionManager getCoverageOptionManager() { + return coverageOptionManager; + } } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeXViewer.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeXViewer.java index 3ece8dbcb98..2b26113f026 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeXViewer.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeXViewer.java @@ -10,25 +10,25 @@ *******************************************************************************/ package org.eclipse.osee.coverage.editor.xmerge;
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.nebula.widgets.xviewer.IXViewerFactory;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.osee.coverage.editor.xcover.CoverageXViewer;
-import org.eclipse.osee.coverage.editor.xcover.XCoverageViewer.TableType;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.merge.IMergeItem;
-import org.eclipse.osee.coverage.merge.MergeManager;
-import org.eclipse.osee.coverage.model.ICoverage;
-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.ui.skynet.results.XResultData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.swt.widgets.TreeItem;
+import java.util.HashMap; +import java.util.Map; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.nebula.widgets.xviewer.IXViewerFactory; +import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.osee.coverage.editor.xcover.CoverageXViewer; +import org.eclipse.osee.coverage.editor.xcover.XCoverageViewer.TableType; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.merge.IMergeItem; +import org.eclipse.osee.coverage.merge.MergeManager; +import org.eclipse.osee.coverage.model.ICoverage; +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.ui.skynet.results.XResultData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.TreeColumn; +import org.eclipse.swt.widgets.TreeItem; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/XCoverageMergeViewer.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/XCoverageMergeViewer.java index bbe3ae29fbb..3c40c1d9843 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/XCoverageMergeViewer.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/XCoverageMergeViewer.java @@ -10,17 +10,17 @@ *******************************************************************************/ package org.eclipse.osee.coverage.editor.xmerge;
-import org.eclipse.osee.coverage.editor.xcover.CoverageContentProvider;
-import org.eclipse.osee.coverage.editor.xcover.XCoverageViewer;
-import org.eclipse.osee.coverage.merge.MergeManager;
-import org.eclipse.osee.coverage.model.CoverageOptionManager;
-import org.eclipse.osee.coverage.util.ISaveable;
-import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler;
-import org.eclipse.osee.framework.ui.swt.ALayout;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
+import org.eclipse.osee.coverage.editor.xcover.CoverageContentProvider; +import org.eclipse.osee.coverage.editor.xcover.XCoverageViewer; +import org.eclipse.osee.coverage.merge.MergeManager; +import org.eclipse.osee.coverage.model.CoverageOptionManager; +import org.eclipse.osee.coverage.util.ISaveable; +import org.eclipse.osee.framework.ui.skynet.action.RefreshAction.IRefreshActionHandler; +import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageMessages.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageMessages.java index 8427b76a196..002187f964a 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageMessages.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageMessages.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.coverage.event;
-import org.eclipse.osee.framework.messaging.MessageID;
+import org.eclipse.osee.framework.messaging.MessageID; public enum CoverageMessages implements MessageID {
CoveragePackageSave(true, "Aylfa1rRxx6NQf4MfNwA", "topic:org.eclipse.osee.coverage.msgs.CoveragePackageSave", org.eclipse.osee.coverage.msgs.CoveragePackageSave.class, false);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java index b074b406912..d1fa484e7d1 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.coverage.event;
-import java.util.logging.Level;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.messaging.ConnectionNode;
-import org.eclipse.osee.framework.messaging.MessageService;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
+import java.util.logging.Level; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.messaging.ConnectionNode; +import org.eclipse.osee.framework.messaging.MessageService; +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTracker; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/IMergeItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/IMergeItem.java index 831004813d6..94ac9fef1cb 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/IMergeItem.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/IMergeItem.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.coverage.merge;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
+import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchItem.java index d99aba4f8b1..6759fd00fce 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchItem.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchItem.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.coverage.merge;
-import java.util.Collection;
-import org.eclipse.osee.coverage.model.ICoverage;
+import java.util.Collection; +import org.eclipse.osee.coverage.model.ICoverage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchType.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchType.java index 1aae930a8e0..3cb9c53753e 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchType.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MatchType.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.coverage.merge;
-import java.util.Arrays;
-import java.util.Collection;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.CoveragePackage;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
+import java.util.Arrays; +import java.util.Collection; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.core.exception.OseeStateException; public enum MatchType {
// Item matches in name only
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java index f0b8a5f5ac9..ac76f7da6a4 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java @@ -10,24 +10,24 @@ *******************************************************************************/ package org.eclipse.osee.coverage.merge;
-import java.util.Collection;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.CoveragePackage;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.model.ICoverageUnitProvider;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.coverage.util.ISaveable;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-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.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
+import java.util.Collection; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.model.ICoverageUnitProvider; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.coverage.util.ISaveable; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; +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.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.results.XResultData; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java index 8ebfc5fcc22..1f5f5dcc53b 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.coverage.merge;
-import java.util.Collection;
-import java.util.Collections;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.util.Collection; +import java.util.Collections; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemBase.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemBase.java index 7ef935b5d6b..c7dbca0f2a8 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemBase.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemBase.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.coverage.merge;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
+import org.eclipse.osee.framework.core.exception.OseeArgumentException; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java index ffd6f378d9d..7afb640819e 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.coverage.merge;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java index bf3af99bf2b..5b6f60611f0 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java @@ -11,27 +11,27 @@ package org.eclipse.osee.coverage.merge;
import java.util.AbstractMap.SimpleEntry; -import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
+import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.CoveragePackage;
-import org.eclipse.osee.coverage.model.CoveragePackageBase;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.jdk.core.util.AHTML;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
+import java.util.concurrent.CopyOnWriteArrayList; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.model.CoveragePackageBase; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.jdk.core.util.AHTML; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.ui.skynet.results.XResultData; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MessageMergeItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MessageMergeItem.java index 59f1a1d2f83..fee966541c5 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MessageMergeItem.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MessageMergeItem.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.coverage.merge;
-import java.util.Collection;
-import java.util.Collections;
-import org.eclipse.osee.coverage.model.ICoverage;
+import java.util.Collection; +import java.util.Collections; +import org.eclipse.osee.coverage.model.ICoverage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOption.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOption.java index bc096296280..4d7c65bb79e 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOption.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOption.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.eclipse.osee.framework.jdk.core.util.Strings; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java index fc00853f590..549660c3e90 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java @@ -10,19 +10,19 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
+import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.logging.Level; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManagerDefault.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManagerDefault.java index c227aadd8de..e7ce20f09ac 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManagerDefault.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManagerDefault.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.Arrays;
-import java.util.List;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
+import java.util.Arrays; +import java.util.List; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java index 2cead995fd7..d62d41900c5 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java @@ -10,20 +10,20 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.results.XResultData;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArrayList; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.results.XResultData; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePreferences.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePreferences.java index cce7a0f39a6..307d86b5df3 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePreferences.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePreferences.java @@ -10,19 +10,19 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import org.eclipse.osee.framework.access.AccessControlManager;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
+import org.eclipse.osee.framework.access.AccessControlManager; +import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.enums.PermissionEnum; +import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; +import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; +import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.eclipse.osee.framework.ui.plugin.util.Result; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageTestUnit.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageTestUnit.java index 7b1074de2d8..2ceb421d30b 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageTestUnit.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageTestUnit.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.Collection;
-import org.eclipse.osee.coverage.util.CoverageImage;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.util.Collection; +import org.eclipse.osee.coverage.util.CoverageImage; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* Single test that can cover multiple Coverage Items
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverage.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverage.java index 66b473b630a..f82edd2e207 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverage.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverage.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.Collection;
-import org.eclipse.osee.framework.core.data.Identity;
-import org.eclipse.osee.framework.core.data.Named;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.util.Collection; +import org.eclipse.osee.framework.core.data.Identity; +import org.eclipse.osee.framework.core.data.Named; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverageItemProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverageItemProvider.java index 25de787181f..9f3a52d4f70 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverageItemProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverageItemProvider.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.List;
+import java.util.List; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverageUnitProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverageUnitProvider.java index 74b840171ed..a8bfc3b7377 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverageUnitProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverageUnitProvider.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.List;
+import java.util.List; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ITestUnitProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ITestUnitProvider.java index 5d9582381ec..b3fb4b2d56e 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ITestUnitProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ITestUnitProvider.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.Collection;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import java.util.Collection; +import org.eclipse.osee.framework.core.exception.OseeCoreException; /**
* Allow external mechnism for test units to be provided to UI
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/MessageCoverageItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/MessageCoverageItem.java index d46ab17ef67..828e7236a1c 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/MessageCoverageItem.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/MessageCoverageItem.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.Collection;
-import java.util.Collections;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.util.Collection; +import java.util.Collections; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.swt.KeyedImage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/SimpleCoverageUnitFileContentsProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/SimpleCoverageUnitFileContentsProvider.java index 267c98483a8..43c0d3e1c59 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/SimpleCoverageUnitFileContentsProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/SimpleCoverageUnitFileContentsProvider.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.HashMap; +import java.util.Map; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/SimpleTestUnitProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/SimpleTestUnitProvider.java index bdb4df6318a..52db598901f 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/SimpleTestUnitProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/SimpleTestUnitProvider.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.coverage.model;
-import java.util.Collection;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
+import java.util.Collection; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.HashCollection; +import org.eclipse.osee.framework.jdk.core.util.Collections; +import org.eclipse.osee.framework.jdk.core.util.Strings; /**
* Simple provider that optimizes how test units are stored by sharing test unit names.
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 7461f89b1c1..7a1b4d70e9b 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 @@ -37,7 +37,6 @@ import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -108,9 +107,9 @@ public class CoverageNavigateView extends ViewPart implements IActionable { }
if (!str.equals("")) {
if (CoverageUtil.isAdmin()) {
- label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ label.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
} else {
- label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE));
+ label.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE));
}
}
label.setText(str);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CreateTestCoverageUnits.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CreateTestCoverageUnits.java index c0c797a4c11..4b8ed38cfe0 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CreateTestCoverageUnits.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CreateTestCoverageUnits.java @@ -29,7 +29,7 @@ import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -42,7 +42,7 @@ public class CreateTestCoverageUnits extends XNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException { - if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), + if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName() + "\n\nThis will create test CoverageUnits to an existing Coverage Package.")) { return; } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/DoesNotWorkItemCoverage.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/DoesNotWorkItemCoverage.java index c3e99547352..1f0b928331e 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/DoesNotWorkItemCoverage.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/DoesNotWorkItemCoverage.java @@ -48,7 +48,7 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.results.XResultData; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -61,7 +61,7 @@ public class DoesNotWorkItemCoverage extends XNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException { - if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) { + if (!MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) { return; } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageOptionManagerStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageOptionManagerStore.java index 17fa12fe43b..b8191b324ea 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageOptionManagerStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageOptionManagerStore.java @@ -10,19 +10,19 @@ *******************************************************************************/ package org.eclipse.osee.coverage.store;
-import java.util.logging.Level;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageOptionManager;
-import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
-import org.eclipse.osee.coverage.model.CoveragePreferences;
-import org.eclipse.osee.framework.access.AccessControlManager;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.core.exception.MultipleAttributesExist;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
+import java.util.logging.Level; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageOptionManager; +import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; +import org.eclipse.osee.coverage.model.CoveragePreferences; +import org.eclipse.osee.framework.access.AccessControlManager; +import org.eclipse.osee.framework.core.enums.PermissionEnum; +import org.eclipse.osee.framework.core.exception.MultipleAttributesExist; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.plugin.util.Result; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageStore.java index 58631511e3d..8d8aab5f5b2 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageStore.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.coverage.store;
-import org.eclipse.osee.coverage.model.ICoverage;
+import org.eclipse.osee.coverage.model.ICoverage; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbTestUnitProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbTestUnitProvider.java index da9f44e81d6..05a7411fcdb 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbTestUnitProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbTestUnitProvider.java @@ -10,19 +10,19 @@ *******************************************************************************/ package org.eclipse.osee.coverage.store;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.ITestUnitProvider;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
+import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.ITestUnitProvider; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.HashCollection; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; /**
* This provider takes test unit names and converts them to ids and adds name/id entry to db table. It uses the
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/ICoverageStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/ICoverageStore.java index 894a472353d..d87c710751c 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/ICoverageStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/ICoverageStore.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.coverage.store;
-import org.eclipse.osee.coverage.model.CoverageOptionManager;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
+import org.eclipse.osee.coverage.model.CoverageOptionManager; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.ui.plugin.util.Result; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java index f33abc2fc14..d991822e371 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java @@ -10,36 +10,36 @@ *******************************************************************************/ package org.eclipse.osee.coverage.store;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.Collection;
-import org.eclipse.osee.coverage.event.CoverageEventManager;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.CoverageOptionManager;
-import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
-import org.eclipse.osee.coverage.model.CoveragePackage;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.msgs.CoveragePackageSave;
-import org.eclipse.osee.coverage.util.ISaveable;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-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.util.OseeData;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.util.ElapsedTime;
+import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.util.Collection; +import org.eclipse.osee.coverage.event.CoverageEventManager; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoverageOptionManager; +import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.msgs.CoveragePackageSave; +import org.eclipse.osee.coverage.util.ISaveable; +import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +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.util.OseeData; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.skynet.util.ElapsedTime; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java index 4949e0a361d..079d78ef105 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java @@ -10,20 +10,20 @@ *******************************************************************************/ package org.eclipse.osee.coverage.store;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageOptionManager;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
-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.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
+import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageOptionManager; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.core.data.IArtifactType; +import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; +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.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.plugin.util.Result; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitFileContentsProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitFileContentsProvider.java index dd48ded06fb..7f3cd9e8441 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitFileContentsProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitFileContentsProvider.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.coverage.store;
-import java.util.logging.Level;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverageUnitFileContentsProvider;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import java.util.logging.Level; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverageUnitFileContentsProvider; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java index 6d654e1c456..898e3af63e5 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java @@ -10,24 +10,24 @@ *******************************************************************************/ package org.eclipse.osee.coverage.store;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.CoverageOptionManager;
-import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.skynet.core.utility.UsersByIds;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
+import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoverageOptionManager; +import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.skynet.core.User; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.skynet.core.utility.UsersByIds; +import org.eclipse.osee.framework.ui.plugin.util.Result; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitStore.java index d1d45bb2b23..fcd0107e8bc 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitStore.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.coverage.store;
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
+import java.util.HashMap; +import java.util.Map; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.database.core.ConnectionHandler; +import org.eclipse.osee.framework.database.core.IOseeStatement; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java index 76e1260558f..f3d39e27e60 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java @@ -10,37 +10,37 @@ *******************************************************************************/ package org.eclipse.osee.coverage.util;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.merge.MatchItem;
-import org.eclipse.osee.coverage.merge.MergeManager;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.model.CoverageItem;
-import org.eclipse.osee.coverage.model.CoverageOption;
-import org.eclipse.osee.coverage.model.CoveragePackageBase;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.coverage.model.ICoverageItemProvider;
-import org.eclipse.osee.coverage.model.ICoverageUnitProvider;
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.SystemGroup;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
-import org.eclipse.swt.widgets.Listener;
+import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.logging.Level; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.merge.MatchItem; +import org.eclipse.osee.coverage.merge.MergeManager; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoverageOption; +import org.eclipse.osee.coverage.model.CoveragePackageBase; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.coverage.model.ICoverageItemProvider; +import org.eclipse.osee.coverage.model.ICoverageUnitProvider; +import org.eclipse.osee.framework.core.enums.BranchArchivedState; +import org.eclipse.osee.framework.core.enums.BranchType; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.jdk.core.type.Pair; +import org.eclipse.osee.framework.jdk.core.util.Collections; +import org.eclipse.osee.framework.jdk.core.util.Lib; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.SystemGroup; +import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; +import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog; +import org.eclipse.osee.framework.ui.swt.KeyedImage; +import org.eclipse.swt.widgets.Listener; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/ISaveable.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/ISaveable.java index 4545874c34c..baacc622c61 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/ISaveable.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/ISaveable.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.coverage.util;
-import java.util.Collection;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
+import java.util.Collection; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.plugin.util.Result; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/NotSaveable.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/NotSaveable.java index f70ba2bf0e3..c1af0242a0a 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/NotSaveable.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/NotSaveable.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.coverage.util;
-import java.util.Collection;
-import org.eclipse.osee.coverage.model.CoverageImport;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
+import java.util.Collection; +import org.eclipse.osee.coverage.model.CoverageImport; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.plugin.util.Result; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoverageListDialog.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoverageListDialog.java index b338f2d80c1..da544b2cb81 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoverageListDialog.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoverageListDialog.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.coverage.util.dialog;
-import java.util.Collection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.osee.coverage.model.ICoverage;
-import org.eclipse.swt.widgets.Display;
+import java.util.Collection; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.ui.swt.Displays; /**
* @author Donald G. Dunne
@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Display; public class CoverageListDialog extends org.eclipse.ui.dialogs.ListDialog {
public CoverageListDialog(String title, String message) {
- super(Display.getCurrent().getActiveShell());
+ super(Displays.getActiveShell());
setTitle(title);
setMessage(message);
setContentProvider(new IStructuredContentProvider() {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoverageMethodListDialog.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoverageMethodListDialog.java index aac5b091331..1d035124d2b 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoverageMethodListDialog.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoverageMethodListDialog.java @@ -22,8 +22,8 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; /** @@ -36,7 +36,7 @@ public class CoverageMethodListDialog extends CheckedTreeSelectionDialog { } public CoverageMethodListDialog(Collection<CoverageOption> values, Collection<CoverageOption> selected) { - super(Display.getCurrent().getActiveShell(), labelProvider, new ArrayTreeContentProvider()); + super(Displays.getActiveShell(), labelProvider, new ArrayTreeContentProvider()); setTitle("Select Coverage Method(s)"); setMessage("Select Coverage Method(s)"); setComparator(new ArtifactNameSorter()); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoveragePackageArtifactListDialog.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoveragePackageArtifactListDialog.java index a62af603b2e..33b7d015a4e 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoveragePackageArtifactListDialog.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoveragePackageArtifactListDialog.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.coverage.util.dialog;
-import java.util.Collection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.swt.widgets.Display;
+import java.util.Collection; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.swt.Displays; /**
* @author Donald G. Dunne
@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Display; public class CoveragePackageArtifactListDialog extends org.eclipse.ui.dialogs.ListDialog {
public CoveragePackageArtifactListDialog(String title, String message) {
- super(Display.getCurrent().getActiveShell());
+ super(Displays.getActiveShell());
setTitle(title);
setMessage(message);
setContentProvider(new IStructuredContentProvider() {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/CoverageXWidgetFactory.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/CoverageXWidgetFactory.java index 9b2ca14439b..12ae78d7e7f 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/CoverageXWidgetFactory.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/CoverageXWidgetFactory.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.coverage.util.widget;
-import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.IXWidgetProvider;
+import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.IXWidgetProvider; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataFile.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataFile.java index 3ce05f0451c..9a7398c71a6 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataFile.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataFile.java @@ -10,18 +10,18 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.eclipse.osee.coverage.vcast.CoverageDataUnit.CoverageDataType;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.AFile;
-import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.eclipse.osee.coverage.vcast.CoverageDataUnit.CoverageDataType; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.AFile; +import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataSubProgram.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataSubProgram.java index 2a656f31882..0cd38883356 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataSubProgram.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataSubProgram.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList; +import java.util.List; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataUnit.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataUnit.java index 250b59c1c45..f4f06c2d7ae 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataUnit.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataUnit.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList; +import java.util.List; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastAggregateReport.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastAggregateReport.java index 1385475afe5..2ebf9b9ebf0 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastAggregateReport.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastAggregateReport.java @@ -10,19 +10,19 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.core.exception.OseeWrappedException; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastVcp.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastVcp.java index 4c351633e19..93c7a62f8a7 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastVcp.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastVcp.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.coverage.vcast.VcpSourceFile.SourceValue;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.AFile;
+import java.io.File; +import java.util.ArrayList; +import java.util.List; +import org.eclipse.osee.coverage.vcast.VcpSourceFile.SourceValue; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.AFile; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpResultsDatFile.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpResultsDatFile.java index fef54a2628d..0d52fa8ac31 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpResultsDatFile.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpResultsDatFile.java @@ -10,23 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.coverage.vcast.VcpResultsFile.ResultsValue;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.jdk.core.util.AFile;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLog;
+import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.logging.Level; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.coverage.vcast.VcpResultsFile.ResultsValue; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap; +import org.eclipse.osee.framework.jdk.core.type.Pair; +import org.eclipse.osee.framework.jdk.core.util.AFile; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.logging.OseeLog; /**
* Reads results.dat file that contains <file num> <procedure num> <execution line num>
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpResultsFile.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpResultsFile.java index b1686354f58..51d2d1c197d 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpResultsFile.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpResultsFile.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
+import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLog; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceFile.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceFile.java index df2038b6fb9..622d7c1c0b1 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceFile.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceFile.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.eclipse.osee.coverage.internal.Activator;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
+import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLog; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLineFile.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLineFile.java index ca64839aa39..d44915ec5c2 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLineFile.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLineFile.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.io.File;
-import java.util.Arrays;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.eclipse.osee.coverage.model.CoverageUnit;
-import org.eclipse.osee.coverage.model.ICoverageUnitFileContentsProvider;
-import org.eclipse.osee.coverage.vcast.VcpSourceFile.SourceValue;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.AFile;
+import java.io.File; +import java.util.Arrays; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverageUnitFileContentsProvider; +import org.eclipse.osee.coverage.vcast.VcpSourceFile.SourceValue; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.util.AFile; /**
* Reads results.dat file that contains <file num> <procedure num> <execution line num>
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLisFile.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLisFile.java index de7d7127948..22e19d23cd2 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLisFile.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLisFile.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.coverage.vcast;
-import java.io.File;
-import java.util.Arrays;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.eclipse.osee.coverage.vcast.VcpSourceFile.SourceValue;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.jdk.core.util.AFile;
+import java.io.File; +import java.util.Arrays; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.eclipse.osee.coverage.vcast.VcpSourceFile.SourceValue; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.Pair; +import org.eclipse.osee.framework.jdk.core.util.AFile; /**
* Reads <filename>.LIS file associated with a source file
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VectorCastAdaCoverageImporter.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VectorCastAdaCoverageImporter.java index b3abe90e325..cf42ab79621 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VectorCastAdaCoverageImporter.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VectorCastAdaCoverageImporter.java @@ -16,7 +16,7 @@ import java.util.HashSet; import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set; +import java.util.Set;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/TreeViewerTest.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/TreeViewerTest.java index 08c9ac349f5..dd8bfcb3f95 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/TreeViewerTest.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/TreeViewerTest.java @@ -20,6 +20,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; @@ -38,235 +39,254 @@ import org.eclipse.swt.widgets.TreeColumn; public class TreeViewerTest { - class TreeViewerTestLabelProvider implements ITableLabelProvider, ITableColorProvider, ITableFontProvider { - Font font = null; - - public String getColumnText(Object element, int columnIndex) { - if (!(element instanceof File)) { - return null; - } - File file = (File) element; - switch (columnIndex) { - case 0: - return file.getName(); - case 1: - return "" + new Date(file.lastModified()); - case 2: - return "" + file.isHidden(); - } - return null; - } - - public Image getColumnImage(Object element, int columnIndex) { - if (columnIndex != 0) { - return null; - } - if (!(element instanceof File)) { - return null; - } - File file = (File) element; - Display display = Display.getCurrent(); - if (file.isDirectory()) { - return display.getSystemImage(SWT.ICON_WARNING); - } - return display.getSystemImage(SWT.ICON_QUESTION); - } - - public void dispose() { - if (font != null) { - font.dispose(); - } - font = null; - } - - public boolean isLabelProperty(Object element, String property) { - return false; - } - - public void addListener(ILabelProviderListener listener) { - } - - public void removeListener(ILabelProviderListener listener) { - } - - public Color getForeground(Object element, int columnIndex) { - if (columnIndex == 1) { - Display display = Display.getCurrent(); - return display.getSystemColor(SWT.COLOR_RED); - } - return null; - } - - public Color getBackground(Object element, int columnIndex) { - if (columnIndex == 0) { - File file = (File) element; - Display display = Display.getCurrent(); - if (file.isDirectory()) { - return display.getSystemColor(SWT.COLOR_CYAN); - } - return display.getSystemColor(SWT.COLOR_MAGENTA); - } - return null; - } - - public Font getFont(Object element, int columnIndex) { - if (columnIndex == 2) { - if (font == null) { - Display display = Display.getCurrent(); - font = new Font(display, "Times", 12, SWT.ITALIC); - } - return font; - } - return null; - } - } - - public static void main(String[] args) { - final Display display = new Display(); - final Shell shell = new Shell(display); - shell.setLayout(new FormLayout()); - - TreeViewerTestLabelProvider labelProvider1 = new TreeViewerTest().new TreeViewerTestLabelProvider(); - ITreeContentProvider contentProvider = new ITreeContentProvider() { - public Object[] getChildren(Object parentElement) { - if (!(parentElement instanceof File)) { - return null; - } - File file = (File) parentElement; - if (file.isDirectory()) { - return file.listFiles(); - } - return null; - } - - public Object getParent(Object element) { - if (!(element instanceof File)) { - return null; - } - File file = (File) element; - return file.getParentFile(); - } - - public boolean hasChildren(Object element) { - if (!(element instanceof File)) { - return false; - } - File file = (File) element; - return file.isDirectory(); - } - - public Object[] getElements(Object inputElement) { - return getChildren(inputElement); - } - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - }; - - ILabelProvider labelProvider2 = new ILabelProvider() { - public void dispose() { - } - - public boolean isLabelProperty(Object element, String property) { - return false; - } - - public void addListener(ILabelProviderListener listener) { - } - - public void removeListener(ILabelProviderListener listener) { - } - - public Image getImage(Object element) { - if (!(element instanceof File)) { - return null; - } - File file = (File) element; - if (file.isDirectory()) { - return display.getSystemImage(SWT.ICON_WARNING); - } - return display.getSystemImage(SWT.ICON_QUESTION); - } - - public String getText(Object element) { - if (!(element instanceof File)) { - return null; - } - File file = (File) element; - return file.getName(); - } - - }; - - final TreeViewer treeViewer1 = new TreeViewer(shell, SWT.FULL_SELECTION | SWT.CHECK); - Tree tree1 = treeViewer1.getTree(); - tree1.setHeaderVisible(true); - TreeColumn column1 = new TreeColumn(tree1, SWT.LEFT); - column1.setText("Name"); - column1.setImage(display.getSystemImage(SWT.ICON_WORKING)); - column1.setWidth(200); - TreeColumn column2 = new TreeColumn(tree1, SWT.CENTER); - column2.setText("Last Modified"); - column2.setImage(display.getSystemImage(SWT.ICON_INFORMATION)); - column2.setWidth(200); - TreeColumn column3 = new TreeColumn(tree1, SWT.CENTER); - column3.setText("Hidden"); - column3.setImage(display.getSystemImage(SWT.ICON_INFORMATION)); - column3.setWidth(100); - treeViewer1.setLabelProvider(labelProvider1); - treeViewer1.setContentProvider(contentProvider); - - final TreeViewer treeViewer2 = new TreeViewer(shell); - Tree tree2 = treeViewer2.getTree(); - treeViewer2.setLabelProvider(labelProvider2); - treeViewer2.setContentProvider(contentProvider); - - Button b = new Button(shell, SWT.PUSH); - b.setText("choose root folder"); - b.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - DirectoryDialog f = new DirectoryDialog(shell, SWT.OPEN); - String root = f.open(); - if (root != null) { - File file = new File(root); - if (file.exists()) { - treeViewer1.setInput(file); - treeViewer1.refresh(); - treeViewer2.setInput(file); - treeViewer2.refresh(); - } - } - } - }); - - FormData data = new FormData(); - data.left = new FormAttachment(0, 10); - data.top = new FormAttachment(0, 10); - data.right = new FormAttachment(50, -5); - data.bottom = new FormAttachment(b, -10); - tree1.setLayoutData(data); - - data = new FormData(); - data.left = new FormAttachment(50, 5); - data.top = new FormAttachment(0, 10); - data.right = new FormAttachment(100, -10); - data.bottom = new FormAttachment(b, -10); - tree2.setLayoutData(data); - - data = new FormData(); - data.left = new FormAttachment(0, 10); - data.bottom = new FormAttachment(100, -10); - b.setLayoutData(data); - - shell.open(); - while (!shell.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - display.dispose(); - } + class TreeViewerTestLabelProvider implements ITableLabelProvider, ITableColorProvider, ITableFontProvider { + Font font = null; + + @Override + public String getColumnText(Object element, int columnIndex) { + if (!(element instanceof File)) { + return null; + } + File file = (File) element; + switch (columnIndex) { + case 0: + return file.getName(); + case 1: + return "" + new Date(file.lastModified()); + case 2: + return "" + file.isHidden(); + } + return null; + } + + @Override + public Image getColumnImage(Object element, int columnIndex) { + if (columnIndex != 0) { + return null; + } + if (!(element instanceof File)) { + return null; + } + File file = (File) element; + if (file.isDirectory()) { + return Displays.getSystemImage(SWT.ICON_WARNING); + } + return Displays.getSystemImage(SWT.ICON_QUESTION); + } + + @Override + public void dispose() { + if (font != null) { + font.dispose(); + } + font = null; + } + + @Override + public boolean isLabelProperty(Object element, String property) { + return false; + } + + @Override + public void addListener(ILabelProviderListener listener) { + } + + @Override + public void removeListener(ILabelProviderListener listener) { + } + + @Override + public Color getForeground(Object element, int columnIndex) { + if (columnIndex == 1) { + return Displays.getSystemColor(SWT.COLOR_RED); + } + return null; + } + + @Override + public Color getBackground(Object element, int columnIndex) { + if (columnIndex == 0) { + File file = (File) element; + if (file.isDirectory()) { + return Displays.getSystemColor(SWT.COLOR_CYAN); + } + return Displays.getSystemColor(SWT.COLOR_MAGENTA); + } + return null; + } + + @Override + public Font getFont(Object element, int columnIndex) { + if (columnIndex == 2) { + if (font == null) { + Display display = Display.getCurrent(); + font = new Font(display, "Times", 12, SWT.ITALIC); + } + return font; + } + return null; + } + } + + public static void main(String[] args) { + final Display display = new Display(); + final Shell shell = new Shell(display); + shell.setLayout(new FormLayout()); + + TreeViewerTestLabelProvider labelProvider1 = new TreeViewerTest().new TreeViewerTestLabelProvider(); + ITreeContentProvider contentProvider = new ITreeContentProvider() { + @Override + public Object[] getChildren(Object parentElement) { + if (!(parentElement instanceof File)) { + return null; + } + File file = (File) parentElement; + if (file.isDirectory()) { + return file.listFiles(); + } + return null; + } + + @Override + public Object getParent(Object element) { + if (!(element instanceof File)) { + return null; + } + File file = (File) element; + return file.getParentFile(); + } + + @Override + public boolean hasChildren(Object element) { + if (!(element instanceof File)) { + return false; + } + File file = (File) element; + return file.isDirectory(); + } + + @Override + public Object[] getElements(Object inputElement) { + return getChildren(inputElement); + } + + @Override + public void dispose() { + } + + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + }; + + ILabelProvider labelProvider2 = new ILabelProvider() { + @Override + public void dispose() { + } + + @Override + public boolean isLabelProperty(Object element, String property) { + return false; + } + + @Override + public void addListener(ILabelProviderListener listener) { + } + + @Override + public void removeListener(ILabelProviderListener listener) { + } + + @Override + public Image getImage(Object element) { + if (!(element instanceof File)) { + return null; + } + File file = (File) element; + if (file.isDirectory()) { + return display.getSystemImage(SWT.ICON_WARNING); + } + return display.getSystemImage(SWT.ICON_QUESTION); + } + + @Override + public String getText(Object element) { + if (!(element instanceof File)) { + return null; + } + File file = (File) element; + return file.getName(); + } + + }; + + final TreeViewer treeViewer1 = new TreeViewer(shell, SWT.FULL_SELECTION | SWT.CHECK); + Tree tree1 = treeViewer1.getTree(); + tree1.setHeaderVisible(true); + TreeColumn column1 = new TreeColumn(tree1, SWT.LEFT); + column1.setText("Name"); + column1.setImage(display.getSystemImage(SWT.ICON_WORKING)); + column1.setWidth(200); + TreeColumn column2 = new TreeColumn(tree1, SWT.CENTER); + column2.setText("Last Modified"); + column2.setImage(display.getSystemImage(SWT.ICON_INFORMATION)); + column2.setWidth(200); + TreeColumn column3 = new TreeColumn(tree1, SWT.CENTER); + column3.setText("Hidden"); + column3.setImage(display.getSystemImage(SWT.ICON_INFORMATION)); + column3.setWidth(100); + treeViewer1.setLabelProvider(labelProvider1); + treeViewer1.setContentProvider(contentProvider); + + final TreeViewer treeViewer2 = new TreeViewer(shell); + Tree tree2 = treeViewer2.getTree(); + treeViewer2.setLabelProvider(labelProvider2); + treeViewer2.setContentProvider(contentProvider); + + Button b = new Button(shell, SWT.PUSH); + b.setText("choose root folder"); + b.addListener(SWT.Selection, new Listener() { + @Override + public void handleEvent(Event e) { + DirectoryDialog f = new DirectoryDialog(shell, SWT.OPEN); + String root = f.open(); + if (root != null) { + File file = new File(root); + if (file.exists()) { + treeViewer1.setInput(file); + treeViewer1.refresh(); + treeViewer2.setInput(file); + treeViewer2.refresh(); + } + } + } + }); + + FormData data = new FormData(); + data.left = new FormAttachment(0, 10); + data.top = new FormAttachment(0, 10); + data.right = new FormAttachment(50, -5); + data.bottom = new FormAttachment(b, -10); + tree1.setLayoutData(data); + + data = new FormData(); + data.left = new FormAttachment(50, 5); + data.top = new FormAttachment(0, 10); + data.right = new FormAttachment(100, -10); + data.bottom = new FormAttachment(b, -10); + tree2.setLayoutData(data); + + data = new FormData(); + data.left = new FormAttachment(0, 10); + data.bottom = new FormAttachment(100, -10); + b.setLayoutData(data); + + shell.open(); + while (!shell.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + display.dispose(); + } }
\ No newline at end of file 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 7309c80cebd..606b514cf17 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 @@ -35,13 +35,13 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; import org.eclipse.ui.part.ViewPart; @@ -142,12 +142,12 @@ public class AdminView extends ViewPart implements IActionable { public void handleBroadcastMessage() { EntryDialog ed = - new EntryDialog(Display.getCurrent().getActiveShell(), "Broadcast Message to OSEE Instantiations", null, + new EntryDialog(Displays.getActiveShell(), "Broadcast Message to OSEE Instantiations", null, "Enter Message", MessageDialog.QUESTION, new String[] {"OK", "Cancel"}, 0); if (ed.open() == 0) { String message = ed.getEntry(); if (!message.equals("")) { - if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Broadcast Message", + if (MessageDialog.openConfirm(Displays.getActiveShell(), "Broadcast Message", "Broadcast message\n\n\"" + message + "\"\n\nAre you sure?")) { try { OseeEventManager.kickBroadcastEvent(this, new BroadcastEvent(BroadcastEventType.Message, null, @@ -162,7 +162,7 @@ public class AdminView extends ViewPart implements IActionable { } public void handlePing() { - if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Ping OSEE Instantiations?", + if (MessageDialog.openConfirm(Displays.getActiveShell(), "Ping OSEE Instantiations?", "Ping OSEE Instantiations?")) { try { OseeEventManager.kickBroadcastEvent(this, new BroadcastEvent(BroadcastEventType.Ping, null, diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java index 721a4cf1fb9..3bbb952d35c 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java @@ -33,6 +33,7 @@ import org.eclipse.osee.framework.skynet.core.event2.BroadcastEvent; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
@@ -45,7 +46,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.TabFolder;
@@ -55,227 +55,227 @@ import org.eclipse.ui.PlatformUI; public class OseeClientsTab {
- private final User whoAmI;
- private final List<User> users;
- private CheckboxTreeViewer peopleCheckboxTreeViewer;
- private Composite mainComposite;
- private Text text;
-
- public OseeClientsTab(TabFolder tabFolder) throws OseeCoreException {
- super();
- this.users = UserManager.getUsersSortedByName();
- this.whoAmI = UserManager.getUser();
- users.remove(whoAmI);
- this.mainComposite = null;
- createControl(tabFolder);
- mainComposite.setEnabled(isUserAllowedToOperate());
- }
-
- private void createControl(TabFolder tabFolder) throws OseeCoreException {
- mainComposite = new Composite(tabFolder, SWT.NONE);
- mainComposite.setLayout(new GridLayout());
- mainComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- TabItem tab = new TabItem(tabFolder, SWT.NONE);
- tab.setControl(mainComposite);
- tab.setText("OSEE Clients");
-
- Group group = new Group(mainComposite, SWT.NONE);
- group.setLayout(new GridLayout());
- group.setText("Issue Shutdown Request");
- group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- if (isUserAllowedToOperate()) {
- SashForm sashForm = new SashForm(group, SWT.NONE);
- sashForm.setLayout(new GridLayout());
- sashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- createUserSelectionArea(sashForm);
- createMessageArea(sashForm);
- } else {
- createDefaultWarning(group);
- }
- }
-
- private void createMessageArea(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- Group group = new Group(composite, SWT.NONE);
- group.setLayout(new GridLayout());
- group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- group.setText("Enter Reason for Shutdown -- THIS WILL BE DISPLAYED TO THE SELECTED USERS --");
-
- text = new Text(group, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL);
- text.setEditable(true);
- GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
- gd.heightHint = 100;
- text.setLayoutData(gd);
-
- Button button = new Button(composite, SWT.NONE);
- button.setText("Send Shutdown Request");
- button.setToolTipText("By pressing the send button, a shutdown message will be sent to\n" + "all the selected OSEE clients causing their workbench to close.\n" + "NOTE: Users will be prompted to save their work.");
- button.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- processShutdownRequest(text.getText(), getSelectedUsers());
- }
- });
-
- Composite blankComposite = new Composite(composite, SWT.NONE);
- blankComposite.setLayout(new GridLayout());
- blankComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- }
-
- public static Control createDefaultWarning(Composite parent) {
- Composite composite = new Composite(parent, SWT.BORDER);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-
- Label image = new Label(composite, SWT.NONE);
- image.setLayoutData(new GridData(SWT.END, SWT.CENTER, true, true));
- image.setImage(ImageManager.getImage(FrameworkImage.LOCKED_KEY));
- image.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-
- Label label = new Label(composite, SWT.NONE);
- Font font = new Font(PlatformUI.getWorkbench().getDisplay(), "Courier New", 10, SWT.BOLD);
- label.setFont(font);
- label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED));
- label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, true, true));
- label.setText("Access Denied.\nContact your administrator.");
- label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-
- return composite;
- }
-
- private void processShutdownRequest(String reason, Collection<User> selectedUsers) {
- if (Strings.isValid(reason) && !selectedUsers.isEmpty()) {
- boolean result =
- MessageDialog.openConfirm(mainComposite.getShell(), "Disconnect OSEE Clients",
- "Are you sure you want to shutdown the selected OSEE clients?");
- if (false != result) {
- try {
- OseeEventManager.kickBroadcastEvent(this, new BroadcastEvent(BroadcastEventType.Force_Shutdown,
- selectedUsers, reason));
- AWorkbench.popup("Success", "Shutdown request sent.");
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
- } else {
- StringBuilder error = new StringBuilder();
- error.append("Unable to process request.\n");
- if (reason == null || reason.length() <= 0) {
- error.append(" A reason must be entered before a client can be requested to shutdown.\n");
- }
- if (selectedUsers.isEmpty()) {
- error.append(" At least 1 user must be selected.\n");
- }
- MessageDialog.openError(mainComposite.getShell(), "Disconnect OSEE Clients", error.toString());
- }
- }
-
- private boolean isUserAllowedToOperate() throws OseeCoreException {
- return AccessControlManager.isOseeAdmin();
- }
-
- private Collection<User> getSelectedUsers() {
- Set<User> toReturn = new HashSet<User>();
- try {
- Object[] checked = peopleCheckboxTreeViewer.getCheckedElements();
- for (Object object : checked) {
- if (false != peopleCheckboxTreeViewer.getChecked(object)) {
- toReturn.add((User) object);
- }
- }
- } catch (Exception ex) {
- OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- return toReturn;
- }
-
- private void createUserSelectionArea(Composite parent) {
- Group group = new Group(parent, SWT.NONE);
- group.setLayout(new GridLayout());
- group.setText("Select Users to Shutdown");
-
- peopleCheckboxTreeViewer =
- new CheckboxTreeViewer(group, SWT.BORDER | SWT.MULTI | SWT.CHECK | SWT.V_SCROLL | SWT.H_SCROLL);
- peopleCheckboxTreeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- peopleCheckboxTreeViewer.setContentProvider(new TreeContentProvider());
- peopleCheckboxTreeViewer.setLabelProvider(new PersonLabelProvider());
- peopleCheckboxTreeViewer.setInput(users);
- Composite composite = new Composite(group, SWT.NONE);
- composite.setLayout(new GridLayout(2, true));
-
- Button selectAll = new Button(composite, SWT.PUSH);
- selectAll.setText("Select All");
- selectAll.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- selectAll(true);
- }
- });
-
- Button deselectAll = new Button(composite, SWT.PUSH);
- deselectAll.setText("Deselect All");
- deselectAll.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- selectAll(false);
- }
- });
- }
-
- private void selectAll(boolean isSelectAll) {
- Object[] objects = peopleCheckboxTreeViewer.getExpandedElements();
- for (Object object : objects) {
- peopleCheckboxTreeViewer.setSubtreeChecked(object, isSelectAll);
- }
- }
-
- private static class TreeContentProvider implements ITreeContentProvider {
-
- public void dispose() {
- // Nothing to dispose
- }
-
- public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
- // Nothing to change
- }
-
- public Object[] getChildren(Object parentElement) {
- return null;
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public Object[] getElements(Object inputElement) {
- return ((ArrayList) inputElement).toArray();
- }
- }
-
- private static class PersonLabelProvider extends LabelProvider {
-
- @Override
- public Image getImage(Object arg0) {
- return null;
- }
-
- @Override
- public String getText(Object arg0) {
- return ((User) arg0).getName();
- }
- }
+ private final User whoAmI;
+ private final List<User> users;
+ private CheckboxTreeViewer peopleCheckboxTreeViewer;
+ private Composite mainComposite;
+ private Text text;
+
+ public OseeClientsTab(TabFolder tabFolder) throws OseeCoreException {
+ super();
+ this.users = UserManager.getUsersSortedByName();
+ this.whoAmI = UserManager.getUser();
+ users.remove(whoAmI);
+ this.mainComposite = null;
+ createControl(tabFolder);
+ mainComposite.setEnabled(isUserAllowedToOperate());
+ }
+
+ private void createControl(TabFolder tabFolder) throws OseeCoreException {
+ mainComposite = new Composite(tabFolder, SWT.NONE);
+ mainComposite.setLayout(new GridLayout());
+ mainComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ TabItem tab = new TabItem(tabFolder, SWT.NONE);
+ tab.setControl(mainComposite);
+ tab.setText("OSEE Clients");
+
+ Group group = new Group(mainComposite, SWT.NONE);
+ group.setLayout(new GridLayout());
+ group.setText("Issue Shutdown Request");
+ group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ if (isUserAllowedToOperate()) {
+ SashForm sashForm = new SashForm(group, SWT.NONE);
+ sashForm.setLayout(new GridLayout());
+ sashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ createUserSelectionArea(sashForm);
+ createMessageArea(sashForm);
+ } else {
+ createDefaultWarning(group);
+ }
+ }
+
+ private void createMessageArea(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayout(new GridLayout());
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ Group group = new Group(composite, SWT.NONE);
+ group.setLayout(new GridLayout());
+ group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+ group.setText("Enter Reason for Shutdown -- THIS WILL BE DISPLAYED TO THE SELECTED USERS --");
+
+ text = new Text(group, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL);
+ text.setEditable(true);
+ GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ gd.heightHint = 100;
+ text.setLayoutData(gd);
+
+ Button button = new Button(composite, SWT.NONE);
+ button.setText("Send Shutdown Request");
+ button.setToolTipText("By pressing the send button, a shutdown message will be sent to\n" + "all the selected OSEE clients causing their workbench to close.\n" + "NOTE: Users will be prompted to save their work.");
+ button.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ processShutdownRequest(text.getText(), getSelectedUsers());
+ }
+ });
+
+ Composite blankComposite = new Composite(composite, SWT.NONE);
+ blankComposite.setLayout(new GridLayout());
+ blankComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ }
+
+ public static Control createDefaultWarning(Composite parent) {
+ Composite composite = new Composite(parent, SWT.BORDER);
+ composite.setLayout(new GridLayout(2, false));
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ composite.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+ Label image = new Label(composite, SWT.NONE);
+ image.setLayoutData(new GridData(SWT.END, SWT.CENTER, true, true));
+ image.setImage(ImageManager.getImage(FrameworkImage.LOCKED_KEY));
+ image.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+ Label label = new Label(composite, SWT.NONE);
+ Font font = new Font(PlatformUI.getWorkbench().getDisplay(), "Courier New", 10, SWT.BOLD);
+ label.setFont(font);
+ label.setForeground(Displays.getSystemColor(SWT.COLOR_DARK_RED));
+ label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, true, true));
+ label.setText("Access Denied.\nContact your administrator.");
+ label.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+ return composite;
+ }
+
+ private void processShutdownRequest(String reason, Collection<User> selectedUsers) {
+ if (Strings.isValid(reason) && !selectedUsers.isEmpty()) {
+ boolean result =
+ MessageDialog.openConfirm(mainComposite.getShell(), "Disconnect OSEE Clients",
+ "Are you sure you want to shutdown the selected OSEE clients?");
+ if (false != result) {
+ try {
+ OseeEventManager.kickBroadcastEvent(this, new BroadcastEvent(BroadcastEventType.Force_Shutdown,
+ selectedUsers, reason));
+ AWorkbench.popup("Success", "Shutdown request sent.");
+ } catch (Exception ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ }
+ } else {
+ StringBuilder error = new StringBuilder();
+ error.append("Unable to process request.\n");
+ if (reason == null || reason.length() <= 0) {
+ error.append(" A reason must be entered before a client can be requested to shutdown.\n");
+ }
+ if (selectedUsers.isEmpty()) {
+ error.append(" At least 1 user must be selected.\n");
+ }
+ MessageDialog.openError(mainComposite.getShell(), "Disconnect OSEE Clients", error.toString());
+ }
+ }
+
+ private boolean isUserAllowedToOperate() throws OseeCoreException {
+ return AccessControlManager.isOseeAdmin();
+ }
+
+ private Collection<User> getSelectedUsers() {
+ Set<User> toReturn = new HashSet<User>();
+ try {
+ Object[] checked = peopleCheckboxTreeViewer.getCheckedElements();
+ for (Object object : checked) {
+ if (false != peopleCheckboxTreeViewer.getChecked(object)) {
+ toReturn.add((User) object);
+ }
+ }
+ } catch (Exception ex) {
+ OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ return toReturn;
+ }
+
+ private void createUserSelectionArea(Composite parent) {
+ Group group = new Group(parent, SWT.NONE);
+ group.setLayout(new GridLayout());
+ group.setText("Select Users to Shutdown");
+
+ peopleCheckboxTreeViewer =
+ new CheckboxTreeViewer(group, SWT.BORDER | SWT.MULTI | SWT.CHECK | SWT.V_SCROLL | SWT.H_SCROLL);
+ peopleCheckboxTreeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ peopleCheckboxTreeViewer.setContentProvider(new TreeContentProvider());
+ peopleCheckboxTreeViewer.setLabelProvider(new PersonLabelProvider());
+ peopleCheckboxTreeViewer.setInput(users);
+ Composite composite = new Composite(group, SWT.NONE);
+ composite.setLayout(new GridLayout(2, true));
+
+ Button selectAll = new Button(composite, SWT.PUSH);
+ selectAll.setText("Select All");
+ selectAll.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ selectAll(true);
+ }
+ });
+
+ Button deselectAll = new Button(composite, SWT.PUSH);
+ deselectAll.setText("Deselect All");
+ deselectAll.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ selectAll(false);
+ }
+ });
+ }
+
+ private void selectAll(boolean isSelectAll) {
+ Object[] objects = peopleCheckboxTreeViewer.getExpandedElements();
+ for (Object object : objects) {
+ peopleCheckboxTreeViewer.setSubtreeChecked(object, isSelectAll);
+ }
+ }
+
+ private static class TreeContentProvider implements ITreeContentProvider {
+
+ public void dispose() {
+ // Nothing to dispose
+ }
+
+ public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
+ // Nothing to change
+ }
+
+ public Object[] getChildren(Object parentElement) {
+ return null;
+ }
+
+ public Object getParent(Object element) {
+ return null;
+ }
+
+ public boolean hasChildren(Object element) {
+ return false;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Object[] getElements(Object inputElement) {
+ return ((ArrayList) inputElement).toArray();
+ }
+ }
+
+ private static class PersonLabelProvider extends LabelProvider {
+
+ @Override
+ public Image getImage(Object arg0) {
+ return null;
+ }
+
+ @Override
+ public String getText(Object arg0) {
+ return ((User) arg0).getName();
+ }
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbLabelProvider.java index b5a9968c6c7..88db6e5a526 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbLabelProvider.java @@ -14,10 +14,10 @@ import java.sql.Timestamp; import org.eclipse.jface.viewers.ITableColorProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Display; /** * Label provider for the TableViewerExample @@ -27,47 +27,50 @@ import org.eclipse.swt.widgets.Display; */ public class DbLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider { - private final String[] columnNames; + private final String[] columnNames; - public DbLabelProvider(String[] columnNames) { - this.columnNames = columnNames; - }; + public DbLabelProvider(String[] columnNames) { + this.columnNames = columnNames; + }; - public Color getForeground(Object element, int columnIndex) { - DbModel model = (DbModel) element; - if (model.isColumnChanged(columnNames[columnIndex])) return Display.getCurrent().getSystemColor(SWT.COLOR_RED); - return null; - } + public Color getForeground(Object element, int columnIndex) { + DbModel model = (DbModel) element; + if (model.isColumnChanged(columnNames[columnIndex])) { + return Displays.getSystemColor(SWT.COLOR_RED); + } + return null; + } - public Color getBackground(Object element, int columnIndex) { - return null; - } + public Color getBackground(Object element, int columnIndex) { + return null; + } - /** - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) - */ - public String getColumnText(Object element, int columnIndex) { - DbModel dbModel = (DbModel) element; - Object obj = dbModel.getColumn(columnIndex); - if (obj == null) - return ""; - else if (obj instanceof String) - return (String) obj; - else if (obj instanceof Long) - return ((Long) obj).toString(); - else if (obj instanceof Integer) - return ((Integer) obj).toString(); - else if (obj instanceof Timestamp) - return ((Timestamp) obj).toString(); - else - return "Unknown column type"; - } + /** + * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) + */ + public String getColumnText(Object element, int columnIndex) { + DbModel dbModel = (DbModel) element; + Object obj = dbModel.getColumn(columnIndex); + if (obj == null) { + return ""; + } else if (obj instanceof String) { + return (String) obj; + } else if (obj instanceof Long) { + return ((Long) obj).toString(); + } else if (obj instanceof Integer) { + return ((Integer) obj).toString(); + } else if (obj instanceof Timestamp) { + return ((Timestamp) obj).toString(); + } else { + return "Unknown column type"; + } + } - /** - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) - */ - public Image getColumnImage(Object element, int columnIndex) { - return null; - } + /** + * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) + */ + public Image getColumnImage(Object element, int columnIndex) { + return null; + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java index 0b3100b5a9d..bd0a482c5f8 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Vector; - import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.CellEditor; diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java index 4fc0434e0a8..7b5cce130ca 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java @@ -11,7 +11,6 @@ package org.eclipse.osee.framework.ui.admin.dbtabletab; import java.util.logging.Level; - import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.logging.OseeLog; diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateComposite.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateComposite.java index 60c923b107e..43a5f9d32fa 100644 --- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateComposite.java @@ -184,14 +184,14 @@ public class XNavigateComposite extends Composite { if (tip != null && !tip.isDisposed()) { tip.dispose(); } - tip = new Shell(Display.getCurrent().getActiveShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); - tip.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); + tip = new Shell(Displays.getActiveShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); + tip.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND)); FillLayout layout = new FillLayout(); layout.marginWidth = 2; tip.setLayout(layout); label = new Label(tip, SWT.NONE); - label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_FOREGROUND)); - label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); + label.setForeground(Displays.getSystemColor(SWT.COLOR_INFO_FOREGROUND)); + label.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND)); label.setData("_TABLEITEM", item); label.setText(item.getText() + "\n\n" + ((XNavigateItem) item.getData()).getDescription()); label.addListener(SWT.MouseExit, labelListener); diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateItemAction.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateItemAction.java index 11854a2a46b..20147d255f8 100644 --- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateItemAction.java +++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateItemAction.java @@ -57,7 +57,7 @@ public class XNavigateItemAction extends XNavigateItem { if (promptFirst) { Displays.ensureInDisplayThread(new Runnable() { public void run() { - if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) { + if (MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) { action.run(); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/images/lock.gif b/plugins/org.eclipse.osee.framework.ui.skynet/images/lock.gif Binary files differnew file mode 100644 index 00000000000..1075ee45868 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.ui.skynet/images/lock.gif 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 e667ba37fc5..99a72c19d58 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 @@ -128,7 +128,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -246,20 +245,20 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent Composite composite = new Composite(parent, SWT.BORDER);
composite.setLayout(new GridLayout(2, false));
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ composite.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
Label image = new Label(composite, SWT.NONE);
image.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
image.setImage(ImageManager.getImage(FrameworkImage.LOCKED_NO_ACCESS));
- image.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ image.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
Label label = new Label(composite, SWT.NONE);
Font font = new Font(PlatformUI.getWorkbench().getDisplay(), "Courier New", 10, SWT.BOLD);
label.setFont(font);
- label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED));
+ label.setForeground(Displays.getSystemColor(SWT.COLOR_DARK_RED));
label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
label.setText("Branch Read Access Denied.\nContact your administrator.");
- label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ label.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
return composite;
}
@@ -870,7 +869,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent Artifact selectedArtifact = (Artifact) selection.getFirstElement();
try {
if (selectedArtifact != null) {
- PolicyDialog pd = new PolicyDialog(Display.getCurrent().getActiveShell(), selectedArtifact);
+ PolicyDialog pd = new PolicyDialog(Displays.getActiveShell(), selectedArtifact);
pd.open();
checkBranchReadable();
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageProvider.java index b381236d0ab..041369fe0b9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageProvider.java @@ -23,27 +23,27 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; * @author Ryan D. Brooks */ public abstract class ArtifactImageProvider { - /** - * Providers can return null which will cause null to be returned from the associated getImage or getImageDescriptor - * call. Alternatively, providers that wish to defer to the basic implementation should call return - * super.setupImage() - * - * @param artifact - * @throws OseeCoreException - */ - public String setupImage(Artifact artifact) throws OseeCoreException { - return ArtifactImageManager.setupImageNoProviders(artifact); - } + /** + * Providers can return null which will cause null to be returned from the associated getImage or getImageDescriptor + * call. Alternatively, providers that wish to defer to the basic implementation should call return + * super.setupImage() + * + * @param artifact + * @throws OseeCoreException + */ + public String setupImage(Artifact artifact) throws OseeCoreException { + return ArtifactImageManager.setupImageNoProviders(artifact); + } - public String setupImage(ArtifactType artifactType) throws OseeCoreException { - return ArtifactImageManager.setupImage(BaseImage.getBaseImageEnum(artifactType)); - } + public String setupImage(ArtifactType artifactType) throws OseeCoreException { + return ArtifactImageManager.setupImage(BaseImage.getBaseImageEnum(artifactType)); + } - /** - * Provide image artifact type registration by ImageManager.register.* calls - * - * @throws OseeCoreException - */ - public abstract void init() throws OseeCoreException; + /** + * Provide image artifact type registration by ImageManager.register.* calls + * + * @throws OseeCoreException + */ + public abstract void init() throws OseeCoreException; }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java index de6ef4f4a2e..8d7d7427f42 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java @@ -28,6 +28,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.UniversalCellEditor;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
@@ -41,7 +42,6 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Menu;
@@ -53,290 +53,290 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar;
public class AttributesComposite extends Composite {
- private TableViewer tableViewer;
- private Table table;
- private Text helpText;
- private static final String[] columnNames = new String[] {"name", "value"};
- private static final Integer[] columnWidths = new Integer[] {200, 600};
- private Artifact artifact;
- private final IDirtiableEditor editor;
- private Label warningLabel;
- private final ArrayList<ModifyAttributesListener> modifyAttrListeners = new ArrayList<ModifyAttributesListener>();
- private MenuItem deleteItem;
- private final ToolBar toolBar;
-
- public static final int NAME_COLUMN_INDEX = 0;
- public static final int VALUE_COLUMN_INDEX = 1;
-
- public AttributesComposite(IDirtiableEditor editor, Composite parent, int style, Artifact artifact) {
- this(editor, parent, style, artifact, null);
- }
-
- public AttributesComposite(IDirtiableEditor editor, Composite parent, int style, Artifact artifact, ToolBar toolBar) {
- super(parent, style);
- this.artifact = artifact;
- this.editor = editor;
-
- create(this);
- Menu popupMenu = new Menu(parent);
- createAddMenuItem(popupMenu);
- createDeleteMenuItem(popupMenu);
- popupMenu.addMenuListener(new AttributeMenuListener());
- tableViewer.getTable().setMenu(popupMenu);
-
- this.toolBar = toolBar;
- }
-
- public void updateLabel(String msg) {
- warningLabel.setText(msg);
- layout();
- }
-
- private void create(Composite parent) {
- this.setLayout(new GridLayout());
- this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- SashForm mainSash = new SashForm(this, SWT.NONE);
- mainSash.setLayout(new GridLayout());
- mainSash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- mainSash.setOrientation(SWT.VERTICAL);
-
- createTableArea(mainSash);
-
- SashForm sashForm = new SashForm(mainSash, SWT.NONE);
- sashForm.setLayout(new GridLayout());
- sashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- sashForm.setOrientation(SWT.HORIZONTAL);
-
- createWarningArea(sashForm);
- createHelpArea(sashForm);
-
- mainSash.setWeights(new int[] {8, 2});
- sashForm.setWeights(new int[] {5, 5});
-
- setHelpContexts();
- }
-
- private void createTableArea(Composite parent) {
- Group composite = new Group(parent, SWT.NONE);
- composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true));
- composite.setText("Attributes");
-
- createTable(composite);
- createColumns();
- createTableViewer(composite);
-
- tableViewer.refresh();
- attachTableListeners();
- }
-
- private void createTable(Composite parent) {
- table =
- new Table(parent,
- SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
- table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- }
-
- private void attachTableListeners() {
- tableViewer.addPostSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- Object selected = selection.getFirstElement();
-
- if (selected instanceof Attribute<?>) {
- Attribute<?> attribute = (Attribute<?>) selected;
- String tipText = attribute.getAttributeType().getDescription();
- if (tipText != null && !tipText.equals("null")) {
- helpText.setText(tipText);
- } else {
- helpText.setText("");
- }
- }
- }
- });
- }
-
- private void createTableViewer(Composite parent) {
- tableViewer = new TableViewer(table);
-
- TableViewerEditor.create(
- tableViewer,
- new ColumnViewerEditorActivationStrategy(tableViewer),
- ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR | ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION);
- tableViewer.setUseHashlookup(true);
- tableViewer.setColumnProperties(columnNames);
-
- if (!artifact.isReadOnly()) {
- CellEditor[] editors = new CellEditor[columnNames.length];
- editors[VALUE_COLUMN_INDEX] = new UniversalCellEditor(table, SWT.NONE);
-
- tableViewer.setCellEditors(editors);
- tableViewer.setCellModifier(new AttributeCellModifier(editor, tableViewer, this));
- }
- tableViewer.setContentProvider(new AttributeContentProvider());
- tableViewer.setLabelProvider(new AttributeLabelProvider());
- tableViewer.setInput(artifact);
- }
-
- private void createColumns() {
- for (int index = 0; index < columnNames.length; index++) {
- TableColumn column = new TableColumn(table, SWT.LEFT, index);
- column.setText(columnNames[index]);
- column.setWidth(columnWidths[index]);
- }
- }
-
- private void createHelpArea(Composite parent) {
- Group composite = new Group(parent, SWT.NONE);
- composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setText("Tips");
-
- helpText = new Text(composite, SWT.WRAP | SWT.READ_ONLY);
- helpText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- }
-
- private void createWarningArea(Composite parent) {
- Group composite = new Group(parent, SWT.NONE);
- composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setText("Warnings");
-
- warningLabel = new Label(composite, SWT.NONE);
- warningLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- warningLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- updateLabel("");
- }
-
- private void createAddMenuItem(Menu parentMenu) {
- MenuItem addItem = new MenuItem(parentMenu, SWT.CASCADE);
- addItem.setText("Add");
- addItem.setEnabled(true && !artifact.isReadOnly());
-
- // Update the enabled values for the popup menu each time it comes up
- addItem.addArmListener(new ArmListener() {
-
- public void widgetArmed(ArmEvent e) {
- MenuItem addItem = (MenuItem) e.getSource();
- for (MenuItem attrItem : addItem.getMenu().getItems()) {
- try {
- attrItem.setEnabled(artifact.getRemainingAttributeCount((AttributeType) attrItem.getData()) > 0);
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- }
- }
- });
-
- Menu attributesMenu = new Menu(parentMenu);
-
- try {
- SelectionAdapter listener = new AttributeMenuSelectionListener(this, tableViewer, editor);
- for (AttributeType attributeType : artifact.getAttributeTypes()) {
- MenuItem item = new MenuItem(attributesMenu, SWT.CASCADE);
- item.setText(attributeType.getName() + " Attribute");
- item.setData(attributeType);
- item.addSelectionListener(listener);
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- addItem.setMenu(attributesMenu);
- }
-
- private void createDeleteMenuItem(Menu parentMenu) {
- deleteItem = new MenuItem(parentMenu, SWT.PUSH);
- deleteItem.setImage(null);
- deleteItem.setText("Delete");
- deleteItem.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- Attribute<?> attribute = getSelectedAttribute();
- try {
- attribute.delete();
- editor.onDirtied();
- notifyModifyAttribuesListeners();
- tableViewer.refresh();
- } catch (OseeStateException ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
- }
-
- private Attribute<?> getSelectedAttribute() {
- TableItem[] items = tableViewer.getTable().getSelection();
- if (items.length > 0) {
- return (Attribute<?>) tableViewer.getTable().getSelection()[0].getData();
- } else {
- return null;
- }
- }
-
- public class AttributeMenuListener implements MenuListener {
- public void menuHidden(MenuEvent e) {
- }
-
- public void menuShown(MenuEvent e) {
- Attribute<?> attribute = getSelectedAttribute();
-
- if (attribute == null) {
- deleteItem.setText("Delete - No Attribute Selected");
- deleteItem.setEnabled(false);
- } else if (!attribute.canDelete()) {
- deleteItem.setText("Delete - Lower Limit Met");
- deleteItem.setEnabled(false);
- } else {
- deleteItem.setText("Delete");
- deleteItem.setEnabled(!artifact.isReadOnly());
- }
- }
- }
-
- public Artifact getArtifact() {
- return artifact;
- }
-
- public void refreshArtifact(Artifact artifact) {
- this.artifact = artifact;
-
- if (tableViewer.getContentProvider() != null) {
- tableViewer.setInput(artifact);
- tableViewer.refresh();
- }
- }
-
- public void addModifyAttributesListener(ModifyAttributesListener listener) {
- if (!modifyAttrListeners.contains(listener)) {
- modifyAttrListeners.add(listener);
- }
- }
-
- public void removeModifyAttributesListener(ModifyAttributesListener listener) {
- modifyAttrListeners.remove(listener);
- }
-
- public void notifyModifyAttribuesListeners() {
- for (ModifyAttributesListener listener : modifyAttrListeners) {
- listener.handleEvent();
- }
- }
-
- private void setHelpContexts() {
- SkynetGuiPlugin.getInstance().setHelp(tableViewer.getControl(), "artifact_editor",
- "org.eclipse.osee.framework.help.ui");
- }
-
- /**
- * @return the toolBar
- */
- public ToolBar getToolBar() {
- return toolBar;
- }
+ private TableViewer tableViewer;
+ private Table table;
+ private Text helpText;
+ private static final String[] columnNames = new String[] {"name", "value"};
+ private static final Integer[] columnWidths = new Integer[] {200, 600};
+ private Artifact artifact;
+ private final IDirtiableEditor editor;
+ private Label warningLabel;
+ private final ArrayList<ModifyAttributesListener> modifyAttrListeners = new ArrayList<ModifyAttributesListener>();
+ private MenuItem deleteItem;
+ private final ToolBar toolBar;
+
+ public static final int NAME_COLUMN_INDEX = 0;
+ public static final int VALUE_COLUMN_INDEX = 1;
+
+ public AttributesComposite(IDirtiableEditor editor, Composite parent, int style, Artifact artifact) {
+ this(editor, parent, style, artifact, null);
+ }
+
+ public AttributesComposite(IDirtiableEditor editor, Composite parent, int style, Artifact artifact, ToolBar toolBar) {
+ super(parent, style);
+ this.artifact = artifact;
+ this.editor = editor;
+
+ create(this);
+ Menu popupMenu = new Menu(parent);
+ createAddMenuItem(popupMenu);
+ createDeleteMenuItem(popupMenu);
+ popupMenu.addMenuListener(new AttributeMenuListener());
+ tableViewer.getTable().setMenu(popupMenu);
+
+ this.toolBar = toolBar;
+ }
+
+ public void updateLabel(String msg) {
+ warningLabel.setText(msg);
+ layout();
+ }
+
+ private void create(Composite parent) {
+ this.setLayout(new GridLayout());
+ this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ SashForm mainSash = new SashForm(this, SWT.NONE);
+ mainSash.setLayout(new GridLayout());
+ mainSash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ mainSash.setOrientation(SWT.VERTICAL);
+
+ createTableArea(mainSash);
+
+ SashForm sashForm = new SashForm(mainSash, SWT.NONE);
+ sashForm.setLayout(new GridLayout());
+ sashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ sashForm.setOrientation(SWT.HORIZONTAL);
+
+ createWarningArea(sashForm);
+ createHelpArea(sashForm);
+
+ mainSash.setWeights(new int[] {8, 2});
+ sashForm.setWeights(new int[] {5, 5});
+
+ setHelpContexts();
+ }
+
+ private void createTableArea(Composite parent) {
+ Group composite = new Group(parent, SWT.NONE);
+ composite.setLayout(new GridLayout());
+ composite.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true));
+ composite.setText("Attributes");
+
+ createTable(composite);
+ createColumns();
+ createTableViewer(composite);
+
+ tableViewer.refresh();
+ attachTableListeners();
+ }
+
+ private void createTable(Composite parent) {
+ table =
+ new Table(parent,
+ SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
+ table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ table.setLinesVisible(true);
+ table.setHeaderVisible(true);
+ }
+
+ private void attachTableListeners() {
+ tableViewer.addPostSelectionChangedListener(new ISelectionChangedListener() {
+
+ public void selectionChanged(SelectionChangedEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ Object selected = selection.getFirstElement();
+
+ if (selected instanceof Attribute<?>) {
+ Attribute<?> attribute = (Attribute<?>) selected;
+ String tipText = attribute.getAttributeType().getDescription();
+ if (tipText != null && !tipText.equals("null")) {
+ helpText.setText(tipText);
+ } else {
+ helpText.setText("");
+ }
+ }
+ }
+ });
+ }
+
+ private void createTableViewer(Composite parent) {
+ tableViewer = new TableViewer(table);
+
+ TableViewerEditor.create(
+ tableViewer,
+ new ColumnViewerEditorActivationStrategy(tableViewer),
+ ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR | ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION);
+ tableViewer.setUseHashlookup(true);
+ tableViewer.setColumnProperties(columnNames);
+
+ if (!artifact.isReadOnly()) {
+ CellEditor[] editors = new CellEditor[columnNames.length];
+ editors[VALUE_COLUMN_INDEX] = new UniversalCellEditor(table, SWT.NONE);
+
+ tableViewer.setCellEditors(editors);
+ tableViewer.setCellModifier(new AttributeCellModifier(editor, tableViewer, this));
+ }
+ tableViewer.setContentProvider(new AttributeContentProvider());
+ tableViewer.setLabelProvider(new AttributeLabelProvider());
+ tableViewer.setInput(artifact);
+ }
+
+ private void createColumns() {
+ for (int index = 0; index < columnNames.length; index++) {
+ TableColumn column = new TableColumn(table, SWT.LEFT, index);
+ column.setText(columnNames[index]);
+ column.setWidth(columnWidths[index]);
+ }
+ }
+
+ private void createHelpArea(Composite parent) {
+ Group composite = new Group(parent, SWT.NONE);
+ composite.setLayout(new GridLayout());
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ composite.setText("Tips");
+
+ helpText = new Text(composite, SWT.WRAP | SWT.READ_ONLY);
+ helpText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ }
+
+ private void createWarningArea(Composite parent) {
+ Group composite = new Group(parent, SWT.NONE);
+ composite.setLayout(new GridLayout());
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ composite.setText("Warnings");
+
+ warningLabel = new Label(composite, SWT.NONE);
+ warningLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ warningLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
+ updateLabel("");
+ }
+
+ private void createAddMenuItem(Menu parentMenu) {
+ MenuItem addItem = new MenuItem(parentMenu, SWT.CASCADE);
+ addItem.setText("Add");
+ addItem.setEnabled(true && !artifact.isReadOnly());
+
+ // Update the enabled values for the popup menu each time it comes up
+ addItem.addArmListener(new ArmListener() {
+
+ public void widgetArmed(ArmEvent e) {
+ MenuItem addItem = (MenuItem) e.getSource();
+ for (MenuItem attrItem : addItem.getMenu().getItems()) {
+ try {
+ attrItem.setEnabled(artifact.getRemainingAttributeCount((AttributeType) attrItem.getData()) > 0);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+ }
+ }
+ }
+ });
+
+ Menu attributesMenu = new Menu(parentMenu);
+
+ try {
+ SelectionAdapter listener = new AttributeMenuSelectionListener(this, tableViewer, editor);
+ for (AttributeType attributeType : artifact.getAttributeTypes()) {
+ MenuItem item = new MenuItem(attributesMenu, SWT.CASCADE);
+ item.setText(attributeType.getName() + " Attribute");
+ item.setData(attributeType);
+ item.addSelectionListener(listener);
+ }
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ addItem.setMenu(attributesMenu);
+ }
+
+ private void createDeleteMenuItem(Menu parentMenu) {
+ deleteItem = new MenuItem(parentMenu, SWT.PUSH);
+ deleteItem.setImage(null);
+ deleteItem.setText("Delete");
+ deleteItem.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ Attribute<?> attribute = getSelectedAttribute();
+ try {
+ attribute.delete();
+ editor.onDirtied();
+ notifyModifyAttribuesListeners();
+ tableViewer.refresh();
+ } catch (OseeStateException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+ }
+
+ private Attribute<?> getSelectedAttribute() {
+ TableItem[] items = tableViewer.getTable().getSelection();
+ if (items.length > 0) {
+ return (Attribute<?>) tableViewer.getTable().getSelection()[0].getData();
+ } else {
+ return null;
+ }
+ }
+
+ public class AttributeMenuListener implements MenuListener {
+ public void menuHidden(MenuEvent e) {
+ }
+
+ public void menuShown(MenuEvent e) {
+ Attribute<?> attribute = getSelectedAttribute();
+
+ if (attribute == null) {
+ deleteItem.setText("Delete - No Attribute Selected");
+ deleteItem.setEnabled(false);
+ } else if (!attribute.canDelete()) {
+ deleteItem.setText("Delete - Lower Limit Met");
+ deleteItem.setEnabled(false);
+ } else {
+ deleteItem.setText("Delete");
+ deleteItem.setEnabled(!artifact.isReadOnly());
+ }
+ }
+ }
+
+ public Artifact getArtifact() {
+ return artifact;
+ }
+
+ public void refreshArtifact(Artifact artifact) {
+ this.artifact = artifact;
+
+ if (tableViewer.getContentProvider() != null) {
+ tableViewer.setInput(artifact);
+ tableViewer.refresh();
+ }
+ }
+
+ public void addModifyAttributesListener(ModifyAttributesListener listener) {
+ if (!modifyAttrListeners.contains(listener)) {
+ modifyAttrListeners.add(listener);
+ }
+ }
+
+ public void removeModifyAttributesListener(ModifyAttributesListener listener) {
+ modifyAttrListeners.remove(listener);
+ }
+
+ public void notifyModifyAttribuesListeners() {
+ for (ModifyAttributesListener listener : modifyAttrListeners) {
+ listener.handleEvent();
+ }
+ }
+
+ private void setHelpContexts() {
+ SkynetGuiPlugin.getInstance().setHelp(tableViewer.getControl(), "artifact_editor",
+ "org.eclipse.osee.framework.help.ui");
+ }
+
+ /**
+ * @return the toolBar
+ */
+ public ToolBar getToolBar() {
+ return toolBar;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java index a27185f5d2c..8a9035d4ac3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java @@ -19,200 +19,201 @@ import org.eclipse.osee.framework.ui.swt.KeyedImage; * @author Ryan D. Brooks
*/
public enum FrameworkImage implements KeyedImage {
- ACCEPT("accept.gif"),
- ADD_GREEN("add.png"),
- ARCHIVE("archive.gif"),
- ARTIFACT_EDITOR("artifact_editor.gif"),
- ARTIFACT_EXPLORER("artifact_explorer.gif"),
- ARTIFACT_IMPORT_WIZARD("artifact_import_wiz.png"),
- ARTIFACT_SEARCH("artifact_search.gif"),
- ARTIFACT_VERSION("artifact_version.gif"),
- ARROW_RIGHT_YELLOW("nav_forward.gif"),
- ARROW_UP_YELLOW("up.gif"),
- ARROW_DOWN_YELLOW("down.gif"),
- ARROW_LEFT_YELLOW("nav_backward.gif"),
- ATTRIBUTE_MOLECULE("molecule.gif"),
- ATTRIBUTE_SUB_A("attribute.gif"),
- ATTRIBUTE_DISABLED("disabled_attribute.gif"),
- APPLICATION_SERVER("appserver.gif"),
- AUTHENTICATED("authenticated.gif"),
- BACK("back.png"),
- BLAM("blam.gif"),
- BRANCH_CHANGE("branch_change.gif"),
- BRANCH("branch.gif"),
- BRANCH_SYSTEM_ROOT("branchYellow.gif"),
- BRANCH_BASELINE("baseline.gif"),
- BRANCH_CHANGE_DEST("branch_change_dest.gif"),
- BRANCH_CHANGE_SOURCE("branch_change_source.gif"),
- BRANCH_IN_CREATION_OVERLAY("waiting_ovr.gif"),
- BRANCH_MERGE("merge.gif"),
- BRANCH_WORKING("working.gif"),
- BRANCH_FAVORITE_OVERLAY("star_9_9.gif"),
- BRANCH_CHANGE_MANAGED("change_managed_branch.gif"),
- BRANCH_COMMIT("commitBranch.gif"),
- CHANGE_LOG("changelog_obj.gif"),
- CLOCK("clock.gif"),
- COLLAPSE_ALL("collapseAll.gif"),
- COMPARE_HEAD_TX("head.gif"),
- COMPARE_PARENT_BRANCH("branches.gif"),
- COMPARE_OTHER_BRANCH("branches_rep.gif"),
- CONFLICTING_Deleted("CONFLICTING_Deleted.gif"),
- CONFLICTING_Modified("CONFLICTING_Modified.gif"),
- CONFLICTING_New("CONFLICTING_New.gif"),
- COPYTOCLIPBOARD("copyToClipboard.gif"),
- CUSTOMIZE("customize.gif"),
- DELTAS("compare.GIF"),
- DELTAS_BASE_TO_HEAD_TXS("compareBaseToHeadTxs.GIF"),
- DELTAS_DIFFERENT_BRANCHES_WITH_MERGE("compareBranchesWithMerge.GIF"),
- DELTAS_DIFFERENT_BRANCHES("compareBranches.GIF"),
- DELTAS_TXS_SAME_BRANCH("compareTxs.GIF"),
- DB_ICON_BLUE("DBiconBlue.GIF"),
- DB_ICON_BLUE_EDIT("DBiconBlueEdit.GIF"),
- DELETE("delete.png"),
- DELETE_EDIT("delete_edit.gif"),
- DIRTY("dirty.gif"),
- DOCUMENT("docOrder.gif"),
- DOT_RED("red_light.gif"),
- DOT_YELLOW("yellow_light.gif"),
- DOT_GREEN("green_light.gif"),
- DUPLICATE("duplicate.gif"),
- EDIT("edit.gif"),
- EDIT2("edit2.gif"),
- EDIT_BLUE("DBiconBlueEdit.GIF"),
- EDIT_ARTIFACT("edit_artifact.gif"),
- EMAIL("email.gif"),
- ERROR("errorRound.gif"),
- ERROR_OVERLAY("error.gif"),
- EXPAND_ALL("expandAll.gif"),
- EXPORT_DATA("export_data.gif"),
- EXPORT_TABLE("export_table.gif"),
- EXCLAIM_RED("redExclaim.gif"),
- FLASHLIGHT("flashlight.gif"),
- FILTERS("filter.gif"),
- GEAR("gear.gif"),
- GREEN_PLUS("greenPlus.gif"),
- GROUP("group.gif"),
- HEADING("heading.gif"),
- HELP("help.gif"),
- IMPORT("import.gif"),
- INCOMING_ARTIFACT_DELETED("INCOMING_Deleted.gif"),
- INCOMING_DELETED("INCOMING_Deleted.gif"),
- INCOMING_INTRODUCED("INCOMING_New.gif"),
- INCOMING_MODIFIED("INCOMING_Modified.gif"),
- INCOMING_NEW("INCOMING_New.gif"),
- INFO_SM("info_sm.gif"),
- INFO_LG("info_lg.gif"),
- LASER("laser_16_16.gif"),
- LASER_OVERLAY("laser_8_8.gif"),
- LEFT_ARROW_1("leftarrow1.png"),
- LEFT_ARROW_N("leftarrowN.png"),
- LINE_MATCH("line_match.gif"),
- LOAD("load.gif"),
- LOCKED_KEY("lockkey.gif"),
- LOCKED_NO_ACCESS("red_lock.gif"),
- LOCKED_WITH_ACCESS("green_lock.gif"),
- OSEE_TYPES_LINK("link_obj.gif"),
- NOT_EQUAL("not_equal.gif"),
- NAV_BACKWARD("nav_backward.gif"),
- NAV_FORWARD("nav_forward.gif"),
- MAGNIFY("magnify.gif"),
- MERGE("merge.gif"),
- MERGE_SOURCE("green_s.gif"),
- MERGE_DEST("blue_d.gif"),
- MERGE_YELLOW_M("yellow_m.gif"),
- MERGE_START("conflict.gif"),
- MERGE_INFO("issue.gif"),
- MERGE_MARKED(PluginUiImage.CHECKBOX_ENABLED),
- MERGE_EDITED(PluginUiImage.CHECKBOX_DISABLED),
- MERGE_OUT_OF_DATE("chkbox_red.gif"),
- MERGE_OUT_OF_DATE_COMMITTED("chkbox_enabled_conflicted.gif"),
- MERGE_NO_CONFLICT("accept.gif"),
- MERGE_NOT_RESOLVEABLE("red_light.gif"),
- MERGE_SUCCESS("icon_success.gif"),
- MERGE_CAUTION("icon_warning.gif"),
- NARRITIVE("narrative.gif"),
- OPEN("open.gif"),
- OUTGOING_ARTIFACT_DELETED("OUTGOING_Deleted.gif"),
- OUTGOING_DELETED("OUTGOING_Deleted.gif"),
- OUTGOING_INTRODUCED("OUTGOING_New.gif"),
- OUTGOING_MERGED("branch_merge.gif"),
- OUTGOING_MODIFIED("OUTGOING_Modified.gif"),
- OUTGOING_NEW("OUTGOING_New.gif"),
- OUTLINE("outline_co.gif"),
- PASTE_SPECIAL_WIZ("paste_wiz.png"),
- PROBLEM("greenBug.gif"),
- PREVIEW_ARTIFACT("preview_artifact.gif"),
- PRINT("print.gif"),
- PURPLE("purple.gif"),
- RECTANGLE_16("rectangle16.gif"),
- RECTANGLE_24("rectangle24.gif"),
- RELATION("relate.gif"),
- RELOAD("reload.gif"),
- RES("res.gif"),
- REMOVE("remove.gif"),
- REMOVE_ALL("removeAll.gif"),
- REPORT("report.gif"),
- REJECT("reject.gif"),
- RIGHT_ARROW_1("rightarrow1.png"),
- RIGHT_ARROW_N("rightarrowN.png"),
- ROOT_HIERARCHY("package_obj.gif"),
- RUN_EXC("run_exc.gif"),
- PAGE("page.gif"),
- RULE("rule.gif"),
- SAVE_NEEDED("save.gif"),
- SAVED("saved.gif"),
- SAVE("save.gif"),
- SEVERITY_MAJOR("major.gif"),
- SEVERITY_MINOR("minor.gif"),
- SEVERITY_ISSUE("issue.gif"),
- SLASH_RED_OVERLAY("red_slash.gif"),
- SWITCHED("switched.gif"),
- TRASH("trash.gif"),
- TOOLS("tools.gif"),
- SKYWALKER("skywalker.gif"),
- SUPPORT("users2.gif"),
- USER("userPurple.gif"),
- USER_PURPLE("userPurple.gif"),
- USER_RED("userRed.gif"),
- USER_GREY("userGrey.gif"),
- USER_YELLOW("userYellow.gif"),
- USER_ADD("userAdd.gif"),
- USERS("users2.gif"),
- UN_ARCHIVE("unarchive.gif"),
- VERSION("version.gif"),
- WORKFLOW("workflow.gif"),
- WIDGET("widget.gif"),
- WARNING("warn.gif"),
- WARNING_OVERLAY("alert_8_8.gif"),
- WWW(PluginUiImage.URL),
- X_RED("redRemove.gif");
+ ACCEPT("accept.gif"),
+ ADD_GREEN("add.png"),
+ ARCHIVE("archive.gif"),
+ ARTIFACT_EDITOR("artifact_editor.gif"),
+ ARTIFACT_EXPLORER("artifact_explorer.gif"),
+ ARTIFACT_IMPORT_WIZARD("artifact_import_wiz.png"),
+ ARTIFACT_SEARCH("artifact_search.gif"),
+ ARTIFACT_VERSION("artifact_version.gif"),
+ ARROW_RIGHT_YELLOW("nav_forward.gif"),
+ ARROW_UP_YELLOW("up.gif"),
+ ARROW_DOWN_YELLOW("down.gif"),
+ ARROW_LEFT_YELLOW("nav_backward.gif"),
+ ATTRIBUTE_MOLECULE("molecule.gif"),
+ ATTRIBUTE_SUB_A("attribute.gif"),
+ ATTRIBUTE_DISABLED("disabled_attribute.gif"),
+ APPLICATION_SERVER("appserver.gif"),
+ AUTHENTICATED("authenticated.gif"),
+ BACK("back.png"),
+ BLAM("blam.gif"),
+ BRANCH_CHANGE("branch_change.gif"),
+ BRANCH("branch.gif"),
+ BRANCH_SYSTEM_ROOT("branchYellow.gif"),
+ BRANCH_BASELINE("baseline.gif"),
+ BRANCH_CHANGE_DEST("branch_change_dest.gif"),
+ BRANCH_CHANGE_SOURCE("branch_change_source.gif"),
+ BRANCH_IN_CREATION_OVERLAY("waiting_ovr.gif"),
+ BRANCH_MERGE("merge.gif"),
+ BRANCH_WORKING("working.gif"),
+ BRANCH_FAVORITE_OVERLAY("star_9_9.gif"),
+ BRANCH_CHANGE_MANAGED("change_managed_branch.gif"),
+ BRANCH_COMMIT("commitBranch.gif"),
+ CHANGE_LOG("changelog_obj.gif"),
+ CLOCK("clock.gif"),
+ COLLAPSE_ALL("collapseAll.gif"),
+ COMPARE_HEAD_TX("head.gif"),
+ COMPARE_PARENT_BRANCH("branches.gif"),
+ COMPARE_OTHER_BRANCH("branches_rep.gif"),
+ CONFLICTING_Deleted("CONFLICTING_Deleted.gif"),
+ CONFLICTING_Modified("CONFLICTING_Modified.gif"),
+ CONFLICTING_New("CONFLICTING_New.gif"),
+ COPYTOCLIPBOARD("copyToClipboard.gif"),
+ CUSTOMIZE("customize.gif"),
+ DELTAS("compare.GIF"),
+ DELTAS_BASE_TO_HEAD_TXS("compareBaseToHeadTxs.GIF"),
+ DELTAS_DIFFERENT_BRANCHES_WITH_MERGE("compareBranchesWithMerge.GIF"),
+ DELTAS_DIFFERENT_BRANCHES("compareBranches.GIF"),
+ DELTAS_TXS_SAME_BRANCH("compareTxs.GIF"),
+ DB_ICON_BLUE("DBiconBlue.GIF"),
+ DB_ICON_BLUE_EDIT("DBiconBlueEdit.GIF"),
+ DELETE("delete.png"),
+ DELETE_EDIT("delete_edit.gif"),
+ DIRTY("dirty.gif"),
+ DOCUMENT("docOrder.gif"),
+ DOT_RED("red_light.gif"),
+ DOT_YELLOW("yellow_light.gif"),
+ DOT_GREEN("green_light.gif"),
+ DUPLICATE("duplicate.gif"),
+ EDIT("edit.gif"),
+ EDIT2("edit2.gif"),
+ EDIT_BLUE("DBiconBlueEdit.GIF"),
+ EDIT_ARTIFACT("edit_artifact.gif"),
+ EMAIL("email.gif"),
+ ERROR("errorRound.gif"),
+ ERROR_OVERLAY("error.gif"),
+ EXPAND_ALL("expandAll.gif"),
+ EXPORT_DATA("export_data.gif"),
+ EXPORT_TABLE("export_table.gif"),
+ EXCLAIM_RED("redExclaim.gif"),
+ FLASHLIGHT("flashlight.gif"),
+ FILTERS("filter.gif"),
+ GEAR("gear.gif"),
+ GREEN_PLUS("greenPlus.gif"),
+ GROUP("group.gif"),
+ HEADING("heading.gif"),
+ HELP("help.gif"),
+ IMPORT("import.gif"),
+ INCOMING_ARTIFACT_DELETED("INCOMING_Deleted.gif"),
+ INCOMING_DELETED("INCOMING_Deleted.gif"),
+ INCOMING_INTRODUCED("INCOMING_New.gif"),
+ INCOMING_MODIFIED("INCOMING_Modified.gif"),
+ INCOMING_NEW("INCOMING_New.gif"),
+ INFO_SM("info_sm.gif"),
+ INFO_LG("info_lg.gif"),
+ LASER("laser_16_16.gif"),
+ LASER_OVERLAY("laser_8_8.gif"),
+ LEFT_ARROW_1("leftarrow1.png"),
+ LEFT_ARROW_N("leftarrowN.png"),
+ LINE_MATCH("line_match.gif"),
+ LOAD("load.gif"),
+ LOCKED("lock.gif"),
+ LOCKED_KEY("lockkey.gif"),
+ LOCKED_NO_ACCESS("red_lock.gif"),
+ LOCKED_WITH_ACCESS("green_lock.gif"),
+ OSEE_TYPES_LINK("link_obj.gif"),
+ NOT_EQUAL("not_equal.gif"),
+ NAV_BACKWARD("nav_backward.gif"),
+ NAV_FORWARD("nav_forward.gif"),
+ MAGNIFY("magnify.gif"),
+ MERGE("merge.gif"),
+ MERGE_SOURCE("green_s.gif"),
+ MERGE_DEST("blue_d.gif"),
+ MERGE_YELLOW_M("yellow_m.gif"),
+ MERGE_START("conflict.gif"),
+ MERGE_INFO("issue.gif"),
+ MERGE_MARKED(PluginUiImage.CHECKBOX_ENABLED),
+ MERGE_EDITED(PluginUiImage.CHECKBOX_DISABLED),
+ MERGE_OUT_OF_DATE("chkbox_red.gif"),
+ MERGE_OUT_OF_DATE_COMMITTED("chkbox_enabled_conflicted.gif"),
+ MERGE_NO_CONFLICT("accept.gif"),
+ MERGE_NOT_RESOLVEABLE("red_light.gif"),
+ MERGE_SUCCESS("icon_success.gif"),
+ MERGE_CAUTION("icon_warning.gif"),
+ NARRITIVE("narrative.gif"),
+ OPEN("open.gif"),
+ OUTGOING_ARTIFACT_DELETED("OUTGOING_Deleted.gif"),
+ OUTGOING_DELETED("OUTGOING_Deleted.gif"),
+ OUTGOING_INTRODUCED("OUTGOING_New.gif"),
+ OUTGOING_MERGED("branch_merge.gif"),
+ OUTGOING_MODIFIED("OUTGOING_Modified.gif"),
+ OUTGOING_NEW("OUTGOING_New.gif"),
+ OUTLINE("outline_co.gif"),
+ PASTE_SPECIAL_WIZ("paste_wiz.png"),
+ PROBLEM("greenBug.gif"),
+ PREVIEW_ARTIFACT("preview_artifact.gif"),
+ PRINT("print.gif"),
+ PURPLE("purple.gif"),
+ RECTANGLE_16("rectangle16.gif"),
+ RECTANGLE_24("rectangle24.gif"),
+ RELATION("relate.gif"),
+ RELOAD("reload.gif"),
+ RES("res.gif"),
+ REMOVE("remove.gif"),
+ REMOVE_ALL("removeAll.gif"),
+ REPORT("report.gif"),
+ REJECT("reject.gif"),
+ RIGHT_ARROW_1("rightarrow1.png"),
+ RIGHT_ARROW_N("rightarrowN.png"),
+ ROOT_HIERARCHY("package_obj.gif"),
+ RUN_EXC("run_exc.gif"),
+ PAGE("page.gif"),
+ RULE("rule.gif"),
+ SAVE_NEEDED("save.gif"),
+ SAVED("saved.gif"),
+ SAVE("save.gif"),
+ SEVERITY_MAJOR("major.gif"),
+ SEVERITY_MINOR("minor.gif"),
+ SEVERITY_ISSUE("issue.gif"),
+ SLASH_RED_OVERLAY("red_slash.gif"),
+ SWITCHED("switched.gif"),
+ TRASH("trash.gif"),
+ TOOLS("tools.gif"),
+ SKYWALKER("skywalker.gif"),
+ SUPPORT("users2.gif"),
+ USER("userPurple.gif"),
+ USER_PURPLE("userPurple.gif"),
+ USER_RED("userRed.gif"),
+ USER_GREY("userGrey.gif"),
+ USER_YELLOW("userYellow.gif"),
+ USER_ADD("userAdd.gif"),
+ USERS("users2.gif"),
+ UN_ARCHIVE("unarchive.gif"),
+ VERSION("version.gif"),
+ WORKFLOW("workflow.gif"),
+ WIDGET("widget.gif"),
+ WARNING("warn.gif"),
+ WARNING_OVERLAY("alert_8_8.gif"),
+ WWW(PluginUiImage.URL),
+ X_RED("redRemove.gif");
- private final String fileName;
- private final KeyedImage alias;
+ private final String fileName;
+ private final KeyedImage alias;
- private FrameworkImage(String fileName) {
- this.fileName = fileName;
- this.alias = null;
- }
+ private FrameworkImage(String fileName) {
+ this.fileName = fileName;
+ this.alias = null;
+ }
- private FrameworkImage(KeyedImage alias) {
- this.fileName = alias.getImageKey();
- this.alias = alias;
- }
+ private FrameworkImage(KeyedImage alias) {
+ this.fileName = alias.getImageKey();
+ this.alias = alias;
+ }
- @Override
- public ImageDescriptor createImageDescriptor() {
- if (alias == null) {
- return ImageManager.createImageDescriptor(SkynetGuiPlugin.PLUGIN_ID, "images", fileName);
- }
- return alias.createImageDescriptor();
- }
+ @Override
+ public ImageDescriptor createImageDescriptor() {
+ if (alias == null) {
+ return ImageManager.createImageDescriptor(SkynetGuiPlugin.PLUGIN_ID, "images", fileName);
+ }
+ return alias.createImageDescriptor();
+ }
- @Override
- public String getImageKey() {
- if (alias == null) {
- return SkynetGuiPlugin.PLUGIN_ID + "." + fileName;
- }
- return alias.getImageKey();
- }
+ @Override
+ public String getImageKey() {
+ if (alias == null) {
+ return SkynetGuiPlugin.PLUGIN_ID + "." + fileName;
+ }
+ return alias.getImageKey();
+ }
}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/MatchingStrategy.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/MatchingStrategy.java index 3a7d0de67ca..75d4cfa5c33 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/MatchingStrategy.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/MatchingStrategy.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.Import;
-import java.util.Collection;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.type.ArtifactType;
-import org.eclipse.osee.framework.core.model.type.AttributeType;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.importing.resolvers.AttributeBasedArtifactResolver;
-import org.eclipse.osee.framework.skynet.core.importing.resolvers.GuidBasedArtifactResolver;
-import org.eclipse.osee.framework.skynet.core.importing.resolvers.IArtifactImportResolver;
-import org.eclipse.osee.framework.skynet.core.importing.resolvers.NewArtifactImportResolver;
+import java.util.Collection; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.type.ArtifactType; +import org.eclipse.osee.framework.core.model.type.AttributeType; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; +import org.eclipse.osee.framework.skynet.core.importing.resolvers.AttributeBasedArtifactResolver; +import org.eclipse.osee.framework.skynet.core.importing.resolvers.GuidBasedArtifactResolver; +import org.eclipse.osee.framework.skynet.core.importing.resolvers.IArtifactImportResolver; +import org.eclipse.osee.framework.skynet.core.importing.resolvers.NewArtifactImportResolver; public enum MatchingStrategy {
ATTRIBUTE(), GUID(), NONE();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenWithSelectionListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenWithSelectionListener.java index 1d527106eaa..c3ea0112618 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenWithSelectionListener.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenWithSelectionListener.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet;
import org.eclipse.core.commands.Command;
-import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java index dd0070caf51..b9a863032c9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java @@ -69,7 +69,6 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
@@ -86,749 +85,747 @@ import org.eclipse.ui.PlatformUI; * @author Ryan D. Brooks
*/
public class RelationsComposite extends Composite implements IFrameworkTransactionEventListener {
- private TreeViewer treeViewer;
- private Tree tree;
- private NeedSelectedArtifactListener needSelectedArtifactListener;
- private final IDirtiableEditor editor;
- public static final String VIEW_ID = "osee.define.relation.RelationExplorer";
- public static final String[] columnNames = new String[] {" ", "Rationale"};
- // the index of column order
- private static int COLUMN_ORDER = 1;
-
- private MenuItem openMenuItem;
- private MenuItem wordPreviewItem;
- // private MenuItem openWithMenuItem;
- private MenuItem editMenuItem;
- private MenuItem viewRelationTreeItem;
- private MenuItem orderRelationMenuItem;
- private MenuItem deleteRelationMenuItem;
- private MenuItem deleteArtifactMenuItem;
- private MenuItem massEditMenuItem;
-
- private final Artifact artifact;
- private final RelationLabelProvider relationLabelProvider;
- private final ToolBar toolBar;
-
- public RelationsComposite(IDirtiableEditor editor, Composite parent, int style, Artifact artifact) {
- this(editor, parent, style, artifact, null);
- }
-
- public RelationsComposite(IDirtiableEditor editor, Composite parent, int style, Artifact artifact, ToolBar toolBar) {
- super(parent, style);
-
- if (artifact == null) {
- throw new IllegalArgumentException("Can not edit a null artifact");
- }
-
- this.artifact = artifact;
- this.editor = editor;
- this.relationLabelProvider = new RelationLabelProvider(artifact);
-
- createPartControl();
- OseeEventManager.addListener(this);
- this.toolBar = toolBar;
- }
-
- public TreeViewer getTreeViewer() {
- return treeViewer;
- }
-
- public void createPartControl() {
- this.setLayout(new GridLayout());
- this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- createTreeArea(this);
- createColumns();
- packColumnData();
-
- needSelectedArtifactListener = new NeedSelectedArtifactListener();
- createPopupMenu();
- setHelpContexts();
- }
-
- private void createTreeArea(Composite parent) {
- treeViewer = new TreeViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.NO_SCROLL);
- tree = treeViewer.getTree();
- tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- tree.setHeaderVisible(true);
-
- CellEditor[] editors = new CellEditor[columnNames.length];
- editors[1] = new TextCellEditor(tree);
- treeViewer.setCellEditors(editors);
- treeViewer.setCellModifier(new RelationCellModifier(treeViewer));
- treeViewer.setColumnProperties(columnNames);
- treeViewer.setContentProvider(new RelationContentProvider());
- treeViewer.setLabelProvider(relationLabelProvider);
- treeViewer.setUseHashlookup(true);
- treeViewer.setInput(new ArtifactRoot(artifact));
-
- treeViewer.addDoubleClickListener(new DoubleClickListener());
- tree.addKeyListener(new keySelectedListener());
- treeViewer.addTreeListener(new ITreeViewerListener() {
-
- public void treeCollapsed(TreeExpansionEvent event) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- packColumnData();
- }
- });
-
- }
-
- public void treeExpanded(TreeExpansionEvent event) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- packColumnData();
- }
- });
- }
-
- });
-
- tree.addMouseMoveListener(new MouseMoveListener() {
-
- public void mouseMove(MouseEvent e) {
- }
- });
-
- expandItemsThatHaveChildren();
- new RelationSkynetDragAndDrop(tree, VIEW_ID);
- }
-
- private void expandItemsThatHaveChildren() {
- //expand items that have children
- Object[] types = ((ITreeContentProvider) treeViewer.getContentProvider()).getChildren(treeViewer.getInput());
- for (Object obj : types) {
- if (obj instanceof RelationType) {
- RelationType type = (RelationType) obj;
- if (RelationManager.getRelatedArtifactsCount(artifact, type, null) > 0) {
- treeViewer.expandToLevel(obj, 1);
- }
- }
- }
- }
-
- private void createColumns() {
- for (int index = 0; index < columnNames.length; index++) {
- TreeColumn column = new TreeColumn(tree, SWT.LEFT, index);
- column.setText(columnNames[index]);
- }
- }
-
- private void packColumnData() {
- TreeColumn[] columns = treeViewer.getTree().getColumns();
- for (TreeColumn column : columns) {
- column.pack();
- }
- }
-
- public void createPopupMenu() {
- Menu popupMenu = new Menu(treeViewer.getTree().getParent());
- popupMenu.addMenuListener(needSelectedArtifactListener);
-
- createOpenMenuItem(popupMenu);
- createWordPreviewMenuItem(popupMenu);
- // createOpenWithMenuItem(popupMenu);
- new MenuItem(popupMenu, SWT.SEPARATOR);
- createEditMenuItem(popupMenu);
- createMassEditMenuItem(popupMenu);
- new MenuItem(popupMenu, SWT.SEPARATOR);
- createViewRelationTreeMenuItem(popupMenu);
- new MenuItem(popupMenu, SWT.SEPARATOR);
- createOrderRelationTreeMenuItem(popupMenu);
- new MenuItem(popupMenu, SWT.SEPARATOR);
- createDeleteRelationMenuItem(popupMenu);
- new MenuItem(popupMenu, SWT.SEPARATOR);
-
- createExpandAllMenuItem(popupMenu);
- createSelectAllMenuItem(popupMenu);
-
- new MenuItem(popupMenu, SWT.SEPARATOR);
- createDeleteArtifactMenuItem(popupMenu);
-
- tree.setMenu(popupMenu);
- }
-
- public class DoubleClickListener implements IDoubleClickListener {
- public void doubleClick(DoubleClickEvent event) {
- openViewer((IStructuredSelection) event.getSelection());
- }
- }
-
- private void createOrderRelationTreeMenuItem(final Menu parentMenu) {
-
- orderRelationMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
- orderRelationMenuItem.setText("&Order Relations");
- needSelectedArtifactListener.add(orderRelationMenuItem);
-
- Menu subMenu = new Menu(parentMenu);
- orderRelationMenuItem.setMenu(subMenu);
-
- List<IRelationSorterId> orderTypes = RelationManager.getRelationOrderTypes();
- for (IRelationSorterId id : orderTypes) {
- MenuItem idMenu = new MenuItem(subMenu, SWT.CASCADE | SWT.CHECK);
- idMenu.setText(id.getName());
- idMenu.addSelectionListener(new SelectionId(id));
- }
-
- parentMenu.addListener(SWT.Show, new Listener() {
-
- @Override
- public void handleEvent(Event event) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- Object[] objects = selection.toArray();
- if (objects.length == 1 && objects[0] instanceof RelationTypeSideSorter) {
- orderRelationMenuItem.setEnabled(true);
- try {
- checkCurrentOrderStrategy(orderRelationMenuItem.getMenu(), (RelationTypeSideSorter) objects[0]);
- } catch (OseeCoreException ex) {
- }
- } else {
- orderRelationMenuItem.setEnabled(false);
- }
- }
-
- });
- orderRelationMenuItem.setEnabled(true);
- }
-
- private void checkCurrentOrderStrategy(Menu menu, RelationTypeSideSorter rts) throws OseeCoreException {
- String relationOrderName = rts.getSorterName();
-
- for (MenuItem item : menu.getItems()) {
- String itemName = item.getText();
- if (itemName.equals(relationOrderName)) {
- item.setSelection(true);
- } else {
- item.setSelection(false);
- }
- }
- }
-
- private class SelectionId implements SelectionListener {
-
- private final IRelationSorterId id;
-
- SelectionId(IRelationSorterId id) {
- this.id = id;
- }
-
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- Object[] objects = selection.toArray();
- if (objects.length == 1 && objects[0] instanceof RelationTypeSideSorter) {
- RelationTypeSideSorter typeSide = (RelationTypeSideSorter) objects[0];
- try {
- typeSide.getArtifact().setRelationOrder(typeSide, id);
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- }
- }
- }
-
- private void createDeleteRelationMenuItem(final Menu parentMenu) {
- deleteRelationMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
- deleteRelationMenuItem.setText("&Delete Relation");
- needSelectedArtifactListener.add(deleteRelationMenuItem);
- deleteRelationMenuItem.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-
- try {
- performDeleteRelation(selection);
- } catch (ArtifactDoesNotExist ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- }
- });
-
- deleteRelationMenuItem.setEnabled(true);
- }
-
- private void createDeleteArtifactMenuItem(final Menu parentMenu) {
- deleteArtifactMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
- deleteArtifactMenuItem.setText("&Delete Artifact");
- needSelectedArtifactListener.add(deleteArtifactMenuItem);
- deleteArtifactMenuItem.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-
- performDeleteArtifact(selection);
- }
- });
-
- deleteArtifactMenuItem.setEnabled(true);
- }
-
- private void createMassEditMenuItem(final Menu parentMenu) {
- massEditMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
- massEditMenuItem.setText("&Mass Edit");
- needSelectedArtifactListener.add(massEditMenuItem);
- massEditMenuItem.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
-
- performMassEdit(selection);
- }
- });
-
- massEditMenuItem.setEnabled(true);
- }
-
- private void createViewRelationTreeMenuItem(Menu menu) {
- viewRelationTreeItem = new MenuItem(menu, SWT.PUSH);
- viewRelationTreeItem.setText("&View Relation Table Report");
- viewRelationTreeItem.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- TreeViewerReport report =
- new TreeViewerReport("Relation View Report for " + artifact.getName(), treeViewer);
- ArrayList<Integer> ignoreCols = new ArrayList<Integer>();
- ignoreCols.add(COLUMN_ORDER);
- report.setIgnoreColumns(ignoreCols);
- report.open();
- }
- });
- }
-
- private void createOpenMenuItem(Menu parentMenu) {
- openMenuItem = new MenuItem(parentMenu, SWT.PUSH);
- openMenuItem.setText("Open");
- needSelectedArtifactListener.addArtifactEnabled(openMenuItem);
- openMenuItem.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- openViewer((IStructuredSelection) treeViewer.getSelection());
- }
- });
- }
-
- private void openViewer(IStructuredSelection selection) {
- for (Object object : selection.toArray()) {
- if (object instanceof WrapperForRelationLink) {
- WrapperForRelationLink link = (WrapperForRelationLink) object;
- try { - RendererManager.open(link.getOther(), PresentationType.GENERALIZED_EDIT); - } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); - } - }
- }
- }
-
- private void createWordPreviewMenuItem(Menu parentMenu) {
- wordPreviewItem = new MenuItem(parentMenu, SWT.PUSH);
- wordPreviewItem.setText("Open Preview");
- needSelectedArtifactListener.addArtifactEnabled(wordPreviewItem);
- wordPreviewItem.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- openWordViewer((IStructuredSelection) treeViewer.getSelection());
- }
- });
- }
-
- private void openWordViewer(IStructuredSelection selection) {
- List<Artifact> artifacts = new ArrayList<Artifact>();
-
- for (Object object : selection.toArray()) {
- if (object instanceof WrapperForRelationLink) {
- WrapperForRelationLink link = (WrapperForRelationLink) object;
- artifacts.add(link.getOther());
- }
- }
- RendererManager.openInJob(artifacts, PresentationType.PREVIEW); - }
-
- private void performMassEdit(IStructuredSelection selection) {
- Set<Artifact> selectedArtifacts = getSelectedArtifacts(selection);
- MassArtifactEditor.editArtifacts("Mass Edit", selectedArtifacts);
- }
-
- private Set<Artifact> getSelectedArtifacts(IStructuredSelection selection) {
- Set<Artifact> selectedArtifacts = new HashSet<Artifact>();
- Iterator<?> iter = selection.iterator();
- while (iter.hasNext()) {
- Object object = iter.next();
- if (object instanceof WrapperForRelationLink) {
- WrapperForRelationLink wrapped = (WrapperForRelationLink) object;
- selectedArtifacts.add(wrapped.getOther());
- }
- }
- return selectedArtifacts;
- }
-
- private void createEditMenuItem(Menu parentMenu) {
- editMenuItem = new MenuItem(parentMenu, SWT.PUSH);
- editMenuItem.setText("&Edit");
-
- needSelectedArtifactListener.add(editMenuItem);
- editMenuItem.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent event) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- Object object = selection.getFirstElement();
-
- if (object instanceof WrapperForRelationLink) {
- RendererManager.openInJob(((WrapperForRelationLink) object).getOther(),
- PresentationType.SPECIALIZED_EDIT);
- }
- }
- });
- }
-
- private void createExpandAllMenuItem(Menu parentMenu) {
- MenuItem menuItem = new MenuItem(parentMenu, SWT.PUSH);
- menuItem.setText("Expand All\tCtrl+X");
- menuItem.addSelectionListener(new ExpandListener());
- }
-
- public class ExpandListener extends SelectionAdapter {
- @Override
- public void widgetSelected(SelectionEvent event) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- Iterator<?> iter = selection.iterator();
- while (iter.hasNext()) {
- treeViewer.expandToLevel(iter.next(), TreeViewer.ALL_LEVELS);
- }
- packColumnData();
- }
- }
-
- public class NeedSelectedArtifactListener implements MenuListener {
- Collection<MenuItem> accessControlitems;
- Collection<MenuItem> artEnabledOnlyitems;
-
- public NeedSelectedArtifactListener() {
- this.accessControlitems = new LinkedList<MenuItem>();
- this.artEnabledOnlyitems = new LinkedList<MenuItem>();
- }
-
- public void addArtifactEnabled(MenuItem item) {
- artEnabledOnlyitems.add(item);
-
- }
-
- public void add(MenuItem item) {
- accessControlitems.add(item);
- }
-
- public void menuHidden(MenuEvent e) {
- }
-
- public void menuShown(MenuEvent e) {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- boolean valid = selection.getFirstElement() instanceof WrapperForRelationLink;
-
- for (MenuItem item : accessControlitems) {
- item.setEnabled(valid && !artifact.isReadOnly());
- }
-
- for (MenuItem item : artEnabledOnlyitems) {
- item.setEnabled(valid);
- }
- }
- }
-
- private void createSelectAllMenuItem(Menu parentMenu) {
- MenuItem menuItem = new MenuItem(parentMenu, SWT.PUSH);
- menuItem.setText("&Select All\tCtrl+A");
- menuItem.addListener(SWT.Selection, new Listener() {
- public void handleEvent(org.eclipse.swt.widgets.Event event) {
- treeViewer.getTree().selectAll();
- }
- });
- }
-
- @Override
- public void dispose() {
- OseeEventManager.removeListener(this);
- super.dispose();
- }
-
- private void expandAll(IStructuredSelection selection) {
- Iterator<?> iter = selection.iterator();
- while (iter.hasNext()) {
- treeViewer.expandToLevel(iter.next(), TreeViewer.ALL_LEVELS);
- }
- this.packColumnData();
- }
-
- /** - * Performs the deletion functionality - * - * @param selection - */ - private void performDeleteArtifact(IStructuredSelection selection) {
- try {
- Set<Artifact> artifactsToBeDeleted = getSelectedArtifacts(selection);
-
- //Ask if they are sure they want all artifacts to be deleted
- if (!artifactsToBeDeleted.isEmpty()) {
- if (MessageDialog.openConfirm(
- Display.getCurrent().getActiveShell(),
- "Delete Artifact (s)",
- "Delete Artifact (s)?\n\n\"" + Collections.toString(",", artifactsToBeDeleted) + "\"\n\nNOTE: This will delete the artifact from the system. Use \"Delete Relation\" to remove this artifact from the relation.")) {
-
- for (Artifact artifact : artifactsToBeDeleted) {
- artifact.deleteAndPersist();
- }
- }
- }
-
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- refresh();
- }
-
- /** - * Performs the deletion functionality - * - * @param selection - * @throws ArtifactDoesNotExist - */ - private void performDeleteRelation(IStructuredSelection selection) throws ArtifactDoesNotExist {
- if (artifact.isReadOnly()) {
- MessageDialog.openError(
- Display.getCurrent().getActiveShell(),
- "Delete Relation Error",
- "Access control has restricted this action. The current user does not have sufficient permission to delete objects on this artifact.");
- return;
- }
-
- Object[] objects = selection.toArray();
- for (Object object : objects) {
- if (object instanceof WrapperForRelationLink) {
- WrapperForRelationLink wrapper = (WrapperForRelationLink) object;
- try {
- wrapper.getArtifactA().deleteRelation(
- new RelationTypeSide(wrapper.getRelationType(), RelationSide.SIDE_B), wrapper.getArtifactB());
- Object parent = ((ITreeContentProvider) treeViewer.getContentProvider()).getParent(object);
- if (parent != null) {
- treeViewer.refresh(parent);
- } else {
- treeViewer.refresh();
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- } else if (object instanceof RelationTypeSideSorter) {
- RelationTypeSideSorter group = (RelationTypeSideSorter) object;
- try {
- RelationManager.deleteRelations(artifact, group.getRelationType(), group.getSide());
- treeViewer.refresh(group);
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- }
- }
- editor.onDirtied();
- }
-
- public void refresh() {
- if (!treeViewer.getTree().isDisposed()) {
- treeViewer.refresh();
- packColumnData();
- }
- }
-
- private class keySelectedListener implements KeyListener {
- public void keyPressed(KeyEvent e) {
- }
-
- public void keyReleased(KeyEvent e) {
- if (e.keyCode == SWT.DEL) {
- try {
- performDeleteRelation((IStructuredSelection) treeViewer.getSelection());
- } catch (ArtifactDoesNotExist ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- }
- if (e.keyCode == 'a' && e.stateMask == SWT.CONTROL) {
- treeViewer.getTree().selectAll();
- }
- if (e.keyCode == 'x' && e.stateMask == SWT.CONTROL) {
- expandAll((IStructuredSelection) treeViewer.getSelection());
- }
- }
- }
-
- public Artifact getArtifact() {
- return artifact;
- }
-
- public void refreshArtifact(Artifact newArtifact) {
- relationLabelProvider.setArtifact(newArtifact);
- treeViewer.setInput(newArtifact);
- expandItemsThatHaveChildren();
- refresh();
- }
-
- private class RelationSkynetDragAndDrop extends SkynetDragAndDrop {
- boolean isFeedbackAfter = false;
-
- public RelationSkynetDragAndDrop(Tree tree, String viewId) {
- super(tree, viewId);
- }
-
- @Override
- public Artifact[] getArtifacts() {
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- Object[] objects = selection.toArray();
- Artifact[] artifacts = null;
-
- if (objects.length > 0 && objects[0] instanceof WrapperForRelationLink) {
- artifacts = new Artifact[objects.length];
-
- for (int index = 0; index < objects.length; index++) {
- WrapperForRelationLink link = (WrapperForRelationLink) objects[index];
- artifacts[index] = link.getOther();
- }
- }
- return artifacts;
- }
-
- @Override
- public void performDragOver(DropTargetEvent event) {
- Tree tree = treeViewer.getTree();
- TreeItem selected = tree.getItem(treeViewer.getTree().toControl(event.x, event.y));
-
- event.feedback = DND.FEEDBACK_EXPAND;
- event.detail = DND.DROP_NONE;
-
- if (selected != null && selected.getData() instanceof RelationTypeSideSorter) {
- if (artifact.isReadOnly()) {
- event.detail = DND.DROP_NONE;
-
- MessageDialog.openError(
- Display.getCurrent().getActiveShell(),
- "Create Relation Error",
- "Access control has restricted this action. The current user does not have sufficient permission to create relations on this artifact.");
- return;
- } else {
- event.detail = DND.DROP_COPY;
- tree.setInsertMark(null, false);
- }
- } else if (selected != null && selected.getData() instanceof WrapperForRelationLink) {
- WrapperForRelationLink targetLink = (WrapperForRelationLink) selected.getData();
- IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
- Object obj = selection.getFirstElement();
- if (obj instanceof WrapperForRelationLink) {
- WrapperForRelationLink dropTarget = (WrapperForRelationLink) obj;
-
- if (artifact.isReadOnly()) {
- event.detail = DND.DROP_NONE;
- MessageDialog.openError(
- Display.getCurrent().getActiveShell(),
- "Create Relation Error",
- "Access control has restricted this action. The current user does not have sufficient permission to create relations on this artifact.");
- return;
- }
- // the links must be in the same group
- if (relationLinkIsInSameGroup(targetLink, dropTarget)) {
- if (isFeedbackAfter) {
- event.feedback = DND.FEEDBACK_INSERT_AFTER;
- } else {
- event.feedback = DND.FEEDBACK_INSERT_BEFORE;
- }
- event.detail = DND.DROP_MOVE;
- }
- }
- } else {
- tree.setInsertMark(null, false);
- }
- }
-
- private boolean relationLinkIsInSameGroup(WrapperForRelationLink targetLink, WrapperForRelationLink dropTarget) {
- return targetLink.getRelationType().equals(dropTarget.getRelationType()) && //same type
- (targetLink.getArtifactA().equals(dropTarget.getArtifactA()) || //either the A or B side is equal, meaning they are on the same side
- targetLink.getArtifactB().equals(dropTarget.getArtifactB()));
- }
-
- @Override
- public void operationChanged(DropTargetEvent event) {
- if (!isCtrlPressed(event)) {
- isFeedbackAfter = false;
- }
- }
-
- private boolean isCtrlPressed(DropTargetEvent event) {
- boolean ctrPressed = event.detail == 1;
-
- if (ctrPressed) {
- isFeedbackAfter = true;
- }
- return ctrPressed;
- }
-
- @Override
- public void performDrop(DropTargetEvent event) {
- TreeItem selected = treeViewer.getTree().getItem(treeViewer.getTree().toControl(event.x, event.y));
- Object object = selected.getData();
- try {
- if (object instanceof WrapperForRelationLink) {//used for ordering
- WrapperForRelationLink targetLink = (WrapperForRelationLink) object;
- Artifact[] artifactsToMove = ((ArtifactData) event.data).getArtifacts();
- for (Artifact artifactToMove : artifactsToMove) {
- IRelationEnumeration typeSide =
- new RelationTypeSide(targetLink.getRelationType(), targetLink.getRelationSide());
- artifact.setRelationOrder(typeSide, targetLink.getOther(), isFeedbackAfter, artifactToMove);
- }
- treeViewer.refresh();
- editor.onDirtied();
- } else if (object instanceof RelationTypeSideSorter) {
- RelationTypeSideSorter group = (RelationTypeSideSorter) object;
-
- RelationExplorerWindow window = new RelationExplorerWindow(treeViewer, group);
-
- ArtifactDragDropSupport.performDragDrop(event, window,
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
- window.createArtifactInformationBox();
- treeViewer.refresh();
- editor.onDirtied();
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
-
- isFeedbackAfter = false;
- }
- }
-
- private void setHelpContexts() {
- SkynetGuiPlugin.getInstance().setHelp(treeViewer.getControl(), "relation_page_tree_viewer",
- "org.eclipse.osee.framework.help.ui");
- }
-
- public ToolBar getToolBar() {
- return toolBar;
- }
-
- @Override
- public void handleFrameworkTransactionEvent(Sender sender, FrameworkTransactionData transData) throws OseeCoreException {
- if (transData.isRelAddedChangedDeleted(this.artifact)) {
- Displays.ensureInDisplayThread(new Runnable() {
- @Override
- public void run() {
- if (!treeViewer.getControl().isDisposed()) {
- treeViewer.refresh();
- }
- }
- });
- }
- }
+ private TreeViewer treeViewer;
+ private Tree tree;
+ private NeedSelectedArtifactListener needSelectedArtifactListener;
+ private final IDirtiableEditor editor;
+ public static final String VIEW_ID = "osee.define.relation.RelationExplorer";
+ public static final String[] columnNames = new String[] {" ", "Rationale"};
+ // the index of column order
+ private static int COLUMN_ORDER = 1;
+
+ private MenuItem openMenuItem;
+ private MenuItem wordPreviewItem;
+ // private MenuItem openWithMenuItem;
+ private MenuItem editMenuItem;
+ private MenuItem viewRelationTreeItem;
+ private MenuItem orderRelationMenuItem;
+ private MenuItem deleteRelationMenuItem;
+ private MenuItem deleteArtifactMenuItem;
+ private MenuItem massEditMenuItem;
+
+ private final Artifact artifact;
+ private final RelationLabelProvider relationLabelProvider;
+ private final ToolBar toolBar;
+
+ public RelationsComposite(IDirtiableEditor editor, Composite parent, int style, Artifact artifact) {
+ this(editor, parent, style, artifact, null);
+ }
+
+ public RelationsComposite(IDirtiableEditor editor, Composite parent, int style, Artifact artifact, ToolBar toolBar) {
+ super(parent, style);
+
+ if (artifact == null) {
+ throw new IllegalArgumentException("Can not edit a null artifact");
+ }
+
+ this.artifact = artifact;
+ this.editor = editor;
+ this.relationLabelProvider = new RelationLabelProvider(artifact);
+
+ createPartControl();
+ OseeEventManager.addListener(this);
+ this.toolBar = toolBar;
+ }
+
+ public TreeViewer getTreeViewer() {
+ return treeViewer;
+ }
+
+ public void createPartControl() {
+ this.setLayout(new GridLayout());
+ this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ createTreeArea(this);
+ createColumns();
+ packColumnData();
+
+ needSelectedArtifactListener = new NeedSelectedArtifactListener();
+ createPopupMenu();
+ setHelpContexts();
+ }
+
+ private void createTreeArea(Composite parent) {
+ treeViewer = new TreeViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.NO_SCROLL);
+ tree = treeViewer.getTree();
+ tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ tree.setHeaderVisible(true);
+
+ CellEditor[] editors = new CellEditor[columnNames.length];
+ editors[1] = new TextCellEditor(tree);
+ treeViewer.setCellEditors(editors);
+ treeViewer.setCellModifier(new RelationCellModifier(treeViewer));
+ treeViewer.setColumnProperties(columnNames);
+ treeViewer.setContentProvider(new RelationContentProvider());
+ treeViewer.setLabelProvider(relationLabelProvider);
+ treeViewer.setUseHashlookup(true);
+ treeViewer.setInput(new ArtifactRoot(artifact));
+
+ treeViewer.addDoubleClickListener(new DoubleClickListener());
+ tree.addKeyListener(new KeySelectedListener());
+ treeViewer.addTreeListener(new ITreeViewerListener() {
+ @Override
+ public void treeCollapsed(TreeExpansionEvent event) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ packColumnData();
+ }
+ });
+ }
+
+ @Override
+ public void treeExpanded(TreeExpansionEvent event) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ packColumnData();
+ }
+ });
+ }
+ });
+
+ tree.addMouseMoveListener(new MouseMoveListener() {
+ @Override
+ public void mouseMove(MouseEvent e) {
+ }
+ });
+
+ expandItemsThatHaveChildren();
+ new RelationSkynetDragAndDrop(tree, VIEW_ID);
+ }
+
+ private void expandItemsThatHaveChildren() {
+ //expand items that have children
+ Object[] types = ((ITreeContentProvider) treeViewer.getContentProvider()).getChildren(treeViewer.getInput());
+ for (Object obj : types) {
+ if (obj instanceof RelationType) {
+ RelationType type = (RelationType) obj;
+ if (RelationManager.getRelatedArtifactsCount(artifact, type, null) > 0) {
+ treeViewer.expandToLevel(obj, 1);
+ }
+ }
+ }
+ }
+
+ private void createColumns() {
+ for (int index = 0; index < columnNames.length; index++) {
+ TreeColumn column = new TreeColumn(tree, SWT.LEFT, index);
+ column.setText(columnNames[index]);
+ }
+ }
+
+ private void packColumnData() {
+ TreeColumn[] columns = treeViewer.getTree().getColumns();
+ for (TreeColumn column : columns) {
+ column.pack();
+ }
+ }
+
+ public void createPopupMenu() {
+ Menu popupMenu = new Menu(treeViewer.getTree().getParent());
+ popupMenu.addMenuListener(needSelectedArtifactListener);
+
+ createOpenMenuItem(popupMenu);
+ createWordPreviewMenuItem(popupMenu);
+ // createOpenWithMenuItem(popupMenu);
+ new MenuItem(popupMenu, SWT.SEPARATOR);
+ createEditMenuItem(popupMenu);
+ createMassEditMenuItem(popupMenu);
+ new MenuItem(popupMenu, SWT.SEPARATOR);
+ createViewRelationTreeMenuItem(popupMenu);
+ new MenuItem(popupMenu, SWT.SEPARATOR);
+ createOrderRelationTreeMenuItem(popupMenu);
+ new MenuItem(popupMenu, SWT.SEPARATOR);
+ createDeleteRelationMenuItem(popupMenu);
+ new MenuItem(popupMenu, SWT.SEPARATOR);
+
+ createExpandAllMenuItem(popupMenu);
+ createSelectAllMenuItem(popupMenu);
+
+ new MenuItem(popupMenu, SWT.SEPARATOR);
+ createDeleteArtifactMenuItem(popupMenu);
+
+ tree.setMenu(popupMenu);
+ }
+
+ public class DoubleClickListener implements IDoubleClickListener {
+ @Override
+ public void doubleClick(DoubleClickEvent event) {
+ openViewer((IStructuredSelection) event.getSelection());
+ }
+ }
+
+ private void createOrderRelationTreeMenuItem(final Menu parentMenu) {
+
+ orderRelationMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
+ orderRelationMenuItem.setText("&Order Relations");
+ needSelectedArtifactListener.add(orderRelationMenuItem);
+
+ Menu subMenu = new Menu(parentMenu);
+ orderRelationMenuItem.setMenu(subMenu);
+
+ List<IRelationSorterId> orderTypes = RelationManager.getRelationOrderTypes();
+ for (IRelationSorterId id : orderTypes) {
+ MenuItem idMenu = new MenuItem(subMenu, SWT.CASCADE | SWT.CHECK);
+ idMenu.setText(id.getName());
+ idMenu.addSelectionListener(new SelectionId(id));
+ }
+
+ parentMenu.addListener(SWT.Show, new Listener() {
+
+ @Override
+ public void handleEvent(Event event) {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+ Object[] objects = selection.toArray();
+ if (objects.length == 1 && objects[0] instanceof RelationTypeSideSorter) {
+ orderRelationMenuItem.setEnabled(true);
+ try {
+ checkCurrentOrderStrategy(orderRelationMenuItem.getMenu(), (RelationTypeSideSorter) objects[0]);
+ } catch (OseeCoreException ex) {
+ }
+ } else {
+ orderRelationMenuItem.setEnabled(false);
+ }
+ }
+
+ });
+ orderRelationMenuItem.setEnabled(true);
+ }
+
+ private void checkCurrentOrderStrategy(Menu menu, RelationTypeSideSorter rts) throws OseeCoreException {
+ String relationOrderName = rts.getSorterName();
+
+ for (MenuItem item : menu.getItems()) {
+ String itemName = item.getText();
+ if (itemName.equals(relationOrderName)) {
+ item.setSelection(true);
+ } else {
+ item.setSelection(false);
+ }
+ }
+ }
+
+ private class SelectionId implements SelectionListener {
+
+ private final IRelationSorterId id;
+
+ SelectionId(IRelationSorterId id) {
+ this.id = id;
+ }
+
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+ Object[] objects = selection.toArray();
+ if (objects.length == 1 && objects[0] instanceof RelationTypeSideSorter) {
+ RelationTypeSideSorter typeSide = (RelationTypeSideSorter) objects[0];
+ try {
+ typeSide.getArtifact().setRelationOrder(typeSide, id);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+ }
+ }
+ }
+ }
+
+ private void createDeleteRelationMenuItem(final Menu parentMenu) {
+ deleteRelationMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
+ deleteRelationMenuItem.setText("&Delete Relation");
+ needSelectedArtifactListener.add(deleteRelationMenuItem);
+ deleteRelationMenuItem.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+ performDeleteRelation(selection);
+ }
+ });
+
+ deleteRelationMenuItem.setEnabled(true);
+ }
+
+ private void createDeleteArtifactMenuItem(final Menu parentMenu) {
+ deleteArtifactMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
+ deleteArtifactMenuItem.setText("&Delete Artifact");
+ needSelectedArtifactListener.add(deleteArtifactMenuItem);
+ deleteArtifactMenuItem.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+
+ performDeleteArtifact(selection);
+ }
+ });
+
+ deleteArtifactMenuItem.setEnabled(true);
+ }
+
+ private void createMassEditMenuItem(final Menu parentMenu) {
+ massEditMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
+ massEditMenuItem.setText("&Mass Edit");
+ needSelectedArtifactListener.add(massEditMenuItem);
+ massEditMenuItem.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+
+ performMassEdit(selection);
+ }
+ });
+
+ massEditMenuItem.setEnabled(true);
+ }
+
+ private void createViewRelationTreeMenuItem(Menu menu) {
+ viewRelationTreeItem = new MenuItem(menu, SWT.PUSH);
+ viewRelationTreeItem.setText("&View Relation Table Report");
+ viewRelationTreeItem.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ TreeViewerReport report =
+ new TreeViewerReport("Relation View Report for " + artifact.getName(), treeViewer);
+ ArrayList<Integer> ignoreCols = new ArrayList<Integer>();
+ ignoreCols.add(COLUMN_ORDER);
+ report.setIgnoreColumns(ignoreCols);
+ report.open();
+ }
+ });
+ }
+
+ private void createOpenMenuItem(Menu parentMenu) {
+ openMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+ openMenuItem.setText("Open");
+ needSelectedArtifactListener.addArtifactEnabled(openMenuItem);
+ openMenuItem.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent event) {
+ openViewer((IStructuredSelection) treeViewer.getSelection());
+ }
+ });
+ }
+
+ private void openViewer(IStructuredSelection selection) {
+ for (Object object : selection.toArray()) {
+ if (object instanceof WrapperForRelationLink) {
+ WrapperForRelationLink link = (WrapperForRelationLink) object;
+ try {
+ RendererManager.open(link.getOther(), PresentationType.GENERALIZED_EDIT);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ }
+ }
+ }
+
+ private void createWordPreviewMenuItem(Menu parentMenu) {
+ wordPreviewItem = new MenuItem(parentMenu, SWT.PUSH);
+ wordPreviewItem.setText("Open Preview");
+ needSelectedArtifactListener.addArtifactEnabled(wordPreviewItem);
+ wordPreviewItem.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent event) {
+ openWordViewer((IStructuredSelection) treeViewer.getSelection());
+ }
+ });
+ }
+
+ private void openWordViewer(IStructuredSelection selection) {
+ List<Artifact> artifacts = new ArrayList<Artifact>();
+
+ for (Object object : selection.toArray()) {
+ if (object instanceof WrapperForRelationLink) {
+ WrapperForRelationLink link = (WrapperForRelationLink) object;
+ artifacts.add(link.getOther());
+ }
+ }
+ RendererManager.openInJob(artifacts, PresentationType.PREVIEW);
+ }
+
+ private void performMassEdit(IStructuredSelection selection) {
+ Set<Artifact> selectedArtifacts = getSelectedArtifacts(selection);
+ MassArtifactEditor.editArtifacts("Mass Edit", selectedArtifacts);
+ }
+
+ private Set<Artifact> getSelectedArtifacts(IStructuredSelection selection) {
+ Set<Artifact> selectedArtifacts = new HashSet<Artifact>();
+ Iterator<?> iter = selection.iterator();
+ while (iter.hasNext()) {
+ Object object = iter.next();
+ if (object instanceof WrapperForRelationLink) {
+ WrapperForRelationLink wrapped = (WrapperForRelationLink) object;
+ selectedArtifacts.add(wrapped.getOther());
+ }
+ }
+ return selectedArtifacts;
+ }
+
+ private void createEditMenuItem(Menu parentMenu) {
+ editMenuItem = new MenuItem(parentMenu, SWT.PUSH);
+ editMenuItem.setText("&Edit");
+
+ needSelectedArtifactListener.add(editMenuItem);
+ editMenuItem.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+ Object object = selection.getFirstElement();
+
+ if (object instanceof WrapperForRelationLink) {
+ RendererManager.openInJob(((WrapperForRelationLink) object).getOther(),
+ PresentationType.SPECIALIZED_EDIT);
+ }
+ }
+ });
+ }
+
+ private void createExpandAllMenuItem(Menu parentMenu) {
+ MenuItem menuItem = new MenuItem(parentMenu, SWT.PUSH);
+ menuItem.setText("Expand All\tCtrl+X");
+ menuItem.addSelectionListener(new ExpandListener());
+ }
+
+ public class ExpandListener extends SelectionAdapter {
+ @Override
+ public void widgetSelected(SelectionEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+ Iterator<?> iter = selection.iterator();
+ while (iter.hasNext()) {
+ treeViewer.expandToLevel(iter.next(), TreeViewer.ALL_LEVELS);
+ }
+ packColumnData();
+ }
+ }
+
+ public class NeedSelectedArtifactListener implements MenuListener {
+ Collection<MenuItem> accessControlitems;
+ Collection<MenuItem> artEnabledOnlyitems;
+
+ public NeedSelectedArtifactListener() {
+ this.accessControlitems = new LinkedList<MenuItem>();
+ this.artEnabledOnlyitems = new LinkedList<MenuItem>();
+ }
+
+ public void addArtifactEnabled(MenuItem item) {
+ artEnabledOnlyitems.add(item);
+
+ }
+
+ public void add(MenuItem item) {
+ accessControlitems.add(item);
+ }
+
+ @Override
+ public void menuHidden(MenuEvent e) {
+ }
+
+ @Override
+ public void menuShown(MenuEvent e) {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+ boolean valid = selection.getFirstElement() instanceof WrapperForRelationLink;
+
+ for (MenuItem item : accessControlitems) {
+ item.setEnabled(valid && !artifact.isReadOnly());
+ }
+
+ for (MenuItem item : artEnabledOnlyitems) {
+ item.setEnabled(valid);
+ }
+ }
+ }
+
+ private void createSelectAllMenuItem(Menu parentMenu) {
+ MenuItem menuItem = new MenuItem(parentMenu, SWT.PUSH);
+ menuItem.setText("&Select All\tCtrl+A");
+ menuItem.addListener(SWT.Selection, new Listener() {
+ @Override
+ public void handleEvent(org.eclipse.swt.widgets.Event event) {
+ treeViewer.getTree().selectAll();
+ }
+ });
+ }
+
+ @Override
+ public void dispose() {
+ OseeEventManager.removeListener(this);
+ super.dispose();
+ }
+
+ private void expandAll(IStructuredSelection selection) {
+ Iterator<?> iter = selection.iterator();
+ while (iter.hasNext()) {
+ treeViewer.expandToLevel(iter.next(), TreeViewer.ALL_LEVELS);
+ }
+ this.packColumnData();
+ }
+
+ /**
+ * Performs the deletion functionality
+ *
+ * @param selection
+ */
+ private void performDeleteArtifact(IStructuredSelection selection) {
+ try {
+ Set<Artifact> artifactsToBeDeleted = getSelectedArtifacts(selection);
+
+ //Ask if they are sure they want all artifacts to be deleted
+ if (!artifactsToBeDeleted.isEmpty()) {
+ if (MessageDialog.openConfirm(
+ Displays.getActiveShell(),
+ "Delete Artifact (s)",
+ "Delete Artifact (s)?\n\n\"" + Collections.toString(",", artifactsToBeDeleted) + "\"\n\nNOTE: This will delete the artifact from the system. Use \"Delete Relation\" to remove this artifact from the relation.")) {
+
+ for (Artifact artifact : artifactsToBeDeleted) {
+ artifact.deleteAndPersist();
+ }
+ }
+ }
+
+ } catch (Exception ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ refresh();
+ }
+
+ /**
+ * Performs the deletion functionality
+ *
+ * @param selection
+ * @throws ArtifactDoesNotExist
+ */
+ private void performDeleteRelation(IStructuredSelection selection) {
+ if (artifact.isReadOnly()) {
+ MessageDialog.openError(
+ Displays.getActiveShell(),
+ "Delete Relation Error",
+ "Access control has restricted this action. The current user does not have sufficient permission to delete objects on this artifact.");
+ return;
+ }
+
+ Object[] objects = selection.toArray();
+ for (Object object : objects) {
+ if (object instanceof WrapperForRelationLink) {
+ WrapperForRelationLink wrapper = (WrapperForRelationLink) object;
+ try {
+ wrapper.getArtifactA().deleteRelation(
+ new RelationTypeSide(wrapper.getRelationType(), RelationSide.SIDE_B), wrapper.getArtifactB());
+ Object parent = ((ITreeContentProvider) treeViewer.getContentProvider()).getParent(object);
+ if (parent != null) {
+ treeViewer.refresh(parent);
+ } else {
+ treeViewer.refresh();
+ }
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+ }
+ } else if (object instanceof RelationTypeSideSorter) {
+ RelationTypeSideSorter group = (RelationTypeSideSorter) object;
+ try {
+ RelationManager.deleteRelations(artifact, group.getRelationType(), group.getSide());
+ treeViewer.refresh(group);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+ }
+ }
+ }
+ editor.onDirtied();
+ }
+
+ public void refresh() {
+ if (!treeViewer.getTree().isDisposed()) {
+ treeViewer.refresh();
+ packColumnData();
+ }
+ }
+
+ private final class KeySelectedListener implements KeyListener {
+ @Override
+ public void keyPressed(KeyEvent e) {
+ }
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+ if (e.keyCode == SWT.DEL) {
+ performDeleteRelation((IStructuredSelection) treeViewer.getSelection());
+ }
+ if (e.keyCode == 'a' && e.stateMask == SWT.CONTROL) {
+ treeViewer.getTree().selectAll();
+ }
+ if (e.keyCode == 'x' && e.stateMask == SWT.CONTROL) {
+ expandAll((IStructuredSelection) treeViewer.getSelection());
+ }
+ }
+ }
+
+ public Artifact getArtifact() {
+ return artifact;
+ }
+
+ public void refreshArtifact(Artifact newArtifact) {
+ relationLabelProvider.setArtifact(newArtifact);
+ treeViewer.setInput(newArtifact);
+ expandItemsThatHaveChildren();
+ refresh();
+ }
+
+ private class RelationSkynetDragAndDrop extends SkynetDragAndDrop {
+ boolean isFeedbackAfter = false;
+
+ public RelationSkynetDragAndDrop(Tree tree, String viewId) {
+ super(tree, viewId);
+ }
+
+ @Override
+ public Artifact[] getArtifacts() {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+ Object[] objects = selection.toArray();
+ Artifact[] artifacts = null;
+
+ if (objects.length > 0 && objects[0] instanceof WrapperForRelationLink) {
+ artifacts = new Artifact[objects.length];
+
+ for (int index = 0; index < objects.length; index++) {
+ WrapperForRelationLink link = (WrapperForRelationLink) objects[index];
+ artifacts[index] = link.getOther();
+ }
+ }
+ return artifacts;
+ }
+
+ @Override
+ public void performDragOver(DropTargetEvent event) {
+ Tree tree = treeViewer.getTree();
+ TreeItem selected = tree.getItem(treeViewer.getTree().toControl(event.x, event.y));
+
+ event.feedback = DND.FEEDBACK_EXPAND;
+ event.detail = DND.DROP_NONE;
+
+ if (selected != null && selected.getData() instanceof RelationTypeSideSorter) {
+ if (artifact.isReadOnly()) {
+ event.detail = DND.DROP_NONE;
+
+ MessageDialog.openError(
+ Displays.getActiveShell(),
+ "Create Relation Error",
+ "Access control has restricted this action. The current user does not have sufficient permission to create relations on this artifact.");
+ return;
+ } else {
+ event.detail = DND.DROP_COPY;
+ tree.setInsertMark(null, false);
+ }
+ } else if (selected != null && selected.getData() instanceof WrapperForRelationLink) {
+ WrapperForRelationLink targetLink = (WrapperForRelationLink) selected.getData();
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+ Object obj = selection.getFirstElement();
+ if (obj instanceof WrapperForRelationLink) {
+ WrapperForRelationLink dropTarget = (WrapperForRelationLink) obj;
+
+ if (artifact.isReadOnly()) {
+ event.detail = DND.DROP_NONE;
+ MessageDialog.openError(
+ Displays.getActiveShell(),
+ "Create Relation Error",
+ "Access control has restricted this action. The current user does not have sufficient permission to create relations on this artifact.");
+ return;
+ }
+ // the links must be in the same group
+ if (relationLinkIsInSameGroup(targetLink, dropTarget)) {
+ if (isFeedbackAfter) {
+ event.feedback = DND.FEEDBACK_INSERT_AFTER;
+ } else {
+ event.feedback = DND.FEEDBACK_INSERT_BEFORE;
+ }
+ event.detail = DND.DROP_MOVE;
+ }
+ }
+ } else {
+ tree.setInsertMark(null, false);
+ }
+ }
+
+ private boolean relationLinkIsInSameGroup(WrapperForRelationLink targetLink, WrapperForRelationLink dropTarget) {
+ return targetLink.getRelationType().equals(dropTarget.getRelationType()) && //same type
+ (targetLink.getArtifactA().equals(dropTarget.getArtifactA()) || //either the A or B side is equal, meaning they are on the same side
+ targetLink.getArtifactB().equals(dropTarget.getArtifactB()));
+ }
+
+ @Override
+ public void operationChanged(DropTargetEvent event) {
+ if (!isCtrlPressed(event)) {
+ isFeedbackAfter = false;
+ }
+ }
+
+ private boolean isCtrlPressed(DropTargetEvent event) {
+ boolean ctrPressed = event.detail == 1;
+
+ if (ctrPressed) {
+ isFeedbackAfter = true;
+ }
+ return ctrPressed;
+ }
+
+ @Override
+ public void performDrop(DropTargetEvent event) {
+ TreeItem selected = treeViewer.getTree().getItem(treeViewer.getTree().toControl(event.x, event.y));
+ Object object = selected.getData();
+ try {
+ if (object instanceof WrapperForRelationLink) {//used for ordering
+ WrapperForRelationLink targetLink = (WrapperForRelationLink) object;
+ Artifact[] artifactsToMove = ((ArtifactData) event.data).getArtifacts();
+ for (Artifact artifactToMove : artifactsToMove) {
+ IRelationEnumeration typeSide =
+ new RelationTypeSide(targetLink.getRelationType(), targetLink.getRelationSide());
+ artifact.setRelationOrder(typeSide, targetLink.getOther(), isFeedbackAfter, artifactToMove);
+ }
+ treeViewer.refresh();
+ editor.onDirtied();
+ } else if (object instanceof RelationTypeSideSorter) {
+ RelationTypeSideSorter group = (RelationTypeSideSorter) object;
+
+ RelationExplorerWindow window = new RelationExplorerWindow(treeViewer, group);
+
+ ArtifactDragDropSupport.performDragDrop(event, window,
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
+ window.createArtifactInformationBox();
+ treeViewer.refresh();
+ editor.onDirtied();
+ }
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+
+ isFeedbackAfter = false;
+ }
+ }
+
+ private void setHelpContexts() {
+ SkynetGuiPlugin.getInstance().setHelp(treeViewer.getControl(), "relation_page_tree_viewer",
+ "org.eclipse.osee.framework.help.ui");
+ }
+
+ public ToolBar getToolBar() {
+ return toolBar;
+ }
+
+ @Override
+ public void handleFrameworkTransactionEvent(Sender sender, FrameworkTransactionData transData) {
+ if (transData.isRelAddedChangedDeleted(this.artifact)) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ if (!treeViewer.getControl().isDisposed()) {
+ treeViewer.refresh();
+ }
+ }
+ });
+ }
+ }
}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderIntermediate.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderIntermediate.java index aaeecc12761..95d3874d5d3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderIntermediate.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderIntermediate.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.core.runtime.ListenerList; +import org.eclipse.jface.viewers.IPostSelectionProvider; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; public class SelectionProviderIntermediate implements IPostSelectionProvider {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderWrapper.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderWrapper.java index 1298957348b..486afebf5e6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderWrapper.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderWrapper.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
+import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; public class SelectionProviderWrapper implements ISelectionProvider {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java index 6db8bfe57db..82b53b72eb9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java @@ -30,7 +30,6 @@ import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.OverlayImage; import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; /** diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenAssociatedArtifactFromBranchProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenAssociatedArtifactFromBranchProvider.java index 221732733c8..c7eaee39be4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenAssociatedArtifactFromBranchProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenAssociatedArtifactFromBranchProvider.java @@ -10,28 +10,28 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.action;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.operation.IOperation;
-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.skynet.core.User;
-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.IBranchProvider;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.operations.LoadAssociatedArtifactOperationFromBranch;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.core.runtime.jobs.JobChangeAdapter; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.operation.IOperation; +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.skynet.core.User; +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.IBranchProvider; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.operations.LoadAssociatedArtifactOperationFromBranch; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RendererManager; +import org.eclipse.osee.framework.ui.swt.ImageManager; public class OpenAssociatedArtifactFromBranchProvider extends Action {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/IBrowserActionHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/IBrowserActionHandler.java index dde467f7655..188b8daa2e6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/IBrowserActionHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/IBrowserActionHandler.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.action.browser;
-import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.Browser; public interface IBrowserActionHandler {
public Browser getBrowser();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactNameConflictHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactNameConflictHandler.java index 7985b2fa075..5dfb754fcba 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactNameConflictHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactNameConflictHandler.java @@ -15,7 +15,6 @@ import org.eclipse.jface.window.Window; import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.widgets.Display;
/**
* @author Roberto E. Escobar
@@ -34,7 +33,7 @@ public class ArtifactNameConflictHandler { public void run() {
String startingName = beforeAfterNames.getFirst();
InputDialog dialog =
- new InputDialog(Display.getCurrent().getActiveShell(), "Name Artifact", "Enter artifact name",
+ new InputDialog(Displays.getActiveShell(), "Name Artifact", "Enter artifact name",
startingName, new NonBlankAndNotSameAsStartingValidator(startingName));
int result = dialog.open();
if (result == Window.OK) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java index 32ea082780d..36decb2ab77 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java @@ -39,7 +39,7 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.EnumSelectionDialog.Selection;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.DateSelectionDialog;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Donald G. Dunne
@@ -262,7 +262,7 @@ public class ArtifactPromptChange { set = smas.iterator().next().getSoleAttributeValue(attributeName, false);
}
MessageDialogWithToggle md =
- new MessageDialogWithToggle(Display.getCurrent().getActiveShell(), displayName, null, displayName,
+ new MessageDialogWithToggle(Displays.getActiveShell(), displayName, null, displayName,
MessageDialog.QUESTION, new String[] {"Ok", "Cancel"}, MessageDialog.OK,
toggleMessage != null ? toggleMessage : displayName, set);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSelectionDialog.java index 7e2ddeaadc9..435cf917f77 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSelectionDialog.java @@ -20,13 +20,13 @@ import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.osee.framework.ui.plugin.util.StringLabelProvider; import org.eclipse.osee.framework.ui.plugin.util.StringViewerSorter; import org.eclipse.osee.framework.ui.skynet.widgets.XRadioButton; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; /** @@ -48,7 +48,7 @@ public class EnumSelectionDialog extends CheckedTreeSelectionDialog { * @param artifacts */ public EnumSelectionDialog(String attributeName, Collection<? extends Artifact> artifacts) { - super(Display.getCurrent().getActiveShell(), new StringLabelProvider(), new ArrayTreeContentProvider()); + super(Displays.getActiveShell(), new StringLabelProvider(), new ArrayTreeContentProvider()); setTitle("Select Options"); setMessage("Select option(s) to add, delete or replace."); Set<String> options; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java index 9f26f2b8cc0..43299566ede 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java @@ -10,19 +10,19 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.artifact;
-import java.util.Collection;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
-import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.IOperationFactory;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor;
+import java.util.Collection; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.core.operation.IOperation; +import org.eclipse.osee.framework.jdk.core.type.HashCollection; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.xnavigate.IOperationFactory; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java index 49608fac57a..8ed7b1ff483 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java @@ -36,11 +36,11 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.access.PolicyDialog;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView;
import org.eclipse.osee.framework.ui.skynet.widgets.xHistory.HistoryView;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
@@ -132,7 +132,7 @@ public class ArtifactEditorActionBarContributor implements IActionContributor { try {
MessageDialog dialog =
new MessageDialog(
- Display.getCurrent().getActiveShell(),
+ Displays.getActiveShell(),
"Confirm Artifact Deletion",
null,
" Are you sure you want to delete this artifact and all of the default hierarchy children?",
@@ -193,7 +193,7 @@ public class ArtifactEditorActionBarContributor implements IActionContributor { @Override
public void run() {
try {
- PolicyDialog pd = new PolicyDialog(Display.getCurrent().getActiveShell(), getSelectedArtifact());
+ PolicyDialog pd = new PolicyDialog(Displays.getActiveShell(), getSelectedArtifact());
pd.open();
} catch (Exception ex) {
OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditPresenter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditPresenter.java index 1aa5efe4cba..d741985aa36 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditPresenter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditPresenter.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.artifact.editor.sections;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.type.AttributeType;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.sections.AttributeTypeEditPresenter.Display.OperationType;
+import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.type.AttributeType; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.artifact.editor.sections.AttributeTypeEditPresenter.Display.OperationType; public class AttributeTypeEditPresenter {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ats/OseeAts.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ats/OseeAts.java index f6abe746aac..748d601b0c6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ats/OseeAts.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ats/OseeAts.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.ats;
-import java.util.logging.Level;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
+import java.util.logging.Level; +import org.eclipse.core.runtime.Platform; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; public final class OseeAts {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java index dba221f0b82..43beea8029b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java index 3507f41fc97..4afee1cdbd5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java @@ -70,7 +70,7 @@ public class ImageCaptureBlam extends AbstractBlam { gc.copyArea(image, topLeftPoint.x, topLeftPoint.y);
gc.dispose();
Display.getDefault().removeFilter(SWT.MouseUp, displayKeysListener);
- ImageDialog diag = new ImageDialog(image, Display.getCurrent().getActiveShell());
+ ImageDialog diag = new ImageDialog(image, Displays.getActiveShell());
diag.open();
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/LoadAllArtifactsOnBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/LoadAllArtifactsOnBranch.java index 3b2571b975a..314121cce9b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/LoadAllArtifactsOnBranch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/LoadAllArtifactsOnBranch.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.blam.operation;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.util.Arrays;
import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java index fb4972b9ae6..159695caa9b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java @@ -10,29 +10,29 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.blam.operation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-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.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
-import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
-import org.eclipse.osee.framework.ui.skynet.widgets.XArtifactList;
-import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;
-import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout;
-import org.eclipse.ui.forms.widgets.FormToolkit;
+import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.enums.CoreRelationTypes; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.skynet.core.User; +import org.eclipse.osee.framework.skynet.core.UserManager; +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.search.ArtifactQuery; +import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; +import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; +import org.eclipse.osee.framework.ui.skynet.widgets.XArtifactList; +import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; +import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; +import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout; +import org.eclipse.ui.forms.widgets.FormToolkit; /**
* @author Ryan D. Brooks
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java index 1b6c0d2d780..eb47559080a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java @@ -34,7 +34,6 @@ import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.widgets.Display;
/**
* @author Megumi Telles
@@ -97,7 +96,7 @@ public class PurgeArchivedBranch extends AbstractBlam { }
private void confirmPurgeArchivedBranch(List<BranchInfo> branches) throws OseeCoreException {
- if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Purge Confirmation",
+ if (MessageDialog.openConfirm(Displays.getActiveShell(), "Purge Confirmation",
"Do you wish to purge the archived branches: " + "?")) {
//only delete archived branches that are not changed managed, rebaselined and deleted
for (BranchInfo purgeBranch : branches) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SendEmailCall.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SendEmailCall.java index d8917850bb2..e745c6880cc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SendEmailCall.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SendEmailCall.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.blam.operation;
-import java.util.concurrent.Callable;
-import javax.mail.MessagingException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.util.OseeEmail;
+import java.util.concurrent.Callable; +import javax.mail.MessagingException; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.util.OseeEmail; public final class SendEmailCall implements Callable<String> {
private final Artifact user;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetRequirementCategory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetRequirementCategory.java index bba00149694..0cc9380c5bd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetRequirementCategory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetRequirementCategory.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.blam.operation;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java index 957ee8cace9..62f91f9c05b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java @@ -28,7 +28,6 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.widgets.Display;
/**
* @author Ryan D. Brooks
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java index 9a6b8bcffcc..a7b3845e5e2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java @@ -21,11 +21,11 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.swt.ALayout;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
@@ -34,136 +34,136 @@ import org.eclipse.swt.widgets.Text; * @author Roberto E. Escobar
*/
public class BranchSelectComposite extends Composite implements Listener {
- protected static final int SIZING_TEXT_FIELD_WIDTH = 250;
-
- private Button branchSelectButton;
- private Text branchSelectTextWidget;
- private Branch selectedBranch;
- private final Set<Listener> listeners;
- private final boolean allowOnlyWorkingBranches;
-
- public BranchSelectComposite(Composite parent, int style, boolean allowOnlyWorkingBranches) {
- super(parent, style);
- this.allowOnlyWorkingBranches = allowOnlyWorkingBranches;
- this.listeners = Collections.synchronizedSet(new HashSet<Listener>());
- createControl(this);
- }
-
- public static BranchSelectComposite createWorkingBranchSelectComposite(Composite parent, int style) {
- return new BranchSelectComposite(parent, style, true);
- }
-
- public static BranchSelectComposite createBranchSelectComposite(Composite parent, int style) {
- return new BranchSelectComposite(parent, style, false);
- }
-
- private void createControl(Composite parent) {
- parent.setLayout(ALayout.getZeroMarginLayout(2, false));
- parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-
- branchSelectTextWidget = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- branchSelectTextWidget.setLayoutData(data);
- branchSelectTextWidget.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- branchSelectTextWidget.setText(" -- Select A Branch -- ");
- branchSelectTextWidget.setDoubleClickEnabled(false);
- branchSelectTextWidget.addListener(SWT.MouseDoubleClick, new Listener() {
- @Override
- public void handleEvent(Event event) {
- handleSelectedBranch(event);
- notifyListener(event);
- }
- });
-
- branchSelectButton = new Button(parent, SWT.PUSH);
- branchSelectButton.setText("Select Branch...");
- branchSelectButton.addListener(SWT.Selection, this);
- branchSelectButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- branchSelectButton.addListener(SWT.MouseUp, new Listener() {
- @Override
- public void handleEvent(Event event) {
- if (event.button == 3) {
- try {
- setSelected(BranchManager.getCommonBranch());
- notifyListener(event);
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
- }
- });
- }
-
- public Branch getSelectedBranch() {
- return selectedBranch;
- }
-
- private boolean areOnlyWorkingBranchesAllowed() {
- return allowOnlyWorkingBranches;
- }
-
- public void handleEvent(Event event) {
- handleSelectedBranch(event);
- notifyListener(event);
- }
-
- private void handleSelectedBranch(Event event) {
- if (event.widget == branchSelectButton || (event.widget == branchSelectTextWidget && branchSelectTextWidget.getDoubleClickEnabled())) {
- if (areOnlyWorkingBranchesAllowed()) {
- Branch newBranch = BranchSelectionDialog.getWorkingBranchFromUser();
- if (newBranch != null) {
- setSelected(newBranch);
- }
- } else {
- Branch newBranch = BranchSelectionDialog.getBranchFromUser();
- if (newBranch != null) {
- setSelected(newBranch);
- }
- }
- }
- }
-
- public void setSelected(Branch branch) {
- if (branch != null) {
- selectedBranch = branch;
- branchSelectTextWidget.setText(selectedBranch.getName());
- } else {
- branchSelectTextWidget.setText(" -- Select A Branch -- ");
- }
- }
-
- private void notifyListener(Event event) {
- synchronized (listeners) {
- for (Listener listener : listeners) {
- listener.handleEvent(event);
- }
- }
- }
-
- public void addListener(Listener listener) {
- synchronized (listeners) {
- listeners.add(listener);
- }
- }
-
- public void removeListener(Listener listener) {
- synchronized (listeners) {
- listeners.remove(listener);
- }
- }
-
- /**
- * @param defaultSelectedBranch the defaultSelectedBranch to set
- */
- public void setDefaultSelectedBranch(Branch defaultSelectedBranch) {
- setSelected(defaultSelectedBranch);
- }
-
- /**
- * @return the branchSelectLabel
- */
- public Text getBranchSelectText() {
- return branchSelectTextWidget;
- }
+ protected static final int SIZING_TEXT_FIELD_WIDTH = 250;
+
+ private Button branchSelectButton;
+ private Text branchSelectTextWidget;
+ private Branch selectedBranch;
+ private final Set<Listener> listeners;
+ private final boolean allowOnlyWorkingBranches;
+
+ public BranchSelectComposite(Composite parent, int style, boolean allowOnlyWorkingBranches) {
+ super(parent, style);
+ this.allowOnlyWorkingBranches = allowOnlyWorkingBranches;
+ this.listeners = Collections.synchronizedSet(new HashSet<Listener>());
+ createControl(this);
+ }
+
+ public static BranchSelectComposite createWorkingBranchSelectComposite(Composite parent, int style) {
+ return new BranchSelectComposite(parent, style, true);
+ }
+
+ public static BranchSelectComposite createBranchSelectComposite(Composite parent, int style) {
+ return new BranchSelectComposite(parent, style, false);
+ }
+
+ private void createControl(Composite parent) {
+ parent.setLayout(ALayout.getZeroMarginLayout(2, false));
+ parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+
+ branchSelectTextWidget = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
+ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
+ data.widthHint = SIZING_TEXT_FIELD_WIDTH;
+ branchSelectTextWidget.setLayoutData(data);
+ branchSelectTextWidget.setBackground(Displays.getSystemColor(SWT.COLOR_WHITE));
+ branchSelectTextWidget.setText(" -- Select A Branch -- ");
+ branchSelectTextWidget.setDoubleClickEnabled(false);
+ branchSelectTextWidget.addListener(SWT.MouseDoubleClick, new Listener() {
+ @Override
+ public void handleEvent(Event event) {
+ handleSelectedBranch(event);
+ notifyListener(event);
+ }
+ });
+
+ branchSelectButton = new Button(parent, SWT.PUSH);
+ branchSelectButton.setText("Select Branch...");
+ branchSelectButton.addListener(SWT.Selection, this);
+ branchSelectButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
+ branchSelectButton.addListener(SWT.MouseUp, new Listener() {
+ @Override
+ public void handleEvent(Event event) {
+ if (event.button == 3) {
+ try {
+ setSelected(BranchManager.getCommonBranch());
+ notifyListener(event);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ }
+ }
+ });
+ }
+
+ public Branch getSelectedBranch() {
+ return selectedBranch;
+ }
+
+ private boolean areOnlyWorkingBranchesAllowed() {
+ return allowOnlyWorkingBranches;
+ }
+
+ public void handleEvent(Event event) {
+ handleSelectedBranch(event);
+ notifyListener(event);
+ }
+
+ private void handleSelectedBranch(Event event) {
+ if (event.widget == branchSelectButton || (event.widget == branchSelectTextWidget && branchSelectTextWidget.getDoubleClickEnabled())) {
+ if (areOnlyWorkingBranchesAllowed()) {
+ Branch newBranch = BranchSelectionDialog.getWorkingBranchFromUser();
+ if (newBranch != null) {
+ setSelected(newBranch);
+ }
+ } else {
+ Branch newBranch = BranchSelectionDialog.getBranchFromUser();
+ if (newBranch != null) {
+ setSelected(newBranch);
+ }
+ }
+ }
+ }
+
+ public void setSelected(Branch branch) {
+ if (branch != null) {
+ selectedBranch = branch;
+ branchSelectTextWidget.setText(selectedBranch.getName());
+ } else {
+ branchSelectTextWidget.setText(" -- Select A Branch -- ");
+ }
+ }
+
+ private void notifyListener(Event event) {
+ synchronized (listeners) {
+ for (Listener listener : listeners) {
+ listener.handleEvent(event);
+ }
+ }
+ }
+
+ public void addListener(Listener listener) {
+ synchronized (listeners) {
+ listeners.add(listener);
+ }
+ }
+
+ public void removeListener(Listener listener) {
+ synchronized (listeners) {
+ listeners.remove(listener);
+ }
+ }
+
+ /**
+ * @param defaultSelectedBranch the defaultSelectedBranch to set
+ */
+ public void setDefaultSelectedBranch(Branch defaultSelectedBranch) {
+ setSelected(defaultSelectedBranch);
+ }
+
+ /**
+ * @return the branchSelectLabel
+ */
+ public Text getBranchSelectText() {
+ return branchSelectTextWidget;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java index 0b058eb01bc..546fef96c3b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectionDialog.java @@ -20,6 +20,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchOptions;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.XBranchWidget;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
@@ -29,7 +30,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.TreeItem;
@@ -45,7 +45,7 @@ public class BranchSelectionDialog extends MessageDialog { private final Collection<Branch> branches;
public BranchSelectionDialog(String title, Collection<Branch> branches) {
- super(Display.getCurrent().getActiveShell(), title, null, null, MessageDialog.NONE,
+ super(Displays.getActiveShell(), title, null, null, MessageDialog.NONE,
new String[] {"Ok", "Cancel"}, 0);
this.allowOnlyWorkingBranches = false;
this.selected = null;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java index e55addf6ee8..a871f07816b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java @@ -10,17 +10,17 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change;
-import java.util.logging.Level;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.preferences.EditorsPreferencePage;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPersistableElement;
+import java.util.logging.Level; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.preferences.EditorsPreferencePage; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.IPersistableElement; public class ChangeReportEditorInput implements IEditorInput, IPersistableElement {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiData.java index 306e6ad1f58..cbf42ba83a3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiData.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change;
-import java.util.ArrayList;
-import java.util.Collection;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.change.Change;
+import java.util.ArrayList; +import java.util.Collection; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.change.Change; public class ChangeUiData {
private final Collection<Change> changes = new ArrayList<Change>();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java index e8048cdd7dd..4a354a0ac10 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java @@ -10,22 +10,22 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-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.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.util.Conditions;
-import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.view.ChangeReportEditor;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.progress.UIJob;
+import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +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.core.model.TransactionRecord; +import org.eclipse.osee.framework.core.util.Conditions; +import org.eclipse.osee.framework.plugin.core.util.Jobs; +import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.view.ChangeReportEditor; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.progress.UIJob; public final class ChangeUiUtil {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/CompareType.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/CompareType.java index 424d128f87b..1ca8dfa1678 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/CompareType.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/CompareType.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change;
-import org.eclipse.osee.framework.ui.skynet.change.presenter.BaseToHeadHandler;
-import org.eclipse.osee.framework.ui.skynet.change.presenter.CurrentsAgainstOtherHandler;
-import org.eclipse.osee.framework.ui.skynet.change.presenter.CurrentsAgainstParentHandler;
-import org.eclipse.osee.framework.ui.skynet.change.presenter.IChangeReportUiHandler;
-import org.eclipse.osee.framework.ui.skynet.change.presenter.SpecificTxsHandler;
+import org.eclipse.osee.framework.ui.skynet.change.presenter.BaseToHeadHandler; +import org.eclipse.osee.framework.ui.skynet.change.presenter.CurrentsAgainstOtherHandler; +import org.eclipse.osee.framework.ui.skynet.change.presenter.CurrentsAgainstParentHandler; +import org.eclipse.osee.framework.ui.skynet.change.presenter.IChangeReportUiHandler; +import org.eclipse.osee.framework.ui.skynet.change.presenter.SpecificTxsHandler; public enum CompareType {
COMPARE_SPECIFIC_TRANSACTIONS(new SpecificTxsHandler()),
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ParentBranchProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ParentBranchProvider.java index a7b741d836c..09999f40759 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ParentBranchProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ParentBranchProvider.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change;
-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.core.util.Conditions;
-import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
+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.core.util.Conditions; +import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; public final class ParentBranchProvider implements IBranchProvider {
private final ChangeUiData uiData;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiOtherBranchDialogProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiOtherBranchDialogProvider.java index ab17dc5fae0..c50c85bba9a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiOtherBranchDialogProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiOtherBranchDialogProvider.java @@ -10,22 +10,22 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change;
-import java.util.Collection;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
-import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.UIJob;
+import java.util.Collection; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.window.Window; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.plugin.core.util.Jobs; +import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; +import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; +import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.progress.UIJob; public final class UiOtherBranchDialogProvider implements IBranchProvider {
private final ChangeUiData uiData;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java index ace1753c29a..31a5d7130f7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java @@ -10,23 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change;
-import java.util.ArrayList;
-import java.util.Collection;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
-import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.UIJob;
+import java.util.ArrayList; +import java.util.Collection; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.window.Window; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.plugin.core.util.Jobs; +import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; +import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.progress.UIJob; public final class UiSelectBetweenDeltasBranchProvider implements IBranchProvider {
private final ChangeUiData uiData;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/CompareAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/CompareAction.java index b1e54c1d5f5..6131f6b687f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/CompareAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/CompareAction.java @@ -10,22 +10,22 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.actions;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.action.Action;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditorInput;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil;
-import org.eclipse.osee.framework.ui.skynet.change.CompareType;
-import org.eclipse.osee.framework.ui.skynet.change.ParentBranchProvider;
-import org.eclipse.osee.framework.ui.skynet.change.UiOtherBranchDialogProvider;
-import org.eclipse.osee.framework.ui.skynet.change.operations.LoadCompareBaseToHead;
-import org.eclipse.osee.framework.ui.skynet.change.operations.LoadCompareBranchToBranch;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.core.runtime.jobs.JobChangeAdapter; +import org.eclipse.jface.action.Action; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.core.operation.IOperation; +import org.eclipse.osee.framework.core.operation.Operations; +import org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditorInput; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil; +import org.eclipse.osee.framework.ui.skynet.change.CompareType; +import org.eclipse.osee.framework.ui.skynet.change.ParentBranchProvider; +import org.eclipse.osee.framework.ui.skynet.change.UiOtherBranchDialogProvider; +import org.eclipse.osee.framework.ui.skynet.change.operations.LoadCompareBaseToHead; +import org.eclipse.osee.framework.ui.skynet.change.operations.LoadCompareBranchToBranch; +import org.eclipse.osee.framework.ui.swt.ImageManager; public final class CompareAction extends Action {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/CompareDropDown.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/CompareDropDown.java index dfeda574ecb..4f653bb27f2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/CompareDropDown.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/CompareDropDown.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.actions;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
+import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IMenuCreator; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Menu; public class CompareDropDown extends Action {
private final MenuManager manager;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenAssociatedArtifact.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenAssociatedArtifact.java index d8251584478..dcd78018ca8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenAssociatedArtifact.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenAssociatedArtifact.java @@ -10,23 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.actions;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.skynet.change.operations.LoadAssociatedArtifactOperation;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.core.runtime.jobs.JobChangeAdapter; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.framework.core.operation.IOperation; +import org.eclipse.osee.framework.core.operation.Operations; +import org.eclipse.osee.framework.skynet.core.User; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.change.operations.LoadAssociatedArtifactOperation; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RendererManager; +import org.eclipse.osee.framework.ui.swt.ImageManager; public class OpenAssociatedArtifact extends Action {
private final ChangeUiData changeData;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java index 672b21e89bf..2092dc4d323 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java @@ -10,21 +10,21 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.actions;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.Action;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.search.QuickSearchView;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.UIJob;
+import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.action.Action; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.plugin.core.util.Jobs; +import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.search.QuickSearchView; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.progress.UIJob; public class OpenQuickSearchAction extends Action {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ReloadChangeReportAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ReloadChangeReportAction.java index 5c972d57779..0c290e17279 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ReloadChangeReportAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ReloadChangeReportAction.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.actions;
-import org.eclipse.jface.action.Action;
-import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
-import org.eclipse.osee.framework.ui.skynet.change.IChangeReportView;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.jface.action.Action; +import org.eclipse.osee.framework.ui.plugin.PluginUiImage; +import org.eclipse.osee.framework.ui.skynet.change.IChangeReportView; +import org.eclipse.osee.framework.ui.swt.ImageManager; public class ReloadChangeReportAction extends Action {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ShowDocumentOrderAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ShowDocumentOrderAction.java index 98bf9d00e1a..6540c5fe796 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ShowDocumentOrderAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/ShowDocumentOrderAction.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.actions;
-import org.eclipse.jface.action.Action;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.change.IChangeReportPreferences;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
+import org.eclipse.jface.action.Action; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.change.IChangeReportPreferences; +import org.eclipse.osee.framework.ui.swt.ImageManager; public class ShowDocumentOrderAction extends Action implements IChangeReportPreferences.Listener {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperation.java index 95fc07928e6..3ec05258ef2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperation.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.operations;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-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.search.ArtifactQuery;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
+import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.core.model.TransactionRecord; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +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.search.ArtifactQuery; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; public class LoadAssociatedArtifactOperation extends AbstractOperation {
private final ChangeUiData changeData;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperationFromBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperationFromBranch.java index 18524edb2db..4ffe612ec83 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperationFromBranch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperationFromBranch.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.operations;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
+import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; +import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; public class LoadAssociatedArtifactOperationFromBranch extends AbstractOperation {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadChangesOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadChangesOperation.java index d04f0db080c..5782afd867d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadChangesOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadChangesOperation.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.operations;
-import java.util.Collection;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.skynet.core.change.Change;
-import org.eclipse.osee.framework.skynet.core.revision.ChangeDataLoader;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
+import java.util.Collection; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.core.operation.IOperation; +import org.eclipse.osee.framework.skynet.core.change.Change; +import org.eclipse.osee.framework.skynet.core.revision.ChangeDataLoader; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; public class LoadChangesOperation extends AbstractOperation {
private final ChangeUiData changeData;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBaseToHead.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBaseToHead.java index 351ecc4254c..615e1e66d3f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBaseToHead.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBaseToHead.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.operations;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.skynet.change.CompareType;
+import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.core.model.TransactionRecord; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.change.CompareType; public class LoadCompareBaseToHead extends AbstractOperation {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java index fefb159bfcf..95bddbb8fa5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java @@ -10,18 +10,18 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.operations;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.core.util.Conditions;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
-import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.skynet.change.CompareType;
+import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.core.model.TransactionRecord; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.core.util.Conditions; +import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; +import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; +import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.change.CompareType; public class LoadCompareBranchToBranch extends AbstractOperation {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java index 5efc8762d2d..d841af0c1bb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java @@ -10,18 +10,18 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.operations;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.enums.BranchState;
-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.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.skynet.change.CompareType;
+import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.enums.BranchState; +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.core.model.TransactionRecord; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; +import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.change.CompareType; public class UpdateChangeUiData extends AbstractOperation {
private final ChangeUiData changeData;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java index 6207e737a6c..26f3082e3c6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.presenter;
-import java.text.NumberFormat;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.jdk.core.util.AXml;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.text.NumberFormat; +import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.jdk.core.util.AXml; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.swt.KeyedImage; public final class BaseToHeadHandler implements IChangeReportUiHandler {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java index 9427fcf67a6..af880f99599 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java @@ -10,23 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.presenter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.jdk.core.util.AXml;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.skynet.change.view.EditorSection;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
+import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.TransactionRecord; +import org.eclipse.osee.framework.jdk.core.util.AXml; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.User; +import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.change.view.EditorSection; +import org.eclipse.osee.framework.ui.swt.KeyedImage; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.forms.IManagedForm; public class ChangeReportInfoPresenter implements EditorSection.IWidget {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java index 8265942fd1c..199d74e6fe1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.presenter;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.jdk.core.util.AXml;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.jdk.core.util.AXml; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.swt.KeyedImage; public final class CurrentsAgainstOtherHandler implements IChangeReportUiHandler {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java index 54434d6926c..4e648d36a78 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.presenter;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.jdk.core.util.AXml;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.jdk.core.util.AXml; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.swt.KeyedImage; public final class CurrentsAgainstParentHandler implements IChangeReportUiHandler {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/IChangeReportUiHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/IChangeReportUiHandler.java index 23c328402cb..5ac9c32a3b7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/IChangeReportUiHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/IChangeReportUiHandler.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.presenter;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.swt.KeyedImage; public interface IChangeReportUiHandler {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java index 6f4ac426095..14568cdf9ba 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.presenter;
-import java.text.NumberFormat;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.TransactionDelta;
-import org.eclipse.osee.framework.jdk.core.util.AXml;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
+import java.text.NumberFormat; +import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.TransactionDelta; +import org.eclipse.osee.framework.jdk.core.util.AXml; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.swt.KeyedImage; public final class SpecificTxsHandler implements IChangeReportUiHandler {
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 19a0125b3f6..6d4a92ecd7a 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 @@ -10,33 +10,33 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.view;
-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.BranchEventType;
-import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.event.ITransactionsDeletedEventListener;
-import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event2.BranchEvent;
-import org.eclipse.osee.framework.skynet.core.event2.ITransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.event2.TransactionChange;
-import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
-import org.eclipse.osee.framework.ui.skynet.OseeContributionItem;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeReportActionBarContributor;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditorInput;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditorPreferences;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.skynet.change.IChangeReportPreferences;
-import org.eclipse.osee.framework.ui.skynet.change.IChangeReportView;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.forms.editor.FormEditor;
+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.BranchEventType; +import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener; +import org.eclipse.osee.framework.skynet.core.event.ITransactionsDeletedEventListener; +import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; +import org.eclipse.osee.framework.skynet.core.event.Sender; +import org.eclipse.osee.framework.skynet.core.event2.BranchEvent; +import org.eclipse.osee.framework.skynet.core.event2.ITransactionEventListener; +import org.eclipse.osee.framework.skynet.core.event2.TransactionChange; +import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent; +import org.eclipse.osee.framework.ui.skynet.OseeContributionItem; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.change.ChangeReportActionBarContributor; +import org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditorInput; +import org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditorPreferences; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.change.IChangeReportPreferences; +import org.eclipse.osee.framework.ui.skynet.change.IChangeReportView; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.forms.editor.FormEditor; public class ChangeReportEditor extends FormEditor implements IChangeReportView {
public static final String EDITOR_ID = "org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditor";
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportInfo.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportInfo.java index 80d098a599e..22a905fb46c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportInfo.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportInfo.java @@ -10,20 +10,20 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.view;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.ui.skynet.change.presenter.ChangeReportInfoPresenter;
-import org.eclipse.osee.framework.ui.swt.ALayout;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.ui.skynet.change.presenter.ChangeReportInfoPresenter; +import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.osee.framework.ui.swt.KeyedImage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.forms.widgets.FormText; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.ScrolledForm; public class ChangeReportInfo implements ChangeReportInfoPresenter.Display {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java index e820cad029a..73809880c33 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java @@ -10,31 +10,31 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.view;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData;
-import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop;
-import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeXViewer;
-import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeXViewerFactory;
-import org.eclipse.osee.framework.ui.skynet.widgets.xchange.XChangeContentProvider;
-import org.eclipse.osee.framework.ui.skynet.widgets.xchange.XChangeLabelProvider;
-import org.eclipse.osee.framework.ui.swt.ALayout;
-import org.eclipse.osee.framework.ui.swt.Widgets;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
+import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop; +import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeXViewer; +import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeXViewerFactory; +import org.eclipse.osee.framework.ui.skynet.widgets.xchange.XChangeContentProvider; +import org.eclipse.osee.framework.ui.skynet.widgets.xchange.XChangeLabelProvider; +import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Widgets; +import org.eclipse.swt.SWT; +import org.eclipse.swt.dnd.DND; +import org.eclipse.swt.dnd.DropTargetEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.ScrolledForm; public class ChangeReportTable implements EditorSection.IWidget {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/EditorSection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/EditorSection.java index e9d8d539e37..d9c696d698e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/EditorSection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/EditorSection.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.change.view;
-import org.eclipse.osee.framework.ui.swt.Widgets;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.osee.framework.ui.swt.Widgets; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.forms.SectionPart; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.Section; public class EditorSection extends SectionPart {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java index 16e139a7cb8..80b89c0096a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.access.PolicyDialog;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Jeff C. Phillips
@@ -35,7 +35,7 @@ public class AccessControlHandler extends CommandHandler { @Override
public Object execute(ExecutionEvent arg0) throws ExecutionException {
try {
- PolicyDialog pd = new PolicyDialog(Display.getCurrent().getActiveShell(), object);
+ PolicyDialog pd = new PolicyDialog(Displays.getActiveShell(), object);
pd.open();
} catch (Exception ex) {
OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java index bb46883f908..d357a73ece6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java @@ -26,7 +26,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManage import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Jeff C. Phillips
@@ -39,7 +39,7 @@ public class DeleteArtifactHandler extends CommandHandler { if (!artifacts.isEmpty()) {
try {
MessageDialog dialog =
- new MessageDialog(Display.getCurrent().getActiveShell(), "Confirm Artifact Deletion", null,
+ new MessageDialog(Displays.getActiveShell(), "Confirm Artifact Deletion", null,
" Are you sure you want to delete this artifact and all of the default hierarchy children?",
MessageDialog.QUESTION, new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 1);
if (dialog.open() == 0) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java index 557408e8b97..fa11735eae0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java @@ -27,8 +27,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.change.Change;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.revert.RevertWizard;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.NonmodalWizardDialog;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
/**
@@ -60,7 +60,7 @@ public class RevertArtifactHandler extends AbstractHandler { }
RevertWizard wizard = new RevertWizard(artifacts);
- NonmodalWizardDialog dialog = new NonmodalWizardDialog(Display.getCurrent().getActiveShell(), wizard);
+ NonmodalWizardDialog dialog = new NonmodalWizardDialog(Displays.getActiveShell(), wizard);
dialog.create();
dialog.open();
return null;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java index 4097151247e..aa0be60b8d8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java @@ -33,7 +33,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManage import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.ui.PlatformUI;
/**
@@ -50,7 +50,7 @@ public class RevertAttributeHandler extends AbstractHandler { public Object execute(ExecutionEvent event) throws ExecutionException {
// This is serious stuff, make sure the user understands the impact.
if (MessageDialog.openConfirm(
- Display.getCurrent().getActiveShell(),
+ Displays.getActiveShell(),
"Confirm Revert of " + attributes.size() + " attributes.",
"All attribute changes selected will be reverted." + "\n\nTHIS IS IRREVERSIBLE" + "\n\nOSEE must be restarted after all reverting is finished to see the results")) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowPreviewHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowPreviewHandler.java index 543d78206bf..4502abafba5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowPreviewHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowPreviewHandler.java @@ -21,8 +21,8 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.change.Change;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
/**
* @author Paul K. Waldfogel
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java index a51dda4bf55..25ef99b8682 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java @@ -34,7 +34,7 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Jeff C. Phillips
@@ -67,7 +67,7 @@ public class BranchCreationHandler extends CommandHandler { return null;
}
final EntryDialog dialog =
- new EntryDialog(Display.getCurrent().getActiveShell(), "Branch", null, "Enter the name of the new Branch:",
+ new EntryDialog(Displays.getActiveShell(), "Branch", null, "Enter the name of the new Branch:",
MessageDialog.INFORMATION, new String[] {"OK", "Cancel"}, 0);
int result = dialog.open();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java index bf0ad28966a..67cabb85c28 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Roberto E. Escobar @@ -37,7 +37,7 @@ public class DeleteBranchHandler extends CommandHandler { Branch selectedBranch = Handlers.getBranchesFromStructuredSelection(selection).iterator().next(); MessageDialog dialog = - new MessageDialog(Display.getCurrent().getActiveShell(), "Delete Branch", null, + new MessageDialog(Displays.getActiveShell(), "Delete Branch", null, "Are you sure you want to delete the branch: " + selectedBranch.getName(), MessageDialog.QUESTION, new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 1); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java index f519a79f406..7f4885b44c1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java @@ -29,8 +29,8 @@ import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.ats.OseeAts;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java index 7a5f109e64f..e119966bc82 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java @@ -26,7 +26,7 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Jeff C. Phillips @@ -40,7 +40,7 @@ public class PurgeBranchHandler extends CommandHandler { Branch selectedBranch = Handlers.getBranchesFromStructuredSelection(selection).iterator().next(); MessageDialog dialog = - new MessageDialog(Display.getCurrent().getActiveShell(), "Purge Branch", null, + new MessageDialog(Displays.getActiveShell(), "Purge Branch", null, "Are you sure you want to purge the branch: " + selectedBranch.getName(), MessageDialog.QUESTION, new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 1); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java index 5206afd2d25..68a6e81089f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java @@ -29,7 +29,6 @@ import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; import org.eclipse.osee.framework.ui.swt.Displays; -import org.eclipse.swt.widgets.Display; /** * @author Jeff C. Phillips @@ -44,7 +43,7 @@ public class PurgeTransactionHandler extends CommandHandler { List<TransactionRecord> transactions = Handlers.getTransactionsFromStructuredSelection(selection); TransactionRecord selectedTransaction = transactions.iterator().next(); - if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Purge Transaction", + if (MessageDialog.openConfirm(Displays.getActiveShell(), "Purge Transaction", "Are you sure you want to purge the transaction: " + selectedTransaction.getId())) { BranchManager.purgeTransactions(new JobChangeAdapter() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java index 33b6aa4126d..6859a50cd63 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Jeff C. Phillips @@ -52,7 +52,7 @@ public class SetAssociatedBranchArtifactHandler extends CommandHandler { Artifact associatedArtifact = ArtifactQuery.getArtifactFromId(Integer.parseInt(artId), BranchManager.getCommonBranch()); if (MessageDialog.openConfirm( - Display.getCurrent().getActiveShell(), + Displays.getActiveShell(), "Set Associated Artifact", "Set Associated Artifact for Branch\n\n\"" + selectedBranch.getName() + "\"\nto\nArtifact: " + associatedArtifact)) { selectedBranch.setAssociatedArtifactId(Integer.parseInt(artId)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java index c757c8e4549..ec1b901f048 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java @@ -36,7 +36,6 @@ import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchViewPresentationPreferences;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeView;
import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.widgets.Display;
/**
* @author Jeff C. Phillips
@@ -73,7 +72,7 @@ public abstract class CommitHandler extends CommandHandler { @Override
public void run() {
MessageDialog dialog =
- new MessageDialog(Display.getCurrent().getActiveShell(), "Unresolved Conflicts", null,
+ new MessageDialog(Displays.getActiveShell(), "Unresolved Conflicts", null,
fMessage, MessageDialog.QUESTION, choices, 0);
dialogResult.setValue(dialog.open());
if (dialogResult.getValue() == 1) {
@@ -105,12 +104,12 @@ public abstract class CommitHandler extends CommandHandler { try {
if (conflictManager.getOriginalConflicts().isEmpty()) {
MessageDialog dialog =
- new MessageDialog(Display.getCurrent().getActiveShell(), "Commit Branch", null,
+ new MessageDialog(Displays.getActiveShell(), "Commit Branch", null,
message.toString(), MessageDialog.QUESTION, new String[] {"Ok", "Cancel"}, 0);
dialogResult.setValue(dialog.open());
} else {
MessageDialog dialog =
- new MessageDialog(Display.getCurrent().getActiveShell(), "Commit Branch", null,
+ new MessageDialog(Displays.getActiveShell(), "Commit Branch", null,
message.toString(), MessageDialog.QUESTION, new String[] {"Ok",
"Launch Merge Manager", "Cancel"}, 0);
dialogResult.setValue(dialog.open());
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/ArtifactEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/ArtifactEditorHandler.java index 4c885d82bde..c65a4337b13 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/ArtifactEditorHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/ArtifactEditorHandler.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers;
import org.eclipse.core.commands.ExecutionEvent;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
/**
* Opens an artifact editor as long as the user has Read permission
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/NativeEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/NativeEditorHandler.java index c272e80b683..68bc36c4677 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/NativeEditorHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/NativeEditorHandler.java @@ -11,9 +11,9 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.osee.framework.core.enums.PermissionEnum; -import org.eclipse.osee.framework.ui.skynet.render.PresentationType; -import org.eclipse.osee.framework.ui.skynet.render.RendererManager; +import org.eclipse.osee.framework.core.enums.PermissionEnum;
+import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/NativePreviewEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/NativePreviewEditorHandler.java index 8ffeafe23b0..ffa465426a8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/NativePreviewEditorHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/NativePreviewEditorHandler.java @@ -15,7 +15,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.render.NativeRenderer;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewTisHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewTisHandler.java index 292e87edb9e..89e6d8a3788 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewTisHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewTisHandler.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
import org.eclipse.osee.framework.ui.skynet.render.TisRenderer;
/**
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWholeWordHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWholeWordHandler.java index 85e2e6043c3..6c69ed05d39 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWholeWordHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWholeWordHandler.java @@ -14,7 +14,7 @@ import org.eclipse.core.commands.ExecutionEvent; 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.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
import org.eclipse.osee.framework.ui.skynet.render.WholeDocumentRenderer;
/**
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWithChildWordHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWithChildWordHandler.java index 556b05f2a99..16448a17684 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWithChildWordHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWithChildWordHandler.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.render.ITemplateRenderer;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
import org.eclipse.osee.framework.ui.skynet.render.WordTemplateRenderer;
/**
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWordHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWordHandler.java index 716a12f44e2..2120d1aaccf 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWordHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/PreviewWordHandler.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
import org.eclipse.osee.framework.ui.skynet.render.WordTemplateRenderer;
/**
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WholeDocumentEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WholeDocumentEditorHandler.java index 29dea5957d6..300ff698d1a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WholeDocumentEditorHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WholeDocumentEditorHandler.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers; import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WordEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WordEditorHandler.java index d9946f28c0d..f3bdb0af032 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WordEditorHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WordEditorHandler.java @@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers; import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/compare/AttributeCompareItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/compare/AttributeCompareItem.java index 4bec587008b..13d3935fdf3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/compare/AttributeCompareItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/compare/AttributeCompareItem.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.compare;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
-import org.eclipse.swt.graphics.Image;
+import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict; +import org.eclipse.swt.graphics.Image; /**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java index 869bab4fb35..1b7d31b7797 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.dbHealth;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
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 4ae174621dd..030c17dcf68 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 @@ -68,7 +68,6 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
@@ -309,7 +308,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I private void handleNewGroup() {
EntryDialog ed =
- new EntryDialog(Display.getCurrent().getActiveShell(), "Create New Group", null, "Enter Group Name",
+ new EntryDialog(Displays.getActiveShell(), "Create New Group", null, "Enter Group Name",
MessageDialog.QUESTION, new String[] {"OK", "Cancel"}, 0);
if (ed.open() == 0) {
try {
@@ -331,7 +330,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I AWorkbench.popup("ERROR", "No Items Selected");
return;
}
- if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Remove From Group",
+ if (MessageDialog.openConfirm(Displays.getActiveShell(), "Remove From Group",
"Remove From Group - (Artifacts will not be deleted)\n\nAre you sure?")) {
try {
SkynetTransaction transaction = new SkynetTransaction(branch, "Artifacts removed from group");
@@ -365,7 +364,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I names += String.format("%s\n", item.getArtifact().getName());
}
}
- if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Delete Groups",
+ if (MessageDialog.openConfirm(Displays.getActiveShell(), "Delete Groups",
"Delete Groups - (Contained Artifacts will not be deleted)\n\n" + names + "\nAre you sure?")) {
SkynetTransaction transaction = new SkynetTransaction(branch, "Delete Groups: " + names);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactDiffMenu.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactDiffMenu.java index 9773b37fcde..0ac900621b4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactDiffMenu.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactDiffMenu.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.menu;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java index ac27cd37aea..3be4faaedcb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java @@ -32,13 +32,13 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MenuEvent; import org.eclipse.swt.events.MenuListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.ui.ISharedImages; @@ -135,7 +135,7 @@ public class GlobalMenu { try { final Collection<Artifact> artifactsToBeDeleted = globalMenuHelper.getArtifacts(); MessageDialog dialog = - new MessageDialog(Display.getCurrent().getActiveShell(), "Confirm Artifact Deletion", null, + new MessageDialog(Displays.getActiveShell(), "Confirm Artifact Deletion", null, " Are you sure you want to delete this artifact and all of the default hierarchy children?", MessageDialog.QUESTION, new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 1); if (dialog.open() == 0) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/INotificationManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/INotificationManager.java index a5e2fa7ccf8..8426a4ddea1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/INotificationManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/INotificationManager.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.notify;
-import java.util.List;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import java.util.List; +import org.eclipse.osee.framework.core.exception.OseeCoreException; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactEditFileWatcher.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactEditFileWatcher.java index a5137a21765..e5f9c020425 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactEditFileWatcher.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactEditFileWatcher.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.render;
-import java.io.File;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.utility.FileWatcher;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
+import java.io.File; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import org.eclipse.core.runtime.jobs.IJobChangeEvent; +import org.eclipse.core.runtime.jobs.JobChangeAdapter; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.plugin.core.util.Jobs; +import org.eclipse.osee.framework.skynet.core.utility.FileWatcher; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; final class ArtifactEditFileWatcher extends FileWatcher {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java index ccac97b3003..a14a39b7bfa 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java @@ -25,7 +25,6 @@ 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.artifact.BranchManager; import org.eclipse.osee.framework.ui.swt.Displays; -import org.eclipse.swt.widgets.Display; public final class ArtifactGuis { @@ -70,7 +69,7 @@ public final class ArtifactGuis { Displays.pendInDisplayThread(new Runnable() { @Override public void run() { - editAllowed.setValue(MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Confirm Edit", + editAllowed.setValue(MessageDialog.openConfirm(Displays.getActiveShell(), "Confirm Edit", message)); } }); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java index f9ebb1b532a..7674d809fa4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java @@ -14,23 +14,23 @@ import java.util.ArrayList; import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.CoreException;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.type.AttributeType;
import org.eclipse.osee.framework.jdk.core.util.xml.Xml;
-import org.eclipse.osee.framework.logging.OseeLevel; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.linking.OseeLinkBuilder;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditorInput; +import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditorInput;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.render.compare.DefaultArtifactCompare;
import org.eclipse.osee.framework.ui.skynet.render.compare.IComparator;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java index 58278f11d3f..0c9bdb1445c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.ui.skynet.render;
-import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT; -import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.SPECIALIZED_EDIT; +import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENERALIZED_EDIT;
+import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.SPECIALIZED_EDIT;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/ArtifactDeltaToFileConverter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/ArtifactDeltaToFileConverter.java index fc0e3988239..495bacb8c49 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/ArtifactDeltaToFileConverter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/ArtifactDeltaToFileConverter.java @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.render.compare;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta;
-import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil;
+import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.jdk.core.type.Pair; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; +import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; public class ArtifactDeltaToFileConverter {
private final FileSystemRenderer renderer;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/DefaultArtifactCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/DefaultArtifactCompare.java index 523d0f35a97..88de47cf3ab 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/DefaultArtifactCompare.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/DefaultArtifactCompare.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.render.compare;
-import java.util.Collection;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
+import java.util.Collection; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; public class DefaultArtifactCompare implements IComparator {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/IComparator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/IComparator.java index 77d8bb09d51..c93dbed6e79 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/IComparator.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/IComparator.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.render.compare;
-import java.util.Collection;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
+import java.util.Collection; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; public interface IComparator {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WholeWordCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WholeWordCompare.java index 8a202e11fb4..db186b9e0a2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WholeWordCompare.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WholeWordCompare.java @@ -10,26 +10,26 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.render.compare;
-import java.util.Collection;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-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.change.ArtifactDelta;
-import org.eclipse.osee.framework.skynet.core.word.WordAnnotationHandler;
-import org.eclipse.osee.framework.ui.skynet.preferences.MsWordPreferencePage;
-import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil;
-import org.eclipse.osee.framework.ui.skynet.render.VbaWordDiffGenerator;
-import org.eclipse.osee.framework.ui.skynet.render.WordImageChecker;
+import java.util.Collection; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.Pair; +import org.eclipse.osee.framework.skynet.core.UserManager; +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.change.ArtifactDelta; +import org.eclipse.osee.framework.skynet.core.word.WordAnnotationHandler; +import org.eclipse.osee.framework.ui.skynet.preferences.MsWordPreferencePage; +import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; +import org.eclipse.osee.framework.ui.skynet.render.VbaWordDiffGenerator; +import org.eclipse.osee.framework.ui.skynet.render.WordImageChecker; public class WholeWordCompare implements IComparator {
private static final IAttributeType ATTRIBUTE_TYPE = CoreAttributeTypes.WHOLE_WORD_CONTENT;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordChangeReportOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordChangeReportOperation.java index cc1c7302a55..d86d4c3d68a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordChangeReportOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordChangeReportOperation.java @@ -10,34 +10,34 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.render.compare;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-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.util.OseeData;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-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.change.ArtifactDelta;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.preferences.MsWordPreferencePage;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil;
-import org.eclipse.osee.framework.ui.skynet.render.VbaWordDiffGenerator;
-import org.eclipse.osee.framework.ui.skynet.render.WordImageChecker;
-import org.eclipse.osee.framework.ui.skynet.util.WordUiUtil;
+import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.jdk.core.type.Pair; +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.util.OseeData; +import org.eclipse.osee.framework.skynet.core.UserManager; +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.change.ArtifactDelta; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.preferences.MsWordPreferencePage; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; +import org.eclipse.osee.framework.ui.skynet.render.VbaWordDiffGenerator; +import org.eclipse.osee.framework.ui.skynet.render.WordImageChecker; +import org.eclipse.osee.framework.ui.skynet.util.WordUiUtil; public final class WordChangeReportOperation extends AbstractOperation {
private final Collection<ArtifactDelta> artifactsToCompare;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java index b657c028099..7832563553d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java @@ -10,31 +10,31 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.render.compare;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-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.change.ArtifactDelta;
-import org.eclipse.osee.framework.ui.skynet.preferences.MsWordPreferencePage;
-import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil;
-import org.eclipse.osee.framework.ui.skynet.render.VbaWordDiffGenerator;
-import org.eclipse.osee.framework.ui.skynet.render.WordImageChecker;
-import org.eclipse.osee.framework.ui.skynet.util.WordUiUtil;
+import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.operation.IOperation; +import org.eclipse.osee.framework.core.operation.Operations; +import org.eclipse.osee.framework.jdk.core.type.Pair; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.skynet.core.UserManager; +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.change.ArtifactDelta; +import org.eclipse.osee.framework.ui.skynet.preferences.MsWordPreferencePage; +import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; +import org.eclipse.osee.framework.ui.skynet.render.VbaWordDiffGenerator; +import org.eclipse.osee.framework.ui.skynet.render.WordImageChecker; +import org.eclipse.osee.framework.ui.skynet.util.WordUiUtil; public class WordTemplateCompare implements IComparator {
private static final IAttributeType ATTRIBUTE_TYPE = CoreAttributeTypes.WORD_TEMPLATE_CONTENT;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordChangeReportOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordChangeReportOperation.java index b193870e6f9..f1c09944899 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordChangeReportOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordChangeReportOperation.java @@ -10,17 +10,17 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.render.word;
-import java.util.Collection;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.operation.AbstractOperation;
-import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta;
-import org.eclipse.osee.framework.skynet.core.change.Change;
-import org.eclipse.osee.framework.skynet.core.revision.ChangeManager;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
-import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
-import org.eclipse.osee.framework.ui.skynet.render.WordTemplateRenderer;
+import java.util.Collection; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.operation.AbstractOperation; +import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; +import org.eclipse.osee.framework.skynet.core.change.Change; +import org.eclipse.osee.framework.skynet.core.revision.ChangeManager; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; +import org.eclipse.osee.framework.ui.skynet.render.PresentationType; +import org.eclipse.osee.framework.ui.skynet.render.WordTemplateRenderer; public class WordChangeReportOperation extends AbstractOperation {
private final Collection<Change> changes;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java index 46924b68e5d..e91e44b0221 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.ui.skynet.render.word;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; -import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
+import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -30,7 +30,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.skynet.core.utility.Artifacts; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java index 51bf89dc181..ee7670b247d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.render.word;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.CharacterCodingException;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java index 6b08fb5c5bc..89adba3a068 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java @@ -27,6 +27,7 @@ import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.Dialogs;
import org.eclipse.osee.framework.ui.swt.ALayout;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
@@ -34,7 +35,6 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
@@ -145,7 +145,7 @@ public class ResultsEditorHtmlTab implements IResultsEditorHtmlTab, IBrowserActi @Override
public void widgetSelected(SelectionEvent event) {
try {
- final FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell().getShell(), SWT.OPEN);
+ final FileDialog dialog = new FileDialog(Displays.getActiveShell().getShell(), SWT.OPEN);
dialog.setFilterExtensions(new String[] {"*.html"});
String filename = dialog.open();
if (filename == null || filename.equals("")) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java index ea62199a62b..c72bf21b0a1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java @@ -47,6 +47,7 @@ import org.eclipse.osee.framework.ui.skynet.search.filter.FilterTableViewer; import org.eclipse.osee.framework.ui.skynet.search.page.AbstractArtifactSearchViewPage;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
import org.eclipse.osee.framework.ui.skynet.widgets.XBranchSelectWidget;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.HyperLinkLabel;
import org.eclipse.search.ui.IReplacePage;
import org.eclipse.search.ui.ISearchPage;
@@ -65,7 +66,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
@@ -77,526 +77,527 @@ import org.eclipse.swt.widgets.Text; * @author Michael S. Rodgers
*/
public class ArtifactSearchPage extends DialogPage implements ISearchPage, IReplacePage {
- private static final Pattern storageStringPattern = Pattern.compile("(.*?);(.*?);(.*?);(.*)");
- private static final Pattern notSearchPrimitivePattern = Pattern.compile("Not \\[(.*)\\]");
- private static final String FILTERS_STORAGE_KEY = ".filters";
-
- private static ISearchPageContainer aContainer;
-
- private Button addButton;
- private Button allButton;
- private Button atLeastOneButton;
- private ComboViewer searchTypeList;
- private Button notButton;
-
- private StackLayout selectionLayout;
- private static FilterTableViewer filterviewer;
- private Composite artifactTypeControls;
- private ListViewer artifactTypeList;
-
- private XBranchSelectWidget branchSelect;
-
- private SearchFilter HRID_VALUE_FILTER;
- private SearchFilter ATTRIBUTE_VALUE_FILTER;
- private static int lastSearchTypeListSelected = 2; // Attribute
- private static int lastAttributeTypeListSelected = 0; // Name
-
- private final Matcher storageStringMatcher = storageStringPattern.matcher("");
- private final Matcher notSearchPrimitiveMatcher = notSearchPrimitivePattern.matcher("");
-
- public void createControl(Composite parent) {
- initializeDialogUnits(parent);
- boolean isConnectionOk = DbConnectionExceptionComposite.dbConnectionIsOk(parent);
- if (isConnectionOk != false) {
- Composite mainComposite = new Composite(parent, SWT.NONE);
- mainComposite.setFont(parent.getFont());
- mainComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- mainComposite.setLayout(new GridLayout());
-
- branchSelect = new XBranchSelectWidget("Branch To Search");
- branchSelect.setDisplayLabel(false);
- branchSelect.setSelection(BranchManager.getLastBranch());
- branchSelect.createWidgets(mainComposite, 2);
-
- addFilterControls(mainComposite);
- addTableControls(mainComposite);
- addSearchScope(mainComposite);
- addFilterListeners();
-
- setControl(parent);
- aContainer.setPerformActionEnabled(false);
-
- SkynetGuiPlugin.getInstance().setHelp(mainComposite, "artifact_search", "org.eclipse.osee.framework.help.ui");
-
- updateWidgets();
-
- loadState();
- } else {
- setControl(parent);
- }
- }
-
- private Branch getSelectedBranch() {
- Branch branch = branchSelect.getData();
- if (branch == null) {
- branch = BranchManager.getLastBranch();
- }
- try {
- if (branch == null) {
- branch = BranchManager.getCommonBranch();
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- return branch;
- }
-
- /**
- * Controls to allow the user to select wether all the filters are combined using AND or OR
- */
- private void addSearchScope(Composite composite) {
- Group allSelectionGroup = new Group(composite, SWT.NONE);
- allSelectionGroup.setText("Artifacts that match");
- allSelectionGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-
- allSelectionGroup.setLayout(new GridLayout(2, false));
-
- allButton = new Button(allSelectionGroup, SWT.RADIO);
- allButton.setText("All filters (AND)");
- allButton.setSelection(true);
-
- atLeastOneButton = new Button(allSelectionGroup, SWT.RADIO);
- atLeastOneButton.setText("At least one filter (OR)");
- }
-
- private void createArtifactTypeSearchControls(Composite optionsComposite) {
- artifactTypeControls = new Composite(optionsComposite, SWT.NONE);
- artifactTypeControls.setLayout(new GridLayout(1, true));
-
- artifactTypeList = new ListViewer(artifactTypeControls);
- GridData gd = new GridData();
- gd.heightHint = 100;
- artifactTypeList.getList().setLayoutData(gd);
- artifactTypeList.setContentProvider(new SearchContentProvider());
- artifactTypeList.setLabelProvider(new SearchLabelProvider());
- artifactTypeList.setSorter(new SearchSorter());
-
- try {
- for (ArtifactType descriptor : ArtifactTypeManager.getValidArtifactTypes(getSelectedBranch())) {
- artifactTypeList.add(descriptor.getName());
- artifactTypeList.setData(descriptor.getName(), descriptor);
- }
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
- "Error encountered while getting list of artifact types", ex);
- }
- addToSearchTypeList(new ArtifactTypeFilter(artifactTypeControls, artifactTypeList));
- }
-
- private void createOrphanSearchControls(Composite optionsComposite) {
- //uses the artifactTypeList from Artifact_type_filter
- artifactTypeList.getList().select(0);
- addToSearchTypeList(new OrphanSearchFilter("Orphan Search", artifactTypeControls, artifactTypeList));
- }
-
- private void addToSearchTypeList(SearchFilter filter) {
- searchTypeList.add(filter.getFilterName());
- searchTypeList.setData(filter.getFilterName(), filter);
- }
-
- private void createRelationSearchControls(Composite optionsComposite) {
- Composite relationControls = new Composite(optionsComposite, SWT.NONE);
- relationControls.setLayout(new GridLayout(2, true));
-
- final ComboViewer relationTypeList = new ComboViewer(relationControls, SWT.DROP_DOWN | SWT.READ_ONLY);
- relationTypeList.setContentProvider(new SearchContentProvider());
- relationTypeList.setLabelProvider(new SearchLabelProvider());
- relationTypeList.setSorter(new SearchSorter());
- final ComboViewer relationSideList = new ComboViewer(relationControls, SWT.DROP_DOWN | SWT.READ_ONLY);
- relationSideList.setContentProvider(new SearchContentProvider());
- relationSideList.setLabelProvider(new SearchLabelProvider());
- relationSideList.setSorter(new SearchSorter());
-
- try {
- for (RelationType linkDescriptor : RelationTypeManager.getValidTypes(getSelectedBranch())) {
- relationTypeList.add(linkDescriptor.getName());
- relationTypeList.setData(linkDescriptor.getName(), linkDescriptor);
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
-
- relationTypeList.getCombo().addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- relationSideList.getCombo().removeAll();
- RelationType linkDescriptor =
- (RelationType) relationTypeList.getData(relationTypeList.getCombo().getText());
- relationSideList.add(linkDescriptor.getSideAName());
- relationSideList.add(linkDescriptor.getSideBName());
- relationSideList.getCombo().select(0);
- }
- });
- relationTypeList.getCombo().setVisibleItemCount(Math.min(relationTypeList.getCombo().getItemCount(), 15));
-
- if (relationTypeList.getCombo().getItemCount() > 0) { // ensure we don't get a null pointer
- // exception when there are no relation types in the db
- relationTypeList.getCombo().select(0);
- RelationType linkDescriptor = (RelationType) relationTypeList.getData(relationTypeList.getCombo().getText());
- relationSideList.add(linkDescriptor.getSideAName());
- relationSideList.add(linkDescriptor.getSideBName());
- relationSideList.getCombo().select(0);
- }
-
- addToSearchTypeList(new InRelationFilter(relationControls, relationTypeList, relationSideList));
- }
-
- private void createHridSearchControls(Composite optionsComposite) {
- Composite hridControls = new Composite(optionsComposite, SWT.NONE);
- hridControls.setLayout(new GridLayout(2, false));
-
- Label typeLabel = new Label(hridControls, SWT.HORIZONTAL);
- typeLabel.setText("Human Readable ID:");
- Text hridValue = new Text(hridControls, SWT.BORDER);
- hridValue.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-
- hridValue.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- addButton.setEnabled(HRID_VALUE_FILTER.isValid());
- }
- });
-
- new Label(hridControls, SWT.NONE);
-
- Label wildLabel = new Label(hridControls, SWT.NONE);
- wildLabel.setText("(* = any string, \\* = literal *)");
-
- HRID_VALUE_FILTER = new HridValueFilter(hridControls, hridValue);
- addToSearchTypeList(HRID_VALUE_FILTER);
- }
-
- private void createAttributeSearchControls(Composite optionsComposite) {
- Composite attributeControls = new Composite(optionsComposite, SWT.NONE);
- attributeControls.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- attributeControls.setLayout(new GridLayout(2, false));
-
- Label typeLabel = new Label(attributeControls, SWT.HORIZONTAL);
- typeLabel.setText("Attribute Type:");
-
- final ComboViewer attributeTypeList = new ComboViewer(attributeControls, SWT.DROP_DOWN | SWT.READ_ONLY);
- attributeTypeList.setContentProvider(new SearchContentProvider());
- attributeTypeList.setLabelProvider(new SearchLabelProvider());
- attributeTypeList.setSorter(new SearchSorter());
-
- Label valueLabel = new Label(attributeControls, SWT.HORIZONTAL);
- valueLabel.setText("Attribute Value:");
-
- Text attributeValue = new Text(attributeControls, SWT.BORDER);
- attributeValue.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-
- try {
- for (AttributeType type : AttributeTypeManager.getValidAttributeTypes(getSelectedBranch())) {
- attributeTypeList.add(type.getName());
- attributeTypeList.setData(type.getName(), type);
- }
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
- "Error encountered while getting list of attribute types", ex);
- }
- attributeTypeList.getCombo().setVisibleItemCount(Math.min(attributeTypeList.getCombo().getItemCount(), 15));
- attributeTypeList.getCombo().select(lastAttributeTypeListSelected);
- attributeTypeList.addSelectionChangedListener(new ISelectionChangedListener() {
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- lastAttributeTypeListSelected = attributeTypeList.getCombo().getSelectionIndex();
- }
- });
-
- attributeValue.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- addButton.setEnabled(ATTRIBUTE_VALUE_FILTER.isValid());
- }
- });
-
- new Label(attributeControls, SWT.NONE); // spacerLabelSoTheNextOneWillBeInColumnTwo
-
- Label wildLabel = new Label(attributeControls, SWT.NONE);
- wildLabel.setText("(* = any string, \\* = literal *)");
-
- ATTRIBUTE_VALUE_FILTER = new AttributeValueFilter(attributeControls, attributeTypeList, attributeValue);
- addToSearchTypeList(ATTRIBUTE_VALUE_FILTER);
- }
-
- private void addFilterControls(Composite mainComposite) {
- Group filterGroup = new Group(mainComposite, SWT.NONE);
- filterGroup.setText("Create a Filter");
- filterGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- filterGroup.setLayout(new GridLayout());
-
- Composite composite = new Composite(filterGroup, SWT.BORDER);
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- composite.setLayout(new GridLayout(2, false));
-
- searchTypeList = new ComboViewer(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
- searchTypeList.setContentProvider(new SearchContentProvider());
- searchTypeList.setLabelProvider(new SearchLabelProvider());
- searchTypeList.setSorter(new SearchSorter());
-
- notButton = new Button(composite, SWT.CHECK);
- notButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.FILL, true, false));
- notButton.setText("Not Equal");
-
- selectionLayout = new StackLayout();
-
- Composite optionsComposite = new Composite(filterGroup, SWT.BORDER);
- optionsComposite.setLayout(new GridLayout());
- optionsComposite.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-
- optionsComposite.setLayout(selectionLayout);
- createAttributeSearchControls(optionsComposite);
- createArtifactTypeSearchControls(optionsComposite);
- createOrphanSearchControls(optionsComposite);
- createRelationSearchControls(optionsComposite);
- createHridSearchControls(optionsComposite);
-
- searchTypeList.getCombo().setVisibleItemCount(7);
- searchTypeList.getCombo().select(lastSearchTypeListSelected);
- searchTypeList.addSelectionChangedListener(new ISelectionChangedListener() {
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- lastSearchTypeListSelected = searchTypeList.getCombo().getSelectionIndex();
- }
- });
- addButton = new Button(filterGroup, SWT.PUSH);
- addButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, false));
- addButton.setText("Add Filter");
- }
-
- private void addFilterListeners() {
- addButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- SearchFilter searchFilter = (SearchFilter) searchTypeList.getData(searchTypeList.getCombo().getText());
- searchFilter.setNot(notButton.getSelection());
- searchFilter.addFilterTo(filterviewer);
- updateOKStatus();
- }
- });
-
- searchTypeList.getCombo().addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- updateWidgets();
- }
- });
- }
-
- private void updateWidgets() {
- SearchFilter searchFilter = (SearchFilter) searchTypeList.getData(searchTypeList.getCombo().getText());
- addButton.setEnabled(searchFilter.isValid());
- selectionLayout.topControl = searchFilter.optionsControl;
- selectionLayout.topControl.getParent().layout();
- }
-
- private void addTableControls(Composite composite) {
- Composite filterComposite = new Composite(composite, SWT.NONE);
- filterComposite.setFont(composite.getFont());
- filterComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- filterComposite.setLayout(new GridLayout(2, false));
-
- Label tableLabel = new Label(filterComposite, SWT.FILL);
- tableLabel.setText("Filters ");
-
- HyperLinkLabel clearAllLabel = new HyperLinkLabel(filterComposite, SWT.NONE);
- clearAllLabel.setText("clear all");
- clearAllLabel.addListener(SWT.MouseUp, new Listener() {
- @Override
- public void handleEvent(Event event) {
- for (FilterModel filterModel : new CopyOnWriteArrayList<FilterModel>(
- filterviewer.getFilterList().getFilters())) {
- filterviewer.removeFilter(filterModel);
- }
- filterviewer.refresh();
- }
- });
-
- Table table = new Table(composite, SWT.BORDER | SWT.V_SCROLL | SWT.HIDE_SELECTION);
- filterviewer = new FilterTableViewer(table);
- GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
- gridData.heightHint = 100;
- gridData.widthHint = 500;
- table.setLayoutData(gridData);
- }
-
- public void setContainer(ISearchPageContainer container) {
- ArtifactSearchPage.aContainer = container;
- }
-
- /**
- * @return Returns the aContainer.
- */
- public static ISearchPageContainer getContainer() {
- return aContainer;
- }
-
- public boolean performAction() {
- NewSearchUI.activateSearchResultView();
- filterviewer.getFilterList().setAllSelected(allButton.getSelection());
- AbstractArtifactSearchQuery searchQuery =
- new FilterArtifactSearchQuery(filterviewer.getFilterList(), getSelectedBranch());
- NewSearchUI.runQueryInBackground(searchQuery);
- saveState();
- return true;
- }
-
- public boolean performReplace() {
- filterviewer.getFilterList().setAllSelected(allButton.getSelection());
- AbstractArtifactSearchQuery searchQuery =
- new FilterArtifactSearchQuery(filterviewer.getFilterList(), getSelectedBranch());
-
- IStatus status = NewSearchUI.runQueryInForeground(getContainer().getRunnableContext(), searchQuery);
- if (status.matches(IStatus.CANCEL)) {
- return false;
- }
-
- ISearchResultViewPart view = NewSearchUI.activateSearchResultView();
- if (view != null) {
- final ISearchResultPage page = view.getActivePage();
- if (page instanceof AbstractArtifactSearchViewPage) {
- runAttributeFindReplaceDialog(page);
- }
- }
- return true;
- }
-
- private void runAttributeFindReplaceDialog(final ISearchResultPage page) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- if (page instanceof AbstractArtifactSearchViewPage) {
- AbstractArtifactSearchViewPage artifactPage = (AbstractArtifactSearchViewPage) page;
- List<Artifact> artifacts = artifactPage.getInput().getArtifactResults();
- new AttributeFindReplaceDialog(page.getSite().getShell(), artifacts).open();
- }
- }
- });
- }
-
- /*
- * Implements method from IDialogPage
- */
- @Override
- public void setVisible(boolean visible) {
- updateOKStatus();
- super.setVisible(visible);
- }
-
- public static void updateOKStatus() {
- if (filterviewer == null || filterviewer.getFilterList().getFilters().isEmpty()) {
- getContainer().setPerformActionEnabled(false);
- } else {
- getContainer().setPerformActionEnabled(true);
- }
- }
-
- private String asString(FilterModel model) {
- StringBuilder builder = new StringBuilder();
- builder.append(model.getSearch());
- builder.append(";");
- builder.append(model.getType());
- builder.append(";");
- builder.append(model.getValue());
- builder.append(";");
- builder.append(model.getSearchPrimitive().getStorageString());
- return builder.toString();
- }
-
- private void processStoredFilter(String entry) {
- storageStringMatcher.reset(entry);
- if (storageStringMatcher.find()) {
- String searchPrimitive = storageStringMatcher.group(1);
- String type = storageStringMatcher.group(2);
- String value = storageStringMatcher.group(3);
- String storageString = storageStringMatcher.group(4);
- boolean isNotEnabled = false;
- notSearchPrimitiveMatcher.reset(storageString);
- if (notSearchPrimitiveMatcher.find()) {
- isNotEnabled = true;
- storageString = notSearchPrimitiveMatcher.group(1);
- }
- SearchFilter searchFilter = (SearchFilter) searchTypeList.getData(searchPrimitive);
- searchFilter.loadFromStorageString(filterviewer, type, value, storageString, isNotEnabled);
- searchFilter.getFilterName();
- }
- }
-
- protected void saveState() {
- IDialogSettings dialogSettings = SkynetGuiPlugin.getInstance().getDialogSettings();
- if (dialogSettings != null) {
-
- List<String> filterString = new ArrayList<String>();
- FilterModelList filterList = filterviewer.getFilterList();
- for (FilterModel model : filterList.getFilters()) {
- filterString.add(asString(model));
- }
- dialogSettings.put(SkynetGuiPlugin.PLUGIN_ID + FILTERS_STORAGE_KEY,
- filterString.toArray(new String[filterString.size()]));
- }
- }
-
- protected void loadState() {
- IDialogSettings dialogSettings = SkynetGuiPlugin.getInstance().getDialogSettings();
- if (dialogSettings != null) {
- String[] filters = dialogSettings.getArray(SkynetGuiPlugin.PLUGIN_ID + FILTERS_STORAGE_KEY);
- if (filters != null) {
- for (String entry : filters) {
- processStoredFilter(entry);
- }
- }
- }
- }
-
- public class SearchLabelProvider implements ILabelProvider {
-
- public Image getImage(Object arg0) {
- return null;
- }
-
- public String getText(Object arg0) {
- return (String) arg0;
- }
-
- public void addListener(ILabelProviderListener arg0) {
- }
-
- public void dispose() {
- }
-
- public boolean isLabelProperty(Object arg0, String arg1) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener arg0) {
- }
- }
-
- public class SearchContentProvider implements IStructuredContentProvider {
- @SuppressWarnings("unchecked")
- public Object[] getElements(Object arg0) {
- return ((ArrayList) arg0).toArray();
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
- }
- }
-
- public class SearchSorter extends ViewerSorter {
- @SuppressWarnings("unchecked")
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- return getComparator().compare(e1, e2);
- }
- }
+ private static final Pattern storageStringPattern = Pattern.compile("(.*?);(.*?);(.*?);(.*)");
+ private static final Pattern notSearchPrimitivePattern = Pattern.compile("Not \\[(.*)\\]");
+ private static final String FILTERS_STORAGE_KEY = ".filters";
+
+ private static ISearchPageContainer aContainer;
+
+ private Button addButton;
+ private Button allButton;
+ private Button atLeastOneButton;
+ private ComboViewer searchTypeList;
+ private Button notButton;
+
+ private StackLayout selectionLayout;
+ private static FilterTableViewer filterviewer;
+ private Composite artifactTypeControls;
+ private ListViewer artifactTypeList;
+
+ private XBranchSelectWidget branchSelect;
+
+ private SearchFilter HRID_VALUE_FILTER;
+ private SearchFilter ATTRIBUTE_VALUE_FILTER;
+ private static int lastSearchTypeListSelected = 2; // Attribute
+ private static int lastAttributeTypeListSelected = 0; // Name
+
+ private final Matcher storageStringMatcher = storageStringPattern.matcher("");
+ private final Matcher notSearchPrimitiveMatcher = notSearchPrimitivePattern.matcher("");
+
+ public void createControl(Composite parent) {
+ initializeDialogUnits(parent);
+ boolean isConnectionOk = DbConnectionExceptionComposite.dbConnectionIsOk(parent);
+ if (isConnectionOk != false) {
+ Composite mainComposite = new Composite(parent, SWT.NONE);
+ mainComposite.setFont(parent.getFont());
+ mainComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ mainComposite.setLayout(new GridLayout());
+
+ branchSelect = new XBranchSelectWidget("Branch To Search");
+ branchSelect.setDisplayLabel(false);
+ branchSelect.setSelection(BranchManager.getLastBranch());
+ branchSelect.createWidgets(mainComposite, 2);
+
+ addFilterControls(mainComposite);
+ addTableControls(mainComposite);
+ addSearchScope(mainComposite);
+ addFilterListeners();
+
+ setControl(parent);
+ aContainer.setPerformActionEnabled(false);
+
+ SkynetGuiPlugin.getInstance().setHelp(mainComposite, "artifact_search", "org.eclipse.osee.framework.help.ui");
+
+ updateWidgets();
+
+ loadState();
+ } else {
+ setControl(parent);
+ }
+ }
+
+ private Branch getSelectedBranch() {
+ Branch branch = branchSelect.getData();
+ if (branch == null) {
+ branch = BranchManager.getLastBranch();
+ }
+ try {
+ if (branch == null) {
+ branch = BranchManager.getCommonBranch();
+ }
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+ }
+ return branch;
+ }
+
+ /**
+ * Controls to allow the user to select wether all the filters are combined using AND or OR
+ */
+ private void addSearchScope(Composite composite) {
+ Group allSelectionGroup = new Group(composite, SWT.NONE);
+ allSelectionGroup.setText("Artifacts that match");
+ allSelectionGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+
+ allSelectionGroup.setLayout(new GridLayout(2, false));
+
+ allButton = new Button(allSelectionGroup, SWT.RADIO);
+ allButton.setText("All filters (AND)");
+ allButton.setSelection(true);
+
+ atLeastOneButton = new Button(allSelectionGroup, SWT.RADIO);
+ atLeastOneButton.setText("At least one filter (OR)");
+ }
+
+ private void createArtifactTypeSearchControls(Composite optionsComposite) {
+ artifactTypeControls = new Composite(optionsComposite, SWT.NONE);
+ artifactTypeControls.setLayout(new GridLayout(1, true));
+
+ artifactTypeList = new ListViewer(artifactTypeControls);
+ GridData gd = new GridData();
+ gd.heightHint = 100;
+ artifactTypeList.getList().setLayoutData(gd);
+ artifactTypeList.setContentProvider(new SearchContentProvider());
+ artifactTypeList.setLabelProvider(new SearchLabelProvider());
+ artifactTypeList.setSorter(new SearchSorter());
+
+ try {
+ for (ArtifactType descriptor : ArtifactTypeManager.getValidArtifactTypes(getSelectedBranch())) {
+ artifactTypeList.add(descriptor.getName());
+ artifactTypeList.setData(descriptor.getName(), descriptor);
+ }
+ } catch (Exception ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
+ "Error encountered while getting list of artifact types", ex);
+ }
+ addToSearchTypeList(new ArtifactTypeFilter(artifactTypeControls, artifactTypeList));
+ }
+
+ private void createOrphanSearchControls(Composite optionsComposite) {
+ //uses the artifactTypeList from Artifact_type_filter
+ artifactTypeList.getList().select(0);
+ addToSearchTypeList(new OrphanSearchFilter("Orphan Search", artifactTypeControls, artifactTypeList));
+ }
+
+ private void addToSearchTypeList(SearchFilter filter) {
+ searchTypeList.add(filter.getFilterName());
+ searchTypeList.setData(filter.getFilterName(), filter);
+ }
+
+ private void createRelationSearchControls(Composite optionsComposite) {
+ Composite relationControls = new Composite(optionsComposite, SWT.NONE);
+ relationControls.setLayout(new GridLayout(2, true));
+
+ final ComboViewer relationTypeList = new ComboViewer(relationControls, SWT.DROP_DOWN | SWT.READ_ONLY);
+ relationTypeList.setContentProvider(new SearchContentProvider());
+ relationTypeList.setLabelProvider(new SearchLabelProvider());
+ relationTypeList.setSorter(new SearchSorter());
+ final ComboViewer relationSideList = new ComboViewer(relationControls, SWT.DROP_DOWN | SWT.READ_ONLY);
+ relationSideList.setContentProvider(new SearchContentProvider());
+ relationSideList.setLabelProvider(new SearchLabelProvider());
+ relationSideList.setSorter(new SearchSorter());
+
+ try {
+ for (RelationType linkDescriptor : RelationTypeManager.getValidTypes(getSelectedBranch())) {
+ relationTypeList.add(linkDescriptor.getName());
+ relationTypeList.setData(linkDescriptor.getName(), linkDescriptor);
+ }
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+
+ relationTypeList.getCombo().addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ relationSideList.getCombo().removeAll();
+ RelationType linkDescriptor =
+ (RelationType) relationTypeList.getData(relationTypeList.getCombo().getText());
+ relationSideList.add(linkDescriptor.getSideAName());
+ relationSideList.add(linkDescriptor.getSideBName());
+ relationSideList.getCombo().select(0);
+ }
+ });
+ relationTypeList.getCombo().setVisibleItemCount(Math.min(relationTypeList.getCombo().getItemCount(), 15));
+
+ if (relationTypeList.getCombo().getItemCount() > 0) { // ensure we don't get a null pointer
+ // exception when there are no relation types in the db
+ relationTypeList.getCombo().select(0);
+ RelationType linkDescriptor = (RelationType) relationTypeList.getData(relationTypeList.getCombo().getText());
+ relationSideList.add(linkDescriptor.getSideAName());
+ relationSideList.add(linkDescriptor.getSideBName());
+ relationSideList.getCombo().select(0);
+ }
+
+ addToSearchTypeList(new InRelationFilter(relationControls, relationTypeList, relationSideList));
+ }
+
+ private void createHridSearchControls(Composite optionsComposite) {
+ Composite hridControls = new Composite(optionsComposite, SWT.NONE);
+ hridControls.setLayout(new GridLayout(2, false));
+
+ Label typeLabel = new Label(hridControls, SWT.HORIZONTAL);
+ typeLabel.setText("Human Readable ID:");
+ Text hridValue = new Text(hridControls, SWT.BORDER);
+ hridValue.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+
+ hridValue.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ addButton.setEnabled(HRID_VALUE_FILTER.isValid());
+ }
+ });
+
+ new Label(hridControls, SWT.NONE);
+
+ Label wildLabel = new Label(hridControls, SWT.NONE);
+ wildLabel.setText("(* = any string, \\* = literal *)");
+
+ HRID_VALUE_FILTER = new HridValueFilter(hridControls, hridValue);
+ addToSearchTypeList(HRID_VALUE_FILTER);
+ }
+
+ private void createAttributeSearchControls(Composite optionsComposite) {
+ Composite attributeControls = new Composite(optionsComposite, SWT.NONE);
+ attributeControls.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+ attributeControls.setLayout(new GridLayout(2, false));
+
+ Label typeLabel = new Label(attributeControls, SWT.HORIZONTAL);
+ typeLabel.setText("Attribute Type:");
+
+ final ComboViewer attributeTypeList = new ComboViewer(attributeControls, SWT.DROP_DOWN | SWT.READ_ONLY);
+ attributeTypeList.setContentProvider(new SearchContentProvider());
+ attributeTypeList.setLabelProvider(new SearchLabelProvider());
+ attributeTypeList.setSorter(new SearchSorter());
+
+ Label valueLabel = new Label(attributeControls, SWT.HORIZONTAL);
+ valueLabel.setText("Attribute Value:");
+
+ Text attributeValue = new Text(attributeControls, SWT.BORDER);
+ attributeValue.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+
+ try {
+ for (AttributeType type : AttributeTypeManager.getValidAttributeTypes(getSelectedBranch())) {
+ attributeTypeList.add(type.getName());
+ attributeTypeList.setData(type.getName(), type);
+ }
+ } catch (Exception ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
+ "Error encountered while getting list of attribute types", ex);
+ }
+ attributeTypeList.getCombo().setVisibleItemCount(Math.min(attributeTypeList.getCombo().getItemCount(), 15));
+ attributeTypeList.getCombo().select(lastAttributeTypeListSelected);
+ attributeTypeList.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ lastAttributeTypeListSelected = attributeTypeList.getCombo().getSelectionIndex();
+ }
+ });
+
+ attributeValue.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ addButton.setEnabled(ATTRIBUTE_VALUE_FILTER.isValid());
+ }
+ });
+
+ new Label(attributeControls, SWT.NONE); // spacerLabelSoTheNextOneWillBeInColumnTwo
+
+ Label wildLabel = new Label(attributeControls, SWT.NONE);
+ wildLabel.setText("(* = any string, \\* = literal *)");
+
+ ATTRIBUTE_VALUE_FILTER = new AttributeValueFilter(attributeControls, attributeTypeList, attributeValue);
+ addToSearchTypeList(ATTRIBUTE_VALUE_FILTER);
+ }
+
+ private void addFilterControls(Composite mainComposite) {
+ Group filterGroup = new Group(mainComposite, SWT.NONE);
+ filterGroup.setText("Create a Filter");
+ filterGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+ filterGroup.setLayout(new GridLayout());
+
+ Composite composite = new Composite(filterGroup, SWT.BORDER);
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+ composite.setLayout(new GridLayout(2, false));
+
+ searchTypeList = new ComboViewer(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
+ searchTypeList.setContentProvider(new SearchContentProvider());
+ searchTypeList.setLabelProvider(new SearchLabelProvider());
+ searchTypeList.setSorter(new SearchSorter());
+
+ notButton = new Button(composite, SWT.CHECK);
+ notButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.FILL, true, false));
+ notButton.setText("Not Equal");
+
+ selectionLayout = new StackLayout();
+
+ Composite optionsComposite = new Composite(filterGroup, SWT.BORDER);
+ optionsComposite.setLayout(new GridLayout());
+ optionsComposite.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
+
+ optionsComposite.setLayout(selectionLayout);
+ createAttributeSearchControls(optionsComposite);
+ createArtifactTypeSearchControls(optionsComposite);
+ createOrphanSearchControls(optionsComposite);
+ createRelationSearchControls(optionsComposite);
+ createHridSearchControls(optionsComposite);
+
+ searchTypeList.getCombo().setVisibleItemCount(7);
+ searchTypeList.getCombo().select(lastSearchTypeListSelected);
+ searchTypeList.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ lastSearchTypeListSelected = searchTypeList.getCombo().getSelectionIndex();
+ }
+ });
+ addButton = new Button(filterGroup, SWT.PUSH);
+ addButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, false));
+ addButton.setText("Add Filter");
+ }
+
+ private void addFilterListeners() {
+ addButton.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ SearchFilter searchFilter = (SearchFilter) searchTypeList.getData(searchTypeList.getCombo().getText());
+ searchFilter.setNot(notButton.getSelection());
+ searchFilter.addFilterTo(filterviewer);
+ updateOKStatus();
+ }
+ });
+
+ searchTypeList.getCombo().addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ updateWidgets();
+ }
+ });
+ }
+
+ private void updateWidgets() {
+ SearchFilter searchFilter = (SearchFilter) searchTypeList.getData(searchTypeList.getCombo().getText());
+ addButton.setEnabled(searchFilter.isValid());
+ selectionLayout.topControl = searchFilter.optionsControl;
+ selectionLayout.topControl.getParent().layout();
+ }
+
+ private void addTableControls(Composite composite) {
+ Composite filterComposite = new Composite(composite, SWT.NONE);
+ filterComposite.setFont(composite.getFont());
+ filterComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ filterComposite.setLayout(new GridLayout(2, false));
+
+ Label tableLabel = new Label(filterComposite, SWT.FILL);
+ tableLabel.setText("Filters ");
+
+ HyperLinkLabel clearAllLabel = new HyperLinkLabel(filterComposite, SWT.NONE);
+ clearAllLabel.setText("clear all");
+ clearAllLabel.addListener(SWT.MouseUp, new Listener() {
+ @Override
+ public void handleEvent(Event event) {
+ for (FilterModel filterModel : new CopyOnWriteArrayList<FilterModel>(
+ filterviewer.getFilterList().getFilters())) {
+ filterviewer.removeFilter(filterModel);
+ }
+ filterviewer.refresh();
+ }
+ });
+
+ Table table = new Table(composite, SWT.BORDER | SWT.V_SCROLL | SWT.HIDE_SELECTION);
+ filterviewer = new FilterTableViewer(table);
+ GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+ gridData.heightHint = 100;
+ gridData.widthHint = 500;
+ table.setLayoutData(gridData);
+ }
+
+ public void setContainer(ISearchPageContainer container) {
+ ArtifactSearchPage.aContainer = container;
+ }
+
+ /**
+ * @return Returns the aContainer.
+ */
+ public static ISearchPageContainer getContainer() {
+ return aContainer;
+ }
+
+ public boolean performAction() {
+ NewSearchUI.activateSearchResultView();
+ filterviewer.getFilterList().setAllSelected(allButton.getSelection());
+ AbstractArtifactSearchQuery searchQuery =
+ new FilterArtifactSearchQuery(filterviewer.getFilterList(), getSelectedBranch());
+ NewSearchUI.runQueryInBackground(searchQuery);
+ saveState();
+ return true;
+ }
+
+ public boolean performReplace() {
+ filterviewer.getFilterList().setAllSelected(allButton.getSelection());
+ AbstractArtifactSearchQuery searchQuery =
+ new FilterArtifactSearchQuery(filterviewer.getFilterList(), getSelectedBranch());
+
+ IStatus status = NewSearchUI.runQueryInForeground(getContainer().getRunnableContext(), searchQuery);
+ if (status.matches(IStatus.CANCEL)) {
+ return false;
+ }
+
+ ISearchResultViewPart view = NewSearchUI.activateSearchResultView();
+ if (view != null) {
+ final ISearchResultPage page = view.getActivePage();
+ if (page instanceof AbstractArtifactSearchViewPage) {
+ runAttributeFindReplaceDialog(page);
+ }
+ }
+ return true;
+ }
+
+ private void runAttributeFindReplaceDialog(final ISearchResultPage page) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ if (page instanceof AbstractArtifactSearchViewPage) {
+ AbstractArtifactSearchViewPage artifactPage = (AbstractArtifactSearchViewPage) page;
+ List<Artifact> artifacts = artifactPage.getInput().getArtifactResults();
+ new AttributeFindReplaceDialog(page.getSite().getShell(), artifacts).open();
+ }
+ }
+ });
+ }
+
+ /*
+ * Implements method from IDialogPage
+ */
+ @Override
+ public void setVisible(boolean visible) {
+ updateOKStatus();
+ super.setVisible(visible);
+ }
+
+ public static void updateOKStatus() {
+ if (filterviewer == null || filterviewer.getFilterList().getFilters().isEmpty()) {
+ getContainer().setPerformActionEnabled(false);
+ } else {
+ getContainer().setPerformActionEnabled(true);
+ }
+ }
+
+ private String asString(FilterModel model) {
+ StringBuilder builder = new StringBuilder();
+ builder.append(model.getSearch());
+ builder.append(";");
+ builder.append(model.getType());
+ builder.append(";");
+ builder.append(model.getValue());
+ builder.append(";");
+ builder.append(model.getSearchPrimitive().getStorageString());
+ return builder.toString();
+ }
+
+ private void processStoredFilter(String entry) {
+ storageStringMatcher.reset(entry);
+ if (storageStringMatcher.find()) {
+ String searchPrimitive = storageStringMatcher.group(1);
+ String type = storageStringMatcher.group(2);
+ String value = storageStringMatcher.group(3);
+ String storageString = storageStringMatcher.group(4);
+ boolean isNotEnabled = false;
+ notSearchPrimitiveMatcher.reset(storageString);
+ if (notSearchPrimitiveMatcher.find()) {
+ isNotEnabled = true;
+ storageString = notSearchPrimitiveMatcher.group(1);
+ }
+ SearchFilter searchFilter = (SearchFilter) searchTypeList.getData(searchPrimitive);
+ searchFilter.loadFromStorageString(filterviewer, type, value, storageString, isNotEnabled);
+ searchFilter.getFilterName();
+ }
+ }
+
+ protected void saveState() {
+ IDialogSettings dialogSettings = SkynetGuiPlugin.getInstance().getDialogSettings();
+ if (dialogSettings != null) {
+
+ List<String> filterString = new ArrayList<String>();
+ FilterModelList filterList = filterviewer.getFilterList();
+ for (FilterModel model : filterList.getFilters()) {
+ filterString.add(asString(model));
+ }
+ dialogSettings.put(SkynetGuiPlugin.PLUGIN_ID + FILTERS_STORAGE_KEY,
+ filterString.toArray(new String[filterString.size()]));
+ }
+ }
+
+ protected void loadState() {
+ IDialogSettings dialogSettings = SkynetGuiPlugin.getInstance().getDialogSettings();
+ if (dialogSettings != null) {
+ String[] filters = dialogSettings.getArray(SkynetGuiPlugin.PLUGIN_ID + FILTERS_STORAGE_KEY);
+ if (filters != null) {
+ for (String entry : filters) {
+ processStoredFilter(entry);
+ }
+ }
+ }
+ }
+
+ public class SearchLabelProvider implements ILabelProvider {
+
+ public Image getImage(Object arg0) {
+ return null;
+ }
+
+ public String getText(Object arg0) {
+ return (String) arg0;
+ }
+
+ public void addListener(ILabelProviderListener arg0) {
+ }
+
+ public void dispose() {
+ }
+
+ public boolean isLabelProperty(Object arg0, String arg1) {
+ return false;
+ }
+
+ public void removeListener(ILabelProviderListener arg0) {
+ }
+ }
+
+ public class SearchContentProvider implements IStructuredContentProvider {
+ @SuppressWarnings("unchecked")
+ public Object[] getElements(Object arg0) {
+ return ((ArrayList) arg0).toArray();
+ }
+
+ public void dispose() {
+ }
+
+ public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
+ }
+ }
+
+ public class SearchSorter extends ViewerSorter {
+ @SuppressWarnings("unchecked")
+ @Override
+ public int compare(Viewer viewer, Object e1, Object e2) {
+ return getComparator().compare(e1, e2);
+ }
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java index 7eab395b0ca..c0b639590bd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java @@ -10,14 +10,14 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.search;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag; +import org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
/**
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/MaxMatchCountConfirmer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/MaxMatchCountConfirmer.java index 866d3e07997..b75adfc11b3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/MaxMatchCountConfirmer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/MaxMatchCountConfirmer.java @@ -14,7 +14,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.jdk.core.type.MutableBoolean;
import org.eclipse.osee.framework.skynet.core.artifact.ISearchConfirmer;
import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.widgets.Display;
/**
* @author Ryan D. Brooks
@@ -30,7 +29,7 @@ public class MaxMatchCountConfirmer implements ISearchConfirmer { Displays.pendInDisplayThread(new Runnable() {
@Override
public void run() {
- result.setValue(MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Confirm Search",
+ result.setValue(MessageDialog.openConfirm(Displays.getActiveShell(), "Confirm Search",
"The search returned " + count + " results and may take a long time to load, continue?"));
}
});
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java index e7000ebfbab..cdd69e05c17 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java @@ -10,8 +10,8 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.search;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; -import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
+import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
@@ -23,7 +23,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag; +import org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.OseeContributionItem;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java index 9dc8d12a61d..89f10da9b1b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.search;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -29,7 +29,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog;
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.artifact.DeletionFlag; +import org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactMatch;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactXmlQueryResultParser.MatchLocation;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java index 1f04ed96057..7bff62f2761 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java @@ -15,7 +15,7 @@ import java.util.Comparator; import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.StyledString.Styler;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java index 5d6cb37948f..783e5791677 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java @@ -39,12 +39,12 @@ import org.eclipse.osee.framework.ui.skynet.ArtifactDoubleClick; import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.util.ImageCapture;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IMemento;
@@ -63,315 +63,316 @@ import org.eclipse.zest.core.widgets.ZestStyles; * @author Donald G. Dunne
*/
public class SkyWalkerView extends ViewPart {
- public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.skywalker.SkyWalkerView";
- protected GraphViewer viewer;
- private static final String INPUT_KEY = "input";
- private static final String GUID_KEY = "guid";
- private static final String BRANCHID_KEY = "branchId";
- private String storedGuid;
- private String storedBrandId;
- private final SkyWalkerOptions options = new SkyWalkerOptions();
- private final List<Artifact> history = new LinkedList<Artifact>();
- private Action filterAction;
- private Composite viewerComp;
- protected SashForm sashForm;
-
- @Override
- public void createPartControl(Composite parent) {
-
- sashForm = new SashForm(parent, SWT.HORIZONTAL);
- sashForm.setLayout(new FillLayout());
-
- viewerComp = new Composite(sashForm, SWT.NONE);
- viewerComp.setLayout(new FillLayout());
-
- viewer = new GraphViewer(viewerComp, ZestStyles.NONE);
- viewer.setContentProvider(new ArtifactGraphContentProvider(options));
- viewer.setLabelProvider(new ArtifactGraphLabelProvider(options));
- viewer.setConnectionStyle(ZestStyles.CONNECTIONS_SOLID);
- viewer.setNodeStyle(ZestStyles.NODES_NO_LAYOUT_RESIZE);
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- public void doubleClick(DoubleClickEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- Iterator<?> itemsIter = selection.iterator();
- while (itemsIter.hasNext()) {
- Object obj = itemsIter.next();
- if (!(obj instanceof Artifact)) {
- continue;
- }
- Artifact artifact = (Artifact) obj;
- explore(artifact);
- }
- }
-
- });
-
- Composite child1 = new Composite(sashForm, SWT.BORDER);
- child1.setLayout(new FillLayout());
- new SkyWalkerTabOptions(child1, SWT.NONE, options);
-
- options.addSkyWalkerOptionsChangeListener(new ISkyWalkerOptionsChangeListener() {
- public void modified(ModType... modTypes) {
- List<ModType> modList = Arrays.asList(modTypes);
- // Don't redraw if artifact has been changed; else get in infinite loop
- if (modList.contains(ModType.Artifact)) {
- return;
- }
- if (modList.contains(ModType.Layout)) {
- viewer.setLayoutAlgorithm(options.getLayout(), true);
- } else if (modList.contains(ModType.Show_Attribute)) {
- try {
- // exploring another artifact and then the original forces a redraw of all the
- // objects
- // which is necessary for a node size change
- Artifact art = (Artifact) viewer.getInput();
- explore(UserManager.getUser(SystemUser.UnAssigned));
- if (art != null) {
- explore(art);
- }
- } catch (Exception ex) {
- // DO Nothing
- }
- } else {
- redraw();
- }
- }
- });
-
- sashForm.setWeights(new int[] {75, 25});
-
- createActions();
- viewer.setLayoutAlgorithm(options.getLayout());
- // Restore current artifact if stored upon shutdown
- try {
- if (storedGuid != null) {
- Artifact art =
- ArtifactQuery.getArtifactFromId(storedGuid, BranchManager.getBranch(Integer.parseInt(storedBrandId)));
- if (art != null) {
- explore(art);
- }
- }
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- }
-
- protected void createActions() {
-
- IActionBars bars = getViewSite().getActionBars();
- // IMenuManager mm = bars.getMenuManager();
- IToolBarManager tbm = bars.getToolBarManager();
-
- filterAction = new Action("Enable Filters", Action.AS_CHECK_BOX) {
- @Override
- public void run() {
- options.setFilterEnabled(filterAction.isChecked());
- redraw();
- }
- };
- filterAction.setChecked(options.isFilterEnabled());
- filterAction.setToolTipText("Enable Filters");
- filterAction.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.FILTERS));
- tbm.add(filterAction);
-
- Action action = new Action() {
- @Override
- public void run() {
- ArtifactDoubleClick.openArtifact(viewer.getSelection());
- }
- };
- action.setText("Open Selected");
- action.setToolTipText("Open Selected");
- action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.EDIT2));
- tbm.add(action);
-
- action = new Action() {
- @Override
- public void run() {
- if (history.size() > 0) {
- Artifact art = history.get(history.size() - 1);
- history.remove(history.size() - 1);
- explore(art, true);
- }
- }
- };
- action.setText("Back");
- action.setToolTipText("Back");
- action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.BACK));
- tbm.add(action);
-
- action = new Action() {
- @Override
- public void run() {
- ImageCapture imgCapture = new ImageCapture(viewerComp);
- imgCapture.popupDialog();
- }
- };
- action.setText("Print");
- action.setToolTipText("Print");
- action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.PRINT));
- tbm.add(action);
-
- action = new Action() {
- @Override
- public void run() {
- handleSaveOptions();
- }
- };
- action.setText("Save Options");
- action.setToolTipText("Save Options");
- action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.SAVE));
- tbm.add(action);
-
- action = new Action() {
- @Override
- public void run() {
- handleLoadOptions();
- }
- };
- action.setText("Load Options");
- action.setToolTipText("Load Options");
- action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.LOAD));
- tbm.add(action);
-
- action = new Action() {
- @Override
- public void run() {
- redraw();
- }
- };
- action.setText("Refresh");
- action.setToolTipText("Refresh");
- action.setImageDescriptor(ImageManager.getImageDescriptor(PluginUiImage.REFRESH));
- tbm.add(action);
- }
-
- public void handleSaveOptions() {
- final FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell().getShell(), SWT.SAVE);
- dialog.setFilterExtensions(new String[] {"*.sky"});
- String filename = dialog.open();
- if (filename != null) {
- try {
- Lib.writeStringToFile(options.toXml(), new File(filename));
- AWorkbench.popup("Saved", "Save Successful");
- } catch (IOException ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
- }
-
- public void handleLoadOptions() {
- final FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell().getShell(), SWT.OPEN);
- dialog.setFilterExtensions(new String[] {"*.sky"});
- String filename = dialog.open();
- if (filename != null) {
- String xml = AFile.readFile(filename);
- options.fromXml(xml);
- explore(options.getArtifact());
- }
- }
-
- public void redraw() {
- if (viewer.getInput() != null) {
- explore((Artifact) viewer.getInput());
- }
- }
-
- @Override
- public void setFocus() {
- viewer.getControl().setFocus();
- }
-
- public String getActionDescription() {
- return "";
- }
-
- public void explore(Artifact artifact) {
- explore(artifact, false);
- }
-
- private boolean inExplore = false;
-
- private void explore(Artifact artifact, boolean fromHistory) {
- // If already in explore method, don't respond to events trying to redraw
- if (inExplore) {
- return;
- }
- inExplore = true;
- options.setArtifact(artifact);
-
- // Add current artifact to history only if explore wasn't caused by going back in history
- if (!fromHistory && viewer.getInput() != null) {
- Artifact currArt = (Artifact) viewer.getInput();
- if (history.isEmpty()) {
- history.add(currArt);
- } else if (history.size() > 0 && !history.get(history.size() - 1).equals(currArt)) {
- history.add(currArt);
- }
- }
- viewer.setInput(options.getArtifact());
- // Highlight center object
- GraphItem item = viewer.findGraphItem(options.getArtifact());
- if (item != null && item instanceof GraphNode) {
- GraphNode node = (GraphNode) item;
- node.setBackgroundColor(Display.getCurrent().getSystemColor(SWT.COLOR_CYAN));
- viewer.update(node, null);
- }
- setPartName("Sky Walker (" + artifact.getName() + ")");
- inExplore = false;
- }
-
- public static void exploreArtifact(Artifact artifact) {
- exploreArtifact(artifact.getName(), artifact);
- }
-
- public static void exploreArtifact(String name, Artifact artifact) {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- SkyWalkerView view;
- try {
- String id = GUID.create();
- view = (SkyWalkerView) page.showView(SkyWalkerView.VIEW_ID, id, IWorkbenchPage.VIEW_ACTIVATE);
- view.explore(artifact);
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- @Override
- public void saveState(IMemento memento) {
- super.saveState(memento);
-
- if (viewer.getInput() == null) {
- return;
- }
- Artifact artifact = (Artifact) viewer.getInput();
- memento = memento.createChild(INPUT_KEY);
- memento.putString(GUID_KEY, artifact.getGuid());
- memento.putString(BRANCHID_KEY, String.valueOf(artifact.getBranch().getId()));
- }
-
- @Override
- public void init(IViewSite site, IMemento memento) throws PartInitException {
- super.init(site, memento);
- try {
- if (memento != null) {
- memento = memento.getChild(INPUT_KEY);
- if (memento != null) {
- storedGuid = memento.getString(GUID_KEY);
- storedBrandId = memento.getString(BRANCHID_KEY);
- }
- }
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Sky Walker error on init: ", ex);
- }
- }
-
- /**
- * @return the options
- */
- public SkyWalkerOptions getOptions() {
- return options;
- }
+ public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.skywalker.SkyWalkerView";
+ protected GraphViewer viewer;
+ private static final String INPUT_KEY = "input";
+ private static final String GUID_KEY = "guid";
+ private static final String BRANCHID_KEY = "branchId";
+ private String storedGuid;
+ private String storedBrandId;
+ private final SkyWalkerOptions options = new SkyWalkerOptions();
+ private final List<Artifact> history = new LinkedList<Artifact>();
+ private Action filterAction;
+ private Composite viewerComp;
+ protected SashForm sashForm;
+
+ @Override
+ public void createPartControl(Composite parent) {
+
+ sashForm = new SashForm(parent, SWT.HORIZONTAL);
+ sashForm.setLayout(new FillLayout());
+
+ viewerComp = new Composite(sashForm, SWT.NONE);
+ viewerComp.setLayout(new FillLayout());
+
+ viewer = new GraphViewer(viewerComp, ZestStyles.NONE);
+ viewer.setContentProvider(new ArtifactGraphContentProvider(options));
+ viewer.setLabelProvider(new ArtifactGraphLabelProvider(options));
+ viewer.setConnectionStyle(ZestStyles.CONNECTIONS_SOLID);
+ viewer.setNodeStyle(ZestStyles.NODES_NO_LAYOUT_RESIZE);
+ viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+ public void doubleClick(DoubleClickEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ Iterator<?> itemsIter = selection.iterator();
+ while (itemsIter.hasNext()) {
+ Object obj = itemsIter.next();
+ if (!(obj instanceof Artifact)) {
+ continue;
+ }
+ Artifact artifact = (Artifact) obj;
+ explore(artifact);
+ }
+ }
+
+ });
+
+ Composite child1 = new Composite(sashForm, SWT.BORDER);
+ child1.setLayout(new FillLayout());
+ new SkyWalkerTabOptions(child1, SWT.NONE, options);
+
+ options.addSkyWalkerOptionsChangeListener(new ISkyWalkerOptionsChangeListener() {
+ public void modified(ModType... modTypes) {
+ List<ModType> modList = Arrays.asList(modTypes);
+ // Don't redraw if artifact has been changed; else get in infinite loop
+ if (modList.contains(ModType.Artifact)) {
+ return;
+ }
+ if (modList.contains(ModType.Layout)) {
+ viewer.setLayoutAlgorithm(options.getLayout(), true);
+ } else if (modList.contains(ModType.Show_Attribute)) {
+ try {
+ // exploring another artifact and then the original forces a redraw of all the
+ // objects
+ // which is necessary for a node size change
+ Artifact art = (Artifact) viewer.getInput();
+ explore(UserManager.getUser(SystemUser.UnAssigned));
+ if (art != null) {
+ explore(art);
+ }
+ } catch (Exception ex) {
+ // DO Nothing
+ }
+ } else {
+ redraw();
+ }
+ }
+ });
+
+ sashForm.setWeights(new int[] {75, 25});
+
+ createActions();
+ viewer.setLayoutAlgorithm(options.getLayout());
+ // Restore current artifact if stored upon shutdown
+ try {
+ if (storedGuid != null) {
+ Artifact art =
+ ArtifactQuery.getArtifactFromId(storedGuid,
+ BranchManager.getBranch(Integer.parseInt(storedBrandId)));
+ if (art != null) {
+ explore(art);
+ }
+ }
+ } catch (Exception ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+ }
+ }
+
+ protected void createActions() {
+
+ IActionBars bars = getViewSite().getActionBars();
+ // IMenuManager mm = bars.getMenuManager();
+ IToolBarManager tbm = bars.getToolBarManager();
+
+ filterAction = new Action("Enable Filters", Action.AS_CHECK_BOX) {
+ @Override
+ public void run() {
+ options.setFilterEnabled(filterAction.isChecked());
+ redraw();
+ }
+ };
+ filterAction.setChecked(options.isFilterEnabled());
+ filterAction.setToolTipText("Enable Filters");
+ filterAction.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.FILTERS));
+ tbm.add(filterAction);
+
+ Action action = new Action() {
+ @Override
+ public void run() {
+ ArtifactDoubleClick.openArtifact(viewer.getSelection());
+ }
+ };
+ action.setText("Open Selected");
+ action.setToolTipText("Open Selected");
+ action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.EDIT2));
+ tbm.add(action);
+
+ action = new Action() {
+ @Override
+ public void run() {
+ if (history.size() > 0) {
+ Artifact art = history.get(history.size() - 1);
+ history.remove(history.size() - 1);
+ explore(art, true);
+ }
+ }
+ };
+ action.setText("Back");
+ action.setToolTipText("Back");
+ action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.BACK));
+ tbm.add(action);
+
+ action = new Action() {
+ @Override
+ public void run() {
+ ImageCapture imgCapture = new ImageCapture(viewerComp);
+ imgCapture.popupDialog();
+ }
+ };
+ action.setText("Print");
+ action.setToolTipText("Print");
+ action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.PRINT));
+ tbm.add(action);
+
+ action = new Action() {
+ @Override
+ public void run() {
+ handleSaveOptions();
+ }
+ };
+ action.setText("Save Options");
+ action.setToolTipText("Save Options");
+ action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.SAVE));
+ tbm.add(action);
+
+ action = new Action() {
+ @Override
+ public void run() {
+ handleLoadOptions();
+ }
+ };
+ action.setText("Load Options");
+ action.setToolTipText("Load Options");
+ action.setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.LOAD));
+ tbm.add(action);
+
+ action = new Action() {
+ @Override
+ public void run() {
+ redraw();
+ }
+ };
+ action.setText("Refresh");
+ action.setToolTipText("Refresh");
+ action.setImageDescriptor(ImageManager.getImageDescriptor(PluginUiImage.REFRESH));
+ tbm.add(action);
+ }
+
+ public void handleSaveOptions() {
+ final FileDialog dialog = new FileDialog(Displays.getActiveShell().getShell(), SWT.SAVE);
+ dialog.setFilterExtensions(new String[] {"*.sky"});
+ String filename = dialog.open();
+ if (filename != null) {
+ try {
+ Lib.writeStringToFile(options.toXml(), new File(filename));
+ AWorkbench.popup("Saved", "Save Successful");
+ } catch (IOException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ }
+ }
+ }
+
+ public void handleLoadOptions() {
+ final FileDialog dialog = new FileDialog(Displays.getActiveShell().getShell(), SWT.OPEN);
+ dialog.setFilterExtensions(new String[] {"*.sky"});
+ String filename = dialog.open();
+ if (filename != null) {
+ String xml = AFile.readFile(filename);
+ options.fromXml(xml);
+ explore(options.getArtifact());
+ }
+ }
+
+ public void redraw() {
+ if (viewer.getInput() != null) {
+ explore((Artifact) viewer.getInput());
+ }
+ }
+
+ @Override
+ public void setFocus() {
+ viewer.getControl().setFocus();
+ }
+
+ public String getActionDescription() {
+ return "";
+ }
+
+ public void explore(Artifact artifact) {
+ explore(artifact, false);
+ }
+
+ private boolean inExplore = false;
+
+ private void explore(Artifact artifact, boolean fromHistory) {
+ // If already in explore method, don't respond to events trying to redraw
+ if (inExplore) {
+ return;
+ }
+ inExplore = true;
+ options.setArtifact(artifact);
+
+ // Add current artifact to history only if explore wasn't caused by going back in history
+ if (!fromHistory && viewer.getInput() != null) {
+ Artifact currArt = (Artifact) viewer.getInput();
+ if (history.isEmpty()) {
+ history.add(currArt);
+ } else if (history.size() > 0 && !history.get(history.size() - 1).equals(currArt)) {
+ history.add(currArt);
+ }
+ }
+ viewer.setInput(options.getArtifact());
+ // Highlight center object
+ GraphItem item = viewer.findGraphItem(options.getArtifact());
+ if (item != null && item instanceof GraphNode) {
+ GraphNode node = (GraphNode) item;
+ node.setBackgroundColor(Displays.getSystemColor(SWT.COLOR_CYAN));
+ viewer.update(node, null);
+ }
+ setPartName("Sky Walker (" + artifact.getName() + ")");
+ inExplore = false;
+ }
+
+ public static void exploreArtifact(Artifact artifact) {
+ exploreArtifact(artifact.getName(), artifact);
+ }
+
+ public static void exploreArtifact(String name, Artifact artifact) {
+ IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ SkyWalkerView view;
+ try {
+ String id = GUID.create();
+ view = (SkyWalkerView) page.showView(SkyWalkerView.VIEW_ID, id, IWorkbenchPage.VIEW_ACTIVATE);
+ view.explore(artifact);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ @Override
+ public void saveState(IMemento memento) {
+ super.saveState(memento);
+
+ if (viewer.getInput() == null) {
+ return;
+ }
+ Artifact artifact = (Artifact) viewer.getInput();
+ memento = memento.createChild(INPUT_KEY);
+ memento.putString(GUID_KEY, artifact.getGuid());
+ memento.putString(BRANCHID_KEY, String.valueOf(artifact.getBranch().getId()));
+ }
+
+ @Override
+ public void init(IViewSite site, IMemento memento) throws PartInitException {
+ super.init(site, memento);
+ try {
+ if (memento != null) {
+ memento = memento.getChild(INPUT_KEY);
+ if (memento != null) {
+ storedGuid = memento.getString(GUID_KEY);
+ storedBrandId = memento.getString(BRANCHID_KEY);
+ }
+ }
+ } catch (Exception ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Sky Walker error on init: ", ex);
+ }
+ }
+
+ /**
+ * @return the options
+ */
+ public SkyWalkerOptions getOptions() {
+ return options;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeWalker.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeWalker.java index 01c85e7fc7a..178a96a3ad4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeWalker.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeWalker.java @@ -26,11 +26,11 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.util.ArtifactTypeLabelProvider;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.zest.core.viewers.GraphViewer;
@@ -44,84 +44,84 @@ import org.eclipse.zest.layouts.algorithms.RadialLayoutAlgorithm; * @author Donald G. Dunne
*/
public class ArtifactTypeWalker extends ViewPart {
- public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.skywalker.ArtifactTypeWalkerView";
- protected GraphViewer viewer;
- private Composite viewerComp;
-
- @Override
- public void createPartControl(Composite parent) {
-
- viewerComp = new Composite(parent, SWT.NONE);
- viewerComp.setLayout(new FillLayout());
-
- viewer = new GraphViewer(viewerComp, ZestStyles.NONE);
- viewer.setContentProvider(new ArtifactTypeContentProvider());
- viewer.setLabelProvider(new ArtifactTypeLabelProvider());
- viewer.setConnectionStyle(ZestStyles.CONNECTIONS_SOLID);
- viewer.setNodeStyle(ZestStyles.NODES_NO_LAYOUT_RESIZE);
- viewer.setLayoutAlgorithm(new RadialLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING));
- viewer.addDoubleClickListener(new IDoubleClickListener() {
-
- public void doubleClick(DoubleClickEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- Iterator<?> itemsIter = selection.iterator();
- while (itemsIter.hasNext()) {
- Object obj = itemsIter.next();
- if (obj instanceof ArtifactType) {
- explore((ArtifactType) obj);
- }
- }
- }
-
- });
- createActions();
- refresh();
- }
-
- private void explore(ArtifactType artifactType) {
- viewer.setInput(artifactType);
- GraphItem item = viewer.findGraphItem(artifactType);
- if (item != null && item instanceof GraphNode) {
- GraphNode node = (GraphNode) item;
- node.setBackgroundColor(Display.getCurrent().getSystemColor(SWT.COLOR_CYAN));
- viewer.update(node, null);
- }
- setPartName("Artifact Type Walker (" + artifactType.getName() + ")");
- }
-
- protected void createActions() {
-
- IActionBars bars = getViewSite().getActionBars();
- // IMenuManager mm = bars.getMenuManager();
- IToolBarManager tbm = bars.getToolBarManager();
-
- Action action = new Action() {
- @Override
- public void run() {
- refresh();
- }
- };
- action.setText("Refresh");
- action.setToolTipText("Refresh");
- action.setImageDescriptor(ImageManager.getImageDescriptor(PluginUiImage.REFRESH));
- tbm.add(action);
- }
-
- public void refresh() {
- try {
- explore(ArtifactTypeManager.getType(CoreArtifactTypes.Artifact));
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- }
-
- @Override
- public void setFocus() {
- viewer.getControl().setFocus();
- }
-
- public String getActionDescription() {
- return "";
- }
+ public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.skywalker.ArtifactTypeWalkerView";
+ protected GraphViewer viewer;
+ private Composite viewerComp;
+
+ @Override
+ public void createPartControl(Composite parent) {
+
+ viewerComp = new Composite(parent, SWT.NONE);
+ viewerComp.setLayout(new FillLayout());
+
+ viewer = new GraphViewer(viewerComp, ZestStyles.NONE);
+ viewer.setContentProvider(new ArtifactTypeContentProvider());
+ viewer.setLabelProvider(new ArtifactTypeLabelProvider());
+ viewer.setConnectionStyle(ZestStyles.CONNECTIONS_SOLID);
+ viewer.setNodeStyle(ZestStyles.NODES_NO_LAYOUT_RESIZE);
+ viewer.setLayoutAlgorithm(new RadialLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING));
+ viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+ public void doubleClick(DoubleClickEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ Iterator<?> itemsIter = selection.iterator();
+ while (itemsIter.hasNext()) {
+ Object obj = itemsIter.next();
+ if (obj instanceof ArtifactType) {
+ explore((ArtifactType) obj);
+ }
+ }
+ }
+
+ });
+ createActions();
+ refresh();
+ }
+
+ private void explore(ArtifactType artifactType) {
+ viewer.setInput(artifactType);
+ GraphItem item = viewer.findGraphItem(artifactType);
+ if (item != null && item instanceof GraphNode) {
+ GraphNode node = (GraphNode) item;
+ node.setBackgroundColor(Displays.getSystemColor(SWT.COLOR_CYAN));
+ viewer.update(node, null);
+ }
+ setPartName("Artifact Type Walker (" + artifactType.getName() + ")");
+ }
+
+ protected void createActions() {
+
+ IActionBars bars = getViewSite().getActionBars();
+ // IMenuManager mm = bars.getMenuManager();
+ IToolBarManager tbm = bars.getToolBarManager();
+
+ Action action = new Action() {
+ @Override
+ public void run() {
+ refresh();
+ }
+ };
+ action.setText("Refresh");
+ action.setToolTipText("Refresh");
+ action.setImageDescriptor(ImageManager.getImageDescriptor(PluginUiImage.REFRESH));
+ tbm.add(action);
+ }
+
+ public void refresh() {
+ try {
+ explore(ArtifactTypeManager.getType(CoreArtifactTypes.Artifact));
+ } catch (OseeCoreException ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+ }
+ }
+
+ @Override
+ public void setFocus() {
+ viewer.getControl().setFocus();
+ }
+
+ public String getActionDescription() {
+ return "";
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java index 041b076dcec..88559c66add 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.templates;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java index 143f7e8db00..05f594abb7e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.update;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
@@ -30,7 +30,7 @@ import org.eclipse.osee.framework.database.core.OseeSql; import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
/**
* @author Jeff C. Phillips
@@ -51,7 +51,7 @@ public class InterArtifactExplorerDropHandler { Branch destinationBranch = destinationParentArtifact.getBranch();
if (isUpdateFromParent(sourceBranch, destinationBranch)) {
- MessageDialog.openError(Display.getCurrent().getActiveShell(), ACCESS_ERROR_MSG_TITLE,
+ MessageDialog.openError(Displays.getActiveShell(), ACCESS_ERROR_MSG_TITLE,
UPDATE_FROM_PARENT_ERROR_MSG);
} else if (isAccessAllowed(sourceBranch, destinationBranch)) {
List<TransferObject> transferObjects = createTransferObjects(destinationParentArtifact, sourceArtifacts);
@@ -63,7 +63,7 @@ public class InterArtifactExplorerDropHandler { }
addArtifactsToNewTransaction(destinationParentArtifact, transferObjects, sourceBranch);
} else {
- MessageDialog.openError(Display.getCurrent().getActiveShell(), ACCESS_ERROR_MSG_TITLE, ACCESS_ERROR_MSG);
+ MessageDialog.openError(Displays.getActiveShell(), ACCESS_ERROR_MSG_TITLE, ACCESS_ERROR_MSG);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/ReflectArtifactStatusDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/ReflectArtifactStatusDialog.java index 0d3b140b3ac..8551da80d32 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/ReflectArtifactStatusDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/ReflectArtifactStatusDialog.java @@ -13,10 +13,10 @@ package org.eclipse.osee.framework.ui.skynet.update; import java.util.List; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; /**
* @author Jeff C. Phillips
@@ -29,7 +29,7 @@ public class ReflectArtifactStatusDialog extends MessageDialog{ private List<TransferObject> transferObjects;
public ReflectArtifactStatusDialog(List<TransferObject> transferObjects) {
- super(Display.getCurrent().getActiveShell(), TITLE, null, null, MessageDialog.NONE,
+ super(Displays.getActiveShell(), TITLE, null, null, MessageDialog.NONE,
new String[] {OK, CANCEL}, 0);
this.transferObjects = transferObjects;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ElapsedTime.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ElapsedTime.java index 1a151037d17..f1110df321c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ElapsedTime.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ElapsedTime.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.skynet.util;
-import java.util.Date;
-import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
+import java.util.Date; +import org.eclipse.osee.framework.ui.skynet.widgets.XDate; /**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java index 67dcd55eeda..694545598fb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java @@ -23,9 +23,9 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.program.Program; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; /** @@ -68,7 +68,7 @@ public class HtmlExportTable { } public Result export(String speratorChar, String fileExtension) { - if (!popupConfirm || (popupConfirm && MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), + if (!popupConfirm || (popupConfirm && MessageDialog.openConfirm(Displays.getActiveShell(), "Export Table", "Export Table to CSV?"))) { StringBuilder sb = new StringBuilder(); sb.append(title + "\n"); @@ -101,7 +101,7 @@ public class HtmlExportTable { } String path = ""; if (popupConfirm) { - FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.SAVE | SWT.SINGLE); + FileDialog dialog = new FileDialog(Displays.getActiveShell(), SWT.SAVE | SWT.SINGLE); dialog.setFilterExtensions(new String[] {"*." + fileExtension}); dialog.setFilterPath(System.getProperty("user.home")); dialog.setFileName("table.csv"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ImageCapture.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ImageCapture.java index 65faefb9bc4..d2e9f97973b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ImageCapture.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ImageCapture.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.util; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ImageDialog; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; @@ -39,7 +40,7 @@ public class ImageCapture { } public void popupDialog() { - ImageDialog diag = new ImageDialog(image, Display.getCurrent().getActiveShell()); + ImageDialog diag = new ImageDialog(image, Displays.getActiveShell()); diag.open(); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/PromptChangeUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/PromptChangeUtil.java index 87dc4ce78dc..bfce3286e9a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/PromptChangeUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/PromptChangeUtil.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ChangeBranchArchivedStateDialog;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ChangeBranchStateDialog;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ChangeBranchTypeDialog;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.widgets.TreeItem;
/**
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.TreeItem; public class PromptChangeUtil {
public static boolean promptChangeBranchType(final Collection<TreeItem> branches) throws OseeCoreException {
- ChangeBranchTypeDialog ld = new ChangeBranchTypeDialog(Display.getCurrent().getActiveShell());
+ ChangeBranchTypeDialog ld = new ChangeBranchTypeDialog(Displays.getActiveShell());
int result = ld.open();
if (result == 0) {
BranchType type = ld.getSelection();
@@ -43,7 +43,7 @@ public class PromptChangeUtil { }
public static boolean promptChangeBranchState(final Collection<TreeItem> branches) throws OseeCoreException {
- ChangeBranchStateDialog ld = new ChangeBranchStateDialog(Display.getCurrent().getActiveShell());
+ ChangeBranchStateDialog ld = new ChangeBranchStateDialog(Displays.getActiveShell());
int result = ld.open();
if (result == 0) {
BranchState state = ld.getSelection();
@@ -57,7 +57,7 @@ public class PromptChangeUtil { }
public static boolean promptChangeBranchArchivedState(final Collection<TreeItem> branches) throws OseeCoreException {
- ChangeBranchArchivedStateDialog ld = new ChangeBranchArchivedStateDialog(Display.getCurrent().getActiveShell());
+ ChangeBranchArchivedStateDialog ld = new ChangeBranchArchivedStateDialog(Displays.getActiveShell());
int result = ld.open();
if (result == 0) {
BranchArchivedState state = ld.getSelection();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java index fc40f9a4bd1..dccf3eff675 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java @@ -20,7 +20,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.swt.Displays;
-import org.eclipse.swt.widgets.Display;
/**
* @author Megumi Telles
@@ -34,7 +33,7 @@ public final class WordUiUtil { Displays.pendInDisplayThread(new Runnable() {
@Override
public void run() {
- MessageDialog.openError(Display.getCurrent().getActiveShell(), title, message);
+ MessageDialog.openError(Displays.getActiveShell(), title, message);
}
});
}
@@ -43,7 +42,7 @@ public final class WordUiUtil { Displays.pendInDisplayThread(new Runnable() {
@Override
public void run() {
- MessageDialog.openWarning(Display.getCurrent().getActiveShell(), title, message);
+ MessageDialog.openWarning(Displays.getActiveShell(), title, message);
}
});
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEECheckedFilteredTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEECheckedFilteredTreeDialog.java index 8aa1b360820..6a42359d049 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEECheckedFilteredTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEECheckedFilteredTreeDialog.java @@ -19,130 +19,141 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.PatternFilter; public abstract class OSEECheckedFilteredTreeDialog extends MessageDialog { - protected Label statusLabel; - protected Button okButton; - private OSEECheckedFilteredTree treeViewer; - private final PatternFilter patternFilter; - private Object input; - private final IContentProvider contentProvider; - private final IBaseLabelProvider labelProvider; - private Collection<? extends Object> initialSelections; - private final ViewerSorter viewerSorter; - - public OSEECheckedFilteredTreeDialog(String dialogTitle, String dialogMessage, PatternFilter patternFilter, IContentProvider contentProvider, IBaseLabelProvider labelProvider, ViewerSorter viewerSorter) { - super(new Shell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] {"OK", "Cancel"}, 0); - this.contentProvider = contentProvider; - this.labelProvider = labelProvider; - this.patternFilter = patternFilter; - this.viewerSorter = viewerSorter; - setShellStyle(getShellStyle() | SWT.RESIZE); - } - - protected void createPreCustomArea(Composite parent) { - } - - /** - * Sets the input. Convenience method. - * - * @param object the input. - */ - public final void setInput(Object input) { - this.input = input; - if (treeViewer != null) treeViewer.getViewer().setInput(input); - } - - /** - * Sets the initial selection. Convenience method. - * - * @param object the initial selection. - */ - public void setInitialSelections(Collection<? extends Object> initialSelections) { - this.initialSelections = initialSelections; - if (treeViewer != null) { - treeViewer.setInitalChecked(initialSelections); - } - } - - public Object[] getResult() { - if (treeViewer == null) return new Object[] {}; - return treeViewer.getResult(); - } - - @Override - protected Control createCustomArea(Composite parent) { - - statusLabel = new Label(parent, SWT.NONE); - statusLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); - createPreCustomArea(parent); - - Composite aiComp = new Composite(parent, SWT.NONE); - aiComp.setLayout(ALayout.getZeroMarginLayout()); - aiComp.setLayoutData(new GridData(GridData.FILL_BOTH)); - - treeViewer = - new OSEECheckedFilteredTree(aiComp, - SWT.MULTI | SWT.CHECK | SWT.READ_ONLY | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, patternFilter); - GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); - gd.heightHint = 500; - treeViewer.getViewer().getTree().setLayoutData(gd); - treeViewer.getViewer().setContentProvider(contentProvider); - treeViewer.getViewer().setLabelProvider(labelProvider); - treeViewer.getViewer().setSorter(viewerSorter); - treeViewer.getViewer().addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateStatusLabel(); - } - }); - if (input != null) treeViewer.getViewer().setInput(input); - if (initialSelections != null) treeViewer.setInitalChecked(initialSelections); - updateStatusLabel(); - - return parent; - } - - protected void updateStatusLabel() { - Result result = isComplete(); - if (result.isFalse()) - statusLabel.setText(result.getText()); - else - statusLabel.setText(""); - statusLabel.getParent().layout(); - updateButtons(); - } - - @Override - protected Control createButtonBar(Composite parent) { - Control c = super.createButtonBar(parent); - okButton = getButton(0); - okButton.setEnabled(false); - return c; - } - - protected Result isComplete() { - return Result.TrueResult; - } - - private void updateButtons() { - if (okButton != null) okButton.setEnabled(isComplete().isTrue()); - } - - /** - * @return the treeViewer - */ - public OSEECheckedFilteredTree getTreeViewer() { - return treeViewer; - } + protected Label statusLabel; + protected Button okButton; + private OSEECheckedFilteredTree treeViewer; + private final PatternFilter patternFilter; + private Object input; + private final IContentProvider contentProvider; + private final IBaseLabelProvider labelProvider; + private Collection<? extends Object> initialSelections; + private final ViewerSorter viewerSorter; + + public OSEECheckedFilteredTreeDialog(String dialogTitle, String dialogMessage, PatternFilter patternFilter, IContentProvider contentProvider, IBaseLabelProvider labelProvider, ViewerSorter viewerSorter) { + super(new Shell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] {"OK", "Cancel"}, 0); + this.contentProvider = contentProvider; + this.labelProvider = labelProvider; + this.patternFilter = patternFilter; + this.viewerSorter = viewerSorter; + setShellStyle(getShellStyle() | SWT.RESIZE); + } + + protected void createPreCustomArea(Composite parent) { + } + + /** + * Sets the input. Convenience method. + * + * @param object the input. + */ + public final void setInput(Object input) { + this.input = input; + if (treeViewer != null) { + treeViewer.getViewer().setInput(input); + } + } + + /** + * Sets the initial selection. Convenience method. + * + * @param object the initial selection. + */ + public void setInitialSelections(Collection<? extends Object> initialSelections) { + this.initialSelections = initialSelections; + if (treeViewer != null) { + treeViewer.setInitalChecked(initialSelections); + } + } + + public Object[] getResult() { + if (treeViewer == null) { + return new Object[] {}; + } + return treeViewer.getResult(); + } + + @Override + protected Control createCustomArea(Composite parent) { + + statusLabel = new Label(parent, SWT.NONE); + statusLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); + createPreCustomArea(parent); + + Composite aiComp = new Composite(parent, SWT.NONE); + aiComp.setLayout(ALayout.getZeroMarginLayout()); + aiComp.setLayoutData(new GridData(GridData.FILL_BOTH)); + + treeViewer = + new OSEECheckedFilteredTree(aiComp, + SWT.MULTI | SWT.CHECK | SWT.READ_ONLY | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, patternFilter); + GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); + gd.heightHint = 500; + treeViewer.getViewer().getTree().setLayoutData(gd); + treeViewer.getViewer().setContentProvider(contentProvider); + treeViewer.getViewer().setLabelProvider(labelProvider); + treeViewer.getViewer().setSorter(viewerSorter); + treeViewer.getViewer().addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + updateStatusLabel(); + } + }); + if (input != null) { + treeViewer.getViewer().setInput(input); + } + if (initialSelections != null) { + treeViewer.setInitalChecked(initialSelections); + } + updateStatusLabel(); + + return parent; + } + + protected void updateStatusLabel() { + Result result = isComplete(); + if (result.isFalse()) { + statusLabel.setText(result.getText()); + } else { + statusLabel.setText(""); + } + statusLabel.getParent().layout(); + updateButtons(); + } + + @Override + protected Control createButtonBar(Composite parent) { + Control c = super.createButtonBar(parent); + okButton = getButton(0); + okButton.setEnabled(false); + return c; + } + + protected Result isComplete() { + return Result.TrueResult; + } + + private void updateButtons() { + if (okButton != null) { + okButton.setEnabled(isComplete().isTrue()); + } + } + + /** + * @return the treeViewer + */ + public OSEECheckedFilteredTree getTreeViewer() { + return treeViewer; + } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEEFilteredTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEEFilteredTreeDialog.java index 11a0217a301..62b8e34f3b9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEEFilteredTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEEFilteredTreeDialog.java @@ -21,181 +21,181 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.OSEEFilteredTree; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.dialogs.PatternFilter; public abstract class OSEEFilteredTreeDialog<T> extends MessageDialog { - protected Label statusLabel; - private Button okButton; - private OSEEFilteredTree treeViewer; - private final PatternFilter patternFilter; - private boolean checkTree = true; - private boolean multiSelect = true; - private T input; - private T initialSelections; - private final IContentProvider contentProvider; - private final IBaseLabelProvider labelProvider; - - public OSEEFilteredTreeDialog(String dialogTitle, String dialogMessage, IBaseLabelProvider labelProvider, IContentProvider contentProvider, PatternFilter patternFilter) { - super(Display.getCurrent().getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] { - "OK", "Cancel"}, 0); - this.contentProvider = contentProvider; - this.labelProvider = labelProvider; - this.patternFilter = patternFilter; - setShellStyle(getShellStyle() | SWT.RESIZE); - } - - protected void createPreCustomArea(Composite parent) { - } - - /** - * Sets the input. Convenience method. - * - * @param object the input. - */ - public final void setInput(T input) { - this.input = input; - if (getTreeViewer() != null) { - getTreeViewer().getViewer().setInput(input); - } - } - - public T getInput() { - return input; - } - - /** - * Sets the initial selection. Convenience method. - * - * @param object the initial selection. - */ - public void setInitialSelections(T initialSelections) { - this.initialSelections = initialSelections; - if (getTreeViewer() != null) { - updateInitialSelections(this.initialSelections); - } - } - - @SuppressWarnings("unchecked") - private void updateInitialSelections(T object) { - if (object != null) { - ISelection selection; - if (object instanceof List<?>) { - selection = new StructuredSelection((List) object); - } else { - selection = new StructuredSelection(object); - } - getTreeViewer().getViewer().setSelection(selection, true); - } - } - - @Override - protected Control createCustomArea(Composite parent) { - - statusLabel = new Label(parent, SWT.NONE); - statusLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); - updateStatusLabel(); - - createPreCustomArea(parent); - - Composite comp = new Composite(parent, SWT.NONE); - comp.setLayout(ALayout.getZeroMarginLayout()); - comp.setLayoutData(new GridData(GridData.FILL_BOTH)); - - treeViewer = - new OSEECheckedFilteredTree( - comp, - (multiSelect ? SWT.MULTI : SWT.SINGLE) | (isCheckTree() ? SWT.CHECK : SWT.NONE) | SWT.READ_ONLY | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, - patternFilter); - TreeViewer viewer = treeViewer.getViewer(); - viewer.setContentProvider(contentProvider); - viewer.setLabelProvider(labelProvider); - viewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - treeViewer.getViewer().addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - updateStatusLabel(); - } - }); - if (input != null) { - treeViewer.getViewer().setInput(input); - } - updateInitialSelections(this.initialSelections); - if (initialSelections != null) { - updateInitialSelections(initialSelections); - } - return parent; - } - - protected void updateStatusLabel() { - Result result = isComplete(); - if (result.isFalse()) { - statusLabel.setText(result.getText()); - } else { - statusLabel.setText(""); - } - statusLabel.getParent().layout(); - updateButtons(); - } - - @Override - protected Control createButtonBar(Composite parent) { - Control c = super.createButtonBar(parent); - okButton = getButton(0); - okButton.setEnabled(false); - return c; - } - - protected Result isComplete() { - return Result.TrueResult; - } - - private void updateButtons() { - if (okButton != null) { - okButton.setEnabled(isComplete().isTrue()); - } - } - - /** - * @return the treeViewer - */ - public OSEEFilteredTree getTreeViewer() { - return treeViewer; - } - - /** - * @return the isCheckTree - */ - public boolean isCheckTree() { - return checkTree; - } - - /** - * @param isCheckTree the isCheckTree to set - */ - public void setCheckTree(boolean checkTree) { - this.checkTree = checkTree; - } - - /** - * @return the isMultiSelect - */ - public boolean isMultiSelect() { - return multiSelect; - } - - /** - * @param isMultiSelect the isMultiSelect to set - */ - public void setMultiSelect(boolean multiSelect) { - this.multiSelect = multiSelect; - } + protected Label statusLabel; + private Button okButton; + private OSEEFilteredTree treeViewer; + private final PatternFilter patternFilter; + private boolean checkTree = true; + private boolean multiSelect = true; + private T input; + private T initialSelections; + private final IContentProvider contentProvider; + private final IBaseLabelProvider labelProvider; + + public OSEEFilteredTreeDialog(String dialogTitle, String dialogMessage, IBaseLabelProvider labelProvider, IContentProvider contentProvider, PatternFilter patternFilter) { + super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] { + "OK", "Cancel"}, 0); + this.contentProvider = contentProvider; + this.labelProvider = labelProvider; + this.patternFilter = patternFilter; + setShellStyle(getShellStyle() | SWT.RESIZE); + } + + protected void createPreCustomArea(Composite parent) { + } + + /** + * Sets the input. Convenience method. + * + * @param object the input. + */ + public final void setInput(T input) { + this.input = input; + if (getTreeViewer() != null) { + getTreeViewer().getViewer().setInput(input); + } + } + + public T getInput() { + return input; + } + + /** + * Sets the initial selection. Convenience method. + * + * @param object the initial selection. + */ + public void setInitialSelections(T initialSelections) { + this.initialSelections = initialSelections; + if (getTreeViewer() != null) { + updateInitialSelections(this.initialSelections); + } + } + + @SuppressWarnings("unchecked") + private void updateInitialSelections(T object) { + if (object != null) { + ISelection selection; + if (object instanceof List<?>) { + selection = new StructuredSelection((List) object); + } else { + selection = new StructuredSelection(object); + } + getTreeViewer().getViewer().setSelection(selection, true); + } + } + + @Override + protected Control createCustomArea(Composite parent) { + + statusLabel = new Label(parent, SWT.NONE); + statusLabel.setForeground(Displays.getSystemColor(SWT.COLOR_RED)); + updateStatusLabel(); + + createPreCustomArea(parent); + + Composite comp = new Composite(parent, SWT.NONE); + comp.setLayout(ALayout.getZeroMarginLayout()); + comp.setLayoutData(new GridData(GridData.FILL_BOTH)); + + treeViewer = + new OSEECheckedFilteredTree( + comp, + (multiSelect ? SWT.MULTI : SWT.SINGLE) | (isCheckTree() ? SWT.CHECK : SWT.NONE) | SWT.READ_ONLY | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, + patternFilter); + TreeViewer viewer = treeViewer.getViewer(); + viewer.setContentProvider(contentProvider); + viewer.setLabelProvider(labelProvider); + viewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + treeViewer.getViewer().addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + updateStatusLabel(); + } + }); + if (input != null) { + treeViewer.getViewer().setInput(input); + } + updateInitialSelections(this.initialSelections); + if (initialSelections != null) { + updateInitialSelections(initialSelections); + } + return parent; + } + + protected void updateStatusLabel() { + Result result = isComplete(); + if (result.isFalse()) { + statusLabel.setText(result.getText()); + } else { + statusLabel.setText(""); + } + statusLabel.getParent().layout(); + updateButtons(); + } + + @Override + protected Control createButtonBar(Composite parent) { + Control c = super.createButtonBar(parent); + okButton = getButton(0); + okButton.setEnabled(false); + return c; + } + + protected Result isComplete() { + return Result.TrueResult; + } + + private void updateButtons() { + if (okButton != null) { + okButton.setEnabled(isComplete().isTrue()); + } + } + + /** + * @return the treeViewer + */ + public OSEEFilteredTree getTreeViewer() { + return treeViewer; + } + + /** + * @return the isCheckTree + */ + public boolean isCheckTree() { + return checkTree; + } + + /** + * @param isCheckTree the isCheckTree to set + */ + public void setCheckTree(boolean checkTree) { + this.checkTree = checkTree; + } + + /** + * @return the isMultiSelect + */ + public boolean isMultiSelect() { + return multiSelect; + } + + /** + * @param isMultiSelect the isMultiSelect to set + */ + public void setMultiSelect(boolean multiSelect) { + this.multiSelect = multiSelect; + } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java index 6fb25748c41..9e6739c876f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.util.IOseeDictionary; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -53,7 +53,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, } private boolean updateArtifact(String type, String word, Artifact art) { - if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Add to " + type + " Dictionary", + if (MessageDialog.openConfirm(Displays.getActiveShell(), "Add to " + type + " Dictionary", "Add \"" + word + "\" to " + type + " Dictionary")) { try { Set<String> words = new HashSet<String>(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java index e334b55b56d..2797d8417d0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java @@ -19,12 +19,12 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.panels.BranchSelectSimpleComposite;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -33,155 +33,157 @@ import org.eclipse.swt.widgets.Listener; * @author Roberto E. Escobar
*/
public class XBranchSelectComboWidget extends XWidget implements Listener {
- public static final String WIDGET_ID = XBranchSelectWidget.class.getSimpleName();
-
- private BranchSelectSimpleComposite selectComposite;
- private Composite composite;
- private int defaultBranch;
-
- private final List<Listener> listeners = new ArrayList<Listener>();
-
- public XBranchSelectComboWidget(String label) {
- super(label);
- this.defaultBranch = -1;
- }
-
- @Override
- protected void createControls(Composite parent, int horizontalSpan) {
- composite = null;
-
- if (!verticalLabel && (horizontalSpan < 2)) {
- horizontalSpan = 2;
- } else if (verticalLabel) {
- horizontalSpan = 1;
- }
-
- if (isDisplayLabel() && verticalLabel) {
- composite = new Composite(parent, SWT.NONE);
- GridLayout gL = new GridLayout();
- gL.marginWidth = 0;
- gL.marginHeight = 0;
- composite.setLayout(gL);
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- } else {
- composite = parent;
- }
-
- // Create List Widgets
- if (isDisplayLabel()) {
- labelWidget = new Label(composite, SWT.NONE);
- labelWidget.setText(getLabel() + ":");
- }
- selectComposite = BranchSelectSimpleComposite.createBranchSelectComposite(composite, SWT.NONE);
- if (defaultBranch != -1) {
- selectComposite.restoreWidgetValues(null, Integer.toString(defaultBranch));
- }
- selectComposite.addListener(this);
- }
-
- @Override
- public void dispose() {
- if (selectComposite != null) {
- selectComposite.removeListener(this);
- selectComposite.dispose();
- }
- }
-
- @Override
- public Control getControl() {
- return composite;
- }
-
- @Override
- public Branch getData() {
- return selectComposite.getSelectedBranch();
- }
-
- @Override
- public String getReportData() {
- Branch branch = selectComposite.getSelectedBranch();
- return branch != null ? branch.getName() : "";
- }
-
- @Override
- public String getXmlData() {
- System.out.println("Get XML Data Called: ");
- return "";
- }
-
- @Override
- public IStatus isValid() {
- if (selectComposite.getSelectedBranch() == null) {
- return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must select a Branch");
- }
- return Status.OK_STATUS;
- }
-
- @Override
- public void refresh() {
- }
-
- @Override
- public void setFocus() {
- selectComposite.setFocus();
- }
-
- @Override
- public void setXmlData(String str) {
- System.out.println("Set XML Data Called: " + str);
- }
-
- @Override
- public String toHTML(String labelFont) {
- System.out.println("Set to Html Called: " + labelFont);
- return "";
- }
-
- @Override
- public void setDisplayLabel(final String displayLabel) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- XBranchSelectComboWidget.super.setDisplayLabel(displayLabel);
- getLabelWidget().setText(displayLabel);
- }
- });
- }
-
- @Override
- public void setToolTip(final String toolTip) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- if (Strings.isValid(toolTip) != false) {
- XBranchSelectComboWidget.super.setToolTip(toolTip);
- if (selectComposite != null && selectComposite.isDisposed() != true) {
- selectComposite.setToolTipText(toolTip);
- for (Control control : selectComposite.getChildren()) {
- control.setToolTipText(toolTip);
- }
- }
- }
- }
- });
- }
-
- @Override
- public void handleEvent(Event event) {
- super.validate();
- notifyListeners(event);
- }
-
- public void addListener(Listener listener) {
- listeners.add(listener);
- }
-
- public void removeListener(Listener listener) {
- listeners.remove(listener);
- }
-
- private void notifyListeners(Event event) {
- for (Listener listener : listeners) {
- listener.handleEvent(event);
- }
- }
+ public static final String WIDGET_ID = XBranchSelectWidget.class.getSimpleName();
+
+ private BranchSelectSimpleComposite selectComposite;
+ private Composite composite;
+ private final int defaultBranch;
+
+ private final List<Listener> listeners = new ArrayList<Listener>();
+
+ public XBranchSelectComboWidget(String label) {
+ super(label);
+ this.defaultBranch = -1;
+ }
+
+ @Override
+ protected void createControls(Composite parent, int horizontalSpan) {
+ composite = null;
+
+ if (!verticalLabel && (horizontalSpan < 2)) {
+ horizontalSpan = 2;
+ } else if (verticalLabel) {
+ horizontalSpan = 1;
+ }
+
+ if (isDisplayLabel() && verticalLabel) {
+ composite = new Composite(parent, SWT.NONE);
+ GridLayout gL = new GridLayout();
+ gL.marginWidth = 0;
+ gL.marginHeight = 0;
+ composite.setLayout(gL);
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ } else {
+ composite = parent;
+ }
+
+ // Create List Widgets
+ if (isDisplayLabel()) {
+ labelWidget = new Label(composite, SWT.NONE);
+ labelWidget.setText(getLabel() + ":");
+ }
+ selectComposite = BranchSelectSimpleComposite.createBranchSelectComposite(composite, SWT.NONE);
+ if (defaultBranch != -1) {
+ selectComposite.restoreWidgetValues(null, Integer.toString(defaultBranch));
+ }
+ selectComposite.addListener(this);
+ }
+
+ @Override
+ public void dispose() {
+ if (selectComposite != null) {
+ selectComposite.removeListener(this);
+ selectComposite.dispose();
+ }
+ }
+
+ @Override
+ public Control getControl() {
+ return composite;
+ }
+
+ @Override
+ public Branch getData() {
+ return selectComposite.getSelectedBranch();
+ }
+
+ @Override
+ public String getReportData() {
+ Branch branch = selectComposite.getSelectedBranch();
+ return branch != null ? branch.getName() : "";
+ }
+
+ @Override
+ public String getXmlData() {
+ System.out.println("Get XML Data Called: ");
+ return "";
+ }
+
+ @Override
+ public IStatus isValid() {
+ if (selectComposite.getSelectedBranch() == null) {
+ return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must select a Branch");
+ }
+ return Status.OK_STATUS;
+ }
+
+ @Override
+ public void refresh() {
+ }
+
+ @Override
+ public void setFocus() {
+ selectComposite.setFocus();
+ }
+
+ @Override
+ public void setXmlData(String str) {
+ System.out.println("Set XML Data Called: " + str);
+ }
+
+ @Override
+ public String toHTML(String labelFont) {
+ System.out.println("Set to Html Called: " + labelFont);
+ return "";
+ }
+
+ @Override
+ public void setDisplayLabel(final String displayLabel) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ XBranchSelectComboWidget.super.setDisplayLabel(displayLabel);
+ getLabelWidget().setText(displayLabel);
+ }
+ });
+ }
+
+ @Override
+ public void setToolTip(final String toolTip) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ if (Strings.isValid(toolTip) != false) {
+ XBranchSelectComboWidget.super.setToolTip(toolTip);
+ if (selectComposite != null && selectComposite.isDisposed() != true) {
+ selectComposite.setToolTipText(toolTip);
+ for (Control control : selectComposite.getChildren()) {
+ control.setToolTipText(toolTip);
+ }
+ }
+ }
+ }
+ });
+ }
+
+ @Override
+ public void handleEvent(Event event) {
+ super.validate();
+ notifyListeners(event);
+ }
+
+ public void addListener(Listener listener) {
+ listeners.add(listener);
+ }
+
+ public void removeListener(Listener listener) {
+ listeners.remove(listener);
+ }
+
+ private void notifyListeners(Event event) {
+ for (Listener listener : listeners) {
+ listener.handleEvent(event);
+ }
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java index e843a00df03..82b38f0f86f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java @@ -19,12 +19,12 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectComposite;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -34,169 +34,171 @@ import org.eclipse.swt.widgets.Listener; * @author Donald G. Dunne
*/
public class XBranchSelectWidget extends XWidget implements Listener {
- public static final String WIDGET_ID = XBranchSelectWidget.class.getSimpleName();
-
- private BranchSelectComposite selectComposite;
- private Composite composite;
- private Branch defaultBranch;
-
- private final List<Listener> listeners = new ArrayList<Listener>();
-
- public XBranchSelectWidget(String label) {
- super(label);
- }
-
- @Override
- protected void createControls(Composite parent, int horizontalSpan) {
- composite = null;
-
- if (!verticalLabel && (horizontalSpan < 2)) {
- horizontalSpan = 2;
- } else if (verticalLabel) {
- horizontalSpan = 1;
- }
-
- if (isDisplayLabel() && verticalLabel) {
- composite = new Composite(parent, SWT.NONE);
- GridLayout gL = new GridLayout();
- gL.marginWidth = 0;
- gL.marginHeight = 0;
- composite.setLayout(gL);
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- } else {
- composite = parent;
- }
-
- // Create List Widgets
- if (isDisplayLabel()) {
- labelWidget = new Label(composite, SWT.NONE);
- labelWidget.setText(getLabel() + ":");
- }
- selectComposite = BranchSelectComposite.createBranchSelectComposite(composite, SWT.NONE);
- if (defaultBranch != null) {
- selectComposite.setDefaultSelectedBranch(defaultBranch);
- }
- selectComposite.addListener(this);
- }
-
- @Override
- public void dispose() {
- if (selectComposite != null) {
- selectComposite.removeListener(this);
- selectComposite.dispose();
- }
- }
-
- @Override
- public Control getControl() {
- return selectComposite.getBranchSelectText();
- }
-
- @Override
- public Branch getData() {
- return getSelection();
- }
-
- public Branch getSelection() {
- return selectComposite.getSelectedBranch();
- }
-
- @Override
- public String getReportData() {
- Branch branch = selectComposite.getSelectedBranch();
- return branch != null ? branch.getName() : "";
- }
-
- @Override
- public String getXmlData() {
- System.out.println("Get XML Data Called: ");
- return "";
- }
-
- @Override
- public IStatus isValid() {
- if (selectComposite.getSelectedBranch() == null) {
- return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must select a Branch");
- }
- return Status.OK_STATUS;
- }
-
- @Override
- public void refresh() {
- }
-
- @Override
- public void setFocus() {
- selectComposite.setFocus();
- }
-
- @Override
- public void setXmlData(String str) {
- System.out.println("Set XML Data Called: " + str);
- }
-
- @Override
- public String toHTML(String labelFont) {
- System.out.println("Set to Html Called: " + labelFont);
- return "";
- }
-
- @Override
- public void setDisplayLabel(final String displayLabel) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- XBranchSelectWidget.super.setDisplayLabel(displayLabel);
- getLabelWidget().setText(displayLabel);
- }
- });
- }
-
- @Override
- public void setToolTip(final String toolTip) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- if (Strings.isValid(toolTip) != false) {
- XBranchSelectWidget.super.setToolTip(toolTip);
- if (selectComposite != null && selectComposite.isDisposed() != true) {
- selectComposite.setToolTipText(toolTip);
- for (Control control : selectComposite.getChildren()) {
- control.setToolTipText(toolTip);
- }
- }
- }
- }
- });
- }
-
- @Override
- public void handleEvent(Event event) {
- super.validate();
- notifyListeners(event);
- }
-
- public void addListener(Listener listener) {
- listeners.add(listener);
- }
-
- public void removeListener(Listener listener) {
- listeners.remove(listener);
- }
-
- private void notifyListeners(Event event) {
- for (Listener listener : listeners) {
- listener.handleEvent(event);
- }
- }
-
- public void setSelection(Branch branch) {
- defaultBranch = branch;
- if (selectComposite != null) {
- selectComposite.setSelected(branch);
- }
- }
-
- public BranchSelectComposite getSelectComposite() {
- return selectComposite;
- }
+ public static final String WIDGET_ID = XBranchSelectWidget.class.getSimpleName();
+
+ private BranchSelectComposite selectComposite;
+ private Composite composite;
+ private Branch defaultBranch;
+
+ private final List<Listener> listeners = new ArrayList<Listener>();
+
+ public XBranchSelectWidget(String label) {
+ super(label);
+ }
+
+ @Override
+ protected void createControls(Composite parent, int horizontalSpan) {
+ composite = null;
+
+ if (!verticalLabel && (horizontalSpan < 2)) {
+ horizontalSpan = 2;
+ } else if (verticalLabel) {
+ horizontalSpan = 1;
+ }
+
+ if (isDisplayLabel() && verticalLabel) {
+ composite = new Composite(parent, SWT.NONE);
+ GridLayout gL = new GridLayout();
+ gL.marginWidth = 0;
+ gL.marginHeight = 0;
+ composite.setLayout(gL);
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ } else {
+ composite = parent;
+ }
+
+ // Create List Widgets
+ if (isDisplayLabel()) {
+ labelWidget = new Label(composite, SWT.NONE);
+ labelWidget.setText(getLabel() + ":");
+ }
+ selectComposite = BranchSelectComposite.createBranchSelectComposite(composite, SWT.NONE);
+ if (defaultBranch != null) {
+ selectComposite.setDefaultSelectedBranch(defaultBranch);
+ }
+ selectComposite.addListener(this);
+ }
+
+ @Override
+ public void dispose() {
+ if (selectComposite != null) {
+ selectComposite.removeListener(this);
+ selectComposite.dispose();
+ }
+ }
+
+ @Override
+ public Control getControl() {
+ return selectComposite.getBranchSelectText();
+ }
+
+ @Override
+ public Branch getData() {
+ return getSelection();
+ }
+
+ public Branch getSelection() {
+ return selectComposite.getSelectedBranch();
+ }
+
+ @Override
+ public String getReportData() {
+ Branch branch = selectComposite.getSelectedBranch();
+ return branch != null ? branch.getName() : "";
+ }
+
+ @Override
+ public String getXmlData() {
+ System.out.println("Get XML Data Called: ");
+ return "";
+ }
+
+ @Override
+ public IStatus isValid() {
+ if (selectComposite.getSelectedBranch() == null) {
+ return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must select a Branch");
+ }
+ return Status.OK_STATUS;
+ }
+
+ @Override
+ public void refresh() {
+ }
+
+ @Override
+ public void setFocus() {
+ selectComposite.setFocus();
+ }
+
+ @Override
+ public void setXmlData(String str) {
+ System.out.println("Set XML Data Called: " + str);
+ }
+
+ @Override
+ public String toHTML(String labelFont) {
+ System.out.println("Set to Html Called: " + labelFont);
+ return "";
+ }
+
+ @Override
+ public void setDisplayLabel(final String displayLabel) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ XBranchSelectWidget.super.setDisplayLabel(displayLabel);
+ getLabelWidget().setText(displayLabel);
+ }
+ });
+ }
+
+ @Override
+ public void setToolTip(final String toolTip) {
+ Displays.ensureInDisplayThread(new Runnable() {
+ @Override
+ public void run() {
+ if (Strings.isValid(toolTip) != false) {
+ XBranchSelectWidget.super.setToolTip(toolTip);
+ if (selectComposite != null && selectComposite.isDisposed() != true) {
+ selectComposite.setToolTipText(toolTip);
+ for (Control control : selectComposite.getChildren()) {
+ control.setToolTipText(toolTip);
+ }
+ }
+ }
+ }
+ });
+ }
+
+ @Override
+ public void handleEvent(Event event) {
+ super.validate();
+ notifyListeners(event);
+ }
+
+ public void addListener(Listener listener) {
+ listeners.add(listener);
+ }
+
+ public void removeListener(Listener listener) {
+ listeners.remove(listener);
+ }
+
+ private void notifyListeners(Event event) {
+ for (Listener listener : listeners) {
+ listener.handleEvent(event);
+ }
+ }
+
+ public void setSelection(Branch branch) {
+ defaultBranch = branch;
+ if (selectComposite != null) {
+ selectComposite.setSelected(branch);
+ }
+ }
+
+ public BranchSelectComposite getSelectComposite() {
+ return selectComposite;
+ }
}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFileTextWithSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFileTextWithSelectionDialog.java index 4284a5037a9..182d5d50bcf 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFileTextWithSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFileTextWithSelectionDialog.java @@ -13,13 +13,13 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import java.io.File;
import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.FileDialog;
/**
@@ -71,7 +71,7 @@ public class XFileTextWithSelectionDialog extends XText { public void widgetSelected(SelectionEvent e) {
if (type == Type.File) {
- FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.OPEN);
+ FileDialog dialog = new FileDialog(Displays.getActiveShell(), SWT.OPEN);
dialog.setFilterExtensions(new String[] {"*.*"});
File dir = new File(defaultFileSelection != null ? defaultFileSelection : "");
if (dir.isFile() || dir.isDirectory())
@@ -84,7 +84,7 @@ public class XFileTextWithSelectionDialog extends XText { setText(dialog.getFilterPath() + File.separatorChar + dialog.getFileName());
}
} else if (type == Type.Directory) {
- DirectoryDialog dialog = new DirectoryDialog(Display.getCurrent().getActiveShell(), SWT.OPEN);
+ DirectoryDialog dialog = new DirectoryDialog(Displays.getActiveShell(), SWT.OPEN);
File dir = new File(defaultFileSelection != null ? defaultFileSelection : "");
if (dir.isFile() || dir.isDirectory())
dialog.setFilterPath(defaultFileSelection);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java index 53a2438db5a..bd81fdea67a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.GroupListDialog; -import org.eclipse.swt.widgets.Display; +import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne @@ -59,7 +59,7 @@ public class XHyperlabelGroupSelection extends XHyperlinkLabelCmdValueSelection @Override public boolean handleSelection() { try { - GroupListDialog dialog = new GroupListDialog(Display.getCurrent().getActiveShell()); + GroupListDialog dialog = new GroupListDialog(Displays.getActiveShell()); int result = dialog.open(); if (result == 0) { selectedGroups.clear(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelCmdValueSelection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelCmdValueSelection.java index 7572e3c2dd4..7e1af78194c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelCmdValueSelection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelCmdValueSelection.java @@ -15,11 +15,11 @@ import org.eclipse.core.runtime.Status; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; @@ -31,192 +31,192 @@ import org.eclipse.ui.forms.widgets.Hyperlink; */ public abstract class XHyperlinkLabelCmdValueSelection extends XWidget { - Label valueLabel; - Hyperlink selectHyperLinkLabel, clearHyperLinkLabel; - private final boolean supportClear; - private Integer truncateValueLength = null; - - public XHyperlinkLabelCmdValueSelection(String label) { - this(label, false); - } - - public XHyperlinkLabelCmdValueSelection(String label, boolean supportClear, Integer truncateValueLength) { - super(label); - this.supportClear = supportClear; - this.truncateValueLength = truncateValueLength; - } - - public XHyperlinkLabelCmdValueSelection(String label, boolean supportClear) { - this(label, supportClear, null); - } - - public String getCurrentValue() { - return ""; - } - - public void setErrorState(boolean error) { - valueLabel.setForeground(error ? Display.getCurrent().getSystemColor(SWT.COLOR_RED) : null); - } - - public String getHyperlinkLabelString() { - return " <select>"; - } - - public String getClearHyperlinkLabelString() { - return "<clear> "; - } - - public boolean handleSelection() { - return false; - } - - public boolean handleClear() { - return false; - } - - public boolean isSupportClear() { - return supportClear; - } - - @Override - protected void createControls(Composite parent, int horizontalSpan) { - - Composite comp = new Composite(parent, SWT.NONE); - comp.setLayout(ALayout.getZeroMarginLayout(5, false)); - comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - // Create Text Widgets - if (isDisplayLabel() && !getLabel().equals("")) { - labelWidget = new Label(comp, SWT.NONE); - labelWidget.setText(getLabel() + ":"); - if (getToolTip() != null) { - labelWidget.setToolTipText(getToolTip()); - } - } - if (toolkit == null) { - selectHyperLinkLabel = new Hyperlink(comp, SWT.NONE); - } else { - selectHyperLinkLabel = toolkit.createHyperlink(comp, "<select>", SWT.NONE); - } - selectHyperLinkLabel.setToolTipText(Strings.isValid(getToolTip()) ? getToolTip() : "Select to Modify"); - selectHyperLinkLabel.addListener(SWT.MouseUp, new Listener() { - public void handleEvent(Event event) { - if (handleSelection()) { - refresh(); - notifyXModifiedListeners(); - } - } - }); - if (supportClear) { - if (toolkit == null) { - clearHyperLinkLabel = new Hyperlink(comp, SWT.NONE); - } else { - clearHyperLinkLabel = toolkit.createHyperlink(comp, "<clear>", SWT.NONE); - } - clearHyperLinkLabel.setToolTipText("Select to Clear"); - clearHyperLinkLabel.addListener(SWT.MouseUp, new Listener() { - public void handleEvent(Event event) { - clear(); - } - }); - } - valueLabel = new Label(comp, SWT.NONE); - valueLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - valueLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK)); - - refresh(); - } - - public void clear() { - if (handleClear()) { - refresh(); - notifyXModifiedListeners(); - } - } - - @Override - public void refresh() { - if (getControl() == null || getControl().isDisposed()) { - return; - } - boolean updated = false; - if (!getHyperlinkLabelString().equals(selectHyperLinkLabel.getText())) { - selectHyperLinkLabel.setText(getHyperlinkLabelString()); - updated = true; - } - if (supportClear && !getClearHyperlinkLabelString().equals(clearHyperLinkLabel.getText())) { - clearHyperLinkLabel.setText(getClearHyperlinkLabelString()); - updated = true; - } - if (!getCurrentValue().equals(valueLabel.getText())) { - valueLabel.setText(truncateValueLength == null ? getCurrentValue() : Strings.truncate(getCurrentValue(), - truncateValueLength, true)); - valueLabel.setToolTipText(getCurrentValue()); - updated = true; - } - if (updated) { - valueLabel.getParent().layout(); - } - validate(); - } - - @Override - public Control getControl() { - return valueLabel; - } - - @Override - public void adaptControls(FormToolkit toolkit) { - super.adaptControls(toolkit); - toolkit.adapt(selectHyperLinkLabel, true, true); - if (supportClear) { - toolkit.adapt(clearHyperLinkLabel, true, true); - } - } - - @Override - public String toHTML(String labelFont) { - return AHTML.getLabelValueStr(AHTML.LABEL_FONT, getHyperlinkLabelString(), getCurrentValue()); - } - - @Override - public void dispose() { - } - - @Override - public Object getData() { - return null; - } - - @Override - public String getReportData() { - return null; - } - - @Override - public String getXmlData() { - return null; - } - - @Override - public IStatus isValid() { - return Status.OK_STATUS; - } - - @Override - public void setFocus() { - } - - @Override - public void setXmlData(String str) { - } - - public Integer getTruncateValueLength() { - return truncateValueLength; - } - - public void setTruncateValueLength(Integer truncateValueLength) { - this.truncateValueLength = truncateValueLength; - } + Label valueLabel; + Hyperlink selectHyperLinkLabel, clearHyperLinkLabel; + private final boolean supportClear; + private Integer truncateValueLength = null; + + public XHyperlinkLabelCmdValueSelection(String label) { + this(label, false); + } + + public XHyperlinkLabelCmdValueSelection(String label, boolean supportClear, Integer truncateValueLength) { + super(label); + this.supportClear = supportClear; + this.truncateValueLength = truncateValueLength; + } + + public XHyperlinkLabelCmdValueSelection(String label, boolean supportClear) { + this(label, supportClear, null); + } + + public String getCurrentValue() { + return ""; + } + + public void setErrorState(boolean error) { + valueLabel.setForeground(error ? Displays.getSystemColor(SWT.COLOR_RED) : null); + } + + public String getHyperlinkLabelString() { + return " <select>"; + } + + public String getClearHyperlinkLabelString() { + return "<clear> "; + } + + public boolean handleSelection() { + return false; + } + + public boolean handleClear() { + return false; + } + + public boolean isSupportClear() { + return supportClear; + } + + @Override + protected void createControls(Composite parent, int horizontalSpan) { + + Composite comp = new Composite(parent, SWT.NONE); + comp.setLayout(ALayout.getZeroMarginLayout(5, false)); + comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + // Create Text Widgets + if (isDisplayLabel() && !getLabel().equals("")) { + labelWidget = new Label(comp, SWT.NONE); + labelWidget.setText(getLabel() + ":"); + if (getToolTip() != null) { + labelWidget.setToolTipText(getToolTip()); + } + } + if (toolkit == null) { + selectHyperLinkLabel = new Hyperlink(comp, SWT.NONE); + } else { + selectHyperLinkLabel = toolkit.createHyperlink(comp, "<select>", SWT.NONE); + } + selectHyperLinkLabel.setToolTipText(Strings.isValid(getToolTip()) ? getToolTip() : "Select to Modify"); + selectHyperLinkLabel.addListener(SWT.MouseUp, new Listener() { + public void handleEvent(Event event) { + if (handleSelection()) { + refresh(); + notifyXModifiedListeners(); + } + } + }); + if (supportClear) { + if (toolkit == null) { + clearHyperLinkLabel = new Hyperlink(comp, SWT.NONE); + } else { + clearHyperLinkLabel = toolkit.createHyperlink(comp, "<clear>", SWT.NONE); + } + clearHyperLinkLabel.setToolTipText("Select to Clear"); + clearHyperLinkLabel.addListener(SWT.MouseUp, new Listener() { + public void handleEvent(Event event) { + clear(); + } + }); + } + valueLabel = new Label(comp, SWT.NONE); + valueLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + valueLabel.setForeground(Displays.getSystemColor(SWT.COLOR_BLACK)); + + refresh(); + } + + public void clear() { + if (handleClear()) { + refresh(); + notifyXModifiedListeners(); + } + } + + @Override + public void refresh() { + if (getControl() == null || getControl().isDisposed()) { + return; + } + boolean updated = false; + if (!getHyperlinkLabelString().equals(selectHyperLinkLabel.getText())) { + selectHyperLinkLabel.setText(getHyperlinkLabelString()); + updated = true; + } + if (supportClear && !getClearHyperlinkLabelString().equals(clearHyperLinkLabel.getText())) { + clearHyperLinkLabel.setText(getClearHyperlinkLabelString()); + updated = true; + } + if (!getCurrentValue().equals(valueLabel.getText())) { + valueLabel.setText(truncateValueLength == null ? getCurrentValue() : Strings.truncate(getCurrentValue(), + truncateValueLength, true)); + valueLabel.setToolTipText(getCurrentValue()); + updated = true; + } + if (updated) { + valueLabel.getParent().layout(); + } + validate(); + } + + @Override + public Control getControl() { + return valueLabel; + } + + @Override + public void adaptControls(FormToolkit toolkit) { + super.adaptControls(toolkit); + toolkit.adapt(selectHyperLinkLabel, true, true); + if (supportClear) { + toolkit.adapt(clearHyperLinkLabel, true, true); + } + } + + @Override + public String toHTML(String labelFont) { + return AHTML.getLabelValueStr(AHTML.LABEL_FONT, getHyperlinkLabelString(), getCurrentValue()); + } + + @Override + public void dispose() { + } + + @Override + public Object getData() { + return null; + } + + @Override + public String getReportData() { + return null; + } + + @Override + public String getXmlData() { + return null; + } + + @Override + public IStatus isValid() { + return Status.OK_STATUS; + } + + @Override + public void setFocus() { + } + + @Override + public void setXmlData(String str) { + } + + public Integer getTruncateValueLength() { + return truncateValueLength; + } + + public void setTruncateValueLength(Integer truncateValueLength) { + this.truncateValueLength = truncateValueLength; + } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java index a0a383ea893..eb6201054ec 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java @@ -170,7 +170,7 @@ public class XRadioButtons extends XWidget { GridData gd = new GridData(); gd.horizontalSpan = horizontalSpan; comp.setLayoutData(gd); - // comp.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GREEN)); + // comp.setBackground(Displays.getSystemColor(SWT.COLOR_GREEN)); // Create Text Widgets if (isDisplayLabel()) { @@ -195,7 +195,7 @@ public class XRadioButtons extends XWidget { // System.out.println("verticalColumns *" + verticalColumns + "*"); c = new Composite(comp, SWT.NONE); c.setLayout(ALayout.getZeroMarginLayout(verticalColumns, false)); - // c.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + // c.setBackground(Displays.getSystemColor(SWT.COLOR_RED)); } Composite inComp = null; @@ -205,7 +205,7 @@ public class XRadioButtons extends XWidget { inComp = new Composite(c, SWT.NONE); inComp.setLayout(new GridLayout(2, false)); inComp.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); - // inComp.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_CYAN+i)); + // inComp.setBackground(Displays.getSystemColor(SWT.COLOR_CYAN+i)); } XRadioButton button = nameToButton.get(names[i]); if (multiSelect) button.setButtonType(ButtonType.Check); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java index b8f4e3f3ef3..5d52ee69181 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java @@ -33,7 +33,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
/**
@@ -167,7 +166,7 @@ public abstract class XSelectFromDialog<T> extends XText { protected boolean openSelectionDialog() {
boolean selectedChanged = false;
if (getSelectableItems().isEmpty()) {
- MessageDialog.openInformation(Display.getCurrent().getActiveShell(), getLabel(),
+ MessageDialog.openInformation(Displays.getActiveShell(), getLabel(),
"Could not find items available to select from.");
} else {
try {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java index be66506a5b0..54ac2ea9c38 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java @@ -36,7 +36,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.ui.ISharedImages;
@@ -173,7 +172,7 @@ public abstract class XStackedWidget<T> extends XLabel { layout.marginWidth = 2;
composite.setLayout(layout);
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
+ composite.setBackground(Displays.getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
currentPageLabel = new StyledText(composite, SWT.READ_ONLY | SWT.SINGLE | SWT.WRAP);
currentPageLabel.setAlignment(SWT.RIGHT);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextSpellCheckPaintListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextSpellCheckPaintListener.java index 761cf5bab8e..5522430eeed 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextSpellCheckPaintListener.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextSpellCheckPaintListener.java @@ -14,6 +14,7 @@ import java.util.HashSet; import java.util.Set;
import java.util.StringTokenizer;
import org.eclipse.osee.framework.ui.skynet.util.OseeDictionary;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.styledText.ASpellWord;
import org.eclipse.osee.framework.ui.swt.styledText.IDictionary;
import org.eclipse.swt.SWT;
@@ -30,7 +31,6 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
@@ -42,192 +42,205 @@ import org.eclipse.swt.widgets.MenuItem; */
public class XTextSpellCheckPaintListener implements PaintListener {
- private final IDictionary dict;
- private final XText xText;
- private Set<ASpellWord> errors = new HashSet<ASpellWord>();
- private XTextSpellModifyDictionary modDict;
-
- public XTextSpellCheckPaintListener(final XText xText, IDictionary dict) {
- this.xText = xText;
- this.dict = dict;
- if (modDict != null) {
- addXTextSpellModifyDictionary(modDict);
- }
- }
-
- public void addXTextSpellModifyDictionary(XTextSpellModifyDictionary modDict) {
- if (xText == null || xText.getStyledText() == null || xText.getStyledText().isDisposed()) return;
- this.modDict = modDict;
- xText.getStyledText().addMouseListener(mouseListener);
- xText.getStyledText().addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- if (xText == null || xText.getStyledText() == null || xText.getStyledText().isDisposed()) return;
- xText.getStyledText().removeMouseListener(mouseListener);
- }
- });
- }
-
- public void paintControl(PaintEvent e) {
- if (xText == null || xText.getStyledText() == null || xText.getStyledText().isDisposed()) return;
- GC gc = e.gc;
- gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE));
- if (xText != null) {
- String text = xText.getStyledText().getText();
-
- // Get spelling errors
- getErrors(text);
- for (ASpellWord sw : errors)
- drawError(sw.start, sw.word.length(), xText.getStyledText(), gc);
- }
- }
-
- private MouseListener mouseListener = new MouseListener() {
- public void mouseUp(org.eclipse.swt.events.MouseEvent e) {
- StyledText styledText = (StyledText) e.widget;
- int offset = 0;
- try {
- offset = styledText.getOffsetAtLocation(new Point(e.x, e.y));
- } catch (IllegalArgumentException ex) {
- // Illegal arguement exception happens when selected point is outside
- // the range of the rectangle. Since it does it's own calculation, just
- // throw this exception away.
- return;
- }
- for (ASpellWord sw : errors) {
- if (sw.start < offset && (sw.start + sw.word.length()) > offset) {
- // System.out.println("Found error word " + sw.word);
- handleErrorSelected(sw);
- break;
- }
- }
- };
-
- public void mouseDoubleClick(MouseEvent e) {
- }
-
- public void mouseDown(MouseEvent e) {
- }
- };
-
- private void handleErrorSelected(final ASpellWord sw) {
- Menu menu = xText.getStyledText().getMenu();
-
- new MenuItem(menu, SWT.SEPARATOR);
-
- MenuItem addLocal = new MenuItem(menu, SWT.NONE);
- addLocal.setText("Add \"" + sw.word + "\" to Personal dictionary.");
- addLocal.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- if (modDict.addToLocalDictionary(sw.word)) {
- xText.getStyledText().redraw();
- }
- }
- });
-
- MenuItem addGlobal = new MenuItem(menu, SWT.NONE);
- addGlobal.setText("Add \"" + sw.word + "\" to Global dictionary.");
- addGlobal.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- if (modDict.addToGlobalDictionary(sw.word)) {
- xText.getStyledText().redraw();
- }
- }
- });
- menu.addMenuListener(new MenuListener() {
- public void menuHidden(MenuEvent e) {
- xText.getStyledText().setMenu(xText.getDefaultMenu());
- }
-
- public void menuShown(MenuEvent e) {
- };
- });
- }
-
- /**
- * Draws a single spelling error squiggly line
- *
- * @param offset - offset of bad word
- * @param len - length of bad word
+ private final IDictionary dict;
+ private final XText xText;
+ private final Set<ASpellWord> errors = new HashSet<ASpellWord>();
+ private XTextSpellModifyDictionary modDict;
+
+ public XTextSpellCheckPaintListener(final XText xText, IDictionary dict) {
+ this.xText = xText;
+ this.dict = dict;
+ if (modDict != null) {
+ addXTextSpellModifyDictionary(modDict);
+ }
+ }
+
+ public void addXTextSpellModifyDictionary(XTextSpellModifyDictionary modDict) {
+ if (xText == null || xText.getStyledText() == null || xText.getStyledText().isDisposed()) {
+ return;
+ }
+ this.modDict = modDict;
+ xText.getStyledText().addMouseListener(mouseListener);
+ xText.getStyledText().addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ if (xText == null || xText.getStyledText() == null || xText.getStyledText().isDisposed()) {
+ return;
+ }
+ xText.getStyledText().removeMouseListener(mouseListener);
+ }
+ });
+ }
+
+ public void paintControl(PaintEvent e) {
+ if (xText == null || xText.getStyledText() == null || xText.getStyledText().isDisposed()) {
+ return;
+ }
+ GC gc = e.gc;
+ gc.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE));
+ if (xText != null) {
+ String text = xText.getStyledText().getText();
+
+ // Get spelling errors
+ getErrors(text);
+ for (ASpellWord sw : errors) {
+ drawError(sw.start, sw.word.length(), xText.getStyledText(), gc);
+ }
+ }
+ }
+
+ private final MouseListener mouseListener = new MouseListener() {
+ public void mouseUp(org.eclipse.swt.events.MouseEvent e) {
+ StyledText styledText = (StyledText) e.widget;
+ int offset = 0;
+ try {
+ offset = styledText.getOffsetAtLocation(new Point(e.x, e.y));
+ } catch (IllegalArgumentException ex) {
+ // Illegal arguement exception happens when selected point is outside
+ // the range of the rectangle. Since it does it's own calculation, just
+ // throw this exception away.
+ return;
+ }
+ for (ASpellWord sw : errors) {
+ if (sw.start < offset && (sw.start + sw.word.length()) > offset) {
+ // System.out.println("Found error word " + sw.word);
+ handleErrorSelected(sw);
+ break;
+ }
+ }
+ };
+
+ public void mouseDoubleClick(MouseEvent e) {
+ }
+
+ public void mouseDown(MouseEvent e) {
+ }
+ };
+
+ private void handleErrorSelected(final ASpellWord sw) {
+ Menu menu = xText.getStyledText().getMenu();
+
+ new MenuItem(menu, SWT.SEPARATOR);
+
+ MenuItem addLocal = new MenuItem(menu, SWT.NONE);
+ addLocal.setText("Add \"" + sw.word + "\" to Personal dictionary.");
+ addLocal.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ if (modDict.addToLocalDictionary(sw.word)) {
+ xText.getStyledText().redraw();
+ }
+ }
+ });
+
+ MenuItem addGlobal = new MenuItem(menu, SWT.NONE);
+ addGlobal.setText("Add \"" + sw.word + "\" to Global dictionary.");
+ addGlobal.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ if (modDict.addToGlobalDictionary(sw.word)) {
+ xText.getStyledText().redraw();
+ }
+ }
+ });
+ menu.addMenuListener(new MenuListener() {
+ public void menuHidden(MenuEvent e) {
+ xText.getStyledText().setMenu(xText.getDefaultMenu());
+ }
+
+ public void menuShown(MenuEvent e) {
+ };
+ });
+ }
+
+ /**
+ * Draws a single spelling error squiggly line
+ *
+ * @param offset - offset of bad word
+ * @param len - length of bad word
+ */
+ private void drawError(int offset, int len, StyledText sText, GC gc) {
+ if (sText.isDisposed()) {
+ return;
+ }
+ // Convert to coordinates
+ try {
+ Point off1 = sText.getLocationAtOffset(offset);
+ off1.y--;
+ Point off2 = sText.getLocationAtOffset(offset + len);
+ off2.y--;
+ int h = sText.getLineHeight();
+ int[] polyline = computePolyline(off1, off2, h);
+ gc.drawPolyline(polyline);
+ } catch (RuntimeException e) {
+ }
+ }
+
+ /**
*/
- private void drawError(int offset, int len, StyledText sText, GC gc) {
- if (sText.isDisposed()) return;
- // Convert to coordinates
- try {
- Point off1 = sText.getLocationAtOffset(offset);
- off1.y--;
- Point off2 = sText.getLocationAtOffset(offset + len);
- off2.y--;
- int h = sText.getLineHeight();
- int[] polyline = computePolyline(off1, off2, h);
- gc.drawPolyline(polyline);
- } catch (RuntimeException e) {
- }
- }
-
- /**
- */
- private void getErrors(String str) {
- errors.clear();
- StringTokenizer st = new StringTokenizer(str, "[\t\r\n ]", true);
- int loc = 0;
- while (st.hasMoreTokens()) {
- String string = st.nextToken();
- // if not a whitespace character
- if (!string.matches("^\\s*$")) {
- // System.out.println("isWord: orig *" + string + "* => *" + word + "*");
- if (!dict.isWord(string)) {
- // System.out.println("word " + word + " is error");
- String cleanError = OseeDictionary.getInstance().getCleanWord(string);
- ASpellWord sw = new ASpellWord(cleanError, loc);
- errors.add(sw);
- }
- }
- loc += string.length();
- }
- }
-
- /**
- * Computes the squiggly line.
- *
- * @param left the left end point
- * @param right the right end point
- * @param height the height of the squiggly line
- * @return the polyline array
- */
- private int[] computePolyline(Point left, Point right, int height) {
-
- final int WIDTH = 3;
- final int HEIGHT = 0;
-
- int w2 = 2 * WIDTH;
- int peeks = (right.x - left.x) / w2;
-
- int leftX = left.x;
-
- // compute (number of points) * 2
- int length = 4 * peeks + 2;
- if (length <= 0) return new int[0];
-
- int[] coordinates = new int[length];
-
- // compute top and bottom of peeks
- int bottom = left.y + height;
- int top = bottom - HEIGHT;
-
- // populate array with peek coordinates
- int index = 0;
- for (int i = 0; i < peeks; i++) {
- coordinates[index++] = leftX + (w2 * i);
- coordinates[index++] = bottom;
- coordinates[index++] = coordinates[index - 3] + WIDTH;
- coordinates[index++] = top;
- }
- // add the last down flank
- coordinates[length - 2] = left.x + (w2 * peeks);
- coordinates[length - 1] = bottom;
- return coordinates;
- }
+ private void getErrors(String str) {
+ errors.clear();
+ StringTokenizer st = new StringTokenizer(str, "[\t\r\n ]", true);
+ int loc = 0;
+ while (st.hasMoreTokens()) {
+ String string = st.nextToken();
+ // if not a whitespace character
+ if (!string.matches("^\\s*$")) {
+ // System.out.println("isWord: orig *" + string + "* => *" + word + "*");
+ if (!dict.isWord(string)) {
+ // System.out.println("word " + word + " is error");
+ String cleanError = OseeDictionary.getInstance().getCleanWord(string);
+ ASpellWord sw = new ASpellWord(cleanError, loc);
+ errors.add(sw);
+ }
+ }
+ loc += string.length();
+ }
+ }
+
+ /**
+ * Computes the squiggly line.
+ *
+ * @param left the left end point
+ * @param right the right end point
+ * @param height the height of the squiggly line
+ * @return the polyline array
+ */
+ private int[] computePolyline(Point left, Point right, int height) {
+
+ final int WIDTH = 3;
+ final int HEIGHT = 0;
+
+ int w2 = 2 * WIDTH;
+ int peeks = (right.x - left.x) / w2;
+
+ int leftX = left.x;
+
+ // compute (number of points) * 2
+ int length = 4 * peeks + 2;
+ if (length <= 0) {
+ return new int[0];
+ }
+
+ int[] coordinates = new int[length];
+
+ // compute top and bottom of peeks
+ int bottom = left.y + height;
+ int top = bottom - HEIGHT;
+
+ // populate array with peek coordinates
+ int index = 0;
+ for (int i = 0; i < peeks; i++) {
+ coordinates[index++] = leftX + (w2 * i);
+ coordinates[index++] = bottom;
+ coordinates[index++] = coordinates[index - 3] + WIDTH;
+ coordinates[index++] = top;
+ }
+ // add the last down flank
+ coordinates[length - 2] = left.x + (w2 * peeks);
+ coordinates[length - 1] = bottom;
+ return coordinates;
+ }
}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java index 73b8af09ce3..169715c9861 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java @@ -23,13 +23,13 @@ import org.eclipse.osee.framework.jdk.core.type.MutableBoolean; import org.eclipse.osee.framework.jdk.core.util.AXml;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
@@ -40,391 +40,382 @@ import org.eclipse.ui.forms.widgets.FormToolkit; * Abstract class for all widgets used in Wizards and Editors
*/
public abstract class XWidget {
- public final static String XWIDGET_DATA_KEY = "xWidget";
-
- private IManagedForm managedForm;
-
- protected Label labelWidget = null;
- private String label = "";
- private String xmlRoot = "";
- private String xmlSubRoot = "";
- private String toolTip = null;
- private boolean requiredEntry = false;
- private boolean editable = true;
- private final MutableBoolean isNotificationAllowed = new MutableBoolean(true);
-
- protected boolean verticalLabel = false;
- protected boolean fillVertically = false;
- protected boolean fillHorizontally = false;
-
- public boolean isFillHorizontally() {
- return fillHorizontally;
- }
-
- private boolean displayLabel = true;
- private final Set<XModifiedListener> modifiedListeners = new LinkedHashSet<XModifiedListener>();
- private MouseListener mouseLabelListener;
- protected FormToolkit toolkit;
-
- public XWidget(String label) {
- this.label = label;
- }
-
- public XWidget(String label, String xmlRoot) {
- this.label = label;
- this.xmlRoot = xmlRoot;
- }
-
- public XWidget(String label, String xmlRoot, String xmlSubRoot) {
- this.label = label;
- this.xmlRoot = xmlRoot;
- this.xmlSubRoot = xmlSubRoot;
- }
-
- public void setToolTip(String toolTip) {
- this.toolTip = toolTip;
- if (this.labelWidget != null && !labelWidget.isDisposed()) {
- this.labelWidget.setToolTipText(toolTip);
- }
- }
-
- public void addXModifiedListener(XModifiedListener listener) {
- modifiedListeners.add(listener);
- }
-
- public void notifyXModifiedListeners() {
- if (areNotificationsAllowed()) {
- for (XModifiedListener listener : modifiedListeners) {
- listener.widgetModified(this);
- }
- }
- }
-
- public boolean areNotificationsAllowed() {
- return isNotificationAllowed.getValue();
- }
-
- protected IManagedForm getManagedForm() {
- return managedForm;
- }
-
- public boolean isInForm() {
- return getManagedForm() != null;
- }
-
- protected IMessageManager getMessageManager() {
- return getManagedForm() != null ? managedForm.getMessageManager() : null;
- }
-
- public void setMessage(String messageId, String messageText, int type) {
- IMessageManager messageManager = getMessageManager();
- if (messageManager != null && isFormReady()) {
- messageManager.addMessage(messageId, messageText, null, type);
- }
- }
-
- public boolean isFormReady() {
- // Set to true if outside of a form;
- boolean result = managedForm == null;
- if (managedForm != null) {
- result = !managedForm.getForm().isDisposed();
- }
- return result;
- }
-
- public void setControlCausedMessage(String messageId, String messageText, int type) {
- IMessageManager messageManager = getMessageManager();
- if (messageManager != null && isFormReady()) {
- messageManager.addMessage(messageId, messageText, null, type, getErrorMessageControl());
- }
- }
-
- public void setControlCausedMessageByObject(String messageText, int type) {
- IMessageManager messageManager = getMessageManager();
- if (messageManager != null && isFormReady()) {
- messageManager.addMessage(this, messageText, null, type, getErrorMessageControl());
- }
- }
-
- public void removeControlCausedMessageByObject() {
- IMessageManager messageManager = getMessageManager();
- if (messageManager != null && isFormReady()) {
- messageManager.removeMessage(this, getErrorMessageControl());
- }
- }
-
- public void removeControlCausedMessage(String messageId) {
- IMessageManager messageManager = getMessageManager();
- if (messageManager != null && isFormReady()) {
- messageManager.removeMessage(messageId, getErrorMessageControl());
- }
- }
-
- public void removeControlCausedMessages() {
- IMessageManager messageManager = getMessageManager();
- if (messageManager != null && isFormReady()) {
- messageManager.removeMessage(getErrorMessageControl());
- }
- }
-
- public void removeMessage(String messageId) {
- IMessageManager messageManager = getMessageManager();
- if (messageManager != null && isFormReady()) {
- messageManager.removeMessage(messageId);
- }
- }
-
- public void validate() {
- if (isEditable() && Widgets.isAccessible(getControl()) && isFormReady() && areNotificationsAllowed()) {
- IStatus status = isValid();
- if (isInForm()) {
- XWidgetValidateUtility.setStatus(status, this);
- } else {
- if (Widgets.isAccessible(labelWidget)) {
- labelWidget.setForeground(status.isOK() ? null : Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- if (mouseLabelListener == null) {
- mouseLabelListener = new MouseListener() {
- public void mouseDoubleClick(MouseEvent e) {
- openHelp();
- }
-
- public void mouseDown(MouseEvent e) {
- }
-
- public void mouseUp(MouseEvent e) {
- }
- };
- labelWidget.addMouseListener(mouseLabelListener);
- }
- }
- }
- }
- }
-
- /**
- * Return the control that the error message is to be placed. By default the getControl() will be used. Override to
- * change.
- *
- * @return control
- */
- public Control getErrorMessageControl() {
- return getControl();
- }
-
- public abstract Control getControl();
-
- public void openHelp() {
- try {
- if (toolTip != null && label != null) {
- MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- label + " Tool Tip", toolTip);
- }
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- }
-
- protected void setNotificationsAllowed(boolean areAllowed) {
- this.isNotificationAllowed.setValue(areAllowed);
- }
-
- protected void createControls(Composite parent, int horizontalSpan) {
-
- }
-
- public final void createWidgets(Composite parent, int horizontalSpan) {
- setNotificationsAllowed(false);
- try {
- createControls(parent, horizontalSpan);
- } finally {
- setNotificationsAllowed(true);
- }
- }
-
- public final void createWidgets(IManagedForm managedForm, Composite parent, int horizontalSpan) {
- if (managedForm != null) {
- this.toolkit = managedForm.getToolkit();
- this.managedForm = managedForm;
- }
- createWidgets(parent, horizontalSpan);
- adaptControls(toolkit);
-
- // Added to be able to operate on XWidget who create the control
- Control internalControl = getControl();
- if (internalControl != null) {
- internalControl.setData(XWIDGET_DATA_KEY, this);
- }
- }
-
- public void adaptControls(FormToolkit toolkit) {
- if (toolkit != null) {
- if (getControl() != null) {
- toolkit.adapt(getControl(), true, false);
- }
- if (labelWidget != null) {
- toolkit.adapt(labelWidget, true, true);
- toolkit.adapt(labelWidget.getParent(), true, true);
- }
- }
- }
-
- /**
- * Create Widgets used to display label and entry for wizards and editors
- */
- public void dispose() {
- if (Widgets.isAccessible(managedForm.getForm())) {
- removeControlCausedMessageByObject();
- }
- }
-
- public abstract void setFocus();
-
- public abstract void refresh();
-
- public abstract IStatus isValid();
-
- /**
- * Called with string found between xml tags Used by setFromXml() String will be sent through AXml.xmlToText() before
- * being sent to setXmlData implementation. Used by: setFromXml
- *
- * @param str - value to set
- */
- public abstract void setXmlData(String str);
-
- /**
- * Return string to save off between xml tags Used by call to toXml() String returned will be sent through
- * AXml.textToXml() before being saved Used by: toXml
- *
- * @return Return Xml data string.
- */
- protected abstract String getXmlData();
-
- public abstract String toHTML(String labelFont);
-
- protected String toXml() throws Exception {
- if (xmlSubRoot.equals("")) {
- return toXml(xmlRoot);
- } else {
- return toXml(xmlRoot, xmlSubRoot);
- }
- }
-
- protected String toXml(String xmlRoot) throws Exception {
- String s = "<" + xmlRoot + ">" + AXml.textToXml(getXmlData()) + "</" + xmlRoot + ">\n";
- return s;
- }
-
- public String toXml(String xmlRoot, String xmlSubRoot) throws Exception {
- String s =
- "<" + xmlRoot + ">" + "<" + xmlSubRoot + ">" + AXml.textToXml(getXmlData()) + "</" + xmlSubRoot + ">" + "</" + xmlRoot + ">\n";
- return s;
- }
-
- public void setFromXml(String xml) throws IllegalStateException {
- Matcher m;
- m = Pattern.compile("<" + xmlRoot + ">(.*?)</" + xmlRoot + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(xml);
- if (m.find()) setXmlData(AXml.xmlToText(m.group(1)));
- }
-
- public Vector<String> getDisplayLabels() {
- Vector<String> l = new Vector<String>();
- l.add(label);
- return l;
- }
-
- public void setDisplayLabel(String displayLabel) {
- this.label = displayLabel;
- }
-
- public boolean isEditable() {
- return editable;
- }
-
- public void setEditable(boolean editable) {
- this.editable = editable;
- }
-
- public boolean isVerticalLabel() {
- return verticalLabel;
- }
-
- public void setVerticalLabel(boolean verticalLabel) {
- this.verticalLabel = verticalLabel;
- }
-
- public String getXmlRoot() {
- return xmlRoot;
- }
-
- public void setXmlRoot(String xmlRoot) {
- this.xmlRoot = xmlRoot;
- }
-
- public String getXmlSubRoot() {
- return xmlSubRoot;
- }
-
- public void setXmlSubRoot(String xmlSubRoot) {
- this.xmlSubRoot = xmlSubRoot;
- }
-
- public String getToolTip() {
- return toolTip;
- }
-
- public boolean isFillVertically() {
- return fillVertically;
- }
-
- public void setFillVertically(boolean fillVertically) {
- this.fillVertically = fillVertically;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- if (labelWidget != null && !labelWidget.isDisposed()) {
- labelWidget.setText(label);
- }
- }
-
- public Label getLabelWidget() {
- return labelWidget;
- }
-
- protected void setLabelWidget(Label labelWidget) {
- this.labelWidget = labelWidget;
- }
-
- public boolean isRequiredEntry() {
- return requiredEntry;
- }
-
- public void setRequiredEntry(boolean requiredEntry) {
- this.requiredEntry = requiredEntry;
- }
-
- protected abstract String getReportData();
-
- @Override
- public String toString() {
- return String.format("%s: %s\n\n", getLabel(), getReportData());
- }
-
- public void setDisplayLabel(boolean displayLabel) {
- this.displayLabel = displayLabel;
- }
-
- public void setFillHorizontally(boolean fillHorizontally) {
- this.fillHorizontally = fillHorizontally;
- }
-
- public abstract Object getData();
-
- public boolean isDisplayLabel() {
- return displayLabel;
- }
+ public final static String XWIDGET_DATA_KEY = "xWidget";
+
+ private IManagedForm managedForm;
+
+ protected Label labelWidget = null;
+ private String label = "";
+ private String xmlRoot = "";
+ private String xmlSubRoot = "";
+ private String toolTip = null;
+ private boolean requiredEntry = false;
+ private boolean editable = true;
+ private final MutableBoolean isNotificationAllowed = new MutableBoolean(true);
+
+ protected boolean verticalLabel = false;
+ protected boolean fillVertically = false;
+ protected boolean fillHorizontally = false;
+
+ public boolean isFillHorizontally() {
+ return fillHorizontally;
+ }
+
+ private boolean displayLabel = true;
+ private final Set<XModifiedListener> modifiedListeners = new LinkedHashSet<XModifiedListener>();
+ private MouseListener mouseLabelListener;
+ protected FormToolkit toolkit;
+
+ public XWidget(String label) {
+ this.label = label;
+ }
+
+ public XWidget(String label, String xmlRoot) {
+ this.label = label;
+ this.xmlRoot = xmlRoot;
+ }
+
+ public XWidget(String label, String xmlRoot, String xmlSubRoot) {
+ this.label = label;
+ this.xmlRoot = xmlRoot;
+ this.xmlSubRoot = xmlSubRoot;
+ }
+
+ public void setToolTip(String toolTip) {
+ this.toolTip = toolTip;
+ if (this.labelWidget != null && !labelWidget.isDisposed()) {
+ this.labelWidget.setToolTipText(toolTip);
+ }
+ }
+
+ public void addXModifiedListener(XModifiedListener listener) {
+ modifiedListeners.add(listener);
+ }
+
+ public void notifyXModifiedListeners() {
+ if (areNotificationsAllowed()) {
+ for (XModifiedListener listener : modifiedListeners) {
+ listener.widgetModified(this);
+ }
+ }
+ }
+
+ public boolean areNotificationsAllowed() {
+ return isNotificationAllowed.getValue();
+ }
+
+ protected IManagedForm getManagedForm() {
+ return managedForm;
+ }
+
+ public boolean isInForm() {
+ return getManagedForm() != null;
+ }
+
+ protected IMessageManager getMessageManager() {
+ return getManagedForm() != null ? managedForm.getMessageManager() : null;
+ }
+
+ public void setMessage(String messageId, String messageText, int type) {
+ IMessageManager messageManager = getMessageManager();
+ if (messageManager != null && isFormReady()) {
+ messageManager.addMessage(messageId, messageText, null, type);
+ }
+ }
+
+ public boolean isFormReady() {
+ // Set to true if outside of a form;
+ boolean result = managedForm == null;
+ if (managedForm != null) {
+ result = !managedForm.getForm().isDisposed();
+ }
+ return result;
+ }
+
+ public void setControlCausedMessage(String messageId, String messageText, int type) {
+ IMessageManager messageManager = getMessageManager();
+ if (messageManager != null && isFormReady()) {
+ messageManager.addMessage(messageId, messageText, null, type, getErrorMessageControl());
+ }
+ }
+
+ public void setControlCausedMessageByObject(String messageText, int type) {
+ IMessageManager messageManager = getMessageManager();
+ if (messageManager != null && isFormReady()) {
+ messageManager.addMessage(this, messageText, null, type, getErrorMessageControl());
+ }
+ }
+
+ public void removeControlCausedMessageByObject() {
+ IMessageManager messageManager = getMessageManager();
+ if (messageManager != null && isFormReady()) {
+ messageManager.removeMessage(this, getErrorMessageControl());
+ }
+ }
+
+ public void removeControlCausedMessage(String messageId) {
+ IMessageManager messageManager = getMessageManager();
+ if (messageManager != null && isFormReady()) {
+ messageManager.removeMessage(messageId, getErrorMessageControl());
+ }
+ }
+
+ public void validate() {
+ if (isEditable() && Widgets.isAccessible(getControl()) && isFormReady() && areNotificationsAllowed()) {
+ IStatus status = isValid();
+ if (isInForm()) {
+ XWidgetValidateUtility.setStatus(status, this);
+ } else {
+ if (Widgets.isAccessible(labelWidget)) {
+ labelWidget.setForeground(status.isOK() ? null : Displays.getSystemColor(SWT.COLOR_RED));
+ if (mouseLabelListener == null) {
+ mouseLabelListener = new MouseListener() {
+ @Override
+ public void mouseDoubleClick(MouseEvent e) {
+ openHelp();
+ }
+
+ @Override
+ public void mouseDown(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseUp(MouseEvent e) {
+ }
+ };
+ labelWidget.addMouseListener(mouseLabelListener);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Return the control that the error message is to be placed. By default the getControl() will be used. Override to
+ * change.
+ *
+ * @return control
+ */
+ public Control getErrorMessageControl() {
+ return getControl();
+ }
+
+ public abstract Control getControl();
+
+ public void openHelp() {
+ try {
+ if (toolTip != null && label != null) {
+ MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ label + " Tool Tip", toolTip);
+ }
+ } catch (Exception ex) {
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
+ }
+ }
+
+ protected void setNotificationsAllowed(boolean areAllowed) {
+ this.isNotificationAllowed.setValue(areAllowed);
+ }
+
+ protected void createControls(Composite parent, int horizontalSpan) {
+
+ }
+
+ public final void createWidgets(Composite parent, int horizontalSpan) {
+ setNotificationsAllowed(false);
+ try {
+ createControls(parent, horizontalSpan);
+ } finally {
+ setNotificationsAllowed(true);
+ }
+ }
+
+ public final void createWidgets(IManagedForm managedForm, Composite parent, int horizontalSpan) {
+ if (managedForm != null) {
+ this.toolkit = managedForm.getToolkit();
+ this.managedForm = managedForm;
+ }
+ createWidgets(parent, horizontalSpan);
+ adaptControls(toolkit);
+
+ // Added to be able to operate on XWidget who create the control
+ Control internalControl = getControl();
+ if (internalControl != null) {
+ internalControl.setData(XWIDGET_DATA_KEY, this);
+ }
+ }
+
+ public void adaptControls(FormToolkit toolkit) {
+ if (toolkit != null) {
+ if (getControl() != null) {
+ toolkit.adapt(getControl(), true, false);
+ }
+ if (labelWidget != null) {
+ toolkit.adapt(labelWidget, true, true);
+ toolkit.adapt(labelWidget.getParent(), true, true);
+ }
+ }
+ }
+
+ /**
+ * Create Widgets used to display label and entry for wizards and editors
+ */
+ public void dispose() {
+ if (Widgets.isAccessible(managedForm.getForm())) {
+ removeControlCausedMessageByObject();
+ }
+ }
+
+ public abstract void setFocus();
+
+ public abstract void refresh();
+
+ public abstract IStatus isValid();
+
+ /**
+ * Called with string found between xml tags Used by setFromXml() String will be sent through AXml.xmlToText() before
+ * being sent to setXmlData implementation. Used by: setFromXml
+ *
+ * @param str - value to set
+ */
+ public abstract void setXmlData(String str);
+
+ /**
+ * Return string to save off between xml tags Used by call to toXml() String returned will be sent through
+ * AXml.textToXml() before being saved Used by: toXml
+ *
+ * @return Return Xml data string.
+ */
+ protected abstract String getXmlData();
+
+ public abstract String toHTML(String labelFont);
+
+ protected String toXml() throws Exception {
+ if (xmlSubRoot.equals("")) {
+ return toXml(xmlRoot);
+ } else {
+ return toXml(xmlRoot, xmlSubRoot);
+ }
+ }
+
+ protected String toXml(String xmlRoot) throws Exception {
+ String s = "<" + xmlRoot + ">" + AXml.textToXml(getXmlData()) + "</" + xmlRoot + ">\n";
+ return s;
+ }
+
+ public String toXml(String xmlRoot, String xmlSubRoot) throws Exception {
+ String s =
+ "<" + xmlRoot + ">" + "<" + xmlSubRoot + ">" + AXml.textToXml(getXmlData()) + "</" + xmlSubRoot + ">" + "</" + xmlRoot + ">\n";
+ return s;
+ }
+
+ public void setFromXml(String xml) throws IllegalStateException {
+ Matcher m;
+ m = Pattern.compile("<" + xmlRoot + ">(.*?)</" + xmlRoot + ">", Pattern.MULTILINE | Pattern.DOTALL).matcher(xml);
+ if (m.find()) {
+ setXmlData(AXml.xmlToText(m.group(1)));
+ }
+ }
+
+ public Vector<String> getDisplayLabels() {
+ Vector<String> l = new Vector<String>();
+ l.add(label);
+ return l;
+ }
+
+ public void setDisplayLabel(String displayLabel) {
+ this.label = displayLabel;
+ }
+
+ public boolean isEditable() {
+ return editable;
+ }
+
+ public void setEditable(boolean editable) {
+ this.editable = editable;
+ }
+
+ public boolean isVerticalLabel() {
+ return verticalLabel;
+ }
+
+ public void setVerticalLabel(boolean verticalLabel) {
+ this.verticalLabel = verticalLabel;
+ }
+
+ public String getXmlRoot() {
+ return xmlRoot;
+ }
+
+ public void setXmlRoot(String xmlRoot) {
+ this.xmlRoot = xmlRoot;
+ }
+
+ public String getXmlSubRoot() {
+ return xmlSubRoot;
+ }
+
+ public void setXmlSubRoot(String xmlSubRoot) {
+ this.xmlSubRoot = xmlSubRoot;
+ }
+
+ public String getToolTip() {
+ return toolTip;
+ }
+
+ public boolean isFillVertically() {
+ return fillVertically;
+ }
+
+ public void setFillVertically(boolean fillVertically) {
+ this.fillVertically = fillVertically;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ if (labelWidget != null && !labelWidget.isDisposed()) {
+ labelWidget.setText(label);
+ }
+ }
+
+ public Label getLabelWidget() {
+ return labelWidget;
+ }
+
+ protected void setLabelWidget(Label labelWidget) {
+ this.labelWidget = labelWidget;
+ }
+
+ public boolean isRequiredEntry() {
+ return requiredEntry;
+ }
+
+ public void setRequiredEntry(boolean requiredEntry) {
+ this.requiredEntry = requiredEntry;
+ }
+
+ protected abstract String getReportData();
+
+ @Override
+ public String toString() {
+ return String.format("%s: %s\n\n", getLabel(), getReportData());
+ }
+
+ public void setDisplayLabel(boolean displayLabel) {
+ this.displayLabel = displayLabel;
+ }
+
+ public void setFillHorizontally(boolean fillHorizontally) {
+ this.fillHorizontally = fillHorizontally;
+ }
+
+ public abstract Object getData();
+
+ public boolean isDisplayLabel() {
+ return displayLabel;
+ }
}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetUtility.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetUtility.java index 2b90d14c6a8..3cf7680db4a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetUtility.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetUtility.java @@ -19,45 +19,45 @@ import org.eclipse.swt.widgets.Widget; /**
* @author Roberto E. Escobar
*/
-public class XWidgetUtility {
+public final class XWidgetUtility {
- private XWidgetUtility() {
- }
+ private XWidgetUtility() {
+ }
- public static boolean isWidgetAccesible(Widget widget) {
- return widget != null && !widget.isDisposed();
- }
+ public static boolean isWidgetAccesible(Widget widget) {
+ return widget != null && !widget.isDisposed();
+ }
- public static List<XWidget> findXWidgetsInControl(Widget parent) {
- List<XWidget> xWidgets = new ArrayList<XWidget>();
- XWidget xWidget = asXWidget(parent);
- if (xWidget != null) {
- xWidgets.add(xWidget);
- }
- if (parent instanceof Composite) {
- Composite container = (Composite) parent;
- for (Control child : container.getChildren()) {
- xWidgets.addAll(findXWidgetsInControl(child));
- }
- }
- return xWidgets;
- }
+ public static List<XWidget> findXWidgetsInControl(Widget parent) {
+ List<XWidget> xWidgets = new ArrayList<XWidget>();
+ XWidget xWidget = asXWidget(parent);
+ if (xWidget != null) {
+ xWidgets.add(xWidget);
+ }
+ if (parent instanceof Composite) {
+ Composite container = (Composite) parent;
+ for (Control child : container.getChildren()) {
+ xWidgets.addAll(findXWidgetsInControl(child));
+ }
+ }
+ return xWidgets;
+ }
- public static XWidget asXWidget(Widget widget) {
- XWidget toReturn = null;
- if (widget != null) {
- Object object = widget.getData(XWidget.XWIDGET_DATA_KEY);
- toReturn = object instanceof XWidget ? (XWidget) object : null;
- }
- return toReturn;
- }
+ public static XWidget asXWidget(Widget widget) {
+ XWidget toReturn = null;
+ if (widget != null) {
+ Object object = widget.getData(XWidget.XWIDGET_DATA_KEY);
+ toReturn = object instanceof XWidget ? (XWidget) object : null;
+ }
+ return toReturn;
+ }
- public static boolean hasXWidget(Widget widget) {
- boolean result = false;
- if (widget != null) {
- Object object = widget.getData(XWidget.XWIDGET_DATA_KEY);
- result = object instanceof XWidget;
- }
- return result;
- }
+ public static boolean hasXWidget(Widget widget) {
+ boolean result = false;
+ if (widget != null) {
+ Object object = widget.getData(XWidget.XWIDGET_DATA_KEY);
+ result = object instanceof XWidget;
+ }
+ return result;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetValidateUtility.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetValidateUtility.java index 9bc9206d58f..cd1306709f9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetValidateUtility.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetValidateUtility.java @@ -18,49 +18,50 @@ import org.eclipse.osee.framework.skynet.core.validation.OseeValidator; /**
* @author Roberto E. Escobar
*/
-public class XWidgetValidateUtility {
+public final class XWidgetValidateUtility {
- private XWidgetValidateUtility() {
- }
+ private XWidgetValidateUtility() {
+ }
- public static void validate(int requiredQualityOfService, XWidget xWidget, Artifact artifact, String attributeTypeName, Object proposedValue) {
- IStatus status =
- OseeValidator.getInstance().validate(requiredQualityOfService, artifact, attributeTypeName, proposedValue);
- setStatus(status, xWidget);
- }
+ public static void validate(int requiredQualityOfService, XWidget xWidget, Artifact artifact, String attributeTypeName, Object proposedValue) {
+ IStatus status =
+ OseeValidator.getInstance().validate(requiredQualityOfService, artifact, attributeTypeName,
+ proposedValue);
+ setStatus(status, xWidget);
+ }
- public static void setStatus(IStatus status, XWidget xWidget) {
- if (status.isMultiStatus()) {
- for (IStatus item : status.getChildren()) {
- if (item.isOK()) {
- xWidget.removeControlCausedMessage(item.getPlugin());
- } else {
- xWidget.setControlCausedMessage(item.getPlugin(), item.getMessage(),
- toMessageProviderLevel(item.getSeverity()));
- }
- }
- } else {
- if (!status.isOK()) {
- xWidget.setControlCausedMessageByObject(status.getMessage(), toMessageProviderLevel(status.getSeverity()));
- } else {
- xWidget.removeControlCausedMessageByObject();
- }
- }
- }
+ public static void setStatus(IStatus status, XWidget xWidget) {
+ if (status.isMultiStatus()) {
+ for (IStatus item : status.getChildren()) {
+ if (item.isOK()) {
+ xWidget.removeControlCausedMessage(item.getPlugin());
+ } else {
+ xWidget.setControlCausedMessage(item.getPlugin(), item.getMessage(),
+ toMessageProviderLevel(item.getSeverity()));
+ }
+ }
+ } else {
+ if (!status.isOK()) {
+ xWidget.setControlCausedMessageByObject(status.getMessage(), toMessageProviderLevel(status.getSeverity()));
+ } else {
+ xWidget.removeControlCausedMessageByObject();
+ }
+ }
+ }
- public static boolean isValueInRange(int value, int min, int max) {
- return min <= value && value < max;
- }
+ public static boolean isValueInRange(int value, int min, int max) {
+ return min <= value && value < max;
+ }
- public static int toMessageProviderLevel(int level) {
- int toReturn = IMessageProvider.NONE;
- if (level == IStatus.INFO) {
- toReturn = IMessageProvider.INFORMATION;
- } else if (level == IStatus.WARNING) {
- toReturn = IMessageProvider.WARNING;
- } else if (level == IStatus.ERROR) {
- toReturn = IMessageProvider.ERROR;
- }
- return toReturn;
- }
+ public static int toMessageProviderLevel(int level) {
+ int toReturn = IMessageProvider.NONE;
+ if (level == IStatus.INFO) {
+ toReturn = IMessageProvider.INFORMATION;
+ } else if (level == IStatus.WARNING) {
+ toReturn = IMessageProvider.WARNING;
+ } else if (level == IStatus.ERROR) {
+ toReturn = IMessageProvider.ERROR;
+ }
+ return toReturn;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactCheckTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactCheckTreeDialog.java index a396c7d902e..274cda4b915 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactCheckTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactCheckTreeDialog.java @@ -17,9 +17,9 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.util.ArtifactDescriptiveLabelProvider; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; /** @@ -34,7 +34,7 @@ public class ArtifactCheckTreeDialog extends CheckedTreeSelectionDialog { } public ArtifactCheckTreeDialog(Collection<? extends Artifact> artifacts, ILabelProvider iLabelProvider) { - super(Display.getCurrent().getActiveShell(), iLabelProvider, new ArtifactTreeContentProvider()); + super(Displays.getActiveShell(), iLabelProvider, new ArtifactTreeContentProvider()); if (artifacts != null) setInput(artifacts); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeCheckTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeCheckTreeDialog.java index 04cb9c7b899..a48327437e8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeCheckTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeCheckTreeDialog.java @@ -17,9 +17,9 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; /** @@ -32,7 +32,7 @@ public class AttributeTypeCheckTreeDialog extends CheckedTreeSelectionDialog { } public AttributeTypeCheckTreeDialog(Collection<? extends AttributeType> attributeTypes, ILabelProvider iLabelProvider) { - super(Display.getCurrent().getActiveShell(), iLabelProvider, new ArrayTreeContentProvider()); + super(Displays.getActiveShell(), iLabelProvider, new ArrayTreeContentProvider()); if (attributeTypes != null) setInput(attributeTypes); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/CheckBoxDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/CheckBoxDialog.java index 4807179d8ef..ad17c5d8003 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/CheckBoxDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/CheckBoxDialog.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.dialog; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -20,7 +21,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; public class CheckBoxDialog extends MessageDialog { @@ -40,7 +40,7 @@ public class CheckBoxDialog extends MessageDialog { } public CheckBoxDialog(String dialogTitle, String dialogMessage, String checkBoxMessage) { - this(Display.getCurrent().getActiveShell(), dialogTitle, null, dialogMessage, checkBoxMessage, + this(Displays.getActiveShell(), dialogTitle, null, dialogMessage, checkBoxMessage, MessageDialog.QUESTION, 0); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/DateSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/DateSelectionDialog.java index 25677082159..8e442f9c451 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/DateSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/DateSelectionDialog.java @@ -16,13 +16,13 @@ import java.util.Date; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.nebula.widgets.calendarcombo.CalendarCombo; import org.eclipse.nebula.widgets.calendarcombo.CalendarListenerAdapter; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; @@ -40,7 +40,7 @@ public class DateSelectionDialog extends MessageDialog { } public DateSelectionDialog(String dialogTitle, String dialogMessage, Date selectedDate) { - this(Display.getCurrent().getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] { + this(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] { "Ok", "Cancel"}, 0, selectedDate); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/Dialogs.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/Dialogs.java index 4d13225679d..43c5b655341 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/Dialogs.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/Dialogs.java @@ -21,9 +21,9 @@ import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.util.HtmlExportTable; import org.eclipse.osee.framework.ui.skynet.util.email.EmailWizard; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.program.Program; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; /** @@ -43,7 +43,7 @@ public class Dialogs { AWorkbench.popup("ERROR", "Save data is empty. Nothing to save."); return Result.FalseResult; } - final FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell().getShell(), SWT.SAVE); + final FileDialog dialog = new FileDialog(Displays.getActiveShell().getShell(), SWT.SAVE); dialog.setFilterExtensions(new String[] {"*.html"}); String filename = dialog.open(); if (filename == null || filename.equals("")) { @@ -65,7 +65,7 @@ public class Dialogs { return Result.FalseResult; } EmailWizard ew = new EmailWizard(text, title, null, null); - WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), ew); + WizardDialog dialog = new WizardDialog(Displays.getActiveShell(), ew); dialog.create(); if (dialog.open() == 0) { return Result.TrueResult; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java index d9fe51eb47c..9b10e56670e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java @@ -23,6 +23,7 @@ import org.eclipse.osee.framework.ui.plugin.util.IShellCloseEvent; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.widgets.XText;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.FontManager;
import org.eclipse.osee.framework.ui.swt.HyperLinkLabel;
import org.eclipse.swt.SWT;
@@ -40,7 +41,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -64,7 +64,7 @@ public class EntryDialog extends MessageDialog { private final String dialogTitle;
public EntryDialog(String dialogTitle, String dialogMessage) {
- super(Display.getCurrent().getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION,
+ super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION,
new String[] {"OK", "Cancel"}, 0);
this.dialogTitle = dialogTitle;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java index 48ae94747c9..274361a5436 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java @@ -20,6 +20,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.IShellCloseEvent;
import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectComposite;
import org.eclipse.osee.framework.ui.skynet.widgets.XText;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -32,7 +33,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
@@ -52,7 +52,7 @@ public class EntryDialogWithBranchSelect extends MessageDialog { private final List<IShellCloseEvent> closeEventListeners = new ArrayList<IShellCloseEvent>();
public EntryDialogWithBranchSelect(String dialogTitle, String dialogMessage) {
- super(Display.getCurrent().getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION,
+ super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION,
new String[] {"OK", "Cancel"}, 0);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java index ed516a2a0b6..69b1a52bc3c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java @@ -18,6 +18,7 @@ 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.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.browser.LocationListener; @@ -27,7 +28,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.program.Program; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; @@ -37,7 +37,7 @@ public class HtmlDialog extends MessageDialog { private final String html; public HtmlDialog(String title, String message, String html) { - super(Display.getCurrent().getActiveShell(), title, null, message, SWT.NONE, new String[] {"OK", "Cancel"}, 0); + super(Displays.getActiveShell(), title, null, message, SWT.NONE, new String[] {"OK", "Cancel"}, 0); this.html = html; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ImageDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ImageDialog.java index 4c2b1fef435..086b2581df0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ImageDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ImageDialog.java @@ -16,6 +16,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.ui.swt.ALayout; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.ScrolledComposite; import org.eclipse.swt.events.PaintEvent; @@ -28,79 +29,82 @@ import org.eclipse.swt.program.Program; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; public class ImageDialog extends MessageDialog { - private String title = "Image Viewer"; - private static String buttons[] = new String[] {"Export as JPG", "Export as PNG", "Close"}; - private final Image image; + private String title = "Image Viewer"; + private static String buttons[] = new String[] {"Export as JPG", "Export as PNG", "Close"}; + private final Image image; - public ImageDialog(Image image, Shell parentShell) { - this(image, parentShell, buttons, 3); - } + public ImageDialog(Image image, Shell parentShell) { + this(image, parentShell, buttons, 3); + } - public ImageDialog(Image image, Shell parentShell, String[] buttons, int defaultButton) { - super(parentShell, "", null, "", MessageDialog.NONE, buttons, defaultButton); - setShellStyle(getShellStyle() | SWT.RESIZE); - this.image = image; - } + public ImageDialog(Image image, Shell parentShell, String[] buttons, int defaultButton) { + super(parentShell, "", null, "", MessageDialog.NONE, buttons, defaultButton); + setShellStyle(getShellStyle() | SWT.RESIZE); + this.image = image; + } - public void setTitle(String title) { - this.title = title; - } + public void setTitle(String title) { + this.title = title; + } - @Override - protected Control createDialogArea(Composite parent) { - getShell().setText(title); - Composite comp = new Composite(parent, SWT.NONE); - comp.setLayout(ALayout.getZeroMarginLayout()); - comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - comp.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE)); + @Override + protected Control createDialogArea(Composite parent) { + getShell().setText(title); + Composite comp = new Composite(parent, SWT.NONE); + comp.setLayout(ALayout.getZeroMarginLayout()); + comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + comp.setBackground(Displays.getSystemColor(SWT.COLOR_BLUE)); - ScrolledComposite sc = new ScrolledComposite(comp, SWT.V_SCROLL | SWT.H_SCROLL); - Canvas canvas = new Canvas(sc, SWT.BORDER); - sc.setContent(canvas); - canvas.setBounds(image.getBounds()); - canvas.addPaintListener(new PaintListener() { - public void paintControl(PaintEvent e) { - e.gc.drawImage(image, 0, 0); - } - }); - comp.layout(); - return comp; - } + ScrolledComposite sc = new ScrolledComposite(comp, SWT.V_SCROLL | SWT.H_SCROLL); + Canvas canvas = new Canvas(sc, SWT.BORDER); + sc.setContent(canvas); + canvas.setBounds(image.getBounds()); + canvas.addPaintListener(new PaintListener() { + public void paintControl(PaintEvent e) { + e.gc.drawImage(image, 0, 0); + } + }); + comp.layout(); + return comp; + } - private enum ImageType { - JPG, PNG - }; + private enum ImageType { + JPG, + PNG + }; - protected void handleSave(ImageType imageType) { - ImageLoader loader = new ImageLoader(); - ImageData imgData = image.getImageData(); - loader.data = new ImageData[] {imgData}; - int format = 0; - if (imageType == ImageType.JPG) - format = SWT.IMAGE_JPEG; - else if (imageType == ImageType.PNG) format = SWT.IMAGE_PNG; - File file = OseeData.getFile(GUID.create() + "." + imageType.name()); - loader.save(file.getAbsolutePath(), format); - Program.launch(file.getAbsolutePath()); - } + protected void handleSave(ImageType imageType) { + ImageLoader loader = new ImageLoader(); + ImageData imgData = image.getImageData(); + loader.data = new ImageData[] {imgData}; + int format = 0; + if (imageType == ImageType.JPG) { + format = SWT.IMAGE_JPEG; + } else if (imageType == ImageType.PNG) { + format = SWT.IMAGE_PNG; + } + File file = OseeData.getFile(GUID.create() + "." + imageType.name()); + loader.save(file.getAbsolutePath(), format); + Program.launch(file.getAbsolutePath()); + } - @Override - protected void buttonPressed(int buttonId) { - if (buttonId == 0) - handleSave(ImageType.JPG); - else if (buttonId == 1) - handleSave(ImageType.PNG); - else - close(); - setReturnCode(buttonId); - } + @Override + protected void buttonPressed(int buttonId) { + if (buttonId == 0) { + handleSave(ImageType.JPG); + } else if (buttonId == 1) { + handleSave(ImageType.PNG); + } else { + close(); + } + setReturnCode(buttonId); + } - public String getTitle() { - return title; - } + public String getTitle() { + return title; + } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java index 0a9626d4db3..5c823a28606 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java @@ -40,7 +40,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.IManagedForm; @@ -277,7 +276,7 @@ public class DynamicXWidgetLayout { DynamicXWidgetLayoutData layoutData = getLayoutData(aName); Label label = layoutData.getXWidget().getLabelWidget(); if (label != null && !label.isDisposed()) { - label.setForeground(isComplete ? null : Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + label.setForeground(isComplete ? null : Displays.getSystemColor(SWT.COLOR_RED)); } } } @@ -289,7 +288,7 @@ public class DynamicXWidgetLayout { DynamicXWidgetLayoutData layoutData = getLayoutData(aName); Label label = layoutData.getXWidget().getLabelWidget(); if (label != null && !label.isDisposed()) { - label.setForeground(isComplete ? null : Display.getCurrent().getSystemColor(SWT.COLOR_RED)); + label.setForeground(isComplete ? null : Displays.getSystemColor(SWT.COLOR_RED)); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java index 2afb250cde6..0b54d78da6d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java @@ -17,7 +17,7 @@ import java.util.HashSet; import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set; +import java.util.Set;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinition.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinition.java index f194147e023..f13c803c3d7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinition.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinition.java @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set; +import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.osee.framework.core.data.IArtifactType;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinitionFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinitionFactory.java index 2608e30a2fc..fb21236609d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinitionFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinitionFactory.java @@ -10,7 +10,7 @@ *******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.widgets.workflow;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/XWidgetFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/XWidgetFactory.java index 550726c0881..98b1d0a0f31 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/XWidgetFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/XWidgetFactory.java @@ -45,7 +45,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
import org.eclipse.osee.framework.ui.skynet.widgets.XDateDam;
import org.eclipse.osee.framework.ui.skynet.widgets.XFileTextWithSelectionDialog;
-import org.eclipse.osee.framework.ui.skynet.widgets.XFileTextWithSelectionDialog.Type; +import org.eclipse.osee.framework.ui.skynet.widgets.XFileTextWithSelectionDialog.Type;
import org.eclipse.osee.framework.ui.skynet.widgets.XFlatDam;
import org.eclipse.osee.framework.ui.skynet.widgets.XFloat;
import org.eclipse.osee.framework.ui.skynet.widgets.XFloatDam;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewerFactory.java index 8c6e3fd7be7..934c9efe5d4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewerFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewerFactory.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xHistory; import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.nebula.widgets.xviewer.XViewerSorter; +import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
import org.eclipse.swt.SWT;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java index 2bd98d712f4..13068f43b9c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java @@ -15,6 +15,7 @@ import java.util.List; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
@@ -38,178 +39,179 @@ import org.eclipse.swt.widgets.TableItem; */
public class XBarGraphTable extends XWidget {
- private final String itemHeader;
- private final String percentHeader;
- private Table table;
- private final List<XBarGraphLine> lines;
- private boolean isHeaderVisible = true;
- private boolean isLinesVisible = true;
-
- public XBarGraphTable(String label, String itemHeader, String percentHeader, List<XBarGraphLine> lines) {
- super(label);
- this.itemHeader = itemHeader;
- this.percentHeader = percentHeader;
- this.lines = lines;
- }
-
- @Override
- protected void createControls(Composite parent, int horizontalSpan) {
- labelWidget = new Label(parent, SWT.NONE);
- labelWidget.setText(getLabel() + ": ");
-
- table = new Table(parent, SWT.BORDER);
- table.setHeaderVisible(isHeaderVisible);
- table.setLinesVisible(isLinesVisible);
- if (isFillHorizontally()) {
- table.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- }
- TableColumn column1 = new TableColumn(table, SWT.NONE);
- column1.setText(itemHeader);
- column1.setWidth(300);
- final TableColumn column2 = new TableColumn(table, SWT.NONE);
- column2.setText(percentHeader);
- column2.setWidth(500);
- for (XBarGraphLine line : lines) {
- TableItem item = new TableItem(table, SWT.NONE);
- item.setText(line.name);
- }
-
- /*
- * NOTE: MeasureItem, PaintItem and EraseItem are called repeatedly.
- * Therefore, it is critical for performance that these methods be
- * as efficient as possible.
- */
- table.addListener(SWT.PaintItem, new Listener() {
- public void handleEvent(Event event) {
- if (event.index == 1) {
- GC gc = event.gc;
- TableItem item = (TableItem) event.item;
- int index = table.indexOf(item);
- XBarGraphLine line = lines.get(index);
- int cummulativeWidth = 0;
- for (XBarGraphLineSegment seg : line.segments) {
- Color foreground = gc.getForeground();
- Color background = gc.getBackground();
- gc.setForeground(Display.getCurrent().getSystemColor(seg.foreground));
- gc.setBackground(Display.getCurrent().getSystemColor(seg.background));
- int width = (column2.getWidth()) * (int) seg.value / 100;
- gc.fillGradientRectangle(event.x + cummulativeWidth, event.y, width, event.height, true);
- Rectangle rect2 = new Rectangle(event.x + cummulativeWidth, event.y, width - 1, event.height - 1);
- gc.drawRectangle(rect2);
- if (seg.name != null && !seg.name.equals("")) {
- gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_FOREGROUND));
- Point size = event.gc.textExtent(seg.name);
- int offset = Math.max(0, (event.height - size.y) / 2);
- gc.drawText(seg.name, event.x + cummulativeWidth + 5, event.y + offset, true);
- gc.setForeground(background);
- gc.setBackground(foreground);
- }
- cummulativeWidth += width;
- }
- }
- }
- });
- }
-
- @Override
- public void dispose() {
- }
-
- @Override
- public Control getControl() {
- return table;
- }
-
- @Override
- public Object getData() {
- return null;
- }
-
- @Override
- public String getReportData() {
- return null;
- }
-
- @Override
- public String getXmlData() {
- return null;
- }
-
- @Override
- public IStatus isValid() {
- return Status.OK_STATUS;
- }
-
- @Override
- public void refresh() {
- }
-
- @Override
- public void setFocus() {
- }
-
- @Override
- public void setXmlData(String str) {
- }
-
- @Override
- public String toHTML(String labelFont) {
- return null;
- }
-
- public static void main(String[] args) {
- final Display display = new Display();
- Shell shell = new Shell(display);
- shell.setLayout(new GridLayout(1, false));
- shell.setText("Show results as a bar chart in Table");
-
- List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>();
- lines.add(XBarGraphLine.getPercentLine("Fix", 34));
- lines.add(XBarGraphLine.getPercentLine("Improvement", 100));
- lines.add(new XBarGraphLine("Support", SWT.COLOR_GREEN, SWT.COLOR_YELLOW, SWT.COLOR_RED, SWT.COLOR_YELLOW, 33,
- "33%", "67%"));
- List<XBarGraphLineSegment> segments = new ArrayList<XBarGraphLineSegment>();
- segments.add(XBarGraphLineSegment.getPercentSegment("23%", SWT.COLOR_GREEN, 23));
- segments.add(XBarGraphLineSegment.getPercentSegment("45%", SWT.COLOR_BLUE, 45));
- segments.add(XBarGraphLineSegment.getPercentSegment("20%", SWT.COLOR_YELLOW, 20));
- segments.add(XBarGraphLineSegment.getPercentSegment("12%", SWT.COLOR_MAGENTA, 12));
- lines.add(new XBarGraphLine("Other", segments));
- XBarGraphTable table = new XBarGraphTable("By Improvement", "", "Percent", lines);
- table.createWidgets(shell, 1);
-
- shell.pack();
- shell.open();
- while (!shell.isDisposed()) {
- if (!display.readAndDispatch()) display.sleep();
- }
- display.dispose();
- }
-
- /**
- * @return the isHeaderVisible
- */
- public boolean isHeaderVisible() {
- return isHeaderVisible;
- }
-
- /**
- * @param isHeaderVisible the isHeaderVisible to set
- */
- public void setHeaderVisible(boolean isHeaderVisible) {
- this.isHeaderVisible = isHeaderVisible;
- }
-
- /**
- * @return the isLinesVisible
- */
- public boolean isLinesVisible() {
- return isLinesVisible;
- }
-
- /**
- * @param isLinesVisible the isLinesVisible to set
- */
- public void setLinesVisible(boolean isLinesVisible) {
- this.isLinesVisible = isLinesVisible;
- }
+ private final String itemHeader;
+ private final String percentHeader;
+ private Table table;
+ private final List<XBarGraphLine> lines;
+ private boolean isHeaderVisible = true;
+ private boolean isLinesVisible = true;
+
+ public XBarGraphTable(String label, String itemHeader, String percentHeader, List<XBarGraphLine> lines) {
+ super(label);
+ this.itemHeader = itemHeader;
+ this.percentHeader = percentHeader;
+ this.lines = lines;
+ }
+
+ @Override
+ protected void createControls(Composite parent, int horizontalSpan) {
+ labelWidget = new Label(parent, SWT.NONE);
+ labelWidget.setText(getLabel() + ": ");
+
+ table = new Table(parent, SWT.BORDER);
+ table.setHeaderVisible(isHeaderVisible);
+ table.setLinesVisible(isLinesVisible);
+ if (isFillHorizontally()) {
+ table.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ }
+ TableColumn column1 = new TableColumn(table, SWT.NONE);
+ column1.setText(itemHeader);
+ column1.setWidth(300);
+ final TableColumn column2 = new TableColumn(table, SWT.NONE);
+ column2.setText(percentHeader);
+ column2.setWidth(500);
+ for (XBarGraphLine line : lines) {
+ TableItem item = new TableItem(table, SWT.NONE);
+ item.setText(line.name);
+ }
+
+ /*
+ * NOTE: MeasureItem, PaintItem and EraseItem are called repeatedly. Therefore, it is critical for performance
+ * that these methods be as efficient as possible.
+ */
+ table.addListener(SWT.PaintItem, new Listener() {
+ public void handleEvent(Event event) {
+ if (event.index == 1) {
+ GC gc = event.gc;
+ TableItem item = (TableItem) event.item;
+ int index = table.indexOf(item);
+ XBarGraphLine line = lines.get(index);
+ int cummulativeWidth = 0;
+ for (XBarGraphLineSegment seg : line.segments) {
+ Color foreground = gc.getForeground();
+ Color background = gc.getBackground();
+ gc.setForeground(Displays.getSystemColor(seg.foreground));
+ gc.setBackground(Displays.getSystemColor(seg.background));
+ int width = (column2.getWidth()) * (int) seg.value / 100;
+ gc.fillGradientRectangle(event.x + cummulativeWidth, event.y, width, event.height, true);
+ Rectangle rect2 = new Rectangle(event.x + cummulativeWidth, event.y, width - 1, event.height - 1);
+ gc.drawRectangle(rect2);
+ if (seg.name != null && !seg.name.equals("")) {
+ gc.setForeground(Displays.getSystemColor(SWT.COLOR_LIST_FOREGROUND));
+ Point size = event.gc.textExtent(seg.name);
+ int offset = Math.max(0, (event.height - size.y) / 2);
+ gc.drawText(seg.name, event.x + cummulativeWidth + 5, event.y + offset, true);
+ gc.setForeground(background);
+ gc.setBackground(foreground);
+ }
+ cummulativeWidth += width;
+ }
+ }
+ }
+ });
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public Control getControl() {
+ return table;
+ }
+
+ @Override
+ public Object getData() {
+ return null;
+ }
+
+ @Override
+ public String getReportData() {
+ return null;
+ }
+
+ @Override
+ public String getXmlData() {
+ return null;
+ }
+
+ @Override
+ public IStatus isValid() {
+ return Status.OK_STATUS;
+ }
+
+ @Override
+ public void refresh() {
+ }
+
+ @Override
+ public void setFocus() {
+ }
+
+ @Override
+ public void setXmlData(String str) {
+ }
+
+ @Override
+ public String toHTML(String labelFont) {
+ return null;
+ }
+
+ public static void main(String[] args) {
+ final Display display = new Display();
+ Shell shell = new Shell(display);
+ shell.setLayout(new GridLayout(1, false));
+ shell.setText("Show results as a bar chart in Table");
+
+ List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>();
+ lines.add(XBarGraphLine.getPercentLine("Fix", 34));
+ lines.add(XBarGraphLine.getPercentLine("Improvement", 100));
+ lines.add(new XBarGraphLine("Support", SWT.COLOR_GREEN, SWT.COLOR_YELLOW, SWT.COLOR_RED, SWT.COLOR_YELLOW, 33,
+ "33%", "67%"));
+ List<XBarGraphLineSegment> segments = new ArrayList<XBarGraphLineSegment>();
+ segments.add(XBarGraphLineSegment.getPercentSegment("23%", SWT.COLOR_GREEN, 23));
+ segments.add(XBarGraphLineSegment.getPercentSegment("45%", SWT.COLOR_BLUE, 45));
+ segments.add(XBarGraphLineSegment.getPercentSegment("20%", SWT.COLOR_YELLOW, 20));
+ segments.add(XBarGraphLineSegment.getPercentSegment("12%", SWT.COLOR_MAGENTA, 12));
+ lines.add(new XBarGraphLine("Other", segments));
+ XBarGraphTable table = new XBarGraphTable("By Improvement", "", "Percent", lines);
+ table.createWidgets(shell, 1);
+
+ shell.pack();
+ shell.open();
+ while (!shell.isDisposed()) {
+ if (!display.readAndDispatch()) {
+ display.sleep();
+ }
+ }
+ display.dispose();
+ }
+
+ /**
+ * @return the isHeaderVisible
+ */
+ public boolean isHeaderVisible() {
+ return isHeaderVisible;
+ }
+
+ /**
+ * @param isHeaderVisible the isHeaderVisible to set
+ */
+ public void setHeaderVisible(boolean isHeaderVisible) {
+ this.isHeaderVisible = isHeaderVisible;
+ }
+
+ /**
+ * @return the isLinesVisible
+ */
+ public boolean isLinesVisible() {
+ return isLinesVisible;
+ }
+
+ /**
+ * @param isLinesVisible the isLinesVisible to set
+ */
+ public void setLinesVisible(boolean isLinesVisible) {
+ this.isLinesVisible = isLinesVisible;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java index 1db8a3a2cd9..dca06dafb1a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xchange; import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.nebula.widgets.xviewer.XViewerSorter; +import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.XViewerArtifactTypeColumn;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java index eacc82df661..f49eaaf7894 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xmerge;
-import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED; +import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED;
import java.io.File;
import java.io.IOException;
import java.util.Date;
@@ -49,8 +49,8 @@ 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.render.VbaWordDiffGenerator;
import org.eclipse.osee.framework.ui.skynet.revert.RevertWizard;
+import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.NonmodalWizardDialog;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
@@ -199,7 +199,7 @@ public class MergeUtility { artifactList.add(((ArtifactConflict) conflict).getSourceArtifact());
artifacts.add(artifactList);
RevertWizard wizard = new RevertWizard(artifacts);
- NonmodalWizardDialog dialog2 = new NonmodalWizardDialog(Display.getCurrent().getActiveShell(), wizard);
+ NonmodalWizardDialog dialog2 = new NonmodalWizardDialog(Displays.getActiveShell(), wizard);
dialog2.create();
dialog2.open();
return true;
@@ -254,7 +254,7 @@ public class MergeUtility { }
MessageDialog dialog =
- new MessageDialog(Display.getCurrent().getActiveShell().getShell(), "Merge Word Artifacts", null, + new MessageDialog(Displays.getActiveShell().getShell(), "Merge Word Artifacts", null, OPEN_MERGE_DIALOG, 4, buttons, 2); int response = dialog.open();
if (buttons.length == 3) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java index 18359c963a9..b9dda9d3223 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java @@ -73,7 +73,6 @@ import org.eclipse.osee.framework.ui.swt.NonmodalWizardDialog; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IViewSite;
@@ -373,7 +372,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList if (attributeConflict != null) {
try {
if (MergeUtility.okToOverwriteEditedValue(attributeConflict,
- Display.getCurrent().getActiveShell().getShell(), false)) {
+ Displays.getActiveShell().getShell(), false)) {
RendererManager.openInJob(attributeConflict.getArtifact(), PresentationType.MERGE_EDIT);
attributeConflict.markStatusToReflectEdit();
@@ -537,7 +536,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList public Object execute(ExecutionEvent event) throws ExecutionException {
RevertWizard wizard = new RevertWizard(revertList);
NonmodalWizardDialog wizardDialog =
- new NonmodalWizardDialog(Display.getCurrent().getActiveShell(), wizard);
+ new NonmodalWizardDialog(Displays.getActiveShell(), wizard);
wizardDialog.create();
wizardDialog.open();
return null;
@@ -594,7 +593,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList @Override
public Object execute(ExecutionEvent event) throws ExecutionException {
if (attributeConflict != null) {
- MergeUtility.launchMerge(attributeConflict, Display.getCurrent().getActiveShell().getShell());
+ MergeUtility.launchMerge(attributeConflict, Displays.getActiveShell().getShell());
}
return null;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java index ba4a8f042d1..fd6878ba810 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java @@ -42,7 +42,6 @@ import org.eclipse.osee.framework.ui.skynet.mergeWizard.ConflictResolutionWizard import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;
@@ -172,7 +171,7 @@ public class MergeXViewer extends XViewer { }
private void respondToIconClick(Conflict conflict, TreeColumn treeColumn) {
- Shell shell = Display.getCurrent().getActiveShell().getShell();
+ Shell shell = Displays.getActiveShell().getShell();
try {
if (conflict.statusNotResolvable()) {
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 4540cb63ed5..7842f457c8b 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 @@ -56,8 +56,8 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.ats.OseeAts;
import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil;
-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.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
import org.eclipse.osee.framework.ui.swt.ALayout;
import org.eclipse.osee.framework.ui.swt.Displays;
@@ -68,7 +68,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Tree;
@@ -680,7 +679,7 @@ public class MergeXWidget extends XWidget implements IAdaptable { if (selections.size() > 0) {
ListSelectionDialogNoSave dialog =
new ListSelectionDialogNoSave(selections.toArray(), - Display.getCurrent().getActiveShell().getShell(), "Apply Prior Merge Resolution", null, + Displays.getActiveShell().getShell(), "Apply Prior Merge Resolution", null, "Select the destination branch that the previous commit was appplied to", 2, new String[] { "Apply", "Cancel"}, 1); if (dialog.open() == 0) {
@@ -689,7 +688,7 @@ public class MergeXWidget extends XWidget implements IAdaptable { }
}
if (selections.isEmpty()) {
- new MessageDialog(Display.getCurrent().getActiveShell().getShell(),
+ new MessageDialog(Displays.getActiveShell().getShell(),
"Apply Prior Merge Resolution", null, "This Source Branch has had No Prior Merges", 2, new String[] {"OK"}, 1).open(); }
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateItemBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateItemBlam.java index c84cb5107bc..9ff11e094b0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateItemBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateItemBlam.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xnavigate;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.BlamEditor;
diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/Displays.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/Displays.java index ae0d6ae6097..980e6b5f33c 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/Displays.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/Displays.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.ui.swt; import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; @@ -53,14 +54,18 @@ public final class Displays { } public static Shell getActiveShell() { - return Displays.getActiveShell(); + return Display.getDefault().getActiveShell(); } public static Color getSystemColor(int colorId) { - return Displays.getSystemColor(colorId); + return Display.getDefault().getSystemColor(colorId); } public static Color getColor(int red, int green, int blue) { return new Color(Display.getDefault(), red, green, blue); } + + public static Image getSystemImage(int id) { + return Display.getDefault().getSystemImage(id); + } } diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ExceptionComposite.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ExceptionComposite.java index 27e1eb53ed4..5ddca870e56 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ExceptionComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ExceptionComposite.java @@ -39,18 +39,18 @@ public class ExceptionComposite extends Composite { Composite composite = new Composite(parent, SWT.BORDER);
composite.setLayout(new GridLayout(2, false));
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+ composite.setBackground(Displays.getSystemColor(SWT.COLOR_LIST_BACKGROUND));
Label imageLabel = new Label(composite, SWT.NONE);
imageLabel.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, false, true));
Image image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
imageLabel.setImage(image);
- imageLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+ imageLabel.setBackground(Displays.getSystemColor(SWT.COLOR_LIST_BACKGROUND));
Text text = new Text(composite, SWT.WRAP);
text.setFont(parent.getFont());
- text.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED));
- text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+ text.setForeground(Displays.getSystemColor(SWT.COLOR_DARK_RED));
+ text.setBackground(Displays.getSystemColor(SWT.COLOR_LIST_BACKGROUND));
text.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, true));
text.setText(ex.toString());
return composite;
diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/HyperLinkLabel.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/HyperLinkLabel.java index 09c13a0dcbe..4a75c2578c8 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/HyperLinkLabel.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/HyperLinkLabel.java @@ -55,7 +55,7 @@ public class HyperLinkLabel extends Label { } public static void adapt(final Label label) { - label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE)); + label.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE)); label.addMouseTrackListener(new MouseTrackListener() { public void mouseEnter(MouseEvent e) { @@ -87,11 +87,11 @@ public class HyperLinkLabel extends Label { public void refresh() { if (hyperEnabled) { - setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE)); + setForeground(Displays.getSystemColor(SWT.COLOR_BLUE)); removeMouseTrackListener(listener); addMouseTrackListener(listener); } else { - setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK)); + setForeground(Displays.getSystemColor(SWT.COLOR_BLACK)); removeMouseTrackListener(listener); } } diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/LabelComposite.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/LabelComposite.java index 087ff361864..7d047d9a354 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/LabelComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/LabelComposite.java @@ -27,11 +27,11 @@ public class LabelComposite extends Composite { super(parent, SWT.NONE);
setLayout(new GridLayout(2, false));
setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+ setBackground(Displays.getSystemColor(SWT.COLOR_LIST_BACKGROUND));
Label text = new Label(this, SWT.WRAP);
text.setFont(parent.getFont());
- text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+ text.setBackground(Displays.getSystemColor(SWT.COLOR_LIST_BACKGROUND));
text.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
text.setText(label);
}
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/PreviewPanel.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/PreviewPanel.java index ea7780ba909..4999a8865bf 100644 --- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/PreviewPanel.java +++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/PreviewPanel.java @@ -75,15 +75,15 @@ public class PreviewPanel extends Composite { defaultComposite = new Composite(parent, SWT.BORDER); defaultComposite.setLayout(new GridLayout()); defaultComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - defaultComposite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); + defaultComposite.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND)); Label label = new Label(defaultComposite, SWT.NONE); Font font = new Font(PlatformUI.getWorkbench().getDisplay(), "Courier New", 10, SWT.BOLD); label.setFont(font); - label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED)); + label.setForeground(Displays.getSystemColor(SWT.COLOR_DARK_RED)); label.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true)); label.setText(PREVIEW_DEFAULT_TITLE); - label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); + label.setBackground(Displays.getSystemColor(SWT.COLOR_INFO_BACKGROUND)); } private Control getControl(PanelEnum panelId) { diff --git a/plugins/org.eclipse.osee.ote.ui.host.cmd/src/org/eclipse/osee/ote/ui/host/cmd/TestServerConsoleServiceRenderer.java b/plugins/org.eclipse.osee.ote.ui.host.cmd/src/org/eclipse/osee/ote/ui/host/cmd/TestServerConsoleServiceRenderer.java index b7bb1badb4f..738eaec8c94 100644 --- a/plugins/org.eclipse.osee.ote.ui.host.cmd/src/org/eclipse/osee/ote/ui/host/cmd/TestServerConsoleServiceRenderer.java +++ b/plugins/org.eclipse.osee.ote.ui.host.cmd/src/org/eclipse/osee/ote/ui/host/cmd/TestServerConsoleServiceRenderer.java @@ -61,9 +61,10 @@ public class TestServerConsoleServiceRenderer implements IServiceRenderer { this.inputManager = new InputManager<TreeParent>(); } + @Override public void refresh() { - Display.getCurrent().asyncExec(new Runnable() { - + Displays.ensureInDisplayThread(new Runnable() { + @Override public void run() { if (composite != null && !composite.isDisposed() && testService != null) { cleanupService(); diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/OteTestManagerImage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/OteTestManagerImage.java index fa4c54ffd38..bc2aee26794 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/OteTestManagerImage.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/OteTestManagerImage.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ote.ui.test.manager;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.osee.framework.ui.swt.KeyedImage;
-import org.eclipse.osee.ote.ui.test.manager.internal.TestManagerPlugin;
+import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.osee.framework.ui.swt.KeyedImage; +import org.eclipse.osee.ote.ui.test.manager.internal.TestManagerPlugin; /**
* @author Andrew M. Finkbeiner
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/scriptTable/xscript/XScriptTableFactory.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/scriptTable/xscript/XScriptTableFactory.java index 5e00e05cb73..f31f2ee6b19 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/scriptTable/xscript/XScriptTableFactory.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/scriptTable/xscript/XScriptTableFactory.java @@ -13,8 +13,8 @@ package org.eclipse.osee.ote.ui.test.manager.pages.scriptTable.xscript; import java.io.File;
import java.util.logging.Level;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XViewerFactory;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.XViewerFactory;
import org.eclipse.nebula.widgets.xviewer.customize.FileStoreCustomizations;
import org.eclipse.nebula.widgets.xviewer.customize.IXViewerCustomizations;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/TestManagerSelectDialog.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/TestManagerSelectDialog.java index 3f75b0fbb9e..d19b298ed01 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/TestManagerSelectDialog.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/TestManagerSelectDialog.java @@ -15,8 +15,8 @@ import java.util.List; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.window.Window; +import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.ote.ui.test.manager.core.TestManagerEditor; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.ListSelectionDialog; /**
@@ -39,7 +39,7 @@ public class TestManagerSelectDialog { };
TestManagerEditor[] input = PluginUtil.getTestManagers();
this.listSelectionDialog =
- new ListSelectionDialog(Display.getCurrent().getActiveShell(), input, new ArrayContentProvider(),
+ new ListSelectionDialog(Displays.getActiveShell(), input, new ArrayContentProvider(),
labelProvider, MESSAGE);
this.listSelectionDialog.setTitle(MESSAGE);
if (input.length > 0) {
|
