Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ice-build] [eclipse/ice] 710ea7: Committing new branch for dynamic moose file capab...

  Branch: refs/heads/jay/reflectivity
  Home:   https://github.com/eclipse/ice
  Commit: 710ea78726f6a3ff42d4f75499e16e22abe504b0
      https://github.com/eclipse/ice/commit/710ea78726f6a3ff42d4f75499e16e22abe504b0
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

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

  Log Message:
  -----------
  Committing new branch for dynamic moose file capability. 

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


  Commit: 72410931a714ba47dfbffa2cbe95967b864f34c6
      https://github.com/eclipse/ice/commit/72410931a714ba47dfbffa2cbe95967b864f34c6
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.item/META-INF/MANIFEST.MF

  Log Message:
  -----------
  Forgot to drag the Manifest file in the git staging view. 

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


  Commit: a29c7aed8fb32d2378d6763259a0ef60c6d85646
      https://github.com/eclipse/ice/commit/a29c7aed8fb32d2378d6763259a0ef60c6d85646
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.moose/plugin.xml
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLHandler.java
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLWizard.java
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLWizardPage.java
    M src/org.eclipse.ice.item/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.item/build.properties
    A src/org.eclipse.ice.item/plugin.xml
    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/jobLauncher/JobLauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java

  Log Message:
  -----------
  Committing current work to branch regarding yaml file generation from
eclipse toolbar. 
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>


  Commit: e4294dfb102d78fa20df2c5b4388efdbcb1d6128
      https://github.com/eclipse/ice/commit/e4294dfb102d78fa20df2c5b4388efdbcb1d6128
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/model/CaebatModel.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLHandler.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLWizard.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLWizardPage.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/FlightCamera.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PlantAppState.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EclipseStreamingTextWidget.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.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/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/ParameterTester.java

  Log Message:
  -----------
  Merged latest from Master to this branch (Jordan's bug fixes and Anna's
Discrete Moose paramters work). 

Adding a new Eclipse toolbar button, handler, and wizard for generating
MOOSE yaml and action syntax files, locally or remotely. This is a first
pass, feel free to review and provide feedback. 


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


  Commit: 81da700154fb0da7cb7e3763ea9c50fd00468513
      https://github.com/eclipse/ice/commit/81da700154fb0da7cb7e3763ea9c50fd00468513
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

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

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

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


  Commit: 0ab14f922e9fcaa7afc3e6e69122cd7798516d3b
      https://github.com/eclipse/ice/commit/0ab14f922e9fcaa7afc3e6e69122cd7798516d3b
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

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

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

Conflicts:
	src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java

Merging Anna's bug fix into this branch. 

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


  Commit: bb453f2a863547eedb41eaa7419d09a2d2bc881b
      https://github.com/eclipse/ice/commit/bb453f2a863547eedb41eaa7419d09a2d2bc881b
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

  Changed paths:
    A src/org.eclipse.ice.client.widgets.moose/icons/file_obj.gif
    M src/org.eclipse.ice.client.widgets.moose/plugin.xml
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java

  Log Message:
  -----------
  Added a new icon for generate yaml button. Still not great, but better
than the string that was there.

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


  Commit: 748d00346c461b212b1b9c9608419927c2e38d4a
      https://github.com/eclipse/ice/commit/748d00346c461b212b1b9c9608419927c2e38d4a
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.io/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IOService.java
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IReader.java
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IWriter.java
    M src/org.eclipse.ice.item/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java

  Log Message:
  -----------
  Committing initial stab at IOService, IReader, and IWriter, as well as
MOOSEFileHandler's implementation of IReader and IWriter methods. 

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


  Commit: 507cceba225bb458b3074e75d77a1a7770e405dd
      https://github.com/eclipse/ice/commit/507cceba225bb458b3074e75d77a1a7770e405dd
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

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

  Log Message:
  -----------
  Added some more logic checks to updateFileEntries so it can be less
