From 1055de553e0f73eda1582742b16d0a220d5fdfff Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 11 Jan 2017 12:15:11 -0500 Subject: [PATCH] Made templates optional for VIBE The VIBE Key-Value Pair Item now defaults to an empty table. Templates may still be selected manually to populate it. Signed-off-by: Robert Smith --- .../ice.product_WINDOWS.launch | 4 ++-- .../ice/vibe/kvPair/test/VibeKVPairTester.java | 16 +++++++++++++++- org.eclipse.ice.vibe/data/None.dat | 1 + .../org/eclipse/ice/vibe/kvPair/VibeKVPair.java | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 org.eclipse.ice.vibe/data/None.dat diff --git a/org.eclipse.ice.product/ice.product_WINDOWS.launch b/org.eclipse.ice.product/ice.product_WINDOWS.launch index 361391be9..8ef13a8c0 100644 --- a/org.eclipse.ice.product/ice.product_WINDOWS.launch +++ b/org.eclipse.ice.product/ice.product_WINDOWS.launch @@ -22,8 +22,8 @@ - - + + diff --git a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java index cc2b12e60..5f9f3a259 100644 --- a/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java +++ b/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java @@ -178,6 +178,20 @@ public class VibeKVPairTester { } } + //The table should be empty initially + assertEquals(0, table.numberOfRows()); + + //Load a template + template.retrieveAllEntries().get(0).setValue("NTG"); + + // Give the form time to load the new data + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + fail(); + } + // Whether or not the CUTOFF key was found in the table boolean foundCutoff = false; @@ -190,7 +204,7 @@ public class VibeKVPairTester { } // If the CUTOFF key was absent, then the table was not set up correctly - if (!foundCutoff) { + if (foundCutoff) { fail("Did not find CUTOFF row in default table."); } diff --git a/org.eclipse.ice.vibe/data/None.dat b/org.eclipse.ice.vibe/data/None.dat new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/org.eclipse.ice.vibe/data/None.dat @@ -0,0 +1 @@ + diff --git a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java index 8a981decb..4f454816e 100644 --- a/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java +++ b/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java @@ -74,7 +74,7 @@ public class VibeKVPair extends Item implements IReader, IWriter { /** * The name of the default template to load. */ - private static String defaultTemplate = "NTG"; + private static String defaultTemplate = "None"; /** * The tag that indicates this file should be exported to kv pairs. @@ -135,6 +135,7 @@ public class VibeKVPair extends Item implements IReader, IWriter { // The list of available templates ArrayList templateNames = new ArrayList(); + templateNames.add("None"); templateNames.add("NTG"); templateNames.add("DualFoil"); @@ -728,6 +729,10 @@ public class VibeKVPair extends Item implements IReader, IWriter { return "VibeKVPairItem"; } + /* + * (non-Javadoc) + * @see org.eclipse.ice.item.Item#update(org.eclipse.ice.datastructures.ICEObject.IUpdateable) + */ @Override public void update(IUpdateable updateable) { -- GitLab