Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ice-build] [eclipse/ice] ade1e5: Changing CaebatLauncher to not change the input ke...

  Branch: refs/heads/jordan/ParaViewVizService
  Home:   https://github.com/eclipse/ice
  Commit: ade1e523e01362283cedc55d46c858f51ca2edd7
      https://github.com/eclipse/ice/commit/ade1e523e01362283cedc55d46c858f51ca2edd7
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java

  Log Message:
  -----------
  Changing CaebatLauncher to not change the input key-value filename when
using a custom one.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: 903b3afe13a382e896eef7b2db4d97aa56267e44
      https://github.com/eclipse/ice/commit/903b3afe13a382e896eef7b2db4d97aa56267e44
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java

  Log Message:
  -----------
  Fixing Bug 459921.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: 619c4dd18e1796b7f5ca81190f2522d0664167c1
      https://github.com/eclipse/ice/commit/619c4dd18e1796b7f5ca81190f2522d0664167c1
  Author: jdeyton <jordan.deyton@xxxxxxxxx>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitPlotViewer.java

  Log Message:
  -----------
  Updating the VisItPlotViewer to use double-clicks to plot vs single
clicks to select for deletion.

With this change, I also had to update some code so the plot is not
cleared when a plot that is not the rendered plot is removed.

Signed-off-by: jdeyton <jordan.deyton@xxxxxxxxx>


  Commit: 0d1719b8071c79a29819ddba804b937efad3724c
      https://github.com/eclipse/ice/commit/0d1719b8071c79a29819ddba804b937efad3724c
  Author: jdeyton <jordan.deyton@xxxxxxxxx>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitPlotViewer.java

  Log Message:
  -----------
  Updating the VisItPlotViewer to support multiple selections. These plots
can now be deleted all at once. This fixes bug 459695.

Signed-off-by: jdeyton <jordan.deyton@xxxxxxxxx>


  Commit: 09a9916dfdcadcdbb88fa41e1dd22ed46f25c20c
      https://github.com/eclipse/ice/commit/09a9916dfdcadcdbb88fa41e1dd22ed46f25c20c
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java

  Log Message:
  -----------
  Fixing an issue with the IPSReader for the case that the file being read
in has more components than are used in the ports master.  Previously
the unused component entries were ignored.  Now they are read in and
displayed.  This particular problem caused a key error on Caebat Case 2.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: 9ad14abf66a30edf024714c2b9c0b4c6851adf95
      https://github.com/eclipse/ice/commit/9ad14abf66a30edf024714c2b9c0b4c6851adf95
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java

  Log Message:
  -----------
  Organizing imports and correcting the description on the Caebat
Launcher.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: 7a390d4f23ea7bb54a4ae15d02b8ac231b262b09
      https://github.com/eclipse/ice/commit/7a390d4f23ea7bb54a4ae15d02b8ac231b262b09
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java

  Log Message:
  -----------
  Updating some organization in the CaebatLauncher.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: dbb83961e5ef242767845470c96f0b9bf5ca223b
      https://github.com/eclipse/ice/commit/dbb83961e5ef242767845470c96f0b9bf5ca223b
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/wizards/ImportFileWizardPage.java

  Log Message:
  -----------
  Fixing Bug 460723.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: 81f55d588e57a6b61d9696c71ca226884aa74bab
      https://github.com/eclipse/ice/commit/81f55d588e57a6b61d9696c71ca226884aa74bab
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitPlotViewer.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into andrew/caebat


  Commit: 869fee2b472476ee66dbafdb8dc1b95e2dd989af
      https://github.com/eclipse/ice/commit/869fee2b472476ee66dbafdb8dc1b95e2dd989af
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/Entry.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EntryTester.java

  Log Message:
  -----------
  Added a "comment" attribute to Entry, updated tests, and cleaned up
documentation.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 046a40d629b63470c710a8875a35b01b74190733
      https://github.com/eclipse/ice/commit/046a40d629b63470c710a8875a35b01b74190733
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Block.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Parameter.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/YAMLBlock.java

  Log Message:
  -----------
  Cleaned up more documentation before I switch the MOOSE IO classes to
use the new Entry.comment attribute.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: d904612f457e675b30d07e06cb9985a37ab5abfb
      https://github.com/eclipse/ice/commit/d904612f457e675b30d07e06cb9985a37ab5abfb
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java

  Log Message:
  -----------
  Giving the IPSReader default implementations for IPS Components that are
not in the parsed configuration file so that they can be added more
easily.  This fixes bug 460725.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: 3b47c46f867a7e41dd4280c9ca23ba1136c28ab3
      https://github.com/eclipse/ice/commit/3b47c46f867a7e41dd4280c9ca23ba1136c28ab3
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/Entry.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Block.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Parameter.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/YAMLBlock.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EntryTester.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into andrew/caebat


  Commit: d3a6b4266d64f16c59367a91e728104f5e7b9e40
      https://github.com/eclipse/ice/commit/d3a6b4266d64f16c59367a91e728104f5e7b9e40
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Block.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Parameter.java

  Log Message:
  -----------
  Committing work so far on switching MOOSE IO classes to use comments.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 4bb8cd67da98b1a4df42cad645641d5b692d00a9
      https://github.com/eclipse/ice/commit/4bb8cd67da98b1a4df42cad645641d5b692d00a9
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    A utils/ICEDocCleaner/.classpath
    A utils/ICEDocCleaner/.project
    A utils/ICEDocCleaner/.settings/org.eclipse.jdt.core.prefs
    A utils/ICEDocCleaner/bin/.gitignore
    A utils/ICEDocCleaner/src/ICEDocCleaner.java

  Log Message:
  -----------
  Committing ICEDocCleaner for cleaning up documentation from UML
transformations. Instructions on how ot use it are in the header of the
ICEDocCleaner.java file.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 462194d459131706b7d3fe519f388049cb410d3b
      https://github.com/eclipse/ice/commit/462194d459131706b7d3fe519f388049cb410d3b
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/DescriptionCellContentProvider.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/TreePropertyCellContentProvider.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Block.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Parameter.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/BlockTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/MOOSEFileHandlerTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/ParameterTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/YAMLBlockTester.java

  Log Message:
  -----------
  Almost finished getting the MOOSE plugins to use the new Entry.comment
