Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2016-06-24 13:40:20 -0400
committerdonald.g.dunne2016-06-24 13:40:20 -0400
commit93ecc0a364333457d025e035ce28dd42b28fd0f3 (patch)
treebe027dff270f3ab8e29b2ca25e7598f4d3784783
parentc812509191bfcab6fbdef2d7a1fc0c6e1a96a010 (diff)
downloadorg.eclipse.osee-93ecc0a364333457d025e035ce28dd42b28fd0f3.tar.gz
org.eclipse.osee-93ecc0a364333457d025e035ce28dd42b28fd0f3.tar.xz
org.eclipse.osee-93ecc0a364333457d025e035ce28dd42b28fd0f3.zip
feature[ats_ATS292333]: Upgrade to neon
-rw-r--r--features/org.eclipse.osee.dep.feature/feature.xml2
-rw-r--r--features/org.eclipse.osee.dep.feature/pom.xml3
-rw-r--r--features/org.eclipse.osee.x.server.external.feature/feature.xml191
-rw-r--r--features/org.eclipse.osee.x.server.external.feature/pom.xml5
-rw-r--r--plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF15
-rw-r--r--plugins/org.eclipse.osee.ats.dsl.ui/build.properties13
-rw-r--r--plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.osee.ats.dsl/build.properties12
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeTransitionComposite.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java6
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/AbstractXComboViewerSearchWidget.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XAtsProgramComboWidget.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameReverseSorter.java7
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameSorter.java9
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListAndTitleDialog.java9
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListDialog.java9
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java4
-rw-r--r--plugins/org.eclipse.osee.dep.parent/README.txt3
-rw-r--r--plugins/org.eclipse.osee.dep.parent/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui/build.properties13
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF13
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/build.properties11
-rw-r--r--plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/StringViewerSorter.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableXviewer.java9
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java9
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java15
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java13
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeDialog.java7
-rw-r--r--plugins/org.eclipse.osee.orcs.parent/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/client/ClientResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.osee.orcs.script.dsl/build.properties13
-rw-r--r--plugins/org.eclipse.osee.orcs.script.dsl/xtend-gen/org/eclipse/osee/orcs/script/dsl/generator/.OrcsScriptDslGenerator.xtendbinbin2154 -> 2152 bytes
37 files changed, 326 insertions, 139 deletions
diff --git a/features/org.eclipse.osee.dep.feature/feature.xml b/features/org.eclipse.osee.dep.feature/feature.xml
index beede6a5da..b21acf2022 100644
--- a/features/org.eclipse.osee.dep.feature/feature.xml
+++ b/features/org.eclipse.osee.dep.feature/feature.xml
@@ -342,8 +342,6 @@
<import feature="org.eclipse.emf" version="2.9.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.common" version="2.9.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.ecore" version="2.9.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.xtext.runtime" version="2.9.0" match="equivalent"/>
- <import plugin="org.eclipse.xtext.util" version="2.9.0" match="equivalent"/>
<import plugin="com.lowagie.text" version="2.0.0" match="compatible"/>
</requires>
diff --git a/features/org.eclipse.osee.dep.feature/pom.xml b/features/org.eclipse.osee.dep.feature/pom.xml
index b21cc71693..8b1f14fa90 100644
--- a/features/org.eclipse.osee.dep.feature/pom.xml
+++ b/features/org.eclipse.osee.dep.feature/pom.xml
@@ -43,6 +43,7 @@
<plugin id="org.antlr.runtime" />
<plugin id="org.cyberneko.html" />
<plugin id="org.apache.commons.io" />
+ <plugin id="org.apache.commons.cli" />
<plugin id="org.eclipse.team.svn" />
<plugin id="org.eclipse.team.svn.core" />
<plugin id="ch.qos.logback.slf4j" />
@@ -55,6 +56,8 @@
<feature id="org.eclipse.core.runtime.feature" />
<feature id="org.eclipse.xtext.sdk" />
<feature id="org.eclipse.emf" />
+ <feature id="org.eclipse.emf.mwe2.language.sdk" />
+ <feature id="org.eclipse.emf.mwe2.runtime.sdk" />
<feature id="org.eclipse.sdk" />
<feature id="org.eclipse.xtend.sdk" />
<feature id="org.eclipse.xtext.docs" />
diff --git a/features/org.eclipse.osee.x.server.external.feature/feature.xml b/features/org.eclipse.osee.x.server.external.feature/feature.xml
index eb8c4488da..9bd592fa35 100644
--- a/features/org.eclipse.osee.x.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.x.server.external.feature/feature.xml
@@ -43,11 +43,6 @@
<import plugin="com.google.gson" version="2.1.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/>
<import plugin="org.apache.commons.pool" version="1.6.0" match="compatible"/>
- <import feature="org.eclipse.emf" version="2.9.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.emf.common" version="2.9.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.emf.ecore" version="2.9.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.xtext.runtime" version="2.9.0" match="equivalent"/>
- <import plugin="org.eclipse.xtext.util" version="2.9.0" match="equivalent"/>
<import plugin="com.lowagie.text" version="2.0.0" match="compatible"/>
</requires>
@@ -344,26 +339,200 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
+
+ <plugin
id="org.eclipse.xtend.lib"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
+
+ <plugin
id="org.eclipse.xtend.lib.macro"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
+
+ <plugin
id="org.eclipse.xtext.smap"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.xtext.xbase"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.ibm.icu"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.xtext.xtext.generator"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.xtend"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.xtext.ecore"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.xtend.typesystem.emf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.mwe.utils"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.cli"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.codegen"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.ant.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.filesystem"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.text"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.commands"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.mwe2.runtime"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.debug.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.variables"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.resources"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jdt.debug"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.jdt.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.mwe.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.expressions"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jdt.launching"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.codegen.ecore"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.xpand"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.xtext.generator"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.osee.x.server.external.feature/pom.xml b/features/org.eclipse.osee.x.server.external.feature/pom.xml
index a5e07bc750..9898ba7c04 100644
--- a/features/org.eclipse.osee.x.server.external.feature/pom.xml
+++ b/features/org.eclipse.osee.x.server.external.feature/pom.xml
@@ -34,6 +34,11 @@
<plugin id="org.eclipse.jetty.server" />
<plugin id="org.eclipse.jetty.servlet" />
<plugin id="org.eclipse.jetty.util" />
+ <plugin id="org.eclipse.xtext" />
+ <plugin id="org.eclipse.xtend.lib" />
+ <plugin id="org.eclipse.xtend.lib.macro" />
+ <plugin id="org.eclipse.xtext.smap" />
+ <plugin id="org.apache.commons.cli" />
</excludes>
</configuration>
</execution>
diff --git a/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF
index b4de5ddf8a..45f8ef0d46 100644
--- a/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF
@@ -5,17 +5,16 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-Version: 0.25.0.qualifier
Bundle-SymbolicName: org.eclipse.osee.ats.dsl.ui; singleton:=true
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.osee.ats.dsl;visibility:=reexport,
- org.eclipse.xtext.ui,
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.osee.ats.dsl;visibility:=reexport,
+ org.eclipse.xtext.xbase,
+ org.eclipse.ui,
org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.equinox.common;bundle-version="3.5.0",
+ org.eclipse.xtext.ui,
org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
org.eclipse.xtext.builder,
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.eclipse.xtext.common.types.ui,
- org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.compare
+ org.eclipse.xtext.generator;resolution:=optional
Import-Package: org.apache.commons.logging,
org.apache.log4j;version="1.2.15",
org.eclipse.osee.framework.core.exception,
diff --git a/plugins/org.eclipse.osee.ats.dsl.ui/build.properties b/plugins/org.eclipse.osee.ats.dsl.ui/build.properties
index e10dcceb6a..46337ef494 100644
--- a/plugins/org.eclipse.osee.ats.dsl.ui/build.properties
+++ b/plugins/org.eclipse.osee.ats.dsl.ui/build.properties
@@ -2,4 +2,15 @@ source.. = src/,\
src-gen/
bin.includes = META-INF/,\
.,\
- plugin.xml \ No newline at end of file
+ plugin.xml
+additional.bundles = org.eclipse.xtext.xbase,\
+ org.eclipse.xtext.common.types,\
+ org.eclipse.xtext.xtext.generator,\
+ org.eclipse.emf.codegen.ecore,\
+ org.eclipse.emf.mwe.utils,\
+ org.eclipse.emf.mwe2.launch,\
+ org.eclipse.emf.mwe2.lib,\
+ org.objectweb.asm,\
+ org.apache.commons.logging,\
+ org.apache.log4j,\
+ com.ibm.icu \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF
index a2b12f4af7..2ab10aaaa4 100644
--- a/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF
@@ -19,16 +19,8 @@ Export-Package: org.eclipse.osee.ats.dsl,
org.eclipse.osee.ats.dsl.scoping,
org.eclipse.osee.ats.dsl.formatting
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.codegen.ecore;resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.mwe.utils;resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.mwe2.launch;resolution:=optional;x-installation:=greedy,
- org.eclipse.xtext.ui.codetemplates;resolution:=optional;x-installation:=greedy,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.eclipse.xtext.common.types,
+ org.eclipse.xtext.xbase,
+ org.eclipse.equinox.common;bundle-version="3.5.0",
org.eclipse.xtext.xbase.lib
Import-Package: org.apache.commons.logging,
org.apache.log4j;version="1.2.15",
diff --git a/plugins/org.eclipse.osee.ats.dsl/build.properties b/plugins/org.eclipse.osee.ats.dsl/build.properties
index a3dce6f7ac..d07d103e0e 100644
--- a/plugins/org.eclipse.osee.ats.dsl/build.properties
+++ b/plugins/org.eclipse.osee.ats.dsl/build.properties
@@ -4,4 +4,14 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
OSGI-INF/
-
+additional.bundles = org.eclipse.xtext.xbase,\
+ org.eclipse.xtext.common.types,\
+ org.eclipse.xtext.xtext.generator,\
+ org.eclipse.emf.codegen.ecore,\
+ org.eclipse.emf.mwe.utils,\
+ org.eclipse.emf.mwe2.launch,\
+ org.eclipse.emf.mwe2.lib,\
+ org.objectweb.asm,\
+ org.apache.commons.logging,\
+ org.apache.log4j,\
+ com.ibm.icu
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
index e6bb8a3cc6..63a145c9d1 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
@@ -154,7 +154,7 @@ public class NewActionPage1 extends WizardPage {
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
}
- treeViewer.getViewer().setSorter(new AtsObjectNameSorter());
+ treeViewer.getViewer().setComparator(new AtsObjectNameSorter());
GridData gridData1 = new GridData(GridData.FILL_BOTH);
gridData1.heightHint = 400;
treeViewer.setLayoutData(gridData1);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeTransitionComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeTransitionComposite.java
index a74e33a608..8e820a664f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeTransitionComposite.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeTransitionComposite.java
@@ -128,7 +128,7 @@ public class WfeTransitionComposite extends Composite {
transitionToStateCombo.setInput(allPages);
transitionToStateCombo.setLabelProvider(new StateDefinitionLabelProvider());
transitionToStateCombo.setContentProvider(new ArrayContentProvider());
- transitionToStateCombo.setSorter(new StateDefinitionViewSorter());
+ transitionToStateCombo.setComparator(new StateDefinitionViewSorter());
transitionToStateCombo.createWidgets(this, 1);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java
index 1a71f7ce5c..34727be403 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java
@@ -138,21 +138,21 @@ public class ModifyActionableItemsBlam extends AbstractBlam {
wfTree = new FilteredCheckboxTree(treeComp, SWT.CHECK | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
wfTree.getViewer().setContentProvider(new WorkflowsActiveAisContentProvider(defaultTeamWorkflow, Active.Active));
wfTree.getViewer().setLabelProvider(new AtsObjectLabelProvider());
- wfTree.getViewer().setSorter(new AtsObjectNameSorter());
+ wfTree.getViewer().setComparator(new AtsObjectNameSorter());
wfTree.setLayoutData(data);
wfTree.getViewer().addPostSelectionChangedListener(new ModificationListener());
otherTree = new FilteredCheckboxTree(treeComp, SWT.READ_ONLY | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
otherTree.getViewer().setContentProvider(new ArrayTreeContentProvider());
otherTree.getViewer().setLabelProvider(new AtsObjectLabelProvider());
- otherTree.getViewer().setSorter(new AtsObjectNameSorter());
+ otherTree.getViewer().setComparator(new AtsObjectNameSorter());
otherTree.setLayoutData(data);
otherTree.setEnabled(false);
newTree = new FilteredCheckboxTree(treeComp, SWT.CHECK | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
newTree.getViewer().setContentProvider(new AITreeContentProvider(Active.Active));
newTree.getViewer().setLabelProvider(new AtsObjectLabelProvider());
- newTree.getViewer().setSorter(new AtsObjectNameSorter());
+ newTree.getViewer().setComparator(new AtsObjectNameSorter());
newTree.setLayoutData(data);
newTree.getViewer().addPostSelectionChangedListener(new ModificationListener());
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/AbstractXComboViewerSearchWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/AbstractXComboViewerSearchWidget.java
index 76dc53b9e4..01f918a15f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/AbstractXComboViewerSearchWidget.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/widget/AbstractXComboViewerSearchWidget.java
@@ -68,7 +68,7 @@ public abstract class AbstractXComboViewerSearchWidget<ObjectType extends Object
input.add(CLEAR);
}
combo.setInput(input);
- combo.setSorter(new ToStringViewerSorter(true));
+ combo.setComparator(new ToStringViewerSorter(true));
combo.getCombo().setText(getInitialText());
if (!listenerAdded) {
listenerAdded = true;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XAtsProgramComboWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XAtsProgramComboWidget.java
index 6b7891819e..5099daed5f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XAtsProgramComboWidget.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XAtsProgramComboWidget.java
@@ -35,7 +35,7 @@ public class XAtsProgramComboWidget extends XComboViewer {
this.atsPrograms = atsPrograms;
setLabelProvider(new AtsProgramLabelProvider());
setContentProvider(new ArrayContentProvider());
- setSorter(new StringNameSorter());
+ setComparator(new StringNameSorter());
}
public XAtsProgramComboWidget(Collection<? extends IAtsProgram> atsPrograms) throws OseeCoreException {
@@ -57,7 +57,7 @@ public class XAtsProgramComboWidget extends XComboViewer {
@Override
protected void createControls(Composite parent, int horizontalSpan) {
super.createControls(parent, horizontalSpan);
- setSorter(new AtsProgramViewerSorter());
+ setComparator(new AtsProgramViewerSorter());
reload();
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameReverseSorter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameReverseSorter.java
index 209ba1a8a7..6af5d312d3 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameReverseSorter.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameReverseSorter.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.ats.util.widgets.dialog;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.osee.ats.api.IAtsObject;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
*
* @author Donald G. Dunne
*/
-public class AtsObjectNameReverseSorter extends ViewerSorter {
+public class AtsObjectNameReverseSorter extends ViewerComparator {
/**
* Default sorter for artifacts. Sorts on descriptive name
@@ -30,14 +30,13 @@ public class AtsObjectNameReverseSorter extends ViewerSorter {
}
@Override
- @SuppressWarnings("unchecked")
public int compare(Viewer viewer, Object o1, Object o2) {
if (o1 instanceof IAtsObject && o2 instanceof IAtsObject) {
return getComparator().compare(((IAtsObject) o2).getName(), ((IAtsObject) o1).getName());
} else if (o1 instanceof Artifact && o2 instanceof Artifact) {
return getComparator().compare(((Artifact) o2).getName(), ((Artifact) o1).getName());
} else if (o1 instanceof String && o2 instanceof String) {
- return getComparator().compare(o2, o1);
+ return getComparator().compare((String) o2, (String) o1);
}
return super.compare(viewer, o2, o1);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameSorter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameSorter.java
index 298c4815d9..e4cf93a6f6 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameSorter.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameSorter.java
@@ -11,26 +11,25 @@
package org.eclipse.osee.ats.util.widgets.dialog;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.osee.ats.api.IAtsObject;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
* Default sorter for artifacts. Sorts on descriptive name
- *
+ *
* @author Donald G. Dunne
*/
-public class AtsObjectNameSorter extends ViewerSorter {
+public class AtsObjectNameSorter extends ViewerComparator {
@Override
- @SuppressWarnings("unchecked")
public int compare(Viewer viewer, Object o1, Object o2) {
if (o1 instanceof IAtsObject && o2 instanceof IAtsObject) {
return getComparator().compare(((IAtsObject) o1).getName(), ((IAtsObject) o2).getName());
} else if (o1 instanceof Artifact && o2 instanceof Artifact) {
return getComparator().compare(((Artifact) o1).getName(), ((Artifact) o2).getName());
} else if (o1 instanceof String && o2 instanceof String) {
- return getComparator().compare(o1, o2);
+ return getComparator().compare((String) o1, (String) o2);
}
return super.compare(viewer, o1, o2);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListAndTitleDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListAndTitleDialog.java
index b4be610c68..57b2ea1351 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListAndTitleDialog.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/StateListAndTitleDialog.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.ats.util.widgets.dialog;
import java.util.Collection;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;
import org.eclipse.osee.framework.ui.skynet.widgets.XText;
@@ -53,13 +54,7 @@ public class StateListAndTitleDialog extends StateListDialog {
});
Control control = super.createDialogArea(container);
- getTableViewer().setSorter(new ViewerSorter() {
- @SuppressWarnings("unchecked")
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- return getComparator().compare(e1, e2);
- }
- });
+ getTableViewer().setComparator(new ViewerComparator());
return control;
}
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 603b08bd45..9de593eda2 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
@@ -13,6 +13,7 @@ package org.eclipse.osee.ats.util.widgets.dialog;
import java.util.Collection;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.osee.framework.ui.plugin.util.StringLabelProvider;
import org.eclipse.osee.framework.ui.swt.Displays;
@@ -37,13 +38,7 @@ public class StateListDialog extends ListDialog {
@Override
protected Control createDialogArea(Composite container) {
Control control = super.createDialogArea(container);
- getTableViewer().setSorter(new ViewerSorter() {
- @SuppressWarnings("unchecked")
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- return getComparator().compare(e1, e2);
- }
- });
+ getTableViewer().setComparator(new ViewerComparator());
return control;
}
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 ca1ceb8221..809ac59c43 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
@@ -75,7 +75,7 @@ public class TeamVersionListDialog extends SelectionDialog {
teamCombo.setInput(objs);
teamCombo.setLabelProvider(new AtsObjectLabelProvider());
teamCombo.setContentProvider(new ArrayContentProvider());
- teamCombo.setSorter(new AtsObjectNameSorter());
+ teamCombo.setComparator(new AtsObjectNameSorter());
teamCombo.setGrabHorizontal(true);
teamCombo.createWidgets(comp, 2);
teamCombo.getCombo().setVisibleItemCount(20);
@@ -105,7 +105,7 @@ public class TeamVersionListDialog extends SelectionDialog {
versionCombo.setLabelProvider(new AtsObjectLabelProvider());
versionCombo.setContentProvider(new ArrayContentProvider());
- versionCombo.setSorter(new AtsObjectNameSorter());
+ versionCombo.setComparator(new AtsObjectNameSorter());
versionCombo.setGrabHorizontal(true);
versionCombo.createWidgets(comp, 2);
versionCombo.getCombo().setVisibleItemCount(20);
diff --git a/plugins/org.eclipse.osee.dep.parent/README.txt b/plugins/org.eclipse.osee.dep.parent/README.txt
index 0fad593107..6949778842 100644
--- a/plugins/org.eclipse.osee.dep.parent/README.txt
+++ b/plugins/org.eclipse.osee.dep.parent/README.txt
@@ -1 +1,2 @@
-mvn clean verify -Declipse-ip-site=file:../../../org.eclipse.ip/org.eclipse.ip.p2/target/repository/
+If building locally and you get an error regarding not being able to load p2 site eclipse-ip (trying from github.com), point it to a locally built p2 site via:
+ -Declipse-ip-site=file:../../../org.eclipse.ip/org.eclipse.ip.p2/target/repository/ \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.dep.parent/pom.xml b/plugins/org.eclipse.osee.dep.parent/pom.xml
index c69c183826..199e744fcc 100644
--- a/plugins/org.eclipse.osee.dep.parent/pom.xml
+++ b/plugins/org.eclipse.osee.dep.parent/pom.xml
@@ -34,7 +34,7 @@
<jaxdoclet-version>0.9.0</jaxdoclet-version>
<maven-clean-version>2.5</maven-clean-version>
- <platform-version-name>mars</platform-version-name>
+ <platform-version-name>neon</platform-version-name>
<!-- <orbit-version>R20150124073747</orbit-version> -->
<orbit-version>R20160520211859</orbit-version>
<subversive-version>1.0</subversive-version>
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF
index 86cf9f5c69..d29cbfcd1b 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.osee.framework.core.dsl;visibility:=reexport,
org.eclipse.xtext.ui.shared,
org.eclipse.ui,
org.eclipse.xtext.builder,
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.common.types.ui,
org.eclipse.xtext.ui.codetemplates.ui,
org.eclipse.compare
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/build.properties b/plugins/org.eclipse.osee.framework.core.dsl.ui/build.properties
index e10dcceb6a..46337ef494 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui/build.properties
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/build.properties
@@ -2,4 +2,15 @@ source.. = src/,\
src-gen/
bin.includes = META-INF/,\
.,\
- plugin.xml \ No newline at end of file
+ plugin.xml
+additional.bundles = org.eclipse.xtext.xbase,\
+ org.eclipse.xtext.common.types,\
+ org.eclipse.xtext.xtext.generator,\
+ org.eclipse.emf.codegen.ecore,\
+ org.eclipse.emf.mwe.utils,\
+ org.eclipse.emf.mwe2.launch,\
+ org.eclipse.emf.mwe2.lib,\
+ org.objectweb.asm,\
+ org.apache.commons.logging,\
+ org.apache.log4j,\
+ com.ibm.icu \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF
index a76a509d96..25c3e1ab48 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF
@@ -6,16 +6,9 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.codegen.ecore;resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.mwe.utils;resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.mwe2.launch;resolution:=optional;x-installation:=greedy,
- org.eclipse.xtext.ui.codetemplates;resolution:=optional;x-installation:=greedy,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.eclipse.xtext.common.types,
+ org.eclipse.xtext.xbase,
+ org.eclipse.equinox.common;bundle-version="3.5.0",
+ org.eclipse.xtext.generator;resolution:=optional
org.eclipse.xtext.xbase.lib
Import-Package: org.apache.commons.logging,
org.apache.log4j;version="1.2.15",
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/build.properties b/plugins/org.eclipse.osee.framework.core.dsl/build.properties
index 71a7dd528b..46337ef494 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/build.properties
+++ b/plugins/org.eclipse.osee.framework.core.dsl/build.properties
@@ -3,3 +3,14 @@ source.. = src/,\
bin.includes = META-INF/,\
.,\
plugin.xml
+additional.bundles = org.eclipse.xtext.xbase,\
+ org.eclipse.xtext.common.types,\
+ org.eclipse.xtext.xtext.generator,\
+ org.eclipse.emf.codegen.ecore,\
+ org.eclipse.emf.mwe.utils,\
+ org.eclipse.emf.mwe2.launch,\
+ org.eclipse.emf.mwe2.lib,\
+ org.objectweb.asm,\
+ org.apache.commons.logging,\
+ org.apache.log4j,\
+ com.ibm.icu \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/StringViewerSorter.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/StringViewerSorter.java
index 1b5ea9e16b..1afbbfc088 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/StringViewerSorter.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/StringViewerSorter.java
@@ -12,12 +12,13 @@ package org.eclipse.osee.framework.ui.plugin.util;
import java.text.Collator;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerSorter;
/**
* @author Donald G. Dunne
*/
-public class StringViewerSorter extends ViewerSorter {
+public class StringViewerSorter extends ViewerComparator {
public StringViewerSorter() {
// do nothing
@@ -27,9 +28,10 @@ public class StringViewerSorter extends ViewerSorter {
super(collator);
}
- @SuppressWarnings("unchecked")
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
- return getComparator().compare(e1, e2);
+ String s1 = e1 != null ? e1.toString() : null;
+ String s2 = e2 != null ? e2.toString() : null;
+ return getComparator().compare(s1, s2);
}
}
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 88fc5a30ec..53b086b42b 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
@@ -12,6 +12,7 @@ package org.eclipse.osee.framework.ui.skynet;
import java.util.ArrayList;
import java.util.Collection;
+
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnViewerEditor;
import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
@@ -21,7 +22,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerEditor;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.help.ui.OseeHelpContext;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -183,23 +184,22 @@ public class AttributesComposite extends Composite {
}
tableViewer.setContentProvider(new AttributeContentProvider());
tableViewer.setLabelProvider(new AttributeLabelProvider());
- tableViewer.setSorter(new AttributeNameSorter());
+ tableViewer.setComparator(new AttributeNameSorter());
tableViewer.setInput(artifact);
}
- public class AttributeNameSorter extends ViewerSorter {
+ public class AttributeNameSorter extends ViewerComparator {
public AttributeNameSorter() {
super();
}
@Override
- @SuppressWarnings("unchecked")
public int compare(Viewer viewer, Object o1, Object o2) {
if (o1 instanceof Attribute && o2 instanceof Attribute) {
return getComparator().compare(((Attribute<?>) o1).getAttributeType().getName(),
((Attribute<?>) o2).getAttributeType().getName());
} else if (o1 instanceof String && o2 instanceof String) {
- return getComparator().compare(o1, o2);
+ return getComparator().compare((String) o1, (String) o2);
}
return super.compare(viewer, o1, o2);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableXviewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableXviewer.java
index b81e1c3b1b..d89d8a786d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableXviewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableXviewer.java
@@ -23,6 +23,7 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.jface.window.Window;
import org.eclipse.nebula.widgets.xviewer.IMultiColumnEditProvider;
@@ -129,13 +130,7 @@ public class PolicyTableXviewer extends XViewer implements IMultiColumnEditProvi
@Override
protected Control createDialogArea(Composite container) {
Control control = super.createDialogArea(container);
- getTableViewer().setSorter(new ViewerSorter() {
- @SuppressWarnings("unchecked")
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- return getComparator().compare(e1, e2);
- }
- });
+ getTableViewer().setComparator(new ViewerComparator());
return control;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java
index d8342bb108..ab4360fa26 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java
@@ -11,21 +11,20 @@
package org.eclipse.osee.framework.ui.skynet.util;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
- * Default sorter for artifacts. Sorts on descriptive name
+ * Default sorter for artifacts. Sorts on descript ive name
*/
-public class ArtifactNameSorter extends ViewerSorter {
+public class ArtifactNameSorter extends ViewerComparator {
@Override
- @SuppressWarnings("unchecked")
public int compare(Viewer viewer, Object o1, Object o2) {
if (o1 instanceof Artifact && o2 instanceof Artifact) {
return getComparator().compare(((Artifact) o1).getName(), ((Artifact) o2).getName());
} else if (o1 instanceof String && o2 instanceof String) {
- return getComparator().compare(o1, o2);
+ return getComparator().compare((String) o1, (String) o2);
}
return super.compare(viewer, o1, o2);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java
index 9d9d783195..0799cadcd0 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -22,7 +23,7 @@ import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider;
import org.eclipse.osee.framework.ui.skynet.ToStringViewerSorter;
@@ -62,9 +63,9 @@ public class XComboViewer extends GenericXWidget {
};
private Collection<Object> input;
private IContentProvider contentProvider;
- private ViewerSorter sorter;
+ private ViewerComparator sorter;
private int widthHint;
- private int heightHint;
+ private int heightHint;
public XComboViewer(String displayLabel, int comboWidgetSWTStyle) {
super(displayLabel);
@@ -81,10 +82,10 @@ public class XComboViewer extends GenericXWidget {
this.contentProvider = contentProvider;
}
- public void setSorter(ViewerSorter sorter) {
+ public void setComparator(ViewerComparator sorter) {
this.sorter = sorter;
if (comboViewer != null) {
- comboViewer.setSorter(sorter);
+ comboViewer.setComparator(sorter);
}
}
@@ -150,9 +151,9 @@ public class XComboViewer extends GenericXWidget {
comboViewer.setContentProvider(contentProvider);
comboViewer.setLabelProvider(getLabelProvider());
if (sorter != null) {
- comboViewer.setSorter(sorter);
+ comboViewer.setComparator(sorter);
} else if (isUseToStringSorter()) {
- comboViewer.setSorter(new ToStringViewerSorter());
+ comboViewer.setComparator(new ToStringViewerSorter());
}
comboViewer.setInput(input);
comboViewer.getCombo().addSelectionListener(new SelectionAdapter() {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java
index bc005ff3a1..1ea3b83f42 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java
@@ -20,6 +20,7 @@ import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.osee.framework.core.util.Result;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -47,7 +48,7 @@ public class FilteredCheckboxTreeDialog extends MessageDialog {
private final IContentProvider contentProvider;
private final IBaseLabelProvider labelProvider;
private Collection<? extends Object> initialSelections;
- private final ViewerSorter viewerSorter;
+ private final ViewerComparator viewerComparator;
private boolean showSelectButtons = false;
private boolean expandChecked = false;
private boolean multiSelect = true;
@@ -58,17 +59,17 @@ public class FilteredCheckboxTreeDialog extends MessageDialog {
this(dialogTitle, dialogMessage, contentProvider, labelProvider, null);
}
- public FilteredCheckboxTreeDialog(String dialogTitle, String dialogMessage, IContentProvider contentProvider, IBaseLabelProvider labelProvider, ViewerSorter viewerSorter) {
+ public FilteredCheckboxTreeDialog(String dialogTitle, String dialogMessage, IContentProvider contentProvider, IBaseLabelProvider labelProvider, ViewerComparator viewerSorter) {
super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE,
new String[] {"OK", "Cancel"}, 0);
this.contentProvider = contentProvider;
this.labelProvider = labelProvider;
- this.viewerSorter = viewerSorter;
+ this.viewerComparator = viewerSorter;
this.patternFilter = new ToStringContainsPatternFilter();
setShellStyle(getShellStyle() | SWT.RESIZE);
}
- public FilteredCheckboxTreeDialog(String dialogTitle, String dialogMessage, Set<Artifact> artifacts, IContentProvider contentProvider, IBaseLabelProvider labelProvider, ViewerSorter viewerSorter) {
+ public FilteredCheckboxTreeDialog(String dialogTitle, String dialogMessage, Set<Artifact> artifacts, IContentProvider contentProvider, IBaseLabelProvider labelProvider, ViewerComparator viewerSorter) {
this(dialogTitle, dialogMessage, contentProvider, labelProvider, viewerSorter);
this.selectables = artifacts;
}
@@ -140,8 +141,8 @@ public class FilteredCheckboxTreeDialog extends MessageDialog {
treeViewer.getViewer().setContentProvider(contentProvider);
treeViewer.getViewer().setLabelProvider(labelProvider);
treeViewer.getViewer().setAutoExpandLevel(0);
- if (viewerSorter != null) {
- treeViewer.getViewer().setSorter(viewerSorter);
+ if (viewerComparator != null) {
+ treeViewer.getViewer().setComparator(viewerComparator);
}
treeViewer.getViewer().addSelectionChangedListener(new ISelectionChangedListener() {
@Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeDialog.java
index 3ab0eedf0d..6338fb394d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeDialog.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeDialog.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.osee.framework.core.util.Result;
import org.eclipse.osee.framework.ui.swt.ALayout;
@@ -49,7 +50,7 @@ public class FilteredTreeDialog extends MessageDialog {
private final IContentProvider contentProvider;
private final IBaseLabelProvider labelProvider;
private Collection<? extends Object> initialSelections;
- private ViewerSorter viewerSorter;
+ private ViewerComparator viewerSorter;
private boolean multiSelect = true;
private PatternFilter patternFilter;
List<Object> selected = new ArrayList<>();
@@ -58,7 +59,7 @@ public class FilteredTreeDialog extends MessageDialog {
this(dialogTitle, dialogMessage, contentProvider, labelProvider, null);
}
- public FilteredTreeDialog(String dialogTitle, String dialogMessage, IContentProvider contentProvider, IBaseLabelProvider labelProvider, ViewerSorter viewerSorter) {
+ public FilteredTreeDialog(String dialogTitle, String dialogMessage, IContentProvider contentProvider, IBaseLabelProvider labelProvider, ViewerComparator viewerSorter) {
super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE,
new String[] {"OK", "Cancel"}, 0);
this.contentProvider = contentProvider;
@@ -136,7 +137,7 @@ public class FilteredTreeDialog extends MessageDialog {
treeViewer.getViewer().setAutoExpandLevel(0);
treeViewer.setQuickSelectionMode(true);
if (viewerSorter != null) {
- treeViewer.getViewer().setSorter(viewerSorter);
+ treeViewer.getViewer().setComparator(viewerSorter);
}
treeViewer.getViewer().addSelectionChangedListener(new ISelectionChangedListener() {
@Override
diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml
index ca8687eb15..11be89a4ba 100644
--- a/plugins/org.eclipse.osee.orcs.parent/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml
@@ -50,8 +50,7 @@
<module>../../plugins/org.eclipse.osee.orcs.rest.client</module>
<module>../../plugins/org.eclipse.osee.orcs.rest</module>
<module>../../plugins/org.eclipse.osee.orcs.rest.test</module>
- <!-- <module>../../plugins/org.eclipse.osee.orcs.db.test</module>
- -->
+ <module>../../plugins/org.eclipse.osee.orcs.db.test</module>
<module>../../plugins/org.eclipse.osee.orcs.authorization</module>
@@ -96,7 +95,6 @@
<module>../../plugins/org.eclipse.osee.orcs.rest</module>
<module>../../plugins/org.eclipse.osee.orcs.rest.test</module>
<module>../../plugins/org.eclipse.osee.orcs.db.test</module>
- <module>../../plugins/org.eclipse.osee.orcs.test</module>
<module>../../plugins/org.eclipse.osee.orcs.authorization</module>
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/client/ClientResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/client/ClientResource.java
index 497958dbf4..a0fe95dd10 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/client/ClientResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/client/ClientResource.java
@@ -220,8 +220,8 @@ public class ClientResource {
}
private ClientSession getClientSession(String sessionId) {
- return jdbcService.getClient().fetch(null, stmt -> createSession(stmt, uriInfo),
- "select * from osee_session where session_id = ?", sessionId);
+ return jdbcService.getClient().fetch((ClientSession) null, stmt -> createSession(stmt, uriInfo),
+ "select * from osee_session where session_id = ?", sessionId);
}
private boolean alive(ClientSession session) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/META-INF/MANIFEST.MF
index e490ccdcce..545289fe1c 100644
--- a/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Bundle-Version: 0.25.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ui,
org.eclipse.osee.orcs.script.dsl.ui
-Import-Package: org.eclipse.core.runtime,
+Import-Package: com.google.inject,
+ org.eclipse.core.runtime,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.model,
diff --git a/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF
index f090dad349..e1b9de901c 100644
--- a/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.script.dsl/META-INF/MANIFEST.MF
@@ -5,24 +5,13 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-Version: 0.25.0.qualifier
Bundle-SymbolicName: org.eclipse.osee.orcs.script.dsl; singleton:=true
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.xbase.lib
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.xbase,
+ org.eclipse.equinox.common;bundle-version="3.5.0"
Import-Package: com.google.common.collect;version="15.0.0",
org.apache.log4j,
org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.xtext.xbase.lib
+ org.eclipse.osee.framework.jdk.core.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.osee.orcs.script.dsl,
org.eclipse.osee.orcs.script.dsl.conversion,
@@ -38,4 +27,3 @@ Export-Package: org.eclipse.osee.orcs.script.dsl,
org.eclipse.osee.orcs.script.dsl.services,
org.eclipse.osee.orcs.script.dsl.typesystem,
org.eclipse.osee.orcs.script.dsl.validation
-
diff --git a/plugins/org.eclipse.osee.orcs.script.dsl/build.properties b/plugins/org.eclipse.osee.orcs.script.dsl/build.properties
index 9b82d81de1..acb72d39df 100644
--- a/plugins/org.eclipse.osee.orcs.script.dsl/build.properties
+++ b/plugins/org.eclipse.osee.orcs.script.dsl/build.properties
@@ -4,4 +4,15 @@ source.. = src/,\
bin.includes = model/,\
META-INF/,\
.,\
- plugin.xml \ No newline at end of file
+ plugin.xml
+additional.bundles = org.eclipse.xtext.xbase,\
+ org.eclipse.xtext.common.types,\
+ org.eclipse.xtext.xtext.generator,\
+ org.eclipse.emf.codegen.ecore,\
+ org.eclipse.emf.mwe.utils,\
+ org.eclipse.emf.mwe2.launch,\
+ org.eclipse.emf.mwe2.lib,\
+ org.objectweb.asm,\
+ org.apache.commons.logging,\
+ org.apache.log4j,\
+ com.ibm.icu \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.script.dsl/xtend-gen/org/eclipse/osee/orcs/script/dsl/generator/.OrcsScriptDslGenerator.xtendbin b/plugins/org.eclipse.osee.orcs.script.dsl/xtend-gen/org/eclipse/osee/orcs/script/dsl/generator/.OrcsScriptDslGenerator.xtendbin
index 030dcae3fc..117d341e9c 100644
--- a/plugins/org.eclipse.osee.orcs.script.dsl/xtend-gen/org/eclipse/osee/orcs/script/dsl/generator/.OrcsScriptDslGenerator.xtendbin
+++ b/plugins/org.eclipse.osee.orcs.script.dsl/xtend-gen/org/eclipse/osee/orcs/script/dsl/generator/.OrcsScriptDslGenerator.xtendbin
Binary files differ

Back to the top