Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ice-build] [eclipse/ice] 7f4936: Added a ParaViewConnectionAdapter to cleanly inter...

  Branch: refs/heads/jay/reflectivity
  Home:   https://github.com/eclipse/ice
  Commit: 7f4936f8c26cbaec363346d3c98d1ea10a578f33
      https://github.com/eclipse/ice/commit/7f4936f8c26cbaec363346d3c98d1ea10a578f33
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/connections/paraview/ParaViewConnectionAdapter.java

  Log Message:
  -----------
  Added a ParaViewConnectionAdapter to cleanly interface the
ParaViewVizService with the VtkWebClient.

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


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

  Changed paths:
    R 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/connections/visit/VisItConnectionTable.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
    R 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/ConnectionTable.java

  Log Message:
  -----------
  Renamed the ConnectionManager classes to ConnectionTable (since they
subclass TableComponent).

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


  Commit: 4062bd8b9d2f958ff725a15dfdd09842505db243
      https://github.com/eclipse/ice/commit/4062bd8b9d2f958ff725a15dfdd09842505db243
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M 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/ConnectionClient.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionAdapter.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionClient.java

  Log Message:
  -----------
  Created IConnectionAdapter and IConnectionClient.
Made ConnectionAdapter an implementation of IConnectionAdapter.
Created a basic implementation of IConnectionClient (the code comes from
the current version of VisItPlot).

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


  Commit: 115762c929576e0fcec6aa974e13e73505115894
      https://github.com/eclipse/ice/commit/115762c929576e0fcec6aa974e13e73505115894
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionClient.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionManager.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionClient.java

  Log Message:
  -----------
  Added a ConnectionManager class based on the current VisItVizService
implementation. It is meant to handle mapping clients (IPlots) to their
respective connection adapters.
Renamed a method on the IConnectionClient interface.

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


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

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/connections/paraview/ParaViewConnectionAdapter.java

  Log Message:
  -----------
  Added documentation to the ParaViewConnectionAdapter.

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


  Commit: 947f3b37015d2fac7d965750e03aaaa61aea45fc
      https://github.com/eclipse/ice/commit/947f3b37015d2fac7d965750e03aaaa61aea45fc
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPreferencePage.java

  Log Message:
  -----------
  Applied some of the renaming changes from the previous commits to the
ParaView preference page.

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


  Commit: 35c2198e062615a08b32f1cd6bf2de2365783dd6
      https://github.com/eclipse/ice/commit/35c2198e062615a08b32f1cd6bf2de2365783dd6
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewVizService.java

  Log Message:
  -----------
  Added a basic implementation of ParaViewVizService and skeleton code for
ParaViewPlot.

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


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

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionManager.java

  Log Message:
  -----------
  Made a method in ConnectionManager public.

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


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

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/Launcher.java

  Log Message:
  -----------
  Applying some of the recent name changes to the test launcher.

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


  Commit: 68b0da758c2e00ff1561ad7df78382b1d33dfa56
      https://github.com/eclipse/ice/commit/68b0da758c2e00ff1561ad7df78382b1d33dfa56
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlot.java

  Log Message:
  -----------
  Created a base class, ConnectionPlot, for plots that are based on a
local or remote connection (which is wrapped by an IConnectionAdapter).
Almost all of the code was pulled from the current version of VisItPlot,
but it has been abstracted enough to be re-used for ParaView.

Extended this base class with ParaViewPlot.

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


  Commit: d06109a9b7338b5d21c967bf398fe6345c53d58c
      https://github.com/eclipse/ice/commit/d06109a9b7338b5d21c967bf398fe6345c53d58c
  Author: Jordan <jordan.deyton@xxxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    R src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionClient.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlot.java

  Log Message:
  -----------
  Made ConnectionPlot implement IConnectionClient rather than extend