breaky.

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


  Commit: fa923660496b45b9ef0a05958104dd3c3a22a40c
      https://github.com/eclipse/ice/commit/fa923660496b45b9ef0a05958104dd3c3a22a40c
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.io/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.io/OSGI-INF/ioservice.xml
    M src/org.eclipse.ice.io/build.properties
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IOService.java
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IReader.java
    A src/org.eclipse.ice.item/OSGi-INF/ItemIO.xml
    A src/org.eclipse.ice.item/OSGi-INF/MOOSEIO.xml
    M src/org.eclipse.ice.item/build.properties
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.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/nuclear/MOOSELauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java

  Log Message:
  -----------
  Committing update for IO services. Item now receives an IOService, and
IOService receives IReaders and IWriters via OSGi Declarative Services.
MOOSEFileHandler now realizes both the IReader and IWriter interface and
provides implementations that enable dynamic file entry generation
depending on the user-selected input file. This is handled at the Item
and JobLauncher level. 

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


  Commit: bad1e9d769727740ac43271ed69da6e4fb2a65db
      https://github.com/eclipse/ice/commit/bad1e9d769727740ac43271ed69da6e4fb2a65db
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    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 tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java

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

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


  Commit: 737ee79ae2bfa321b863d42d553b1e5bb3fc86ec
      https://github.com/eclipse/ice/commit/737ee79ae2bfa321b863d42d553b1e5bb3fc86ec
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

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

  Log Message:
  -----------
  Fixing a bug where commented out parameters were being processed by the
MOOSE launcher.

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


  Commit: dbe40e37d1928aaa935dffa6e4ec94d5655349aa
      https://github.com/eclipse/ice/commit/dbe40e37d1928aaa935dffa6e4ec94d5655349aa
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    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 tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java

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


  Commit: 306e037774bef668a22824d7f64dccf51fc62c06
      https://github.com/eclipse/ice/commit/306e037774bef668a22824d7f64dccf51fc62c06
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.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/nuclear/MOOSELauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java

  Log Message:
  -----------
  Fixing a few tests related to the new MOOSE IO infrastructure. Setup
MOOSEFileHandler.findAll to change the name of the File Entry to its
parent Blocks name if the Entry's current name is the general 'file' or
'data_file' to make the Entry more descriptive for the MOOSE user. 

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


  Commit: 95b32c669b62372b86e4b057c1065ab66b048ea8
      https://github.com/eclipse/ice/commit/95b32c669b62372b86e4b057c1065ab66b048ea8
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

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

  Log Message:
  -----------
  Put some logic checks back in.

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


  Commit: c1417edde3e0224915ac39a20fbedd6b803e68ea
      https://github.com/eclipse/ice/commit/c1417edde3e0224915ac39a20fbedd6b803e68ea
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.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/nuclear/MOOSELauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/MOOSEFileHandler.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java

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


  Commit: 99a10423ebca00817e3027491fea2d0525a43e39
      https://github.com/eclipse/ice/commit/99a10423ebca00817e3027491fea2d0525a43e39
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

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

  Log Message:
  -----------
  Put some logic checks back in.

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


  Commit: 68cfc4e9af84e2fdeb9ebdffe2727c1790426156
      https://github.com/eclipse/ice/commit/68cfc4e9af84e2fdeb9ebdffe2727c1790426156
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M repository/org.eclipse.ice.repository/ice.product.launch
    M tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherTester.java

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

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


  Commit: 36f2ab8742083a099be21c6375353311f3c8f244
      https://github.com/eclipse/ice/commit/36f2ab8742083a099be21c6375353311f3c8f244
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  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/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
    M tests/org.eclipse.ice.caebat.test/src/org/eclipse/ice/caebat/launcher/test/CaebatLauncherBuilderTester.java

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

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


  Commit: b484300fd1a7e52be04190338a16249bea811c02
      https://github.com/eclipse/ice/commit/b484300fd1a7e52be04190338a16249bea811c02
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  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.rcp/src/org/eclipse/ice/client/widgets/jme/EmbeddedView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/MasterApplication.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/ViewAppState.java

  Log Message:
  -----------
  Adding a "take screenshot" button to the MOOSE Model Builder's plant
view.

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


  Commit: 313f288117c8f2f4731f7af53b23641dc6f2fc00
      https://github.com/eclipse/ice/commit/313f288117c8f2f4731f7af53b23641dc6f2fc00
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

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

  Log Message:
  -----------
  Just realized I accidentally renamed the MOOSEModel Input TreeComposite
