Merge pull request #248 from DawnScience/DAQ-128e

[DAQ-128] removing extraneous fields from NXdata group
eclipse · May 20, 2016 · 6f9579b · 6f9579b
2 parents ccba4b3 + 1c513b0
commit 6f9579b
Show file tree

Hide file tree

Showing 36 changed files with 1,494 additions and 795 deletions.
diff --git a/...us.test/src/org/eclipse/dawnsci/nexus/builder/appdef/impl/TomoApplicationBuilderTest.java b/...us.test/src/org/eclipse/dawnsci/nexus/builder/appdef/impl/TomoApplicationBuilderTest.java
@@ -23,7 +23,7 @@
 import org.eclipse.dawnsci.nexus.NexusBaseClass;
 import org.eclipse.dawnsci.nexus.NexusException;
 import org.eclipse.dawnsci.nexus.NexusNodeFactory;
-import org.eclipse.dawnsci.nexus.builder.AbstractNexusProvider;
+import org.eclipse.dawnsci.nexus.builder.AbstractNexusObjectProvider;
 import org.eclipse.dawnsci.nexus.builder.NexusEntryBuilder;
 import org.eclipse.dawnsci.nexus.builder.NexusFileBuilder;
 import org.eclipse.dawnsci.nexus.builder.NexusObjectProvider;
@@ -35,7 +35,7 @@
 
 public class TomoApplicationBuilderTest {
 
-	public static class TestPositioner extends AbstractNexusProvider<NXpositioner> {
+	public static class TestPositioner extends AbstractNexusObjectProvider<NXpositioner> {
 
 		public TestPositioner() {
 			super("positioner", NexusBaseClass.NX_POSITIONER, NXpositioner.NX_VALUE);
@@ -86,7 +86,8 @@ public void testSetTitle_dataNode() {
 	@Test
 	public void testSetSource() throws Exception {
 		tomoBuilder.addDefaultGroups();
-		NexusObjectProvider<NXsource> sourceProvider = new AbstractNexusProvider<NXsource>(NexusBaseClass.NX_SOURCE) {
+		NexusObjectProvider<NXsource> sourceProvider = new AbstractNexusObjectProvider<NXsource>(
+				"source", NexusBaseClass.NX_SOURCE) {
 
 			@Override
 			protected NXsource doCreateNexusObject(NexusNodeFactory nodeFactory) {
@@ -108,7 +109,8 @@ protected NXsource doCreateNexusObject(NexusNodeFactory nodeFactory) {
 	@Test
 	public void testSetDetector() throws Exception {
 		tomoBuilder.addDefaultGroups();
-		NexusObjectProvider<NXdetector> detectorProvider = new AbstractNexusProvider<NXdetector>(NexusBaseClass.NX_DETECTOR) {
+		NexusObjectProvider<NXdetector> detectorProvider =
+				new AbstractNexusObjectProvider<NXdetector>("detector", NexusBaseClass.NX_DETECTOR) {
 
 			@Override
 			protected NXdetector doCreateNexusObject(
@@ -135,7 +137,8 @@ protected NXdetector doCreateNexusObject(
 	@Test
 	public void testSetSample() throws NexusException {
 		tomoBuilder.addDefaultGroups();
-		NexusObjectProvider<NXsample> sampleProvider = new AbstractNexusProvider<NXsample>(NexusBaseClass.NX_SAMPLE) {
+		NexusObjectProvider<NXsample> sampleProvider = new AbstractNexusObjectProvider<NXsample>(
+				"sample", NexusBaseClass.NX_SAMPLE) {
 
 			@Override
 			protected NXsample doCreateNexusObject(NexusNodeFactory nodeFactory) {