Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ice-build] [eclipse/ice] b186c8: Merge branch 'next' into jay/projectSupportLastMas...

  Branch: refs/heads/jay/projectSupportLastMaster
  Home:   https://github.com/eclipse/ice
  Commit: b186c8f15ffeb69f4ab9babc7cde7302b0a7100c
      https://github.com/eclipse/ice/commit/b186c8f15ffeb69f4ab9babc7cde7302b0a7100c
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

  Changed paths:
    M org.eclipse.ice.build/pom.xml
    M repository/org.eclipse.ice.repository/ice.product
    A repository/org.eclipse.ice.repository/ice.windows_product.launch
    M src/org.eclipse.ice.analysistool/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.analysistool/src/org/eclipse/ice/analysistool/IAnalysisAsset.java
    M src/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF
    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.rcp/META-INF/MANIFEST.MF
    R src/org.eclipse.ice.client.widgets.rcp/OSGI-INF/MasterApplicationHolder.xml
    M src/org.eclipse.ice.client.widgets.rcp/build.properties
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/AbstractController.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/AbstractView.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CompositeAppState.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/EmbeddedView.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/FlightCamera.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IEmbeddedViewClient.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IRenderQueue.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/InputControl.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/MasterApplication.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/SimpleAppState.java
    R 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
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/IMasterApplicationFactory.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationFactory.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationHolder.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AbstractApplication.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AbstractMeshController.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AbstractMeshView.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AddMode.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/CustomChaseCamera.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EdgeController.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EdgeView.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EditMode.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/ICameraListener.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/IMeshSelectionListener.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppState.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppStateMode.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppStateModeFactory.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshSelectionManager.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshUpdateHandler.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/StateType.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/VertexController.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/VertexView.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/BoundaryConditionSection.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/EdgeInfoSection.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/GeneralInfoSection.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/MeshSelection.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/TabDescriptorProvider.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/VertexInfoSection.java
    R src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/VertexSection.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/AbstractPlantController.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/AbstractPlantView.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/HeatExchangerController.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/JunctionController.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PipeController.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PlantAppState.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PlantControllerManager.java
    M src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/ReactorController.java
    M src/org.eclipse.ice.client.widgets.reactoreditor.lwr/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.reactoreditor.lwr/src/org/eclipse/ice/client/widgets/reactoreditor/lwr/PlantAnalysisView.java
    M src/org.eclipse.ice.client.widgets.reactoreditor/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorPage.java
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.client.widgets/OSGI-INF/meshPageVizService.xml
    M src/org.eclipse.ice.client.widgets/plugin.xml
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ComponentPropertySection.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/ICEFormPage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.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/ICESectionPage.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ListComponentNattable.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/MeshElementTreeView.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/MeshElementTreeViewPropertySource.java
    R src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ToggleAxesAction.java
    R src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ToggleHUDAction.java
    M src/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/IComponentVisitor.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/SelectiveComponentVisitor.java
    A src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/MeshComponent.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/TreeComposite.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/BezierEdge.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/BoundaryCondition.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/BoundaryConditionType.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Custom2DShape.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Edge.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/EdgeProperties.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Hex.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/IMeshPart.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/IMeshPartVisitor.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/MeshComponent.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Polygon.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/PolygonProperties.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/PolynomialEdge.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Quad.java
    R src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Vertex.java
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/jaxbclassprovider/ICEJAXBClassProvider.java
    M src/org.eclipse.ice.item/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
    M src/org.eclipse.ice.kdd/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.materials.ui/OSGI-INF/MaterialsUIComponent.xml
    M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/AddMaterialWizardPage.java
    M src/org.eclipse.ice.materials/data/userMatDB.xml
    M src/org.eclipse.ice.mesh/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.mesh/src/org/eclipse/ice/mesh/editor/MeshEditor.java
    M src/org.eclipse.ice.nek5000/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekModel.java
    M src/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekReader.java
    M src/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekWriter.java
    M src/org.eclipse.ice.reactor.plant/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.reactorAnalyzer/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.reflectivity.ui/.classpath
    A src/org.eclipse.ice.reflectivity.ui/.project
    A src/org.eclipse.ice.reflectivity.ui/.settings/org.eclipse.jdt.core.prefs
    A src/org.eclipse.ice.reflectivity.ui/.settings/org.eclipse.pde.core.prefs
    A src/org.eclipse.ice.reflectivity.ui/.settings/org.eclipse.wst.common.project.facet.core.xml
    A src/org.eclipse.ice.reflectivity.ui/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.reflectivity.ui/OSGI-INF/ReflectivityModelComponent.xml
    A src/org.eclipse.ice.reflectivity.ui/build.properties
    A src/org.eclipse.ice.reflectivity.ui/plugin.xml
    A src/org.eclipse.ice.reflectivity.ui/pom.xml
    A src/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityCellEditorSection.java
    A src/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityDataPropertySection.java
    A src/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityEclipseFormWidget.java
    A src/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityFormEditor.java
    A src/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityFormWidgetBuilder.java
    A src/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityPage.java
    A src/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityPerspective.java
    A src/org.eclipse.ice.reflectivity.ui/src/org/eclipse/ice/reflectivity/ui/ReflectivityTabDescriptorProvider.java
    A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/MaterialSelection.java
    M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
    M src/org.eclipse.ice.viz.service.jme3/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.viz.service.jme3/OSGI-INF/MasterApplicationFactory.xml
    A src/org.eclipse.ice.viz.service.jme3/OSGI-INF/MasterApplicationHolder.xml
    A src/org.eclipse.ice.viz.service.jme3/OSGI-INF/vizGeometryService.xml
    A src/org.eclipse.ice.viz.service.jme3/OSGI-INF/vizMeshService.xml
    R src/org.eclipse.ice.viz.service.jme3/OSGI-INF/vizService.xml
    M src/org.eclipse.ice.viz.service.jme3/build.properties
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/CompositeAppState.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/CustomChaseCamera.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/EmbeddedView.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/FlightCamera.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/ICameraListener.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/IEmbeddedViewClient.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/IRenderQueue.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/MasterApplication.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/SimpleAppState.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/ViewAppState.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/VizViewFactory.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/internal/IMasterApplicationFactory.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/internal/MasterApplicationFactory.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/internal/MasterApplicationHolder.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/AbstractMeshController.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/AbstractMeshView.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/AddMode.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/EdgeController.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/EdgeView.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/EditMode.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/IMeshSelectionListener.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/JME3MeshCanvas.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/JME3MeshVizService.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshAppState.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshAppStateMode.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshAppStateModeFactory.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshSelectionManager.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshUpdateHandler.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/StateType.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/ToggleAxesAction.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/ToggleHUDAction.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/VertexController.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/VertexView.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/widgets/AbstractController.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/widgets/AbstractView.java
    A src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/widgets/InputControl.java
    A src/org.eclipse.ice.viz.service.mesh/.classpath
    A src/org.eclipse.ice.viz.service.mesh/.gitignore
    A src/org.eclipse.ice.viz.service.mesh/.project
    A src/org.eclipse.ice.viz.service.mesh/.settings/org.eclipse.jdt.core.prefs
    A src/org.eclipse.ice.viz.service.mesh/META-INF/MANIFEST.MF
    A src/org.eclipse.ice.viz.service.mesh/build.properties
    A src/org.eclipse.ice.viz.service.mesh/plugin.xml
    A src/org.eclipse.ice.viz.service.mesh/pom.xml
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/BezierEdge.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/BoundaryCondition.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/BoundaryConditionType.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Custom2DShape.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Edge.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/EdgeProperties.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Hex.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/IMeshPart.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/IMeshPartVisitor.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Polygon.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/PolygonProperties.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/PolynomialEdge.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Quad.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Vertex.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/VizMeshComponent.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/BoundaryConditionSection.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/EdgeInfoSection.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/GeneralInfoSection.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/MeshSelection.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/TabDescriptorProvider.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/VertexInfoSection.java
    A src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/VertexSection.java
    M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
    A 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/VisItVizService.java
    M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/connections/VisItConnectionPreferencePage.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizService.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/IVizService.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/ProxyPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlot.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/CellColumnLabelProvider.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/EntryCellContentProvider.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/ISecretCellContentProvider.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/IVizCellContentProvider.java
    A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/IVizComboCellContentProvider.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/PortEntryContentProvider.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/TableComponentCellContentProvider.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/TableComponentContentProvider.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlotEditor.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/datastructures/VizObject.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/widgets/PlotGridComposite.java
    M tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/geometry/test/GeometryViewLauncher.java
    R tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/AbstractMeshControllerTester.java
    R tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/EdgeControllerTester.java
    R tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/MeshViewLauncher.java
    R tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/TestMeshController.java
    R tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/VertexControllerTester.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/META-INF/MANIFEST.MF
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/BezierEdgeTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/BoundaryConditionTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/Custom2DShapeTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EdgePropertiesTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EdgeTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/HexTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEJAXBClassProviderTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PolygonPropertiesTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PolygonTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PolynomialEdgeTester.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/QuadTester.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestComponentListener.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestEdge.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestMeshVisitor.java
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java
    R tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/VertexTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherFormTester.java
    M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/MultiLauncherTester.java
    M tests/org.eclipse.ice.mesh.test/src/org/eclipse/ice/mesh/test/MeshEditorTester.java
    M tests/org.eclipse.ice.nek5000.test/src/org/eclipse/ice/nek5000/test/NekReaderTester.java
    M tests/org.eclipse.ice.reactor.plant.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.reactor.sfr.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.reactor.test/META-INF/MANIFEST.MF
    M 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.tablecomponenttester/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.viz.service.geometry.test/bin/org/eclipse/ice/viz/service/geometry/shapes/test/AbstractShapeTester.class
    A tests/org.eclipse.ice.viz.service.geometry.test/bin/org/eclipse/ice/viz/service/geometry/shapes/test/ComplexShapeTester.class
    A tests/org.eclipse.ice.viz.service.geometry.test/bin/org/eclipse/ice/viz/service/geometry/shapes/test/GeometryTester.class
    A tests/org.eclipse.ice.viz.service.geometry.test/bin/org/eclipse/ice/viz/service/geometry/shapes/test/PrimitiveShapeTester.class
    A tests/org.eclipse.ice.viz.service.geometry.test/bin/org/eclipse/ice/viz/service/geometry/shapes/test/TestShape.class
    A tests/org.eclipse.ice.viz.service.geometry.test/bin/org/eclipse/ice/viz/service/geometry/shapes/test/TestShapeVisitor.class
    A tests/org.eclipse.ice.viz.service.geometry.test/bin/org/eclipse/ice/viz/service/geometry/shapes/test/VizTestComponentListener.class
    A tests/org.eclipse.ice.viz.service.jme3.test/.classpath
    A tests/org.eclipse.ice.viz.service.jme3.test/.gitignore
    A tests/org.eclipse.ice.viz.service.jme3.test/.project
    A tests/org.eclipse.ice.viz.service.jme3.test/.settings/org.eclipse.jdt.core.prefs
    A tests/org.eclipse.ice.viz.service.jme3.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.viz.service.jme3.test/build.properties
    A tests/org.eclipse.ice.viz.service.jme3.test/pom.xml
    A tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/AbstractMeshControllerTester.java
    A tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/EdgeControllerTester.java
    A tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/JME3MeshCanvasTester.java
    A tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/JME3MeshVizServiceTester.java
    A tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/MeshViewLauncher.java
    A tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/TestMeshController.java
    A tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/VertexControllerTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/.classpath
    A tests/org.eclipse.ice.viz.service.mesh.test/.gitignore
    A tests/org.eclipse.ice.viz.service.mesh.test/.project
    A tests/org.eclipse.ice.viz.service.mesh.test/.settings/org.eclipse.jdt.core.prefs
    A tests/org.eclipse.ice.viz.service.mesh.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.viz.service.mesh.test/build.properties
    A tests/org.eclipse.ice.viz.service.mesh.test/pom.xml
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/BezierEdgeTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/Custom2DShapeTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/EdgePropertiesTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/EdgeTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/HexTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/MeshTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/PolygonPropertiesTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/PolygonTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/PolynomialEdgeTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/QuadTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/TestComponentListener.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/TestEdge.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/VertexTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/VizMeshComponentTester.java
    A tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/properties/test/BoundaryConditionTester.java
    M tests/org.eclipse.ice.viz.service.test/META-INF/MANIFEST.MF
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/BasicEntryContentProviderTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/DataComponentTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/EntryTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/ICEObjectTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/datastructures/test/TableComponentTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/widgets/test/ActionTreeTester.java

  Log Message:
  -----------
  Merge branch 'next' into jay/projectSupportLastMaster

Conflicts:
	features/org.eclipse.ice.feature/feature.xml
	org.eclipse.ice.build/pom.xml
	repository/org.eclipse.ice.repository/ice.product.launch
	src/org.eclipse.ice.client.widgets.rcp/OSGI-INF/MasterApplicationFactory.xml
	src/org.eclipse.ice.item/OSGi-INF/ItemIO.xml

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



Back to the top