by copy/pasting code when I added the YAML TreeComposite to the form
last week.

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


  Commit: acc1c28c3f7f00ccdf7a53b53f3a930b366fbf2e
      https://github.com/eclipse/ice/commit/acc1c28c3f7f00ccdf7a53b53f3a930b366fbf2e
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

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

  Log Message:
  -----------
  By default, the CSVDataLoader considers :, ; and / to be delimiters in
feature names and splits the name up. This messes up for RELAP-7
postprocessing files which contains these chars in the feature names. To
address this, I gave all loading methods (load(File), load(String) and
load()) a boolean parameter in their signature(s) which determines if
these chars should be considered delimiters. Calling the regular load
methods without a boolean flag will load the file with the boolean flag
set to false by default. Otherwise, if you'd like to use these
characters as delimiters, pass true into the method signature(s).

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


  Commit: a2dd678cddce511af7cd58c28cc95dff43da1a4f
      https://github.com/eclipse/ice/commit/a2dd678cddce511af7cd58c28cc95dff43da1a4f
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-down-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-down-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-left-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-down-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-up-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-right-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-right-32.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-up-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-up-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/camera.png
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CustomFlyByCamera.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/ViewAppState.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PlantAppState.java

  Log Message:
  -----------
  Adding several buttons to the MOOSE Model Builder's plant view. These
all have custom images and can be used manipulate the view's camera.

Removed a previous iteration of the custom fly camera from the rcp
bundle.

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


  Commit: 73a60931816027c0d1933c8b800e4788ee65a70c
      https://github.com/eclipse/ice/commit/73a60931816027c0d1933c8b800e4788ee65a70c
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    R src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-right-32.png

  Log Message:
  -----------
  Removing a custom icon that is not needed yet.

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


  Commit: 1975d489680321bb17f3890e008b4aa3468b2903
      https://github.com/eclipse/ice/commit/1975d489680321bb17f3890e008b4aa3468b2903
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    R src/org.eclipse.ice.caebat/caebatCases/Case3CAEBATModel.xml
    R src/org.eclipse.ice.caebat/caebatCases/Case6CAEBATModel.xml
    R src/org.eclipse.ice.caebat/caebatCases/Case7aCAEBATModel.xml
    R src/org.eclipse.ice.caebat/caebatCases/Case7bCAEBATModel.xml
    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/IPSWriter.java

  Log Message:
  -----------
  Restructuring the output of the IPSWriter to be more rigid with it's
whitespace so that the CaebatLauncher can pick up the simulation root
directory and adjust it so that the correct data is passed back to ICE.
Also removing old XML case files.

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


  Commit: ed7c86d0b92f425648c9fe9a673caef5229fa620
      https://github.com/eclipse/ice/commit/ed7c86d0b92f425648c9fe9a673caef5229fa620
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-down-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-down-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-left-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-down-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-up-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-right-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-up-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-up-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/camera.png
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CustomFlyByCamera.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/ViewAppState.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PlantAppState.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataLoader.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/CSVDataLoaderTester.java

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


  Commit: 7835d64bc221ee54de7eba83f6d7b1ccdce7b621
      https://github.com/eclipse/ice/commit/7835d64bc221ee54de7eba83f6d7b1ccdce7b621
  Author: arbennett <bennettar@xxxxxxxx>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.caebat/build.properties

  Log Message:
  -----------
  Updating build.properties for Caebat plugins.


  Commit: f307ddb27fd7309eaae086a412831f60a943a6e5
      https://github.com/eclipse/ice/commit/f307ddb27fd7309eaae086a412831f60a943a6e5
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-down-16.png
    M src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-up-16.png
    M src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-left-16.png
    M src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-right-16.png
    M src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-left-16.png
    M src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-right-16.png
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java

  Log Message:
  -----------
  Improved the rotation icons since some of them looked a little too
similar to the movement icons.

The left and right roll actions were reversed. This bug has been fixed.

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


  Commit: e291c1a700263f3d8a02fd23eb0b802c68957264
      https://github.com/eclipse/ice/commit/e291c1a700263f3d8a02fd23eb0b802c68957264
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/Action.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/jobLauncher/JobLauncher.java
    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/ItemTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItem.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java

  Log Message:
  -----------
  Committing updates to Item, JobLauncher, JobLaunchAction, and