ConnectionClient (the code was relocated to ConnectionPlot).
Deleted the ConnectionClient implementation.

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


  Commit: 1420348de622651d7a81e65b4341d7b672fd7ecb
      https://github.com/eclipse/ice/commit/1420348de622651d7a81e65b4341d7b672fd7ecb
  Author: Jordan <jordan.deyton@xxxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlot.java

  Log Message:
  -----------
  Removed references to VisIt from the base plot class.

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


  Commit: 0bdee42e9ac68d9edb41fb02867c402b43ec37fb
      https://github.com/eclipse/ice/commit/0bdee42e9ac68d9edb41fb02867c402b43ec37fb
  Author: Jordan <jordan.deyton@xxxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    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/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewVizService.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/MultiPlot.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/PlotComposite.java

  Log Message:
  -----------
  Adding two classes to help manage drawing the same plot in multiple
Composites. Currently, it only works for drawing in one.

Added some code to test this functionality to the MOOSEFormEditor.
Switched the ParaViewPlot to use the new MultiPlot class. I will have to
hook it back up to the ConnectionPlot class later.

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


  Commit: 966574dca25660a48ca8cde944c9f8adfff13d95
      https://github.com/eclipse/ice/commit/966574dca25660a48ca8cde944c9f8adfff13d95
  Author: Jordan <jordan.deyton@xxxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/MultiPlot.java
    R src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/PlotComposite.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/PlotRender.java

  Log Message:
  -----------
  Renamed the PlotComposite class to PlotRender since it isn't a Composite
but wraps one (multiple, actually).

Updated the MultiPlot class to support rendering in multiple parent
Composites. Added documentation to this class explaining the behavior.

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


  Commit: bb2d8bbc02eef9b4683d9529b5d60296a985c495
      https://github.com/eclipse/ice/commit/bb2d8bbc02eef9b4683d9529b5d60296a985c495
  Author: Jordan <jordan.deyton@xxxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M 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/ParaViewPlotRender.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/PlotRender.java

  Log Message:
  -----------
  Added documentation to the PlotRender class and updated some of its code
to make it more customizable. Also made a method private, hence the
change to MultiPlot in which I simplified some code.

Created a sub-class of it called ParaViewPlotRender. It does nothing
special yet.

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


  Commit: e8c259807b4cb4227e9ebf504cbddb378ea493b8
      https://github.com/eclipse/ice/commit/e8c259807b4cb4227e9ebf504cbddb378ea493b8
  Author: Jordan <jordan.deyton@xxxxxxxxx>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.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/PlotRender.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlot.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlotRender.java

  Log Message:
  -----------
  Added a new ConnectionPlotRender as a sub-class of PlotRender and a
parent class of ParaViewPlotRender. It performs error handling for
IConnectionAdapters and only sends requests to render to the sub-class
if the connection is valid.

Made the icon in the PlotRender's infoComposite customizable by
sub-classes.

Converted the ConnectionPlot to be a sub-class of MultiPlot and a parent
class of ParaViewPlot.

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


  Commit: 6c80606ff59295018bbaa2add63cf6b9df6c0d75
      https://github.com/eclipse/ice/commit/6c80606ff59295018bbaa2add63cf6b9df6c0d75
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewVizService.java

  Log Message:
  -----------
  Restoring some commented out code that registers the ParaViewPlots with
the ParaView connection.

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


  Commit: 8b7a4c18a895c4cb16efeb9526d5ac228b17bd7e
      https://github.com/eclipse/ice/commit/8b7a4c18a895c4cb16efeb9526d5ac228b17bd7e
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

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

  Log Message:
  -----------
  Fixing some debug code where I forgot to add a layout, resulting in
0-sized Composites.

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


  Commit: 56b63f1c6a79d63594bf2d4397e09811aef3a430
      https://github.com/eclipse/ice/commit/56b63f1c6a79d63594bf2d4397e09811aef3a430
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionAdapter.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionAdapter.java

  Log Message:
  -----------
  Added a few new convenience methods to the IConnectionAdapter.
