1. 26 Aug, 2015 1 commit
  2. 25 Aug, 2015 6 commits
  3. 24 Aug, 2015 12 commits
    • Jay Jay Billings's avatar
      Merge branch 'jay/projectSupport' into jay/projectSupportLastMaster · 270e3b46
      Jay Jay Billings authored
      
      
      Conflicts:
      	org.eclipse.ice.build/pom.xml
      	org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/AbstractMeshControllerTester.java
      	org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/EdgeControllerTester.java
      	org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/MeshViewLauncher.java
      	org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/TestMeshController.java
      	org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/VertexControllerTester.java
      	org.eclipse.ice.client.widgets.rcp/OSGI-INF/MasterApplicationHolder.xml
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/AbstractView.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CompositeAppState.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/EmbeddedView.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/FlightCamera.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IEmbeddedViewClient.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IRenderQueue.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/InputControl.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/MasterApplication.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/SimpleAppState.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/ViewAppState.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/IMasterApplicationFactory.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationFactory.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationHolder.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AbstractApplication.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AbstractMeshController.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AbstractMeshView.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AddMode.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/CustomChaseCamera.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EdgeController.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EdgeView.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EditMode.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/ICameraListener.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/IMeshSelectionListener.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppState.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppStateMode.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppStateModeFactory.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshSelectionManager.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshUpdateHandler.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/StateType.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/VertexController.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/VertexView.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/BoundaryConditionSection.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/EdgeInfoSection.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/GeneralInfoSection.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/MeshSelection.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/TabDescriptorProvider.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/VertexInfoSection.java
      	org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/VertexSection.java
      	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ToggleAxesAction.java
      	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ToggleHUDAction.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/BezierEdgeTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/BoundaryConditionTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/Custom2DShapeTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EdgePropertiesTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EdgeTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/HexTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PolygonPropertiesTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PolygonTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PolynomialEdgeTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/QuadTester.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestEdge.java
      	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/VertexTester.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/BezierEdge.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/BoundaryCondition.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/BoundaryConditionType.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Custom2DShape.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Edge.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/EdgeProperties.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Hex.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/IMeshPart.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/IMeshPartVisitor.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/MeshComponent.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Polygon.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/PolygonProperties.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/PolynomialEdge.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Quad.java
      	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Vertex.java
      	org.eclipse.ice.viz.service.jme3/OSGI-INF/vizService.xml
      	repository/org.eclipse.ice.repository/ice.product
      	src/org.eclipse.ice.analysistool/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.client.widgets.rcp/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/AbstractView.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CompositeAppState.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/EmbeddedView.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/FlightCamera.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IEmbeddedViewClient.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/IRenderQueue.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/InputControl.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/MasterApplication.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/SimpleAppState.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/ViewAppState.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/IMasterApplicationFactory.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationFactory.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/internal/MasterApplicationHolder.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AbstractMeshController.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AbstractMeshView.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/AddMode.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/CustomChaseCamera.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EdgeController.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EdgeView.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/EditMode.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/ICameraListener.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/IMeshSelectionListener.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppState.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppStateMode.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshAppStateModeFactory.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshSelectionManager.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/MeshUpdateHandler.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/StateType.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/VertexController.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/VertexView.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/BoundaryConditionSection.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/EdgeInfoSection.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/GeneralInfoSection.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/MeshSelection.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/TabDescriptorProvider.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/VertexInfoSection.java
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/mesh/properties/VertexSection.java
      	src/org.eclipse.ice.client.widgets.reactoreditor.lwr/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.client.widgets.reactoreditor/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ToggleAxesAction.java
      	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ToggleHUDAction.java
      	src/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/BezierEdge.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/BoundaryCondition.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/BoundaryConditionType.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Custom2DShape.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Edge.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/EdgeProperties.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Hex.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/IMeshPart.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/IMeshPartVisitor.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/MeshComponent.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Polygon.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/PolygonProperties.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/PolynomialEdge.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Quad.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Vertex.java
      	src/org.eclipse.ice.item/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.kdd/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.mesh/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.nek5000/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.reactor.plant/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.reactorAnalyzer/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.viz.service.jme3/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.viz.service.jme3/OSGI-INF/vizMeshService.xml
      	src/org.eclipse.ice.viz.service.jme3/OSGI-INF/vizService.xml
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/CompositeAppState.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/CustomChaseCamera.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/EmbeddedView.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/FlightCamera.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/ICameraListener.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/IEmbeddedViewClient.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/IRenderQueue.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/MasterApplication.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/SimpleAppState.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/application/ViewAppState.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/internal/IMasterApplicationFactory.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/internal/MasterApplicationFactory.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/internal/MasterApplicationHolder.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/AbstractMeshController.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/AbstractMeshView.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/AddMode.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/EdgeController.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/EdgeView.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/EditMode.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/IMeshSelectionListener.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshAppState.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshAppStateMode.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshAppStateModeFactory.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshSelectionManager.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/MeshUpdateHandler.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/StateType.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/ToggleAxesAction.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/ToggleHUDAction.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/VertexController.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/mesh/VertexView.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/widgets/AbstractView.java
      	src/org.eclipse.ice.viz.service.jme3/src/org/eclipse/ice/viz/service/jme3/widgets/InputControl.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/BezierEdge.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/BoundaryCondition.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/BoundaryConditionType.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Custom2DShape.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Edge.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/EdgeProperties.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Hex.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/IMeshPart.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/IMeshPartVisitor.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Polygon.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/PolygonProperties.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/PolynomialEdge.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Quad.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/Vertex.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/datastructures/VizMeshComponent.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/BoundaryConditionSection.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/EdgeInfoSection.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/GeneralInfoSection.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/MeshSelection.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/TabDescriptorProvider.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/VertexInfoSection.java
      	src/org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/properties/VertexSection.java
      	src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
      	tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/AbstractMeshControllerTester.java
      	tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/EdgeControllerTester.java
      	tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/MeshViewLauncher.java
      	tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/TestMeshController.java
      	tests/org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/VertexControllerTester.java
      	tests/org.eclipse.ice.datastructures.test/META-INF/MANIFEST.MF
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/BezierEdgeTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/BoundaryConditionTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/Custom2DShapeTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EdgePropertiesTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EdgeTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/HexTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PolygonPropertiesTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PolygonTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/PolynomialEdgeTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/QuadTester.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestEdge.java
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/VertexTester.java
      	tests/org.eclipse.ice.reactor.plant.test/META-INF/MANIFEST.MF
      	tests/org.eclipse.ice.reactor.sfr.test/META-INF/MANIFEST.MF
      	tests/org.eclipse.ice.reactor.test/META-INF/MANIFEST.MF
      	tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/AbstractMeshControllerTester.java
      	tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/EdgeControllerTester.java
      	tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/MeshViewLauncher.java
      	tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/TestMeshController.java
      	tests/org.eclipse.ice.viz.service.jme3.test/src/org/eclipse/ice/viz/service/jme3/mesh/test/VertexControllerTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/BezierEdgeTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/Custom2DShapeTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/EdgePropertiesTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/EdgeTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/HexTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/MeshTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/PolygonPropertiesTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/PolygonTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/PolynomialEdgeTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/QuadTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/TestEdge.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/datastructures/test/VertexTester.java
      	tests/org.eclipse.ice.viz.service.mesh.test/src/org/eclipse/ice/viz/service/mesh/properties/test/BoundaryConditionTester.java
      	tests/org.eclipse.ice.viz.service.test/META-INF/MANIFEST.MF
      Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
      270e3b46
    • Jay Jay Billings's avatar
      Added reflectivity ui gitignore. · 9f7056ff
      Jay Jay Billings authored
      
      Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
      9f7056ff
    • Jay Jay Billings's avatar
      Merge branch 'next' into jay/projectSupportLastMaster · b186c8f1
      Jay Jay Billings authored
      
      
      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: default avatarJay Jay Billings <billingsjj@ornl.gov>
      b186c8f1
    • Jay Jay Billings's avatar
      The build will no longer automatically updates the versions. · 24d7843c
      Jay Jay Billings authored
      
      
      I set the build system so that the Tycho versions plugin must be
      explicitly called.
      Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
      24d7843c
    • Jay Jay Billings's avatar
    • Jay Jay Billings's avatar
    • Jay Jay Billings's avatar
      Fixed build errors. · 8223cdcc
      Jay Jay Billings authored
      
      Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
      8223cdcc
    • Jay Jay Billings's avatar
    • Jay Jay Billings's avatar
      Merge remote-tracking branch 'origin/master' into kasper/reflectivity/ui · dacc609a
      Jay Jay Billings authored
      
      
      Conflicts:
      	repository/org.eclipse.ice.repository/ice.product.launch
      Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
      dacc609a
    • Robert Smith's avatar
    • Robert Smith's avatar
      Repaired mesh part and mesh property views · 6863cdc4
      Robert Smith authored
      
      
      The mesh part view and mesh property views were not working with the new
      mesh service. They have been corrected to properly connect to the
      refactored mesh classes. 
      Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
      6863cdc4
    • Jay Jay Billings's avatar
      b384ae17
  4. 22 Aug, 2015 4 commits
  5. 21 Aug, 2015 7 commits
    • Jay Jay Billings's avatar
      cc539344
    • Jay Jay Billings's avatar
      Merge remote-tracking branch 'origin/master' into jay/projectSupport · 2bb4aa43
      Jay Jay Billings authored
      
      
      Conflicts:
      	repository/org.eclipse.ice.repository/ice.product.launch
      	src/org.eclipse.ice.materials/data/userMatDB.xml
      Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
      2bb4aa43
    • Jay Jay Billings's avatar
      fc1f0540
    • Jay Jay Billings's avatar
    • Jordan Deyton's avatar
      Fixing connection preferences table for bug 475606. · 4322d850
      Jordan Deyton authored
      
      
      Changed use of TableColumn.pack() to instead compute the width of the
      header text and use that to set the width of the columns.
      Signed-off-by: default avatarJordan Deyton <deytonjh@ornl.gov>
      4322d850
    • Robert Smith's avatar
      Fixed build properties · 318af777
      Robert Smith authored
      
      
      The client.widgets.rcp build properties file had extraneous code that
      was breaking the build.
      Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
      318af777
    • Robert Smith's avatar
      Merge remote-tracking branch 'master/master' into MeshCanvasMaster3 · a811fb74
      Robert Smith authored
      Conflicts:
      	org.eclipse.ice.build/pom.xml
      	src/org.eclipse.ice.analysistool/src/org/eclipse/ice/analysistool/IAnalysisAsset.java
      	src/org.eclipse.ice.client.widgets.rcp/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/reactoreditor/plant/PipeController.java
      	src/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorPage.java
      	src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ComponentPropertySection.java
      	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
      	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
      	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICESectionPage.java
      	src/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/IComponentVisitor.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/SelectiveComponentVisitor.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/TreeComposite.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Custom2DShape.java
      	src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/mesh/Polygon.java
      	src/org.eclipse.ice.item/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
      	src/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekWriter.java
      	src/org.eclipse.ice.viz.service.jme3/META-INF/MANIFEST.MF
      	src/org.eclipse.ice.viz.service.jme3/OSGI-INF/vizService.xml
      	src/org.eclipse.ice.viz.service.jme3/build.properties
      	src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
      	src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/connections/VisItConnectionPreferencePage.java
      	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizService.java
      	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/IVizService.java
      	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlot.java
      	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/CellColumnLabelProvider.java
      	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/PortEntryContentProvider.java
      	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/preferences/TableComponentContentProvider.java
      	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
      	src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/datastructures/VizObject.java
      	tests/org.eclipse.ice.datastructures.test/META-INF/MANIFEST.MF
      	tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java
      	tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherFormTester.java
      	tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/MultiLauncherTester.java
      	tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/preferences/test/KeyEntryContentProviderTester.java
      	tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/FakeVizService.java
      a811fb74
  6. 18 Aug, 2015 1 commit
  7. 17 Aug, 2015 1 commit
    • Jordan Deyton's avatar
      Addressing bug 472304. · 073d59f4
      Jordan Deyton authored
      Removing the TimeSliderCompositeTester's check against the widget
      background. This has affected at least 3 Linux users so far and
      contributes nothing to the actual functionality of the widget other than
      the widget's aesthetic value.
      073d59f4
  8. 14 Aug, 2015 5 commits
  9. 13 Aug, 2015 3 commits