MooseLauncher. Implemented JobLauncher.getWorkingDirectory() to let
subclasses get a reference to the absolute path of the
iceLaunch_timestamp working directory. 

Removed code in JobLaunchAction.launchLocal that moves generated files
into the default project space. Added code to JobLauncher.launchRemotely
that creates a local remoteIceLaunch_timestamp directory to serve as a
place for downloaded files from the remote host. 

Added file creation/copying/moving functionality to the Item.
Implemented copyFile(s), moveFile(s), getFiles, and deleteDirectory that
subclasses can utilize for simulation file manipulation. 

Reimplemented MOOSELauncher.updateResourceComponent to use these new
Item methods. 

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


  Commit: 9d1c287073dff84d245f61fd11205f7aa481626b
      https://github.com/eclipse/ice/commit/9d1c287073dff84d245f61fd11205f7aa481626b
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M README.md
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.caebat/build.properties
    R src/org.eclipse.ice.caebat/caebatCases/Case3CAEBATModel.xml
    R src/org.eclipse.ice.caebat/caebatCases/Case6CAEBATModel.xml
    R src/org.eclipse.ice.caebat/caebatCases/Case7aCAEBATModel.xml
    R src/org.eclipse.ice.caebat/caebatCases/Case7bCAEBATModel.xml
    M src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java
    M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-down-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-down-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-left-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-down-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-up-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-right-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-up-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-up-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/camera.png
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CustomFlyByCamera.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/EmbeddedView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/MasterApplication.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/ViewAppState.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PlantAppState.java
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSWriter.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/Action.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/jobLauncher/JobLauncher.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.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataLoader.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItem.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/CSVDataLoaderTester.java

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

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.item/src/org/eclipse/ice/item/Item.java
	src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
	src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java


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


  Commit: 78c08177423221e64b1f3830c053810fae3edf08
      https://github.com/eclipse/ice/commit/78c08177423221e64b1f3830c053810fae3edf08
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLHandler.java
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IReader.java
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IWriter.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.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/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 tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java

  Log Message:
  -----------
  Committing updates to IReader/IWriter interfaces. They now read and
write from Forms. Updated MooseModel to utilize new IO interfaces
instead of having a direct reference to the MOOSEFileHandler. Removed
Generate YAML available executable from list on MOOSELauncher since it
is now provided in the Generate YAML action toolbar button. 

Documentation and commments updated throughout.

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


  Commit: b28eddcac1510b6b600988c700dc5024027755e9
      https://github.com/eclipse/ice/commit/b28eddcac1510b6b600988c700dc5024027755e9
  Author: Jordan Deyton <jordan.deyton@xxxxxxxxx>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/CustomTube.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/HeatExchangerView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PipeView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/ReactorMesh.java
    A src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/TubeMesh.java

  Log Message:
  -----------
  Removing the "CustomTube" mesh that came from jMonkeyEngine 2. Replaced
it with a from-scratch tube mesh that just does what we need it to do
(and also should not have buffer overflow issues).

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


  Commit: c7e481272b2ef29592cb1f07b779706976ebd3f0
      https://github.com/eclipse/ice/commit/c7e481272b2ef29592cb1f07b779706976ebd3f0
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.item/build.properties

  Log Message:
  -----------
  Committing fix to item build.properties: mooseio.xml to MOOSEIO.xml

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


  Commit: 7dda86f066f6f427e8faad2966ea08b2f3254860
      https://github.com/eclipse/ice/commit/7dda86f066f6f427e8faad2966ea08b2f3254860
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/TubeMesh.java

  Log Message:
  -----------
  Removed some unnecessary private methods from the new TubeMesh class.

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


  Commit: f00a21d97faac1e7b37ff7c244ee23fab3a830d3
      https://github.com/eclipse/ice/commit/f00a21d97faac1e7b37ff7c244ee23fab3a830d3
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IOService.java
    A tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/serializable/test/IOServiceTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItem.java

  Log Message:
  -----------
  Committing tests for the IOService and Item's setIOService and