Provided a default implementation of these in ConnectionAdapter.
Removed some commented out code from ConnectionAdapter.

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


  Commit: f5a326eaf1e8a68ef117e6c459915930d2415a90
      https://github.com/eclipse/ice/commit/f5a326eaf1e8a68ef117e6c459915930d2415a90
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewVizService.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/connections/ConnectionPlot.java

  Log Message:
  -----------
  Changed the way files are initially sent to the plot. Instead of passing
them through the constructor, they require a subsequent call to
setDataSource. This applies to sub-classes of MultiPlot.

ConnectionPlots (a sub-class of MultiPlot) will require the connection
to be set before setting the file..

When setting the URI for MultiPlots and ConnectionPlots, each class
performs some basic checks on the files. If an error occurs, an
exception is thrown. This produces exceptions at plot creation time.

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


  Commit: 1ad02c4f01e7f54557357a44550a09e21d65ea97
      https://github.com/eclipse/ice/commit/1ad02c4f01e7f54557357a44550a09e21d65ea97
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPreferencePage.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/src/org/eclipse/ice/viz/service/AbstractVizPreferencePage.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/preferences/VizConnectionPreferencePage.java

  Log Message:
  -----------
  Added a method to the AbstractVizPreferencePage to try to automatically
set an appropriate page description based on the IVizService's name.

Added a VizConnectionPreferencePage (a sub-class of the above page) that
sets up a Table of connection preferences. This is the same code from
the VisIt preferences page, but abstracted.

Fixed the ParaView preference page to extend the connection preference
page.

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


  Commit: c3fe9f66fbbe9661a7f6e718880f08cb9baf6c0b
      https://github.com/eclipse/ice/commit/c3fe9f66fbbe9661a7f6e718880f08cb9baf6c0b
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionAdapter.java

  Log Message:
  -----------
  Fixed a silly bug. I was missing a boolean negation.

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


  Commit: 7c250cd25d9ddbc611df1ab4b774ad8e7388f2f5
      https://github.com/eclipse/ice/commit/7c250cd25d9ddbc611df1ab4b774ad8e7388f2f5
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java

  Log Message:
  -----------
  Added some code that starts looking around in the remote file with
ParaView's readers. This required updating the imports.

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


  Commit: 4ef2343716cf52858b7b4b469d9a929b1d610496
      https://github.com/eclipse/ice/commit/4ef2343716cf52858b7b4b469d9a929b1d610496
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java

  Log Message:
  -----------
  Added code to determine the available plot categories and types in a
ParaView file.

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


  Commit: 618a9f488eeb85bf489eee6707757e88ce25b278
      https://github.com/eclipse/ice/commit/618a9f488eeb85bf489eee6707757e88ce25b278
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.java

  Log Message:
  -----------
  Added a ParaView widget inside the ParaViewPlotRender. It successfully
appears in the ParaViewPlot.

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


  Commit: d9a283ceba99fc5fe45fb41ba5b9bf1dd2a447f5
      https://github.com/eclipse/ice/commit/d9a283ceba99fc5fe45fb41ba5b9bf1dd2a447f5
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.java

  Log Message:
  -----------
  Added a ToolBar to the ParaViewPlotRender so that the plot's category
and type can be changed.

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


  Commit: d28f9305617242cbaced0315cacbebecbc362324
      https://github.com/eclipse/ice/commit/d28f9305617242cbaced0315cacbebecbc362324
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/connections/paraview/ParaViewConnectionAdapter.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.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.java

  Log Message:
  -----------
  Updated the ParaView plots to use separate views so that the
content/mouse controls are truly separated between the views.

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


  Commit: b4794e9eb8422e5f36098979987045e79fdab635
      https://github.com/eclipse/ice/commit/b4794e9eb8422e5f36098979987045e79fdab635
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/connections/paraview/ParaViewConnectionAdapter.java

  Log Message:
  -----------
  Adding some code to help explore the structure of files read in
