Merge remote-tracking branch 'origin/master' into kasper/reflectivity/ui

Conflicts: repository/org.eclipse.ice.repository/ice.product.launch Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

Merge remote-tracking branch 'origin/master' into kasper/reflectivity/ui
Conflicts: repository/org.eclipse.ice.repository/ice.product.launch Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>
dacc609a · Jay Jay Billings · fc1f0540 · cfa8ad5d · dacc609a · dacc609a
Commit dacc609a authored 9 years ago by Jay Jay Billings
--- a/tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestEdge.java
+++ b/tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestEdge.java
--- a/tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/VertexTester.java
+++ b/tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/VertexTester.java
--- a/tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/VizMeshComponentTester.java
+++ b/tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/VizMeshComponentTester.java
--- a/tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/BoundaryConditionTester.java
+++ b/tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/BoundaryConditionTester.java
--- a/tests/org.eclipse.ice.viz.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ice.viz.service.test/META-INF/MANIFEST.MF
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/ConnectionTableTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/ConnectionTableTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/KeyEntryContentProviderTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/KeyEntryContentProviderTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/KeyEntryTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/KeyEntryTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/PortEntryContentProviderTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/PortEntryContentProviderTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/PortEntryTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/PortEntryTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/SecretEntryTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/SecretEntryTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/BasicEntryContentProviderTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/BasicEntryContentProviderTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/DataComponentTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/DataComponentTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/EntryTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/EntryTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/ICEObjectTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/ICEObjectTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/TableComponentTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/TableComponentTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVVizServiceTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVVizServiceTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/FakeVizService.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/FakeVizService.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/widgets/test/ActionTreeTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/widgets/test/ActionTreeTester.java
--- a/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/widgets/test/TimeSliderCompositeTester.java
+++ b/tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/widgets/test/TimeSliderCompositeTester.java