attribute. Now when you click on a block in the MOOSE Model Builder, any
in-line comments (ie. name = value  # comment) are displayed in the
"Comment" column, and any descriptions (from the YAML spec) are
displayed in the tooltip when you hover over the parameter.

Just discovered a minor bug which I'll fix tomorrow, and then everything
should be ready to merge into master.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: c790785641c39e0ee8fc796479001f36cb9a6b78
      https://github.com/eclipse/ice/commit/c790785641c39e0ee8fc796479001f36cb9a6b78
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M org.eclipse.ice.build/pom.xml
    M repository/org.eclipse.ice.repository/ice.product.launch
    R src/org.eclipse.ice.caebat/.classpath
    R src/org.eclipse.ice.caebat/.gitignore
    R src/org.eclipse.ice.caebat/.project
    R src/org.eclipse.ice.caebat/.settings/org.eclipse.jdt.core.prefs
    R src/org.eclipse.ice.caebat/.settings/org.eclipse.pde.core.prefs
    R src/org.eclipse.ice.caebat/CaebatModel/example_ini.conf
    R src/org.eclipse.ice.caebat/CaebatModel/example_input_keyvalue
    R src/org.eclipse.ice.caebat/META-INF/MANIFEST.MF
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatKVPairComponent.xml
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatLauncherComponent.xml
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatModelComponent.xml
    R src/org.eclipse.ice.caebat/about.html
    R src/org.eclipse.ice.caebat/build.properties
    R src/org.eclipse.ice.caebat/data/case_6.conf
    R src/org.eclipse.ice.caebat/data/case_6.dat
    R src/org.eclipse.ice.caebat/pom.xml
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/kvPair/CaebatKVPair.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/kvPair/CaebatKVPairBuilder.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncherBuilder.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/model/CaebatModel.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/model/CaebatModelBuilder.java
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java
    A src/org.eclipse.ice.vibe/.classpath
    A src/org.eclipse.ice.vibe/.gitignore
    A src/org.eclipse.ice.vibe/.project
    A src/org.eclipse.ice.vibe/.settings/org.eclipse.jdt.core.prefs
    A src/org.eclipse.ice.vibe/.settings/org.eclipse.pde.core.prefs
    A src/org.eclipse.ice.vibe/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeKVPairComponent.xml
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeLauncherComponent.xml
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeModelComponent.xml
    A src/org.eclipse.ice.vibe/about.html
    A src/org.eclipse.ice.vibe/build.properties
    A src/org.eclipse.ice.vibe/data/case_6.conf
    A src/org.eclipse.ice.vibe/data/case_6.dat
    A src/org.eclipse.ice.vibe/pom.xml
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairBuilder.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncherBuilder.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModelBuilder.java
    R tests/org.eclipse.ice.caebat.test/.classpath
    R tests/org.eclipse.ice.caebat.test/.gitignore
    R tests/org.eclipse.ice.caebat.test/.project
    R tests/org.eclipse.ice.caebat.test/.settings/org.eclipse.jdt.core.prefs
    R tests/org.eclipse.ice.caebat.test/.settings/org.eclipse.pde.core.prefs
    R tests/org.eclipse.ice.caebat.test/CaebatModel/example_ini.conf
    R tests/org.eclipse.ice.caebat.test/META-INF/MANIFEST.MF
    R tests/org.eclipse.ice.caebat.test/about.html
    R tests/org.eclipse.ice.caebat.test/build.properties
    R tests/org.eclipse.ice.caebat.test/pom.xml
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/kvPair/test/CaebatKVPairBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/kvPair/test/CaebatKVPairTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/model/test/CaebatModelBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/model/test/CaebatModelTester.java
    M tests/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.persistence.xml.test/src/xmlpp/test/XMLPersistenceProviderTester.java
    A tests/org.eclipse.ice.vibe.test/.classpath
    A tests/org.eclipse.ice.vibe.test/.gitignore
    A tests/org.eclipse.ice.vibe.test/.project
    A tests/org.eclipse.ice.vibe.test/.settings/org.eclipse.jdt.core.prefs
    A tests/org.eclipse.ice.vibe.test/.settings/org.eclipse.pde.core.prefs
    A tests/org.eclipse.ice.vibe.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.vibe.test/about.html
    A tests/org.eclipse.ice.vibe.test/build.properties
    A tests/org.eclipse.ice.vibe.test/pom.xml
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelTester.java

  Log Message:
  -----------
  Moving Caebat plugins to Vibe plugins.  Fixed a bug where spacing
between components in an IPS .conf file would affect the components read
in.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: c4b839b1c57f636f73cbbf0b9d14e32177fad1cf
      https://github.com/eclipse/ice/commit/c4b839b1c57f636f73cbbf0b9d14e32177fad1cf
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M features/org.eclipse.ice.feature/feature.xml
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java

  Log Message:
  -----------
  Fixing product and feature definitions so that VIBE Plugins show up in
the item launcher.  Fixing bug 460989.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: 06bb57140165564e06bf4d4d654e8c3cc514974e
      https://github.com/eclipse/ice/commit/06bb57140165564e06bf4d4d654e8c3cc514974e
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    A utils/ICEDocCleaner/.classpath
    A utils/ICEDocCleaner/.project
    A utils/ICEDocCleaner/.settings/org.eclipse.jdt.core.prefs
    A utils/ICEDocCleaner/bin/.gitignore
    A utils/ICEDocCleaner/src/ICEDocCleaner.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into andrew/caebat


  Commit: b138963dd900e1028431e1b765c3c324055714e6
      https://github.com/eclipse/ice/commit/b138963dd900e1028431e1b765c3c324055714e6
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataLoader.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java

  Log Message:
  -----------
  Fixed the CSVPlot.load() thread's uncaught exception handler so the
parent thread correctly throws an exception now. Also cleaned up the
other related plotting classes.

Also, I forgot to fix the ICEJAXBClassProviderTester when I added
VizResource to the class list last week.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 3abe5e040d906bb33f83f6f3508949bbe9036d89
      https://github.com/eclipse/ice/commit/3abe5e040d906bb33f83f6f3508949bbe9036d89
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java

  Log Message:
  -----------
  I staged and committed the wrong version of CSVPlot, this is the right
one.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: edf013948609b4776781143de0bd21009a018460
      https://github.com/eclipse/ice/commit/edf013948609b4776781143de0bd21009a018460
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  ICEResourcePage will now try to first render resources via a plotting
service, but if that doesn't work, it'll then try to open text files in
the default text editor (based on a hard coded list of text file
extensions). Finally, if that doesn't work, it'll try to render the
resource in the browser as a last resort.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: dc226ca2c0f210da6c74dbc470e616d7bf803be9
      https://github.com/eclipse/ice/commit/dc226ca2c0f210da6c74dbc470e616d7bf803be9
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  ICEResourcePage now toggles between editor tabs when a resource is
clicked in the resource view. (i.e. toggles between text editors and
plots)

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 8301d006655901d9523068dcac9ca4c984066f3e
      https://github.com/eclipse/ice/commit/8301d006655901d9523068dcac9ca4c984066f3e
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Refactored the editor toggling in ICEResourcePage a little bit. Also,
fixed a bug where the wrong editor would be brought forward if an editor
was already open when the Form was created.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 24569796b1ee49fb858cba295b6baa29fe56761d
      https://github.com/eclipse/ice/commit/24569796b1ee49fb858cba295b6baa29fe56761d
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Removed the default resource selection for when the browser is created.
Since the default selection always corresponds to a text file (std out)
and text files are now delegated to the default Eclipse text editor, it
would cause the Item's std out file to also open in another tab whenever
the user clicks on a resource for the first time (i.e. open 2 resources
with one click). Instead, it will now have no default selection, but
displays a message to the user to select a resource to view it.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 0e7e35c673cee54a3effc768b54df094317c2828
      https://github.com/eclipse/ice/commit/0e7e35c673cee54a3effc768b54df094317c2828
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java

  Log Message:
  -----------
  Fixed ICEResourceView so it correctly sets its editor when the resource
tree is created.

Also added org.eclipse.core.filesystem to the manifest file (for using
the text editor) and neglected to commit it earlier.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 4944e5a9ba1c3d999ad89781b3784096d9abc849
      https://github.com/eclipse/ice/commit/4944e5a9ba1c3d999ad89781b3784096d9abc849
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/Component.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/ListComponent.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/IComponentVisitor.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/AllowedValueType.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/jaxbclassprovider/ICEJAXBClassProvider.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/resource/ICEResource.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncherForm.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataLoader.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/FormTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ResourceComponentTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java

  Log Message:
  -----------
  Merging postprocessing into master.


Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 9a3fc73e7b75b20c66b3e2542ee73fa6c05f3937
      https://github.com/eclipse/ice/commit/9a3fc73e7b75b20c66b3e2542ee73fa6c05f3937
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java

  Log Message:
  -----------
  Resolved a conflicting file in merge.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 8ae04efc8d282854618011562d4d718af859dcf4
      https://github.com/eclipse/ice/commit/8ae04efc8d282854618011562d4d718af859dcf4
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobprofile/JobProfile.java

  Log Message:
  -----------
  Removed old class list and make JobProfile use the ICEJAXBClassProvider.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: adf1ee87ebf4ef31be5ead1dc0b25efc1d8db36a
      https://github.com/eclipse/ice/commit/adf1ee87ebf4ef31be5ead1dc0b25efc1d8db36a
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileTester.java

  Log Message:
  -----------
  About 84% sure this fixes the build.

Signed-off-by: Anna Wojtowicz<wojtowicza@xxxxxxxx>


  Commit: 23def09b06983d63b95707ae06a49bdf334002c5
      https://github.com/eclipse/ice/commit/23def09b06983d63b95707ae06a49bdf334002c5
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java

  Log Message:
  -----------
  Fixed a very specific bug in the MOOSE input file parsing where lines
that were just pure comments but also contained "=" in the comment text
were incorrectly parsed as commented out parameters.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: c3c3b2cb19ca3d77608a6d655b565c5f5b49f890
      https://github.com/eclipse/ice/commit/c3c3b2cb19ca3d77608a6d655b565c5f5b49f890
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/Component.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/ListComponent.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/IComponentVisitor.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/AllowedValueType.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/jaxbclassprovider/ICEJAXBClassProvider.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/resource/ICEResource.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncherForm.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobprofile/JobProfile.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataLoader.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/FormTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ResourceComponentTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java
    A utils/ICEDocCleaner/.classpath
    A utils/ICEDocCleaner/.project
    A utils/ICEDocCleaner/.settings/org.eclipse.jdt.core.prefs
    A utils/ICEDocCleaner/bin/.gitignore
    A utils/ICEDocCleaner/src/ICEDocCleaner.java

  Log Message:
  -----------
  Merge branch 'master' into anna/moose_comments


  Commit: 583e2e0aa5567f3330cb450001ae7d7730217c89
      https://github.com/eclipse/ice/commit/583e2e0aa5567f3330cb450001ae7d7730217c89
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/Component.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/ListComponent.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/IComponentVisitor.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/AllowedValueType.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/jaxbclassprovider/ICEJAXBClassProvider.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/resource/ICEResource.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncherForm.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobprofile/JobProfile.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataLoader.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/FormTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ResourceComponentTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into andrew/caebat


  Commit: a88187ca6b230a43c19f304510b6cdbbd38b0f94
      https://github.com/eclipse/ice/commit/a88187ca6b230a43c19f304510b6cdbbd38b0f94
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfFileFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfReaderFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfWriterFactoryTester.java
    M tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairBuilderTester.java

  Log Message:
  -----------
  Updating VibeKVPairBuilder test code to test the correct stuff.  Fixing
Bug 461763.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: aaff2174ca45fcd0315a03b3e091b260a095318f
      https://github.com/eclipse/ice/commit/aaff2174ca45fcd0315a03b3e091b260a095318f
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairBuilder.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfFileFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfReaderFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfWriterFactoryTester.java
    M tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairBuilderTester.java

  Log Message:
  -----------
  Cleaning up some documentation.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: cd4d25c1905e3bd84ef6fb90981cd490e7f750dd
      https://github.com/eclipse/ice/commit/cd4d25c1905e3bd84ef6fb90981cd490e7f750dd
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M features/org.eclipse.ice.feature/feature.xml
    M org.eclipse.ice.build/pom.xml
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    R src/org.eclipse.ice.caebat/.classpath
    R src/org.eclipse.ice.caebat/.gitignore
    R src/org.eclipse.ice.caebat/.project
    R src/org.eclipse.ice.caebat/.settings/org.eclipse.jdt.core.prefs
    R src/org.eclipse.ice.caebat/.settings/org.eclipse.pde.core.prefs
    R src/org.eclipse.ice.caebat/CaebatModel/example_ini.conf
    R src/org.eclipse.ice.caebat/CaebatModel/example_input_keyvalue
    R src/org.eclipse.ice.caebat/META-INF/MANIFEST.MF
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatKVPairComponent.xml
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatLauncherComponent.xml
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatModelComponent.xml
    R src/org.eclipse.ice.caebat/about.html
    R src/org.eclipse.ice.caebat/build.properties
    R src/org.eclipse.ice.caebat/data/case_6.conf
    R src/org.eclipse.ice.caebat/data/case_6.dat
    R src/org.eclipse.ice.caebat/pom.xml
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/kvPair/CaebatKVPair.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/kvPair/CaebatKVPairBuilder.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncherBuilder.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/model/CaebatModel.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/model/CaebatModelBuilder.java
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java
    A src/org.eclipse.ice.vibe/.classpath
    A src/org.eclipse.ice.vibe/.gitignore
    A src/org.eclipse.ice.vibe/.project
    A src/org.eclipse.ice.vibe/.settings/org.eclipse.jdt.core.prefs
    A src/org.eclipse.ice.vibe/.settings/org.eclipse.pde.core.prefs
    A src/org.eclipse.ice.vibe/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeKVPairComponent.xml
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeLauncherComponent.xml
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeModelComponent.xml
    A src/org.eclipse.ice.vibe/about.html
    A src/org.eclipse.ice.vibe/build.properties
    A src/org.eclipse.ice.vibe/data/case_6.conf
    A src/org.eclipse.ice.vibe/data/case_6.dat
    A src/org.eclipse.ice.vibe/pom.xml
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairBuilder.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncherBuilder.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModelBuilder.java
    R tests/org.eclipse.ice.caebat.test/.classpath
    R tests/org.eclipse.ice.caebat.test/.gitignore
    R tests/org.eclipse.ice.caebat.test/.project
    R tests/org.eclipse.ice.caebat.test/.settings/org.eclipse.jdt.core.prefs
    R tests/org.eclipse.ice.caebat.test/.settings/org.eclipse.pde.core.prefs
    R tests/org.eclipse.ice.caebat.test/CaebatModel/example_ini.conf
    R tests/org.eclipse.ice.caebat.test/META-INF/MANIFEST.MF
    R tests/org.eclipse.ice.caebat.test/about.html
    R tests/org.eclipse.ice.caebat.test/build.properties
    R tests/org.eclipse.ice.caebat.test/pom.xml
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/kvPair/test/CaebatKVPairBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/kvPair/test/CaebatKVPairTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/model/test/CaebatModelBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/model/test/CaebatModelTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfFileFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfReaderFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfWriterFactoryTester.java
    M tests/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.persistence.xml.test/src/xmlpp/test/XMLPersistenceProviderTester.java
    A tests/org.eclipse.ice.vibe.test/.classpath
    A tests/org.eclipse.ice.vibe.test/.gitignore
    A tests/org.eclipse.ice.vibe.test/.project
    A tests/org.eclipse.ice.vibe.test/.settings/org.eclipse.jdt.core.prefs
    A tests/org.eclipse.ice.vibe.test/.settings/org.eclipse.pde.core.prefs
    A tests/org.eclipse.ice.vibe.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.vibe.test/about.html
    A tests/org.eclipse.ice.vibe.test/build.properties
    A tests/org.eclipse.ice.vibe.test/pom.xml
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelTester.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into anna/moose_comments


  Commit: a1215081c850fa654efb29bb3e853edf7f361ace
      https://github.com/eclipse/ice/commit/a1215081c850fa654efb29bb3e853edf7f361ace
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/DescriptionCellContentProvider.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/TreePropertyCellContentProvider.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Block.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Parameter.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/BlockTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/MOOSEFileHandlerTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/ParameterTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/YAMLBlockTester.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/anna/moose_comments'


  Commit: 6cea60e5197d4eb741877b576f91d827133236d1
      https://github.com/eclipse/ice/commit/6cea60e5197d4eb741877b576f91d827133236d1
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Playing around with SWT for tiling things on the ICEResourcePage. So
far, the it generates a 2x3 grid of randomly colored browsers (but these
can be changed to other objects later). Also has buttons for rows and
columns, although I haven't finished hooking them up to update the grid
when a selection is made.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: b5efa5d8df00e48082bd75b8243f4865060e107f
      https://github.com/eclipse/ice/commit/b5efa5d8df00e48082bd75b8243f4865060e107f
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java

  Log Message:
  -----------
  CSV plots now do basic tiling in the Resource Page. I plan to add more
controls so the user can control the grid layout.

Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 5972e595ec1d18fbc1fe6ddb9b2762a85cf81d12
      https://github.com/eclipse/ice/commit/5972e595ec1d18fbc1fe6ddb9b2762a85cf81d12
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Added rows and columns buttons to the plot tiling composite so the user
can manipulate the grid. Hooked up the columns button, rows will be
trickier though.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 0e7425b4412c9d46d074b2bde996c12450667d3e
      https://github.com/eclipse/ice/commit/0e7425b4412c9d46d074b2bde996c12450667d3e
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M tests/org.eclipse.ice.viz.service.visit.test/META-INF/MANIFEST.MF

  Log Message:
  -----------
  Fixed a missing import in the VisItVizService test bundle's manifest.

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: 18ff646f73621b18793b44eeca424cf5a6fb3212
      https://github.com/eclipse/ice/commit/18ff646f73621b18793b44eeca424cf5a6fb3212
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M repository/org.eclipse.ice.repository/ice.product.launch

  Log Message:
  -----------
  Added the Linux SWT bundle to the launch configuration.

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: 65b71f16062cd2ef0b9e9af770084a8060284b4f
      https://github.com/eclipse/ice/commit/65b71f16062cd2ef0b9e9af770084a8060284b4f
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.materials/data/userMatDB.xml

  Log Message:
  -----------
  Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: 4d7d8426e7203b83e78ee07930890041a088722e
      https://github.com/eclipse/ice/commit/4d7d8426e7203b83e78ee07930890041a088722e
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M repository/org.eclipse.ice.repository/ice.product.launch

  Log Message:
  -----------
  Fixed the launch configuration... again. 

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: c0e3649784c6bc9e3e2daf83871f0263dc984973
      https://github.com/eclipse/ice/commit/c0e3649784c6bc9e3e2daf83871f0263dc984973
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java

  Log Message:
  -----------
  Modified the MOOSEFormEditor so that it actually finds the data
component in the mesh block.

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: 92984795579cad7ec44cd2a98b53730685039d50
      https://github.com/eclipse/ice/commit/92984795579cad7ec44cd2a98b53730685039d50
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Fixed a typo in the readme.

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: 82f5b2ec1520c1c533d109abfdbc27bc2705f7f6
      https://github.com/eclipse/ice/commit/82f5b2ec1520c1c533d109abfdbc27bc2705f7f6
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M features/org.eclipse.ice.feature/feature.xml
    M org.eclipse.ice.build/pom.xml
    M repository/org.eclipse.ice.repository/ice.product
    R src/org.eclipse.ice.caebat/.classpath
    R src/org.eclipse.ice.caebat/.gitignore
    R src/org.eclipse.ice.caebat/.project
    R src/org.eclipse.ice.caebat/.settings/org.eclipse.jdt.core.prefs
    R src/org.eclipse.ice.caebat/.settings/org.eclipse.pde.core.prefs
    R src/org.eclipse.ice.caebat/CaebatModel/example_ini.conf
    R src/org.eclipse.ice.caebat/CaebatModel/example_input_keyvalue
    R src/org.eclipse.ice.caebat/META-INF/MANIFEST.MF
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatKVPairComponent.xml
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatLauncherComponent.xml
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatModelComponent.xml
    R src/org.eclipse.ice.caebat/about.html
    R src/org.eclipse.ice.caebat/build.properties
    R src/org.eclipse.ice.caebat/data/case_6.conf
    R src/org.eclipse.ice.caebat/data/case_6.dat
    R src/org.eclipse.ice.caebat/pom.xml
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/kvPair/CaebatKVPair.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/kvPair/CaebatKVPairBuilder.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncherBuilder.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/model/CaebatModel.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/model/CaebatModelBuilder.java
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/DescriptionCellContentProvider.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/TreePropertyCellContentProvider.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/wizards/ImportFileWizardPage.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/Entry.java
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobprofile/JobProfile.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Block.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Parameter.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/YAMLBlock.java
    A src/org.eclipse.ice.vibe/.classpath
    A src/org.eclipse.ice.vibe/.gitignore
    A src/org.eclipse.ice.vibe/.project
    A src/org.eclipse.ice.vibe/.settings/org.eclipse.jdt.core.prefs
    A src/org.eclipse.ice.vibe/.settings/org.eclipse.pde.core.prefs
    A src/org.eclipse.ice.vibe/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeKVPairComponent.xml
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeLauncherComponent.xml
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeModelComponent.xml
    A src/org.eclipse.ice.vibe/about.html
    A src/org.eclipse.ice.vibe/build.properties
    A src/org.eclipse.ice.vibe/data/case_6.conf
    A src/org.eclipse.ice.vibe/data/case_6.dat
    A src/org.eclipse.ice.vibe/pom.xml
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairBuilder.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncherBuilder.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModelBuilder.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataLoader.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitPlotViewer.java
    R tests/org.eclipse.ice.caebat.test/.classpath
    R tests/org.eclipse.ice.caebat.test/.gitignore
    R tests/org.eclipse.ice.caebat.test/.project
    R tests/org.eclipse.ice.caebat.test/.settings/org.eclipse.jdt.core.prefs
    R tests/org.eclipse.ice.caebat.test/.settings/org.eclipse.pde.core.prefs
    R tests/org.eclipse.ice.caebat.test/CaebatModel/example_ini.conf
    R tests/org.eclipse.ice.caebat.test/META-INF/MANIFEST.MF
    R tests/org.eclipse.ice.caebat.test/about.html
    R tests/org.eclipse.ice.caebat.test/build.properties
    R tests/org.eclipse.ice.caebat.test/pom.xml
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/kvPair/test/CaebatKVPairBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/kvPair/test/CaebatKVPairTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/model/test/CaebatModelBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/model/test/CaebatModelTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EntryTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfFileFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfReaderFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfWriterFactoryTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/BlockTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/MOOSEFileHandlerTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/ParameterTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/YAMLBlockTester.java
    M tests/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.persistence.xml.test/src/xmlpp/test/XMLPersistenceProviderTester.java
    A tests/org.eclipse.ice.vibe.test/.classpath
    A tests/org.eclipse.ice.vibe.test/.gitignore
    A tests/org.eclipse.ice.vibe.test/.project
    A tests/org.eclipse.ice.vibe.test/.settings/org.eclipse.jdt.core.prefs
    A tests/org.eclipse.ice.vibe.test/.settings/org.eclipse.pde.core.prefs
    A tests/org.eclipse.ice.vibe.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.vibe.test/about.html
    A tests/org.eclipse.ice.vibe.test/build.properties
    A tests/org.eclipse.ice.vibe.test/pom.xml
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelTester.java
    A utils/ICEDocCleaner/.classpath
    A utils/ICEDocCleaner/.project
    A utils/ICEDocCleaner/.settings/org.eclipse.jdt.core.prefs
    A utils/ICEDocCleaner/bin/.gitignore
    A utils/ICEDocCleaner/src/ICEDocCleaner.java

  Log Message:
  -----------
  Merged in latest master.

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: 2d65bfb4dd7309dc85c85b078026a260f17c2d7f
      https://github.com/eclipse/ice/commit/2d65bfb4dd7309dc85c85b078026a260f17c2d7f
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README.md

Testing write capabilities


  Commit: 40ec6b2e71932c8ac193ad96e79f3d92803240ef
      https://github.com/eclipse/ice/commit/40ec6b2e71932c8ac193ad96e79f3d92803240ef
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M README.md

  Log Message:
  -----------
  pushing update to readme to test push capability

Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>


  Commit: eb0778e4f6c04c88d1fb16f1470fe0219614e926
      https://github.com/eclipse/ice/commit/eb0778e4f6c04c88d1fb16f1470fe0219614e926
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Log Message:
  -----------
  Updated readme.

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: 90f8a89871184f6fd48cb70b9cea1f8804eaf7e1
      https://github.com/eclipse/ice/commit/90f8a89871184f6fd48cb70b9cea1f8804eaf7e1
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
    M tests/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF

  Log Message:
  -----------
  Got the new VisIt stuff building.

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: 452d73ac829cdb3b278c5e8e242de54f0ba538b1
      https://github.com/eclipse/ice/commit/452d73ac829cdb3b278c5e8e242de54f0ba538b1
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M README.md
    M repository/org.eclipse.ice.repository/ice.product.launch

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into jordan/VisItVisService

Conflicts:
	repository/org.eclipse.ice.repository/ice.product.launch
	tests/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: 85ff749f083d455bb728bd7c9e92f5ca5eef3957
      https://github.com/eclipse/ice/commit/85ff749f083d455bb728bd7c9e92f5ca5eef3957
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/anna/moose_comments' into jordan/VisItVisService


  Commit: 3056c03e581de8ce505bdedae1e9a7cfd1d4a79f
      https://github.com/eclipse/ice/commit/3056c03e581de8ce505bdedae1e9a7cfd1d4a79f
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M features/org.eclipse.ice.feature/feature.xml
    M repository/org.eclipse.ice.repository/ice.product.launch

  Log Message:
  -----------
  Fixed a missing bundle in the feature and updated the launch
configuration.

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: e054ebe4b885d047ef939c5459c201f3cc591b5d
      https://github.com/eclipse/ice/commit/e054ebe4b885d047ef939c5459c201f3cc591b5d
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M repository/org.eclipse.ice.repository/ice.product

  Log Message:
  -----------
  Updated the product to include and start the new VisIt bundles.

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


  Commit: dff744693acb68ba360828541ddf49e2e258f1c3
      https://github.com/eclipse/ice/commit/dff744693acb68ba360828541ddf49e2e258f1c3
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M README.md
    M features/org.eclipse.ice.feature/feature.xml
    M org.eclipse.ice.build/pom.xml
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.moose/OSGI-INF/MOOSEEditorComponent.xml
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEEclipseFormWidget.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormWidgetBuilder.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MeshViewComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IVizService.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IVizServiceFactory.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/ListComponent.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/WrappedGlazedEventListener.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/IComponentVisitor.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/SelectiveComponentVisitor.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
    M src/org.eclipse.ice.materials/data/userMatDB.xml
    A src/org.eclipse.ice.viz.service.paraview/.classpath
    A src/org.eclipse.ice.viz.service.paraview/.gitignore
    A src/org.eclipse.ice.viz.service.paraview/.project
    A src/org.eclipse.ice.viz.service.paraview/.settings/org.eclipse.jdt.core.prefs
    A src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.viz.service.paraview/OSGI-INF/vizService.xml
    A src/org.eclipse.ice.viz.service.paraview/build.properties
    A src/org.eclipse.ice.viz.service.paraview/plugin.xml
    A src/org.eclipse.ice.viz.service.paraview/pom.xml
    A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPreferenceInitializer.java
    A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPreferencePage.java
    A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewVizService.java
    M src/org.eclipse.ice.viz.service.visit/META-INF/MANIFEST.MF
    R src/org.eclipse.ice.viz.service.visit/OSGI-INF/visitVisService.xml
    A src/org.eclipse.ice.viz.service.visit/OSGI-INF/vizService.xml
    M src/org.eclipse.ice.viz.service.visit/build.properties
    A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionAdapter.java
    A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionManager.java
    A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/ConnectionPreference.java
    A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPreferenceInitializer.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPreferencePage.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
    A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/actions/ImportLocalFileAction.java
    M src/org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service/build.properties
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizPreferenceInitializer.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizPreferencePage.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizService.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/BasicVizServiceFactory.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/VizPreferenceInitializer.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/VizPreferencePage.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionAdapter.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionManager.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionState.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IKeyChangeListener.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IKeyManager.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/KeyEntry.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/KeyEntryContentProvider.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/Launcher.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/PortEntry.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/PortEntryContentProvider.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/SecretEntry.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/CustomScopedPreferenceStore.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/DynamicComboFieldEditor.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/EntryCellContentProvider.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/EntryCellEditingSupport.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/ISecretCellContentProvider.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentCellContentProvider.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentCellEditingSupport.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentComposite.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentContentProvider.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentPreferenceAdapter.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java
    A tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestListComponentListener.java
    M tests/org.eclipse.ice.filesimulation/src/org/eclipse/ice/filesimulation/FileSimulation.java
    M tests/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.viz.service.paraview.test/.classpath
    A tests/org.eclipse.ice.viz.service.paraview.test/.gitignore
    A tests/org.eclipse.ice.viz.service.paraview.test/.project
    A tests/org.eclipse.ice.viz.service.paraview.test/.settings/org.eclipse.jdt.core.prefs
    A tests/org.eclipse.ice.viz.service.paraview.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.viz.service.paraview.test/build.properties
    A tests/org.eclipse.ice.viz.service.paraview.test/pom.xml
    A tests/org.eclipse.ice.viz.service.paraview.test/src/org/eclipse/ice/viz/service/paraview/test/ParaViewPlotTester.java
    A tests/org.eclipse.ice.viz.service.paraview.test/src/org/eclipse/ice/viz/service/paraview/test/ParaViewVizServiceTester.java
    M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/FakeVizService.java
    M tests/org.eclipse.ice.viz.service.visit.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/VisItPlotTester.java
    M tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/VisItVizServiceTester.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into anna/gridlayout

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: b920a14f0caf5ebb9b220d09999ff0b5b1a517d4
      https://github.com/eclipse/ice/commit/b920a14f0caf5ebb9b220d09999ff0b5b1a517d4
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java

  Log Message:
  -----------
  Added a logic check so the VisIt service doesn't have a heartattack of
null pointer exceptions whenever a ResourceComponent is set on a form
without VisIt already running.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 71514383bbbc444a171e51ec9f9ea2c0c4157c90
      https://github.com/eclipse/ice/commit/71514383bbbc444a171e51ec9f9ea2c0c4157c90
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Hooked up the "rows" button for the ResourcePage grid composite. Since
there's no way to explicitly set rows in a GridLayout, it forces the
number of rows using empty Composites. Both rows and columns now change
dynamically.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: ada7920e94d645a8f56f25389fe761acd536e304
      https://github.com/eclipse/ice/commit/ada7920e94d645a8f56f25389fe761acd536e304
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java

  Log Message:
  -----------
  Adding an option for CSV plots to have a "close" button that appears in
the upper right-hand corner when the cursor is on top of the plotting
canvas (and disappears when the cursor is elsewhere). Default behavior
is no button. Still need to tweak/clean it up a bit.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: d49c74fed3b577f71ad8ca5e936e658e80f8232f
      https://github.com/eclipse/ice/commit/d49c74fed3b577f71ad8ca5e936e658e80f8232f
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java

  Log Message:
  -----------
  Moved the plot close function from CSV classes to the ResourcePage to
keep it generic. It works, but I don't think it's an ideal design. I
posted a question on stackexchange for better suggestions.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: eb174f24bece377341e96619b05f078bd7516e10
      https://github.com/eclipse/ice/commit/eb174f24bece377341e96619b05f078bd7516e10
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java

  Log Message:
  -----------
  Added a setEventListener(event, listener) method to the IPlot interface
and plot classes. Implemented it for CSVPlot to add listeners on the
plot canvas (CSVPlotEditor.setPlotCanvasListener(...)).

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 23e552de58ec9bd9f2166f6eb966286f22661c95
      https://github.com/eclipse/ice/commit/23e552de58ec9bd9f2166f6eb966286f22661c95
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  "Close" buttons now working correctly using the new method in the IPlot
interface.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 2bb720123ed2c6441197595eb70e9a33fe103ff2
      https://github.com/eclipse/ice/commit/2bb720123ed2c6441197595eb70e9a33fe103ff2
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Fixed a disposed widget(s) error thrown when the editor is closed.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: f3a07243f6db97222862ded78f0970d10dea93e1
      https://github.com/eclipse/ice/commit/f3a07243f6db97222862ded78f0970d10dea93e1
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java

  Log Message:
  -----------
  Added a logic check to canOpenFile so it doesn't projectile vomit null
pointer exceptions if VisIt isn't running at the end of a job launch
when files are added to the Resource Component.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 7b5cdb79b4d0268ccd3b9f47238f6a2a526aa6ee
      https://github.com/eclipse/ice/commit/7b5cdb79b4d0268ccd3b9f47238f6a2a526aa6ee
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java

  Log Message:
  -----------
  Updating VIBE plugins to use the IOServices correctly.

Signed-off-by: arbennett <bennettar@xxxxxxxx>


  Commit: a3fdd90d57c241beacad1638d409bc4698259368
      https://github.com/eclipse/ice/commit/a3fdd90d57c241beacad1638d409bc4698259368
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/andrew/caebat'


  Commit: aaba12b97f39e3de6c0b20f6d147587bc24df82b
      https://github.com/eclipse/ice/commit/aaba12b97f39e3de6c0b20f6d147587bc24df82b
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java

  Log Message:
  -----------
  Commented out some code to let the ICEFormEditor render the MOOSE app
selection and input file widgets in the default way (as EntryComposites
in a DataComponent Section).

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 8102552e59be03c08e305fb1b267b8b1657529e4
      https://github.com/eclipse/ice/commit/8102552e59be03c08e305fb1b267b8b1657529e4
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java

  Log Message:
  -----------
  Removed the previously-commented out code as it is no longer needed.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 2e9dea916e61b569b77fa667cf2f5ea58f867f88
      https://github.com/eclipse/ice/commit/2e9dea916e61b569b77fa667cf2f5ea58f867f88
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java

  Log Message:
  -----------
  Removed the MOOSE input file widgets from the MOOSEFormEditor's header.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 599cdeda46ef368ab276f6d25639a3109ebab372
      https://github.com/eclipse/ice/commit/599cdeda46ef368ab276f6d25639a3109ebab372
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java

  Log Message:
  -----------
  Migrated some code from the MOOSETreeCompositeView to the
MOOSEFormEditor to handle creating the plant and mesh views when
necessary.

Commented out the code that adds the MOOSE app selection widget to the
MOOSETreeCompositeView.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: bb6a2567899b787706e00b31391e2ac92b90e034
      https://github.com/eclipse/ice/commit/bb6a2567899b787706e00b31391e2ac92b90e034
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java

  Log Message:
  -----------
  Commented out code that attempted to force the MOOSETreeCompositeView's
ToolBar to wrap when its view width is too small. This code is no longer
necessary.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 87c61cbf2bcbc18061f263b8303c6f07b380a049
      https://github.com/eclipse/ice/commit/87c61cbf2bcbc18061f263b8303c6f07b380a049
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java

  Log Message:
  -----------
  Updated the Mesh and Plant page IDs so that the Mesh View page does not
conflict with the default Resource Page. We shouldn't really have the
two separate pages, so I'll take a look at possibly removing the
embedded mesh view and rely instead on the built-in Resource Page.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 373edea5258ba4773608fd52b6585db5afe2c19e
      https://github.com/eclipse/ice/commit/373edea5258ba4773608fd52b6585db5afe2c19e
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java

  Log Message:
  -----------
  Removing previously commented out code from MOOSETreeCompositeView
(pertaining to the previous MOOSE app selection widget), as it is no
longer useful.

Organized the imports in the MOOSEFormEditor.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: ea5f31f3e63049a85f84d3c64b35ea63b59494e0
      https://github.com/eclipse/ice/commit/ea5f31f3e63049a85f84d3c64b35ea63b59494e0
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java

  Log Message:
  -----------
  Adding some missing documentation and removing some commented out code
that I missed with my last commit.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: a201423660b0110892cc6a79e6e7b4dbf3c9e0aa
      https://github.com/eclipse/ice/commit/a201423660b0110892cc6a79e6e7b4dbf3c9e0aa
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java

  Log Message:
  -----------
  Increased the remote download limit to 50 MB and set it as a system
property (max_download_size) instead of being hardcoded.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: d56125fbedf0c3c26ab00ca5b5083ae223cca33e
      https://github.com/eclipse/ice/commit/d56125fbedf0c3c26ab00ca5b5083ae223cca33e
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
    M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into anna/gridlayout

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: cdc7a416ec303a0827cc5a1f7ddb29bdaf4a2087
      https://github.com/eclipse/ice/commit/cdc7a416ec303a0827cc5a1f7ddb29bdaf4a2087
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java

  Log Message:
  -----------
  Added an if/else statement to check if getting the max_download_size
property returned a valid value. This should fix the build for now, but
it shouldn't be returning an invalid value during unit tests. Asked the
dev list.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: a340c1d56cd64691919f5ceb695206063e6d3ba0
      https://github.com/eclipse/ice/commit/a340c1d56cd64691919f5ceb695206063e6d3ba0
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreePropertySection.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/common/TreeCompositeViewer.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFSectionPage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFTreeCompositeViewer.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/TreePropertySection.java

  Log Message:
  -----------
  Added code to make the ICEFormEditor dirty if the properties in the
TreePropertySection are changed.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 28ddaa82d983362ccbe63e6d48e448070d2cf75d
      https://github.com/eclipse/ice/commit/28ddaa82d983362ccbe63e6d48e448070d2cf75d
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java

  Log Message:
  -----------
  Fixed a bug where the ICEResourceView would only sync with
ICEFormEditors and not sub-classes of ICEFormEditor. This was preventing
the view from working with MOOSEFormEditors.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 067a79c9e62eb6c1c157fe098fb6f5f8a3ae6ea2
      https://github.com/eclipse/ice/commit/067a79c9e62eb6c1c157fe098fb6f5f8a3ae6ea2
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java

  Log Message:
  -----------
  Removed the custom embedded Mesh View from the MOOSEFormEditor. The same
functionality can be achieved via the ICEResourcePage created by the
underlying ICEFormEditor and the properties view.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 2e07b2ca77f0620aa581d23ab9701d3cbd3c0701
      https://github.com/eclipse/ice/commit/2e07b2ca77f0620aa581d23ab9701d3cbd3c0701
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Auto-formatted the text and collapsed a couple of repetitive calls.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 6491f1c1543ff85b49fe7f805db3119c2b69ee12
      https://github.com/eclipse/ice/commit/6491f1c1543ff85b49fe7f805db3119c2b69ee12
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Added code to the ICEResourcePage that, when the current ICEResource is
no longer part of the associated ResourceComponent, clears the content
of the ResourcePage's UI. Now, the browser is displayed with a message
to select a resource to view.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 9483cf00fbd3ddc384b94aa3719c1454f655796e
      https://github.com/eclipse/ice/commit/9483cf00fbd3ddc384b94aa3719c1454f655796e
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into anna/gridlayout


  Commit: 40e833467b07fc8ad087035504f8fff203147086
      https://github.com/eclipse/ice/commit/40e833467b07fc8ad087035504f8fff203147086
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into jordan/bug464037


  Commit: 90ca0440f6490a841d770e7bd6b5d320f1cc01ea
      https://github.com/eclipse/ice/commit/90ca0440f6490a841d770e7bd6b5d320f1cc01ea
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java

  Log Message:
  -----------
  Removed the "MOOSE app..." value from the MOOSE app selection in the
MOOSE Model Builder.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 99e536ea64c298ad9f9fc8a938af79324f917191
      https://github.com/eclipse/ice/commit/99e536ea64c298ad9f9fc8a938af79324f917191
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java

  Log Message:
  -----------
  Added documentation.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: d92aa9d31adea0df3e3f8b02d1888ad8b9842666
      https://github.com/eclipse/ice/commit/d92aa9d31adea0df3e3f8b02d1888ad8b9842666
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java

  Log Message:
  -----------
  Changed the MOOSE Model Builder's MOOSE apps to be upper case. This
required me to update a few lines in the MOOSE Model, specifically to
convert the YAML file names (which are fed to the MMB) to upper case,
and then back to lower case when the YAML file must be determined from
the app name. The apps in the MOOSE Model Builder now match the MOOSE
Launcher.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 09f8c02bae40a0e2a79d45f7b123410170021775
      https://github.com/eclipse/ice/commit/09f8c02bae40a0e2a79d45f7b123410170021775
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreePropertySection.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/common/TreeCompositeViewer.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFSectionPage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFTreeCompositeViewer.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/TreePropertySection.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/jordan/bug464037'


  Commit: 44a15ee79768bbba4692427ea20adec65f5ea467
      https://github.com/eclipse/ice/commit/44a15ee79768bbba4692427ea20adec65f5ea467
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java

  Log Message:
  -----------
  Fixing the MOOSEModelTester to account for the removal of "MOOSE app..."
from the allowed values for the MOOSE Model's app Entry.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 035e223b30cfe8ab6e889382ef76762404db0a75
      https://github.com/eclipse/ice/commit/035e223b30cfe8ab6e889382ef76762404db0a75
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreePropertySection.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/common/TreeCompositeViewer.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFSectionPage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFTreeCompositeViewer.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/TreePropertySection.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into anna/gridlayout

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 80e9c24c15884674a5664acaaa957e8531382d3c
      https://github.com/eclipse/ice/commit/80e9c24c15884674a5664acaaa957e8531382d3c
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Auto-formatted the ICEResourcePage...

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: a7e28ba672d5041c05f20733481a0938437001ac
      https://github.com/eclipse/ice/commit/a7e28ba672d5041c05f20733481a0938437001ac
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java

  Log Message:
  -----------
  Removed the listener method from the IPlot interface.
Changed the IPlot.draw(...) method to return the child Composite or
Canvas.
Applied these changes to the current IPlot implementations.

The net result is no change in user interaction, but we can more easily
add a context/popup menu to the plot Composite or Canvas.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: f466a132192b1d9974ef136c9412828cf37aa9af
      https://github.com/eclipse/ice/commit/f466a132192b1d9974ef136c9412828cf37aa9af
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Made the listener that shows and hides the close button a class variable
so it can be re-used and shared among all drawn plots.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 2e10b882c61292f5b3c8982cbcf02a4158346c9f
      https://github.com/eclipse/ice/commit/2e10b882c61292f5b3c8982cbcf02a4158346c9f
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

  Log Message:
  -----------
  Fixed two bugs. With the first bug, it was possible to get the close
button to not disappear when leaving the plot. The second bug caused the
close button to appear off the edge of the plot.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 3ce7a002fc8bd2302550262a101e4a07be75aecb
      https://github.com/eclipse/ice/commit/3ce7a002fc8bd2302550262a101e4a07be75aecb
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Created the skeleton of PlotGridComposite, which will contain the code
within ICEResourcePage that manages the grid of drawn plots.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 0a06ba856ae6fa85153d74cc764a4b2d8df3ee33
      https://github.com/eclipse/ice/commit/0a06ba856ae6fa85153d74cc764a4b2d8df3ee33
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Moved code for showing the close button from ICEResourcePage to
PlotGridComposite.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: c0c36cf4838f3243d1ef82c7af8c78d5672c559d
      https://github.com/eclipse/ice/commit/c0c36cf4838f3243d1ef82c7af8c78d5672c559d
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Added the code to add and remove plot renderings. Most of this comes
from ICEResourcePage.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 5a368c0c5455cf7345e7aa861c10128061fd460c
      https://github.com/eclipse/ice/commit/5a368c0c5455cf7345e7aa861c10128061fd460c
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Fixed some layout bugs.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: cf98d6a08a6490e3ebb0770be990698659a44793
      https://github.com/eclipse/ice/commit/cf98d6a08a6490e3ebb0770be990698659a44793
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Set up the ICEResourcePage to use the PlotGridComposite. Fixed a layout
bug with the PlotGridComposite.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: aa245547f88b09d8118b323350d1ec4fe3424e7d
      https://github.com/eclipse/ice/commit/aa245547f88b09d8118b323350d1ec4fe3424e7d
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Added a clear button to the PlotGridComposite's ToolBar.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 3d7f8d589800ba3abc6406f458998376c2ede220
      https://github.com/eclipse/ice/commit/3d7f8d589800ba3abc6406f458998376c2ede220
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/LabelContribution.java
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/SpinnerContribution.java

  Log Message:
  -----------
  Added JFace-style ControlContributions for a Spinner and a Label.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 88c03be1e8f472142d0633174599826898e7e3e1
      https://github.com/eclipse/ice/commit/88c03be1e8f472142d0633174599826898e7e3e1
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Added Anna's widgets to the PlotGridComposite's ToolBar, but converted
them to use JFace and added a FormToolkit to decorate them.



Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 72ef96fe663ec4837cd2e673f75825ed63cfa463
      https://github.com/eclipse/ice/commit/72ef96fe663ec4837cd2e673f75825ed63cfa463
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Added new layout code to the PlotGridComposite in the spirit of Anna's
grid layout settings.

Added some notes for fixing bugs.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: b7caedfe8bfe5b3f87eef0f625daaeeedeffdfe3
      https://github.com/eclipse/ice/commit/b7caedfe8bfe5b3f87eef0f625daaeeedeffdfe3
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java

  Log Message:
  -----------
  Added an option for the user to enter the name of a custom MOOSE app.
Would like to test it out more Monday, so putting this in a branch for
now.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: be3a48c901abd4663329b9010765a5710d07a400
      https://github.com/eclipse/ice/commit/be3a48c901abd4663329b9010765a5710d07a400
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Added a condition to the addPlot(...) method so that plots are not drawn
if there is no available space in the grid.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 434eec8c33c9e66b8ba826b0765534ef7abff16d
      https://github.com/eclipse/ice/commit/434eec8c33c9e66b8ba826b0765534ef7abff16d
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Added some code to refreshLayout() to make sure all screen real estate
is occupied when the grid of plots is not full.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: f97b6a69c5521204b3a771266568bff06961ce2f
      https://github.com/eclipse/ice/commit/f97b6a69c5521204b3a771266568bff06961ce2f
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java

  Log Message:
  -----------
  Changed the custom MOOSE launcher to update immediately instead of
waiting for reviewEntries() to trigger. Also added to unit tests. I
think something might be wrong with my build on this machine, so I'll
test it out and merge on my work machine tomorrow.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: f58b89bf56d5226f1e87aaceb34d1ff9c848a7d4
      https://github.com/eclipse/ice/commit/f58b89bf56d5226f1e87aaceb34d1ff9c848a7d4
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Added a context Menu to the grid of drawn plots. It doesn't contain much
yet, but it does update based on the right-clicked plot.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: a2f25141468677b77da74690ac4941439bfed30f
      https://github.com/eclipse/ice/commit/a2f25141468677b77da74690ac4941439bfed30f
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Added a context menu tree that lets you set the plot category and type
based on the clicked plot. The IPlot implementations will need to be
updated to handle subsequent calls to draw(...).

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: c3cff865d89a2826d8e18254ee35098e4e016e84
      https://github.com/eclipse/ice/commit/c3cff865d89a2826d8e18254ee35098e4e016e84
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java

  Log Message:
  -----------
  Added a getResourcePage() method to ICEFormEditor for ICEResourceView to
get a handle on its associated ResourcePage. This eliminated the need
for ICEResourcePage.selectionChanged() to try to filter the location of
events, instead letting the ResourceView directly tell the ResourcePage
to draw. Then added a double-click listener on ICEResourceView, so
resources will be shown/plotted with a double click instead of single.
Cleaned up documentation.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 4253fe1d927e788e9af1a936f22033a54125da91
      https://github.com/eclipse/ice/commit/4253fe1d927e788e9af1a936f22033a54125da91
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java

  Log Message:
  -----------
  Merge branch 'anna/gridlayout' of https://github.com/eclipse/ice into anna/gridlayout


  Commit: 54bd5a4b45d5b14110db670bff2ac7fc11d43cf6
      https://github.com/eclipse/ice/commit/54bd5a4b45d5b14110db670bff2ac7fc11d43cf6
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java

  Log Message:
  -----------
  Removed some old task flags and updated some documentation and notes in
the code.

Changed one reference to getSite().getPage().addSelectionListener(...)
to use
getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(...)
to make sure the SelectionService is used.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: d1996cf666dbeb1b6fd6b0efaf39b7037ef49b12
      https://github.com/eclipse/ice/commit/d1996cf666dbeb1b6fd6b0efaf39b7037ef49b12
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java

  Log Message:
  -----------
  Added the sliders back to the rendered CSVPlots. This should fix the
recent build failure.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 476d5353c39bd2f1b54335ef439308a19b16f727
      https://github.com/eclipse/ice/commit/476d5353c39bd2f1b54335ef439308a19b16f727
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/LabelContribution.java
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/SpinnerContribution.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into anna/custom_moose_launcher


  Commit: f63c90cf1a368ca763e080bd0e7fdb5b2b635f0e
      https://github.com/eclipse/ice/commit/f63c90cf1a368ca763e080bd0e7fdb5b2b635f0e
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java

  Log Message:
  -----------
  Accidentally broke the file Entry updating in the MOOSE Launcher by
creating my own update method, but fixed it by also calling the
super.update() where appropriate.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 2aba2959dbd24b0edadb339fcd5ba191af8734f4
      https://github.com/eclipse/ice/commit/2aba2959dbd24b0edadb339fcd5ba191af8734f4
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/PlotProvider.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java

  Log Message:
  -----------
  Added a removeSeries(...) method to the PlotProvider for CSVPlots. This
method is tested.

Updated the CSVPlot to remove the old series and plot the new one when
draw(...) is called with a new plot category and type.

Fixed the available plot categories in CSVPlot.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: abab00f0e80551f744e2fba4601e43605575677e
      https://github.com/eclipse/ice/commit/abab00f0e80551f744e2fba4601e43605575677e
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java

  Log Message:
  -----------
  Minor update to checkRemoveSeries() to ensure that the removed
SeriesProviders are unique.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 5dee3a0e631b1c7d7b89e585d37197b6e317846f
      https://github.com/eclipse/ice/commit/5dee3a0e631b1c7d7b89e585d37197b6e317846f
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/PlotProvider.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/anna/gridlayout'

Conflicts:
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
	
Merged recent updates to the CSVPlot into master. You should now be able
to change the plot category and type for CSV plots by right-clicking
them and choosing from the "Set Plot Type" sub-menu.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 8355b1575f64240e24af5607d29f261ed1c208f6
      https://github.com/eclipse/ice/commit/8355b1575f64240e24af5607d29f261ed1c208f6
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java

  Log Message:
  -----------
  Fixing the CSVPlotTester, which had bad plot categories defined.

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


  Commit: 22194b815297baa9a906fad7f8dc9c3108055272
      https://github.com/eclipse/ice/commit/22194b815297baa9a906fad7f8dc9c3108055272
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java

  Log Message:
  -----------
  MOOSE Model now automatically changes the AdaptiveTreeComposite.type of
the Mesh block to "FileEntry" if a filename is entered. Fixes bug
459692.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: deec4b7eda752a0fdb13516e2e73b88acf9ebab2
      https://github.com/eclipse/ice/commit/deec4b7eda752a0fdb13516e2e73b88acf9ebab2
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/PlotProvider.java
    M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/eclipse/ice


  Commit: a8cc34408eaee7035dd5073f275ea2c608820d4f
      https://github.com/eclipse/ice/commit/a8cc34408eaee7035dd5073f275ea2c608820d4f
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    M README.md
    M features/org.eclipse.ice.feature/feature.xml
    M org.eclipse.ice.build/pom.xml
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    R src/org.eclipse.ice.caebat/.classpath
    R src/org.eclipse.ice.caebat/.gitignore
    R src/org.eclipse.ice.caebat/.project
    R src/org.eclipse.ice.caebat/.settings/org.eclipse.jdt.core.prefs
    R src/org.eclipse.ice.caebat/.settings/org.eclipse.pde.core.prefs
    R src/org.eclipse.ice.caebat/CaebatModel/example_ini.conf
    R src/org.eclipse.ice.caebat/CaebatModel/example_input_keyvalue
    R src/org.eclipse.ice.caebat/META-INF/MANIFEST.MF
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatKVPairComponent.xml
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatLauncherComponent.xml
    R src/org.eclipse.ice.caebat/OSGi-INF/caebatModelComponent.xml
    R src/org.eclipse.ice.caebat/about.html
    R src/org.eclipse.ice.caebat/build.properties
    R src/org.eclipse.ice.caebat/data/case_6.conf
    R src/org.eclipse.ice.caebat/data/case_6.dat
    R src/org.eclipse.ice.caebat/pom.xml
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/kvPair/CaebatKVPair.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/kvPair/CaebatKVPairBuilder.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncherBuilder.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/model/CaebatModel.java
    R src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/model/CaebatModelBuilder.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreePropertySection.java
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/common/TreeCompositeViewer.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFSectionPage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFTreeCompositeViewer.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/LabelContribution.java
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/SpinnerContribution.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/DescriptionCellContentProvider.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/TreePropertyCellContentProvider.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/TreePropertySection.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/wizards/ImportFileWizardPage.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/Entry.java
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSReader.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobprofile/JobProfile.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Block.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Parameter.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/YAMLBlock.java
    M src/org.eclipse.ice.materials/data/userMatDB.xml
    A src/org.eclipse.ice.vibe/.classpath
    A src/org.eclipse.ice.vibe/.gitignore
    A src/org.eclipse.ice.vibe/.project
    A src/org.eclipse.ice.vibe/.settings/org.eclipse.jdt.core.prefs
    A src/org.eclipse.ice.vibe/.settings/org.eclipse.pde.core.prefs
    A src/org.eclipse.ice.vibe/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeKVPairComponent.xml
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeLauncherComponent.xml
    A src/org.eclipse.ice.vibe/OSGi-INF/vibeModelComponent.xml
    A src/org.eclipse.ice.vibe/about.html
    A src/org.eclipse.ice.vibe/build.properties
    A src/org.eclipse.ice.vibe/data/case_6.conf
    A src/org.eclipse.ice.vibe/data/case_6.dat
    A src/org.eclipse.ice.vibe/pom.xml
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPairBuilder.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncherBuilder.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java
    A src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModelBuilder.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/MultiPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataLoader.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/PlotProvider.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitPlotViewer.java
    R tests/org.eclipse.ice.caebat.test/.classpath
    R tests/org.eclipse.ice.caebat.test/.gitignore
    R tests/org.eclipse.ice.caebat.test/.project
    R tests/org.eclipse.ice.caebat.test/.settings/org.eclipse.jdt.core.prefs
    R tests/org.eclipse.ice.caebat.test/.settings/org.eclipse.pde.core.prefs
    R tests/org.eclipse.ice.caebat.test/CaebatModel/example_ini.conf
    R tests/org.eclipse.ice.caebat.test/META-INF/MANIFEST.MF
    R tests/org.eclipse.ice.caebat.test/about.html
    R tests/org.eclipse.ice.caebat.test/build.properties
    R tests/org.eclipse.ice.caebat.test/pom.xml
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/kvPair/test/CaebatKVPairBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/kvPair/test/CaebatKVPairTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/model/test/CaebatModelBuilderTester.java
    R tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/model/test/CaebatModelTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EntryTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfFileFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfReaderFactoryTester.java
    M tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfWriterFactoryTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobProfileTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/BlockTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/MOOSEFileHandlerTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/ParameterTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/moose/YAMLBlockTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java
    M tests/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.persistence.xml.test/src/xmlpp/test/XMLPersistenceProviderTester.java
    A tests/org.eclipse.ice.vibe.test/.classpath
    A tests/org.eclipse.ice.vibe.test/.gitignore
    A tests/org.eclipse.ice.vibe.test/.project
    A tests/org.eclipse.ice.vibe.test/.settings/org.eclipse.jdt.core.prefs
    A tests/org.eclipse.ice.vibe.test/.settings/org.eclipse.pde.core.prefs
    A tests/org.eclipse.ice.vibe.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.vibe.test/about.html
    A tests/org.eclipse.ice.vibe.test/build.properties
    A tests/org.eclipse.ice.vibe.test/pom.xml
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/kvPair/test/VibeKVPairTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/launcher/test/VibeLauncherTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelBuilderTester.java
    A tests/org.eclipse.ice.vibe.test/src/org/eclipse/ice/vibe/model/test/VibeModelTester.java
    M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java
    M tests/org.eclipse.ice.viz.service.visit.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java
    A utils/ICEDocCleaner/.classpath
    A utils/ICEDocCleaner/.project
    A utils/ICEDocCleaner/.settings/org.eclipse.jdt.core.prefs
    A utils/ICEDocCleaner/bin/.gitignore
    A utils/ICEDocCleaner/src/ICEDocCleaner.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/jordan/VisItVisService' into
jordan/ParaViewVizService

Conflicts:
	repository/org.eclipse.ice.repository/ice.product.launch
	src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
	src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java

Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>


Compare: https://github.com/eclipse/ice/compare/10722d592ccd...a8cc34408eae

Back to the top