ParaView.

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


  Commit: 569b334a3b06f9e68868070e7f831915c80078c3
      https://github.com/eclipse/ice/commit/569b334a3b06f9e68868070e7f831915c80078c3
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/connections/paraview/ParaViewConnectionAdapter.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.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/MultiPlot.java

  Log Message:
  -----------
  Updating the ParaView plot widgets to conform with the latest version of
the HTTP proxy server.
Renamed an abstract method in MultiPlot.

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


  Commit: d1e9e5f1fc544e1f8a799a11d511e455b3a04156
      https://github.com/eclipse/ice/commit/d1e9e5f1fc544e1f8a799a11d511e455b3a04156
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.java

  Log Message:
  -----------
  Fixed the ParaViewPlotRender to pull the current plot category and type.
It can only add additional data to the plot as there will need to be
additional logic (and perhaps more widgets) to handle unselecting
plotted values.

Added an ActionTree that can be used to change the representation. It
pulls from the available representations that the ParaView server
provides.

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


  Commit: cc9be156ef5295b6085ae7a1d971306beabcacfb
      https://github.com/eclipse/ice/commit/cc9be156ef5295b6085ae7a1d971306beabcacfb
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.java

  Log Message:
  -----------
  Performed some code cleanup (mostly dealing with multithreading issues)
and added a lot of documentation.

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


  Commit: fccab48ccbeb2649af6cb69f3b070f6f3ca3583e
      https://github.com/eclipse/ice/commit/fccab48ccbeb2649af6cb69f3b070f6f3ca3583e
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.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/PlotRender.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlot.java

  Log Message:
  -----------
  Added a few new methods to the MultiPlot and PlotRender classes so that
meta data (e.g., plot types, render options, etc.) can be reset when
necessary. For instance, the allowed representation options may depend
on the version of the rendering engine, so when the connection changes,
the representation options should be refreshed.

Added some code to the ParaViewPlotRender to update the representation
options when the connection is changed. ParaViewPlot (rather,
ConnectionPlot) also triggers an update to the available plot types when
the connection changes.

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


  Commit: 10722d592ccdcccb9a1912ccafa5302f34b4dbd9
      https://github.com/eclipse/ice/commit/10722d592ccdcccb9a1912ccafa5302f34b4dbd9
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.java

  Log Message:
  -----------
  Fixed some annoying bugs with the ParaView widget:
(1) Selecting a different plot type will unplot the previously selected
plot type. After I add checkboxes to the ActionTree, I'll revisit this
and allow multiple plots to be selected.
(2) Changing the plot types would produce multiple legends. I added code
to hide the additional legends and lay them out automatically.
(3) Added an extra render after the widget is painted because sometimes
the ParaView widget thinks it is drawing in a very small (as in a few
square pixels) container, and returns a very low quality image.

I also--at least temporarily--removed the ability to select the mesh for
the file. That is because ParaView allows you to select multiple meshes,
but you must have at least one mesh selected at all times. I haven't
quite figured out how to expose this functionality in the UI, and it's a
bit different from VisIt's approach.

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


  Commit: e4a011bdedad335737d1e4f6305fcba22cc6fa1e
      https://github.com/eclipse/ice/commit/e4a011bdedad335737d1e4f6305fcba22cc6fa1e
  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/CSVPlotEditor.java
    M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java

  Log Message:
  -----------
  Changed the CSVPlotEditor to draw the time slider only if there is more
than one time for the plotted data. Furthermore, only one time slider
will be displayed at a time (this fixes an old bug where multiple
sliders would appear).

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


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

  Changed paths:
    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:
  -----------
  Fixed the three bad PlotProviderTester tests that did not test the
