Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ice-build] [eclipse/ice] c22be7: Ignored the tmp directory for the MOOSE tutorial.

  Branch: refs/heads/jay/reflectivity
  Home:   https://github.com/eclipse/ice
  Commit: c22be7c7b1cb9b367d6981a359a7a89e9f11b8e9
      https://github.com/eclipse/ice/commit/c22be7c7b1cb9b367d6981a359a7a89e9f11b8e9
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M docs/moose/tutorial/.gitignore
    R docs/moose/tutorial/main.pdf
    R docs/moose/tutorial/tmp/.gitignore
    M docs/moose/tutorial/tmp/main.aux
    M docs/moose/tutorial/tmp/main.log
    M docs/moose/tutorial/tmp/main.out
    M docs/moose/tutorial/tmp/main.toc

  Log Message:
  -----------
  Ignored the tmp directory for the MOOSE tutorial.

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


  Commit: 4dff190198e23ee2f2e35744b3223a5e99f2ee2e
      https://github.com/eclipse/ice/commit/4dff190198e23ee2f2e35744b3223a5e99f2ee2e
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    A CONTRIBUTING.md
    M docs/moose/tutorial/.gitignore
    M docs/moose/tutorial/.texlipse
    A docs/moose/tutorial/ice_moose_20150505.pdf
    M docs/moose/tutorial/sections/devMoose.tex
    R docs/moose/tutorial/tmp/main.aux
    R docs/moose/tutorial/tmp/main.log
    R docs/moose/tutorial/tmp/main.out
    R docs/moose/tutorial/tmp/main.toc
    M features/org.eclipse.ice.feature/feature.xml
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.rcp/build.properties
    R src/org.eclipse.ice.client.rcp/org.eclipse.ice.client.rcp.application.launch
    R src/org.eclipse.ice.client.rcp/plugin.xml
    R src/org.eclipse.ice.client.rcp/plugin_customization.ini
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/EclipseClient.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/actions/ChooseWorkspaceDialog.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/actions/SwitchWorkspaceAction.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/actions/SwitchWorkspaceActionDelegate.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/workspaceviewer/WorkspaceExplorer.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/workspaceviewer/WorkspaceExplorerContentProvider.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/workspaceviewer/WorkspaceExplorerLabelProvider.java
    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/MoosePreferencePage.java
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets/build.properties
    M src/org.eclipse.ice.client.widgets/plugin.xml
    A src/org.eclipse.ice.client.widgets/plugin_customization.ini
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ListComponentColumnPropertyAccessor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ListComponentSectionPage.java
    M src/org.eclipse.ice.io/OSGI-INF/ioservice.xml
    M src/org.eclipse.ice.reflectivity/build.properties
    M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
    A tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ListComponentColumnPropertyAccessorTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java

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

Conflicts:
	docs/moose/tutorial/.gitignore
	docs/moose/tutorial/tmp/main.aux
	docs/moose/tutorial/tmp/main.log
	docs/moose/tutorial/tmp/main.out
	docs/moose/tutorial/tmp/main.toc

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


  Commit: 181a0d6b2602ae6a771356c541de570868242aec
      https://github.com/eclipse/ice/commit/181a0d6b2602ae6a771356c541de570868242aec
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

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

  Log Message:
  -----------
  Fixed the launch configuration so that it uses the correct product