getReader/getWriter methods. 

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


  Commit: a3fcf8afe22ec1ca6e4a46a54b71ab620c4e1bd8
      https://github.com/eclipse/ice/commit/a3fcf8afe22ec1ca6e4a46a54b71ab620c4e1bd8
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/CustomTube.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/HeatExchangerView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PipeView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/ReactorMesh.java
    A src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/TubeMesh.java

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

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


  Commit: 84e157cacc90291059e15477a3bb486577c7f3ed
      https://github.com/eclipse/ice/commit/84e157cacc90291059e15477a3bb486577c7f3ed
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.client.widgets.moose/icons/file_obj.gif
    M src/org.eclipse.ice.client.widgets.moose/plugin.xml
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLHandler.java
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLWizard.java
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLWizardPage.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/src/org/eclipse/ice/client/widgets/EclipseStreamingTextWidget.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.io/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.io/OSGI-INF/ioservice.xml
    M src/org.eclipse.ice.io/build.properties
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IOService.java
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IReader.java
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IWriter.java
    M src/org.eclipse.ice.item/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.item/OSGi-INF/ItemIO.xml
    A src/org.eclipse.ice.item/OSGi-INF/MOOSEIO.xml
    M src/org.eclipse.ice.item/build.properties
    A src/org.eclipse.ice.item/plugin.xml
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.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/jobLauncher/JobLauncher.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
    A tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/serializable/test/IOServiceTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItem.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/dynamic_moose_files'

Committing all work done in dynamic_moose_files branch to master. This
includes new IO interfaces, Item copy/move file methods, dynamic input
file searching, and generate yaml toolbar action.

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


  Commit: 4b732cde7ac0d563f91814ba26b14f1b49cc45d5
      https://github.com/eclipse/ice/commit/4b732cde7ac0d563f91814ba26b14f1b49cc45d5
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2014-12-22 (Mon, 22 Dec 2014)

  Changed paths:
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.caebat/build.properties
    R src/org.eclipse.ice.caebat/caebatCases/Case3CAEBATModel.xml
    R src/org.eclipse.ice.caebat/caebatCases/Case6CAEBATModel.xml
    R src/org.eclipse.ice.caebat/caebatCases/Case7aCAEBATModel.xml
    R src/org.eclipse.ice.caebat/caebatCases/Case7bCAEBATModel.xml
    M src/org.eclipse.ice.caebat/src/org/eclipse/ice/caebat/launcher/CaebatLauncher.java
    M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.moose/build.properties
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-down-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-down-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-left-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-down-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-pitch-up-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-right-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-roll-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-up-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-up-perspective-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-left-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/arrow-yaw-right-16.png
    A src/org.eclipse.ice.client.widgets.moose/icons/camera.png
    A src/org.eclipse.ice.client.widgets.moose/icons/file_obj.gif
    M src/org.eclipse.ice.client.widgets.moose/plugin.xml
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLHandler.java
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLWizard.java
    A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/GenerateYAMLWizardPage.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CustomFlyByCamera.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/EmbeddedView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/MasterApplication.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/ViewAppState.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/CustomTube.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/HeatExchangerView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PipeView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PlantAppState.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/ReactorMesh.java
    A src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/TubeMesh.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EclipseStreamingTextWidget.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.io/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.io/OSGI-INF/ioservice.xml
    M src/org.eclipse.ice.io/build.properties
    M src/org.eclipse.ice.io/src/org/eclipse/ice/io/ips/IPSWriter.java
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IOService.java
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IReader.java
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/serializable/IWriter.java
    M src/org.eclipse.ice.item/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.item/OSGi-INF/ItemIO.xml
    A src/org.eclipse.ice.item/OSGi-INF/MOOSEIO.xml
    M src/org.eclipse.ice.item/build.properties
    A src/org.eclipse.ice.item/plugin.xml
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/Action.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/jobLauncher/JobLauncher.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.materials/data/userMatDB.xml
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataLoader.java
    A tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/serializable/test/IOServiceTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ItemTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestItem.java
    A 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.viz.test/src/org/eclipse/ice/viz/plotviewer/test/CSVDataLoaderTester.java

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

Conflicts:
	src/org.eclipse.ice.item/META-INF/MANIFEST.MF
	src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
	src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
	src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java

All conflicts fixed. Also fixed a bug in the new MOOSE YAML icon and a
couple of other build.properties problems.

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


Compare: https://github.com/eclipse/ice/compare/2fbcdef2e087...4b732cde7ac0

Back to the top