PlotProvider. Fixed some bugs in the PlotProvider as a result.

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


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

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

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


  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>


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

  Changed paths:
    M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/connections/paraview/ParaViewConnectionAdapter.java
    M 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/ParaViewPlotRender.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPreferencePage.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewVizService.java
    R 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/connections/visit/VisItConnectionTable.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
    M src/org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
    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/MultiPlot.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/PlotRender.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/VizPreferencePage.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionAdapter.java
    M 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/ConnectionPlot.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlotRender.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionTable.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionAdapter.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionClient.java
    M 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/preferences/VizConnectionPreferencePage.java

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

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


  Commit: c6f02c4adea603cbd0bf38e3c8cbb5501804e42e
      https://github.com/eclipse/ice/commit/c6f02c4adea603cbd0bf38e3c8cbb5501804e42e
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    M org.eclipse.ice.target.kepler/kepler_rcp.target

  Log Message:
  -----------
  Added Nattable to the target.

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


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

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

  Log Message:
  -----------
  Fixed the close button to appear regardless of how many child Composites
are in a given plot.

Temporarily disabled the context Menu.

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


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

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

  Log Message:
  -----------
  Removed the old context Menu code after determining that the best
strategy is to let IPlot implementations handle their own context Menus
in the draw(...) method or further down the chain. However, the
PlotGridComposite does provide them with a default context Menu in the
parent Composite passed to draw(...).

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


  Commit: 6cc5dd4da45c00781a033721d42b5eaccdbc7749
      https://github.com/eclipse/ice/commit/6cc5dd4da45c00781a033721d42b5eaccdbc7749
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/AdaptiveTreeComposite.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:
  -----------
  Added a "None" option to the list of MOOSE Model executables to force
the user to select one. Fixes bug 464646.

The "file" parameter on the Mesh block will correctly comment itself out
if the block type is anything other than FileMesh (and vice versa).
Also, if a "file" parameter is ever manually added at any point, it will
be registered with the MOOSE Model to send updates. Fixes bug 459693.

Also added to the AdaptiveTreeComposite.setType(...) method to correctly
re-set the active data node after the type is changed.

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


  Commit: 38449c6360f1b2a3724bddda981724a6e1891cdf
      https://github.com/eclipse/ice/commit/38449c6360f1b2a3724bddda981724a6e1891cdf
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M README.md
    M org.eclipse.ice.target.kepler/kepler_rcp.target
    M repository/org.eclipse.ice.repository/ice.product.launch
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ElementSourceDialog.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ExtraInfoDialog.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICETableComponentSectionPart.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ListComponentSectionPage.java
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/iCore/ICore.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/IElementSource.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/form/Material.java
    M src/org.eclipse.ice.io/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/csv/CSVReader.java
    M src/org.eclipse.ice.item/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/AbstractItemBuilder.java
    R src/org.eclipse.ice.item/src/org/eclipse/ice/item/AbstractModelBuilder.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/JobLaunchAction.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/AbstractModelBuilder.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/Model.java
    M src/org.eclipse.ice.materials/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.materials/data/defaultMatDB.xml
    M src/org.eclipse.ice.materials/data/userMatDB.xml
    M src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/IMaterialsDatabase.java
    A src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/MaterialWritableTableFormat.java
    M src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/XMLMaterialsDatabase.java
    M src/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.reflectivity/OSGI-INF/ReflectivityModelComponent.xml
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityCalculator.java
    M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
    M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModelBuilder.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityProfile.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ScatteringDensityProfile.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/Slab.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/Tile.java
    M tests/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ItemProcessorTester.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/MaterialTester.java
    M tests/org.eclipse.ice.io.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/CSVReaderTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractItemBuilderTester.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractModelBuilderTester.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeMaterialsDatabase.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModel.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModelBuilder.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java
    M tests/org.eclipse.ice.materials.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialWritableTableFormatTester.java
    M tests/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/XMLMaterialDatabaseTester.java
    M tests/org.eclipse.ice.reflectivity.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityCalculatorTester.java
    A tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelBuilderTester.java
    M tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelTester.java

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


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

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

  Log Message:
  -----------
  Updated documentation.

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


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

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

  Log Message:
  -----------
  Changed DrawnPlot to a Composite. It now handles its own layout.