because ours no longer exists in a plugin.xml file.

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


  Commit: c8c3af908bfdcc0a4b18c1b5faae1d3f2ab02685
      https://github.com/eclipse/ice/commit/c8c3af908bfdcc0a4b18c1b5faae1d3f2ab02685
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/AbstractController.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/AbstractView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CompositeAppState.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/FlightCamera.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IEmbeddedViewClient.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IRenderQueue.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/InputControl.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/SimpleAppState.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/jme/ViewFactory.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/IMasterApplicationFactory.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationFactory.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationHolder.java

  Log Message:
  -----------
  Updating licenses and adding missing licenses.

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


  Commit: a684749e51c69bac760c88cdcfe18cfd7311d866
      https://github.com/eclipse/ice/commit/a684749e51c69bac760c88cdcfe18cfd7311d866
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PlantAppState.java
    M tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/geometry/test/GeometryViewLauncher.java
    M tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/MeshViewLauncher.java
    M tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/reactoreditor/plant/test/PlantViewLauncher.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFEntryTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TreeCompositeIteratorTester.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotTreeContentProviderTester.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotTreeLabelProviderTester.java

  Log Message:
  -----------
  Added missing licenses.

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


  Commit: 8cc1f7b7bd96fb6ae58d007928d0b475f24ddbf1
      https://github.com/eclipse/ice/commit/8cc1f7b7bd96fb6ae58d007928d0b475f24ddbf1
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    R src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MeshViewComposite.java

  Log Message:
  -----------
  Removing a class that is no longer required.

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


  Commit: dcccef4a63d12018f92cae8e1c2d2ca139212a9a
      https://github.com/eclipse/ice/commit/dcccef4a63d12018f92cae8e1c2d2ca139212a9a
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M utils/LicenseFixer.sh

  Log Message:
  -----------
  Added a missing space to the script's generated license.

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


  Commit: 6bfbc4ce66d1fb6bb08abf4580a4aa26da928183
      https://github.com/eclipse/ice/commit/6bfbc4ce66d1fb6bb08abf4580a4aa26da928183
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M src/org.eclipse.ice.caebat.batml/src/org/eclipse/ice/caebat/batml/BatMLModel.java
    M src/org.eclipse.ice.caebat.batml/src/org/eclipse/ice/caebat/batml/BatMLModelBuilder.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEPerspective.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCheckStateManager.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MoosePreferencePage.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/actions/NewKernelHandler.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AddMode.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EditMode.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppState.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppStateMode.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshUpdateHandler.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/AbstractTreeAction.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/LabelContribution.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PadFinder.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ScrollClientComposite.java
    M 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/ToggleAxesAction.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ToggleHUDAction.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/CreateItemHandler.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/DeleteItemHandler.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ImportFileWizardHandler.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ImportItemWizardHandler.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ItemSelectedPropertyTester.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/LaunchMeshEditorHandler.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/SelectiveComponentVisitor.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/iterator/AbstractTreeCompositeIterator.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/iterator/BreadthFirstTreeCompositeIterator.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/iterator/PostOrderTreeCompositeIterator.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/iterator/PreOrderTreeCompositeIterator.java
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseServiceHolder.java
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/ReflectivityEditor.java
    M src/org.eclipse.ice.reactor.plant/src/org/eclipse/ice/reactor/plant/SelectivePlantComponentVisitor.java
    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/ParaViewPlotRender.java
    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/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/csv/PlotTimeIdentifierMapping.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/VizConnectionPreferencePage.java

  Log Message:
  -----------
  Added missing licenses.

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


  Commit: 4bb1179d8c217d324b331acee753fb578dbde3db
      https://github.com/eclipse/ice/commit/4bb1179d8c217d324b331acee753fb578dbde3db
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    A CONTRIBUTING.md
    M docs/moose/tutorial/.gitignore
    M docs/moose/tutorial/.texlipse
    A docs/moose/tutorial/ice_moose_20150505.pdf
    R docs/moose/tutorial/main.pdf
    M docs/moose/tutorial/sections/devMoose.tex
    R docs/moose/tutorial/tmp/.gitignore
    R docs/moose/tutorial/tmp/main.aux
    R docs/moose/tutorial/tmp/main.log
    R docs/moose/tutorial/tmp/main.out
    R docs/moose/tutorial/tmp/main.toc
    M features/org.eclipse.ice.feature/feature.xml
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.rcp/build.properties
    R src/org.eclipse.ice.client.rcp/org.eclipse.ice.client.rcp.application.launch
    R src/org.eclipse.ice.client.rcp/plugin.xml
    R src/org.eclipse.ice.client.rcp/plugin_customization.ini
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/EclipseClient.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/actions/ChooseWorkspaceDialog.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/actions/SwitchWorkspaceAction.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/actions/SwitchWorkspaceActionDelegate.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/workspaceviewer/WorkspaceExplorer.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/workspaceviewer/WorkspaceExplorerContentProvider.java
    R src/org.eclipse.ice.client.rcp/src/org/eclipse/ice/client/rcp/workspaceviewer/WorkspaceExplorerLabelProvider.java
    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/MoosePreferencePage.java
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets/build.properties
    M src/org.eclipse.ice.client.widgets/plugin.xml
    A src/org.eclipse.ice.client.widgets/plugin_customization.ini
    A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ListComponentColumnPropertyAccessor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ListComponentSectionPage.java
    M src/org.eclipse.ice.io/OSGI-INF/ioservice.xml
    M src/org.eclipse.ice.reflectivity/build.properties
    M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
    A tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ListComponentColumnPropertyAccessorTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java

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


  Commit: 08ce5e712bb72dbd0ff44c8c3258edbfc7ea8709
      https://github.com/eclipse/ice/commit/08ce5e712bb72dbd0ff44c8c3258edbfc7ea8709
  Author: Jordan Deyton <deytonjh@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M src/org.eclipse.ice.analysistool/src/org/eclipse/ice/analysistool/IDataProvider.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/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEGeometryPage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ScrollClientComposite.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/IEntryContentProvider.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/FeatureSet.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/GridLabelProvider.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWRComposite.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWRData.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWRGridManager.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWRRod.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWReactor.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/Material.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/MaterialBlock.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/Ring.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/Tube.java

  Log Message:
  -----------
  Fixed a lot of missing documentation, particularly empty @returns.

