Merge remote-tracking branch 'origin/master' into jay/reflectivity

Conflicts: src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>
eclipse · Mar 8, 2015 · f0d20a7 · f0d20a7
2 parents c83c40f + adf1ee8
commit f0d20a7
Show file tree

Hide file tree

Showing 41 changed files with 1,964 additions and 2,823 deletions.
diff --git a/src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF b/src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.ice.datastructures;bundle-version="2.0.0",
 Import-Package: com.jme3.app,
  org.eclipse.core.commands.common,
  org.eclipse.core.expressions,
+ org.eclipse.core.filesystem,
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.core.runtime.jobs,

diff --git a/src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java b/src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
@@ -943,7 +943,7 @@ protected ArrayList<ICEFormPage> createDataTableAndMatrixComponentPages() {
 				// Add the page to the list
 				sectionPages.add(tmpPage);
 			}
-			System.out.println(i + numCompsPerPage);
+
 			// Clean up the left over components by just adding them to
 			// their own page.
 			if (i != comps.size()) {