Updated the methods that remove the drawn plots to go through a single
method where possible. It uses a list (so PlotGridComposite clients can
remove by insertion order) and a map (for fast removal when the
DrawnPlot is known but not its index, primarily for internal use or when
it is disposed).

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


  Commit: 66f095f295177c683892fd1ecdb340dd98a3fa73
      https://github.com/eclipse/ice/commit/66f095f295177c683892fd1ecdb340dd98a3fa73
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-16 (Thu, 16 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
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java

  Log Message:
  -----------
  Removed the FormToolkit from PlotGridComposite as it was deleting the
context Menus from drawn plots when decorating them.

Set up the CSVPlot to use the provided context Menu (if one is
available) in draw(...).

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


  Commit: 877c681d6bc613b4d45ae03fec4eee7c071c0c3b
      https://github.com/eclipse/ice/commit/877c681d6bc613b4d45ae03fec4eee7c071c0c3b
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

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

  Log Message:
  -----------
  Cleaned up documentation.

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


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

  Changed paths:
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlotRender.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
    R src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/actions/ImportLocalFileAction.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/VizConnectionPreferencePage.java

  Log Message:
  -----------
  Updated the VisItVizService to use a lot of the abstract or base classes
originally developed in the ParaViewVizService branch.

This fixes the issue where the draw method fails when a new parent
Composite is passed in, i.e., a VisItPlot can be rendered in multiple
Composites.

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


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

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

  Log Message:
  -----------
  Fixed a bug where an exception should have been re-thrown after getting
caught (there is some cleanup that has to be done if an exception is
thrown from a nested call).

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


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

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

  Log Message:
  -----------
  Hooked up the PlotGridComposite's context Menu to the VisItPlot's
underlying VisIt widget.

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


  Commit: 94856e189b407225dcbe8d146d84acbcbc8c0ef0
      https://github.com/eclipse/ice/commit/94856e189b407225dcbe8d146d84acbcbc8c0ef0
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

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

  Log Message:
  -----------
  The MOOSE Model will now still write--but comment out--inactive
subblocks and their parameters. Fixes bug 459690.

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


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

  Changed paths:
    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/VisItPlotRender.java

  Log Message:
  -----------
  Added plot "representation" to the VisItPlot. This is like a
sub-category that must be determined and sent to the VisIt widget. This
fixes bug 464616 in the branch jordan/VisItVizService.

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


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

  Changed paths:
    M org.eclipse.ice.build/pom.xml
    M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF

  Log Message:
  -----------
  Removed the ParaView stuff from the build file, as it is not ready for
production yet.

Also removed all viz service references (including ParaView) from the
MOOSE bundle, as all of that work is handled by the ICEResourcePage in
the main widget bundle.

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


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

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

  Log Message:
  -----------
  Fixed a little bug in the VisItVizService test.

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


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

  Changed paths:
    M README.md
    M org.eclipse.ice.target.kepler/kepler_rcp.target
    M repository/org.eclipse.ice.repository/ice.product.launch
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ElementSourceDialog.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ExtraInfoDialog.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/ICETableComponentSectionPart.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ListComponentSectionPage.java
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/iCore/ICore.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/IElementSource.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/form/AdaptiveTreeComposite.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/Material.java
    M src/org.eclipse.ice.io/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/csv/CSVReader.java
    M src/org.eclipse.ice.item/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/AbstractItemBuilder.java
    R src/org.eclipse.ice.item/src/org/eclipse/ice/item/AbstractModelBuilder.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/JobLaunchAction.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/AbstractModelBuilder.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/Model.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.materials/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.materials/data/defaultMatDB.xml
    M src/org.eclipse.ice.materials/data/userMatDB.xml
    M src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/IMaterialsDatabase.java
    A src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/MaterialWritableTableFormat.java
    M src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/XMLMaterialsDatabase.java
    M src/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.reflectivity/OSGI-INF/ReflectivityModelComponent.xml
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityCalculator.java
    M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
    M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModelBuilder.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityProfile.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ScatteringDensityProfile.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/Slab.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/Tile.java
    M tests/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ItemProcessorTester.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/MaterialTester.java
    M tests/org.eclipse.ice.io.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/CSVReaderTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractItemBuilderTester.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractModelBuilderTester.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeMaterialsDatabase.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModel.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModelBuilder.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java
    M tests/org.eclipse.ice.materials.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialWritableTableFormatTester.java
    M tests/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/XMLMaterialDatabaseTester.java
    M tests/org.eclipse.ice.reflectivity.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityCalculatorTester.java
    A tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelBuilderTester.java
    M tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelTester.java

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

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


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

  Changed paths:
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionAdapter.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlotRender.java

  Log Message:
  -----------
  Hooked up the VisItPlot to query the VisIt API for available window IDs.
Unfortunately, it appears the API is not working as expected, so for now
the new method is just returning the working window ID 1.

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


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

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

  Log Message:
  -----------
  Made the commented out (bugged) code a little easier to debug later. No
behavior is affected by this commit.

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


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

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
    M src/org.eclipse.ice.viz.service.visit/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlotRender.java

  Log Message:
  -----------
  Added a context menu for setting the VisIt plot representation type.

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


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

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

  Log Message:
  -----------
  Fixed a bug that caused the plant view to not open when RELAP was
selected in the MOOSE Model Builder.

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


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

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

  Log Message:
  -----------
  Added some code so that the VisItVizService does not create plots for
files it should not support, e.g. CSV files.

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


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

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

  Log Message:
  -----------
  Added logic to prevent DataComponentComposite from refreshing its
widgets if it's already disposed. *Why* widgets on a disposed composite
are being refreshed... I cannot figure out, but at least there isn't a
wall of disposed exceptions now when you launch a job.

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


  Commit: ab6b19476af589a93e7cf825016ff8e06a05f82b
      https://github.com/eclipse/ice/commit/ab6b19476af589a93e7cf825016ff8e06a05f82b
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-20 (Mon, 20 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.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java

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


  Commit: ff704556d1619031f71927b352eabda1594c9757
      https://github.com/eclipse/ice/commit/ff704556d1619031f71927b352eabda1594c9757
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    A repository/org.eclipse.ice.repository/ice.macosx_product.launch
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java

  Log Message:
  -----------
  Updating the product and run configurations to include the
org.eclipse.equinox.http.jetty.http.port=8080 argument and auto-start
the equinox http jetty plugin. Also adding a new macosx run
configuration to the repository for convenience. Fixed a
nullpointerexception in the Core where the componentContext was null.

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


  Commit: 2839080632b76913469ff42ae9a6a26de3f581a5
      https://github.com/eclipse/ice/commit/2839080632b76913469ff42ae9a6a26de3f581a5
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

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

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


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

  Changed paths:
    M src/org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java

  Log Message:
  -----------
  Added an add series context Menu to the CSVPlot.

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


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

  Changed paths:
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java

  Log Message:
  -----------
  The JobLauncher now checks if *all* Entries on the Form's "Input Files"
DataComponent have valid values (not just the first one). If an Entry
has an invalid value, it throws FormStatus.InfoError, prints a message,
and halts the launching process. Fixes bug 451052.

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


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

  Changed paths:
    M README.md
    M org.eclipse.ice.build/pom.xml
    M org.eclipse.ice.target.kepler/kepler_rcp.target
    A repository/org.eclipse.ice.repository/ice.macosx_product.launch
    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/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/DataComponentComposite.java
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ElementSourceDialog.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ExtraInfoDialog.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/ICETableComponentSectionPart.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ListComponentSectionPage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/iCore/ICore.java
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/IElementSource.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/form/AdaptiveTreeComposite.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/Material.java
    M src/org.eclipse.ice.io/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.io/src/org/eclipse/ice/io/csv/CSVReader.java
    M src/org.eclipse.ice.item/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/AbstractItemBuilder.java
    R src/org.eclipse.ice.item/src/org/eclipse/ice/item/AbstractModelBuilder.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/JobLaunchAction.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/AbstractModelBuilder.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/Model.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.materials/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.materials/data/defaultMatDB.xml
    M src/org.eclipse.ice.materials/data/userMatDB.xml
    M src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/IMaterialsDatabase.java
    A src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/MaterialWritableTableFormat.java
    M src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/XMLMaterialsDatabase.java
    M src/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.reflectivity/OSGI-INF/ReflectivityModelComponent.xml
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityCalculator.java
    M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
    M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModelBuilder.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityProfile.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ScatteringDensityProfile.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/Slab.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/Tile.java
    M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/connections/paraview/ParaViewConnectionAdapter.java
    M 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/ParaViewPlotRender.java
    M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPreferencePage.java
    M 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
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionAdapter.java
    R 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/connections/visit/VisItConnectionTable.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
    A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlotRender.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
    R 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/src/org/eclipse/ice/viz/service/AbstractVizPreferencePage.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/MultiPlot.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/PlotRender.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/VizPreferencePage.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionAdapter.java
    M 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/ConnectionPlot.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlotRender.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionTable.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionAdapter.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionClient.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/Launcher.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/VizConnectionPreferencePage.java
    M tests/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ItemProcessorTester.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/MaterialTester.java
    M tests/org.eclipse.ice.io.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/CSVReaderTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractItemBuilderTester.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractModelBuilderTester.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeMaterialsDatabase.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModel.java
    A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModelBuilder.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java
    M tests/org.eclipse.ice.materials.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialWritableTableFormatTester.java
    M tests/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/XMLMaterialDatabaseTester.java
    M tests/org.eclipse.ice.reflectivity.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityCalculatorTester.java
    A tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelBuilderTester.java
    M tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelTester.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


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

  Changed paths:
    A repository/org.eclipse.ice.repository/ice.macosx_product.launch
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/DataComponentComposite.java
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java

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


  Commit: 4b2927c262c528ecd636111a33f576b3752a6f00
      https://github.com/eclipse/ice/commit/4b2927c262c528ecd636111a33f576b3752a6f00
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-20 (Mon, 20 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/CSVPlotEditor.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 remote-tracking branch 'origin/anna/gridlayout'

Conflicts:
	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java

Merging anna/gridlayout into master. Had to update one line in the
CSVPlot to match a call to CSVPlotEditor.showPlotProvider(...).

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


  Commit: 03ed7275581d367209812ee74716556395e95c08
      https://github.com/eclipse/ice/commit/03ed7275581d367209812ee74716556395e95c08
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-20 (Mon, 20 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/CSVPlotEditor.java

  Log Message:
  -----------
  Adding a remove series and clear entries to the CSVPlot's context Menu.

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


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

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

  Log Message:
  -----------
  Re-organized the code in CSVPlot.load(). The code that actually loads
the CSV file is now contained in a private method, load(File), making it
much easier to read. The load() method still kicks off a thread that
calls this private method.

Re-ordered the series names. Now they are presented as "y-variable vs.
x-variable", which is a pretty standard convention.

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


  Commit: c7a0033aa1915236e0b3f7d7a52de925962407b0
      https://github.com/eclipse/ice/commit/c7a0033aa1915236e0b3f7d7a52de925962407b0
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-04-21 (Tue, 21 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/CSVDataProvider.java

  Log Message:
  -----------
  Fixed the CSVDataProvider, which was relocating the data for
"independent variables" or features, resulting in the data not being
found later. Now, any two features can be plotted against each other if
one or both is set as an independent variable.

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


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

  Changed paths:
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataProvider.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataTableViewer.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotTreeContentProviderTester.java

  Log Message:
  -----------
  Cleaned up a lot of code for readability in CSVDataProvider, simplifying
some bits here and there. I also added some documentation to some of the
more complicated methods.

Organized imports in the other two classes to clear warnings.

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


Compare: https://github.com/eclipse/ice/compare/3af10a6b970e...c37f66c13c44

Back to the top