Auto-formatted and organized imports.
There were a couple of classes in the LWR package that had unused
variables, some non-static references to static variables, and one use
of ArrayList.clone() that I switched to the copy constructor.

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


  Commit: f3e44692e876fc85df510aea369b576a9d18108b
      https://github.com/eclipse/ice/commit/f3e44692e876fc85df510aea369b576a9d18108b
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M docs/moose/tutorial/.gitignore

  Log Message:
  -----------
  Updated .gitignore for the MOOSE docs.

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


  Commit: ba09639e297a4e509ef14507a8c55e437aa96384
      https://github.com/eclipse/ice/commit/ba09639e297a4e509ef14507a8c55e437aa96384
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M docs/moose/tutorial/.gitignore
    R docs/moose/tutorial/tmp/.gitignore
    R docs/moose/tutorial/tmp/main.aux
    R docs/moose/tutorial/tmp/main.log
    R docs/moose/tutorial/tmp/main.out
    R docs/moose/tutorial/tmp/main.toc
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.analysistool/src/org/eclipse/ice/analysistool/IDataProvider.java
    M src/org.eclipse.ice.caebat.batml/src/org/eclipse/ice/caebat/batml/BatMLModel.java
    M src/org.eclipse.ice.caebat.batml/src/org/eclipse/ice/caebat/batml/BatMLModelBuilder.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEPerspective.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCheckStateManager.java
    R src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MeshViewComposite.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MoosePreferencePage.java
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/actions/NewKernelHandler.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/AbstractController.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/AbstractView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CompositeAppState.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/FlightCamera.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IEmbeddedViewClient.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IRenderQueue.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/InputControl.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/SimpleAppState.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/jme/ViewFactory.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/IMasterApplicationFactory.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationFactory.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationHolder.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AddMode.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EditMode.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppState.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppStateMode.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshUpdateHandler.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/AbstractTreeAction.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/ICEFormEditor.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEGeometryPage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/LabelContribution.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PadFinder.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ScrollClientComposite.java
    M 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/ToggleAxesAction.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ToggleHUDAction.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/CreateItemHandler.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/DeleteItemHandler.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ImportFileWizardHandler.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ImportItemWizardHandler.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ItemSelectedPropertyTester.java
    M src/org.eclipse.ice.client/src/org/eclipse/ice/client/common/LaunchMeshEditorHandler.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/SelectiveComponentVisitor.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/IEntryContentProvider.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/iterator/AbstractTreeCompositeIterator.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/iterator/BreadthFirstTreeCompositeIterator.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/iterator/PostOrderTreeCompositeIterator.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/iterator/PreOrderTreeCompositeIterator.java
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseServiceHolder.java
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/ReflectivityEditor.java
    M src/org.eclipse.ice.reactor.plant/src/org/eclipse/ice/reactor/plant/SelectivePlantComponentVisitor.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/FeatureSet.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/GridLabelProvider.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWRComposite.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWRData.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWRGridManager.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWRRod.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/LWReactor.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/Material.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/MaterialBlock.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/Ring.java
    M src/org.eclipse.ice.reactor/src/org/eclipse/ice/reactor/Tube.java
    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/ParaViewPlotRender.java
    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/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/csv/PlotTimeIdentifierMapping.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/VizConnectionPreferencePage.java
    M tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/geometry/test/GeometryViewLauncher.java
    M tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/MeshViewLauncher.java
    M tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/reactoreditor/plant/test/PlantViewLauncher.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EMFEntryTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TreeCompositeIteratorTester.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotTreeContentProviderTester.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotTreeLabelProviderTester.java
    M utils/LicenseFixer.sh

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

Conflicts:
	docs/moose/tutorial/.gitignore
	repository/org.eclipse.ice.repository/ice.product.launch

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


  Commit: e138054cc2b53207e7250804ebc19c8896c6d80f
      https://github.com/eclipse/ice/commit/e138054cc2b53207e7250804ebc19c8896c6d80f
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/Material.java
    A src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/MaterialStack.java
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/AddMaterialWizardPage.java
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialDetailsPage.java
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseContentProvider.java
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseLabelProvider.java
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseMasterDetailsBlock.java
    A src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/MaterialStackWritableTableFormat.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestMaterialFactory.java
    M tests/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/TestMaterialFactory.java

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


Compare: https://github.com/eclipse/ice/compare/a15b399fe916...e138054cc2b5

Back to the top