Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2016-03-22 16:32:10 -0400
committerRyan D. Brooks2016-03-22 16:32:10 -0400
commit7f30a9c3b295e129fcb40e312ec4a741d2d6751f (patch)
treed3bea2d4d2f1b1cc63415eb5e13f366827c7b8e0 /plugins/org.eclipse.osee.ote.ui.define
parentbddec5b32597e651e565d2a8d14b628c4f0e1a10 (diff)
downloadorg.eclipse.osee-7f30a9c3b295e129fcb40e312ec4a741d2d6751f.tar.gz
org.eclipse.osee-7f30a9c3b295e129fcb40e312ec4a741d2d6751f.tar.xz
org.eclipse.osee-7f30a9c3b295e129fcb40e312ec4a741d2d6751f.zip
XViewer: Move model, parsers and util to xviewer.core
Diffstat (limited to 'plugins/org.eclipse.osee.ote.ui.define')
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java12
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java66
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/DataItemLabelProvider.java2
4 files changed, 40 insertions, 41 deletions
diff --git a/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF
index 39f2eac3ef..e0a1f23dc5 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF
@@ -34,6 +34,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.lowagie.text;version="2.1.7",
org.apache.commons.lang;version="2.4.0",
+ org.eclipse.nebula.widgets.xviewer.core.model,
org.eclipse.osee.framework.access,
org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.core.client.server,
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java
index d2f2eb4312..1fc1bd918c 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java
@@ -25,7 +25,7 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -263,9 +263,8 @@ public class TestRunXViewer extends XViewer {
if (!name.equals(Artifact.UNNAMED)) {
Artifact dispoArtifact = null;
try {
- dispoArtifact =
- ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.TestRunDisposition, name,
- artifact.getBranch());
+ dispoArtifact = ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.TestRunDisposition, name,
+ artifact.getBranch());
} catch (ArtifactDoesNotExist ex) {
dispoArtifact =
ArtifactTypeManager.addArtifact(CoreArtifactTypes.TestRunDisposition, artifact.getBranch());
@@ -278,9 +277,8 @@ public class TestRunXViewer extends XViewer {
}
}
try {
- returnValue =
- ArtifactPromptChange.promptChangeAttribute(OteAttributeTypes.TestDisposition, dispositionArtifacts, true,
- false);
+ returnValue = ArtifactPromptChange.promptChangeAttribute(OteAttributeTypes.TestDisposition,
+ dispositionArtifacts, true, false);
refresh();
} catch (Exception ex) {
OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java
index bd87f5d678..ea7c999e80 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewerFactory.java
@@ -10,12 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.ote.ui.define.viewers;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData;
+import org.eclipse.nebula.widgets.xviewer.core.model.CustomizeData;
+import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
import org.eclipse.osee.ote.ui.define.views.TestRunView;
-import org.eclipse.swt.SWT;
/**
* @author Roberto E. Escobar
@@ -23,52 +23,52 @@ import org.eclipse.swt.SWT;
public class TestRunXViewerFactory extends SkynetXViewerFactory {
public static final XViewerColumn DISPOSITION = new XViewerColumn("ote.test.run.view.Disposition", "Disposition",
- 300, SWT.LEFT, true, SortDataType.String, true, null);
+ 300, XViewerAlign.Left, true, SortDataType.String, true, null);
public TestRunXViewerFactory() {
super(TestRunView.VIEW_ID);
registerAllAttributeColumns();
- registerColumns(new XViewerColumn("ote.test.run.view.Name", "Name", 150, SWT.LEFT, true, SortDataType.String,
- false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Passed", "Passed", 50, SWT.LEFT, true, SortDataType.Integer,
- false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Failed", "Failed", 50, SWT.LEFT, true, SortDataType.Integer,
- false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Total Test Points", "Total Test Points", 50, SWT.LEFT,
- false, SortDataType.Integer, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Status", "Status", 150, SWT.LEFT, true, SortDataType.String,
- false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Script Aborted", "Script Aborted", 150, SWT.LEFT, false,
- SortDataType.Boolean, false, null));
-
- registerColumns(new XViewerColumn("ote.test.run.view.Ran In Batch Mode", "Ran In Batch Mode", 150, SWT.LEFT,
+ registerColumns(new XViewerColumn("ote.test.run.view.Name", "Name", 150, XViewerAlign.Left, true,
+ SortDataType.String, false, null));
+ registerColumns(new XViewerColumn("ote.test.run.view.Passed", "Passed", 50, XViewerAlign.Left, true,
+ SortDataType.Integer, false, null));
+ registerColumns(new XViewerColumn("ote.test.run.view.Failed", "Failed", 50, XViewerAlign.Left, true,
+ SortDataType.Integer, false, null));
+ registerColumns(new XViewerColumn("ote.test.run.view.Total Test Points", "Total Test Points", 50,
+ XViewerAlign.Left, false, SortDataType.Integer, false, null));
+ registerColumns(new XViewerColumn("ote.test.run.view.Status", "Status", 150, XViewerAlign.Left, true,
+ SortDataType.String, false, null));
+ registerColumns(new XViewerColumn("ote.test.run.view.Script Aborted", "Script Aborted", 150, XViewerAlign.Left,
false, SortDataType.Boolean, false, null));
+
+ registerColumns(new XViewerColumn("ote.test.run.view.Ran In Batch Mode", "Ran In Batch Mode", 150,
+ XViewerAlign.Left, false, SortDataType.Boolean, false, null));
registerColumns(new XViewerColumn("ote.test.run.view.Is Batch Mode Allowed", "Is Batch Mode Allowed", 150,
- SWT.LEFT, false, SortDataType.Boolean, false, null));
+ XViewerAlign.Left, false, SortDataType.Boolean, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Start Date", "Start Date", 150, SWT.LEFT, false,
+ registerColumns(new XViewerColumn("ote.test.run.view.Start Date", "Start Date", 150, XViewerAlign.Left, false,
SortDataType.Date, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.End Date", "End Date", 150, SWT.LEFT, false,
+ registerColumns(new XViewerColumn("ote.test.run.view.End Date", "End Date", 150, XViewerAlign.Left, false,
SortDataType.Date, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Elapsed Date", "Elapsed Date", 150, SWT.LEFT, false,
+ registerColumns(new XViewerColumn("ote.test.run.view.Elapsed Date", "Elapsed Date", 150, XViewerAlign.Left, false,
SortDataType.String, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Processor ID", "Processor ID", 150, SWT.LEFT, false,
+ registerColumns(new XViewerColumn("ote.test.run.view.Processor ID", "Processor ID", 150, XViewerAlign.Left, false,
SortDataType.String, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Build Id", "Build Id", 150, SWT.LEFT, false,
+ registerColumns(new XViewerColumn("ote.test.run.view.Build Id", "Build Id", 150, XViewerAlign.Left, false,
SortDataType.String, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Qualification Level", "Qualification Level", 150, SWT.LEFT,
- true, SortDataType.String, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Last Author", "Last Author", 150, SWT.LEFT, false,
+ registerColumns(new XViewerColumn("ote.test.run.view.Qualification Level", "Qualification Level", 150,
+ XViewerAlign.Left, true, SortDataType.String, false, null));
+ registerColumns(new XViewerColumn("ote.test.run.view.Last Author", "Last Author", 150, XViewerAlign.Left, false,
SortDataType.String, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Last Modified Date", "Last Modified Date", 150, SWT.LEFT,
- false, SortDataType.Date, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.Revision", "Revision", 150, SWT.LEFT, false,
+ registerColumns(new XViewerColumn("ote.test.run.view.Last Modified Date", "Last Modified Date", 150,
+ XViewerAlign.Left, false, SortDataType.Date, false, null));
+ registerColumns(new XViewerColumn("ote.test.run.view.Revision", "Revision", 150, XViewerAlign.Left, false,
SortDataType.String, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.OS Name", "OS Name", 150, SWT.LEFT, false,
+ registerColumns(new XViewerColumn("ote.test.run.view.OS Name", "OS Name", 150, XViewerAlign.Left, false,
SortDataType.String, false, null));
- registerColumns(new XViewerColumn("ote.test.run.view.User Id", "User Id", 150, SWT.LEFT, false,
+ registerColumns(new XViewerColumn("ote.test.run.view.User Id", "User Id", 150, XViewerAlign.Left, false,
SortDataType.String, false, null));
registerColumns(DISPOSITION);
}
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/DataItemLabelProvider.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/DataItemLabelProvider.java
index 95b73d6e50..4230e10da6 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/DataItemLabelProvider.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/DataItemLabelProvider.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.ote.ui.define.viewers.data;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.swt.graphics.Image;
/**

Back to the top