[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
[ice-build] [eclipse/ice] 6cea60: Playing around with SWT for tiling things on the I...
|
Branch: refs/heads/jay/reflectivity
Home: https://github.com/eclipse/ice
Commit: 6cea60e5197d4eb741877b576f91d827133236d1
https://github.com/eclipse/ice/commit/6cea60e5197d4eb741877b576f91d827133236d1
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Log Message:
-----------
Playing around with SWT for tiling things on the ICEResourcePage. So
far, the it generates a 2x3 grid of randomly colored browsers (but these
can be changed to other objects later). Also has buttons for rows and
columns, although I haven't finished hooking them up to update the grid
when a selection is made.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: b5efa5d8df00e48082bd75b8243f4865060e107f
https://github.com/eclipse/ice/commit/b5efa5d8df00e48082bd75b8243f4865060e107f
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
Log Message:
-----------
CSV plots now do basic tiling in the Resource Page. I plan to add more
controls so the user can control the grid layout.
Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: 5972e595ec1d18fbc1fe6ddb9b2762a85cf81d12
https://github.com/eclipse/ice/commit/5972e595ec1d18fbc1fe6ddb9b2762a85cf81d12
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-20 (Fri, 20 Mar 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Log Message:
-----------
Added rows and columns buttons to the plot tiling composite so the user
can manipulate the grid. Hooked up the columns button, rows will be
trickier though.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: dff744693acb68ba360828541ddf49e2e258f1c3
https://github.com/eclipse/ice/commit/dff744693acb68ba360828541ddf49e2e258f1c3
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M README.md
M features/org.eclipse.ice.feature/feature.xml
M org.eclipse.ice.build/pom.xml
M repository/org.eclipse.ice.repository/ice.product
M repository/org.eclipse.ice.repository/ice.product.launch
M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
M src/org.eclipse.ice.client.widgets.moose/OSGI-INF/MOOSEEditorComponent.xml
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEEclipseFormWidget.java
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormWidgetBuilder.java
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MeshViewComposite.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/viz/service/IPlot.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IVizService.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IVizServiceFactory.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/ListComponent.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/WrappedGlazedEventListener.java
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
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
M src/org.eclipse.ice.materials/data/userMatDB.xml
A src/org.eclipse.ice.viz.service.paraview/.classpath
A src/org.eclipse.ice.viz.service.paraview/.gitignore
A src/org.eclipse.ice.viz.service.paraview/.project
A src/org.eclipse.ice.viz.service.paraview/.settings/org.eclipse.jdt.core.prefs
A src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
A src/org.eclipse.ice.viz.service.paraview/OSGI-INF/vizService.xml
A src/org.eclipse.ice.viz.service.paraview/build.properties
A src/org.eclipse.ice.viz.service.paraview/plugin.xml
A src/org.eclipse.ice.viz.service.paraview/pom.xml
A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPreferenceInitializer.java
A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPreferencePage.java
A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewVizService.java
M src/org.eclipse.ice.viz.service.visit/META-INF/MANIFEST.MF
R src/org.eclipse.ice.viz.service.visit/OSGI-INF/visitVisService.xml
A src/org.eclipse.ice.viz.service.visit/OSGI-INF/vizService.xml
M src/org.eclipse.ice.viz.service.visit/build.properties
A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionAdapter.java
A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionManager.java
A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/ConnectionPreference.java
A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPreferenceInitializer.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPreferencePage.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/actions/ImportLocalFileAction.java
M src/org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
M src/org.eclipse.ice.viz.service/build.properties
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizPreferenceInitializer.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizPreferencePage.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizService.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/BasicVizServiceFactory.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/VizPreferenceInitializer.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/VizPreferencePage.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionAdapter.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionManager.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionState.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IKeyChangeListener.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IKeyManager.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/KeyEntry.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/KeyEntryContentProvider.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/Launcher.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/PortEntry.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/PortEntryContentProvider.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/SecretEntry.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVVizService.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/CustomScopedPreferenceStore.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/DynamicComboFieldEditor.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/EntryCellContentProvider.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/EntryCellEditingSupport.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/ISecretCellContentProvider.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentCellContentProvider.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentCellEditingSupport.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentComposite.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentContentProvider.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/TableComponentPreferenceAdapter.java
M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java
A tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestListComponentListener.java
M tests/org.eclipse.ice.filesimulation/src/org/eclipse/ice/filesimulation/FileSimulation.java
M tests/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF
A tests/org.eclipse.ice.viz.service.paraview.test/.classpath
A tests/org.eclipse.ice.viz.service.paraview.test/.gitignore
A tests/org.eclipse.ice.viz.service.paraview.test/.project
A tests/org.eclipse.ice.viz.service.paraview.test/.settings/org.eclipse.jdt.core.prefs
A tests/org.eclipse.ice.viz.service.paraview.test/META-INF/MANIFEST.MF
A tests/org.eclipse.ice.viz.service.paraview.test/build.properties
A tests/org.eclipse.ice.viz.service.paraview.test/pom.xml
A tests/org.eclipse.ice.viz.service.paraview.test/src/org/eclipse/ice/viz/service/paraview/test/ParaViewPlotTester.java
A tests/org.eclipse.ice.viz.service.paraview.test/src/org/eclipse/ice/viz/service/paraview/test/ParaViewVizServiceTester.java
M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/FakeVizService.java
M tests/org.eclipse.ice.viz.service.visit.test/META-INF/MANIFEST.MF
A tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/VisItPlotTester.java
M tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/VisItVizServiceTester.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into anna/gridlayout
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: b920a14f0caf5ebb9b220d09999ff0b5b1a517d4
https://github.com/eclipse/ice/commit/b920a14f0caf5ebb9b220d09999ff0b5b1a517d4
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
Log Message:
-----------
Added a logic check so the VisIt service doesn't have a heartattack of
null pointer exceptions whenever a ResourceComponent is set on a form
without VisIt already running.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: 71514383bbbc444a171e51ec9f9ea2c0c4157c90
https://github.com/eclipse/ice/commit/71514383bbbc444a171e51ec9f9ea2c0c4157c90
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Log Message:
-----------
Hooked up the "rows" button for the ResourcePage grid composite. Since
there's no way to explicitly set rows in a GridLayout, it forces the
number of rows using empty Composites. Both rows and columns now change
dynamically.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: ada7920e94d645a8f56f25389fe761acd536e304
https://github.com/eclipse/ice/commit/ada7920e94d645a8f56f25389fe761acd536e304
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
Log Message:
-----------
Adding an option for CSV plots to have a "close" button that appears in
the upper right-hand corner when the cursor is on top of the plotting
canvas (and disappears when the cursor is elsewhere). Default behavior
is no button. Still need to tweak/clean it up a bit.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: d49c74fed3b577f71ad8ca5e936e658e80f8232f
https://github.com/eclipse/ice/commit/d49c74fed3b577f71ad8ca5e936e658e80f8232f
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
Log Message:
-----------
Moved the plot close function from CSV classes to the ResourcePage to
keep it generic. It works, but I don't think it's an ideal design. I
posted a question on stackexchange for better suggestions.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: eb174f24bece377341e96619b05f078bd7516e10
https://github.com/eclipse/ice/commit/eb174f24bece377341e96619b05f078bd7516e10
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
Log Message:
-----------
Added a setEventListener(event, listener) method to the IPlot interface
and plot classes. Implemented it for CSVPlot to add listeners on the
plot canvas (CSVPlotEditor.setPlotCanvasListener(...)).
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: 23e552de58ec9bd9f2166f6eb966286f22661c95
https://github.com/eclipse/ice/commit/23e552de58ec9bd9f2166f6eb966286f22661c95
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Log Message:
-----------
"Close" buttons now working correctly using the new method in the IPlot
interface.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: 2bb720123ed2c6441197595eb70e9a33fe103ff2
https://github.com/eclipse/ice/commit/2bb720123ed2c6441197595eb70e9a33fe103ff2
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Log Message:
-----------
Fixed a disposed widget(s) error thrown when the editor is closed.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: d56125fbedf0c3c26ab00ca5b5083ae223cca33e
https://github.com/eclipse/ice/commit/d56125fbedf0c3c26ab00ca5b5083ae223cca33e
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-07 (Tue, 07 Apr 2015)
Changed paths:
M repository/org.eclipse.ice.repository/ice.product
M repository/org.eclipse.ice.repository/ice.product.launch
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/kvPair/VibeKVPair.java
M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/launcher/VibeLauncher.java
M src/org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into anna/gridlayout
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: 9483cf00fbd3ddc384b94aa3719c1454f655796e
https://github.com/eclipse/ice/commit/9483cf00fbd3ddc384b94aa3719c1454f655796e
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-08 (Wed, 08 Apr 2015)
Changed paths:
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into anna/gridlayout
Commit: 035e223b30cfe8ab6e889382ef76762404db0a75
https://github.com/eclipse/ice/commit/035e223b30cfe8ab6e889382ef76762404db0a75
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-08 (Wed, 08 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreeCompositeView.java
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSETreePropertySection.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/common/TreeCompositeViewer.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFSectionPage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFTreeCompositeViewer.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/properties/TreePropertySection.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into anna/gridlayout
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: 80e9c24c15884674a5664acaaa957e8531382d3c
https://github.com/eclipse/ice/commit/80e9c24c15884674a5664acaaa957e8531382d3c
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-09 (Thu, 09 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Log Message:
-----------
Auto-formatted the ICEResourcePage...
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: a7e28ba672d5041c05f20733481a0938437001ac
https://github.com/eclipse/ice/commit/a7e28ba672d5041c05f20733481a0938437001ac
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-09 (Thu, 09 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
Log Message:
-----------
Removed the listener method from the IPlot interface.
Changed the IPlot.draw(...) method to return the child Composite or
Canvas.
Applied these changes to the current IPlot implementations.
The net result is no change in user interaction, but we can more easily
add a context/popup menu to the plot Composite or Canvas.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: f466a132192b1d9974ef136c9412828cf37aa9af
https://github.com/eclipse/ice/commit/f466a132192b1d9974ef136c9412828cf37aa9af
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-09 (Thu, 09 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Log Message:
-----------
Made the listener that shows and hides the close button a class variable
so it can be re-used and shared among all drawn plots.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 2e10b882c61292f5b3c8982cbcf02a4158346c9f
https://github.com/eclipse/ice/commit/2e10b882c61292f5b3c8982cbcf02a4158346c9f
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-09 (Thu, 09 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Log Message:
-----------
Fixed two bugs. With the first bug, it was possible to get the close
button to not disappear when leaving the plot. The second bug caused the
close button to appear off the edge of the plot.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 3ce7a002fc8bd2302550262a101e4a07be75aecb
https://github.com/eclipse/ice/commit/3ce7a002fc8bd2302550262a101e4a07be75aecb
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Created the skeleton of PlotGridComposite, which will contain the code
within ICEResourcePage that manages the grid of drawn plots.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 0a06ba856ae6fa85153d74cc764a4b2d8df3ee33
https://github.com/eclipse/ice/commit/0a06ba856ae6fa85153d74cc764a4b2d8df3ee33
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Moved code for showing the close button from ICEResourcePage to
PlotGridComposite.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: c0c36cf4838f3243d1ef82c7af8c78d5672c559d
https://github.com/eclipse/ice/commit/c0c36cf4838f3243d1ef82c7af8c78d5672c559d
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Added the code to add and remove plot renderings. Most of this comes
from ICEResourcePage.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 5a368c0c5455cf7345e7aa861c10128061fd460c
https://github.com/eclipse/ice/commit/5a368c0c5455cf7345e7aa861c10128061fd460c
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Fixed some layout bugs.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: cf98d6a08a6490e3ebb0770be990698659a44793
https://github.com/eclipse/ice/commit/cf98d6a08a6490e3ebb0770be990698659a44793
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Set up the ICEResourcePage to use the PlotGridComposite. Fixed a layout
bug with the PlotGridComposite.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: aa245547f88b09d8118b323350d1ec4fe3424e7d
https://github.com/eclipse/ice/commit/aa245547f88b09d8118b323350d1ec4fe3424e7d
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Added a clear button to the PlotGridComposite's ToolBar.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 3d7f8d589800ba3abc6406f458998376c2ede220
https://github.com/eclipse/ice/commit/3d7f8d589800ba3abc6406f458998376c2ede220
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/LabelContribution.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/SpinnerContribution.java
Log Message:
-----------
Added JFace-style ControlContributions for a Spinner and a Label.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 88c03be1e8f472142d0633174599826898e7e3e1
https://github.com/eclipse/ice/commit/88c03be1e8f472142d0633174599826898e7e3e1
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Added Anna's widgets to the PlotGridComposite's ToolBar, but converted
them to use JFace and added a FormToolkit to decorate them.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 72ef96fe663ec4837cd2e673f75825ed63cfa463
https://github.com/eclipse/ice/commit/72ef96fe663ec4837cd2e673f75825ed63cfa463
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Added new layout code to the PlotGridComposite in the spirit of Anna's
grid layout settings.
Added some notes for fixing bugs.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: b7caedfe8bfe5b3f87eef0f625daaeeedeffdfe3
https://github.com/eclipse/ice/commit/b7caedfe8bfe5b3f87eef0f625daaeeedeffdfe3
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
Log Message:
-----------
Added an option for the user to enter the name of a custom MOOSE app.
Would like to test it out more Monday, so putting this in a branch for
now.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: be3a48c901abd4663329b9010765a5710d07a400
https://github.com/eclipse/ice/commit/be3a48c901abd4663329b9010765a5710d07a400
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Added a condition to the addPlot(...) method so that plots are not drawn
if there is no available space in the grid.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 434eec8c33c9e66b8ba826b0765534ef7abff16d
https://github.com/eclipse/ice/commit/434eec8c33c9e66b8ba826b0765534ef7abff16d
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Added some code to refreshLayout() to make sure all screen real estate
is occupied when the grid of plots is not full.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: f97b6a69c5521204b3a771266568bff06961ce2f
https://github.com/eclipse/ice/commit/f97b6a69c5521204b3a771266568bff06961ce2f
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java
Log Message:
-----------
Changed the custom MOOSE launcher to update immediately instead of
waiting for reviewEntries() to trigger. Also added to unit tests. I
think something might be wrong with my build on this machine, so I'll
test it out and merge on my work machine tomorrow.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: f58b89bf56d5226f1e87aaceb34d1ff9c848a7d4
https://github.com/eclipse/ice/commit/f58b89bf56d5226f1e87aaceb34d1ff9c848a7d4
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Added a context Menu to the grid of drawn plots. It doesn't contain much
yet, but it does update based on the right-clicked plot.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: a2f25141468677b77da74690ac4941439bfed30f
https://github.com/eclipse/ice/commit/a2f25141468677b77da74690ac4941439bfed30f
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Added a context menu tree that lets you set the plot category and type
based on the clicked plot. The IPlot implementations will need to be
updated to handle subsequent calls to draw(...).
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: c3cff865d89a2826d8e18254ee35098e4e016e84
https://github.com/eclipse/ice/commit/c3cff865d89a2826d8e18254ee35098e4e016e84
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
Log Message:
-----------
Added a getResourcePage() method to ICEFormEditor for ICEResourceView to
get a handle on its associated ResourcePage. This eliminated the need
for ICEResourcePage.selectionChanged() to try to filter the location of
events, instead letting the ResourceView directly tell the ResourcePage
to draw. Then added a double-click listener on ICEResourceView, so
resources will be shown/plotted with a double click instead of single.
Cleaned up documentation.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: 4253fe1d927e788e9af1a936f22033a54125da91
https://github.com/eclipse/ice/commit/4253fe1d927e788e9af1a936f22033a54125da91
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
Log Message:
-----------
Merge branch 'anna/gridlayout' of https://github.com/eclipse/ice into anna/gridlayout
Commit: 54bd5a4b45d5b14110db670bff2ac7fc11d43cf6
https://github.com/eclipse/ice/commit/54bd5a4b45d5b14110db670bff2ac7fc11d43cf6
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
Log Message:
-----------
Removed some old task flags and updated some documentation and notes in
the code.
Changed one reference to getSite().getPage().addSelectionListener(...)
to use
getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(...)
to make sure the SelectionService is used.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: d1996cf666dbeb1b6fd6b0efaf39b7037ef49b12
https://github.com/eclipse/ice/commit/d1996cf666dbeb1b6fd6b0efaf39b7037ef49b12
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
Log Message:
-----------
Added the sliders back to the rendered CSVPlots. This should fix the
recent build failure.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 476d5353c39bd2f1b54335ef439308a19b16f727
https://github.com/eclipse/ice/commit/476d5353c39bd2f1b54335ef439308a19b16f727
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/LabelContribution.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/SpinnerContribution.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into anna/custom_moose_launcher
Commit: f63c90cf1a368ca763e080bd0e7fdb5b2b635f0e
https://github.com/eclipse/ice/commit/f63c90cf1a368ca763e080bd0e7fdb5b2b635f0e
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java
Log Message:
-----------
Accidentally broke the file Entry updating in the MOOSE Launcher by
creating my own update method, but fixed it by also calling the
super.update() where appropriate.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: 2aba2959dbd24b0edadb339fcd5ba191af8734f4
https://github.com/eclipse/ice/commit/2aba2959dbd24b0edadb339fcd5ba191af8734f4
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/PlotProvider.java
M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java
Log Message:
-----------
Added a removeSeries(...) method to the PlotProvider for CSVPlots. This
method is tested.
Updated the CSVPlot to remove the old series and plot the new one when
draw(...) is called with a new plot category and type.
Fixed the available plot categories in CSVPlot.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: abab00f0e80551f744e2fba4601e43605575677e
https://github.com/eclipse/ice/commit/abab00f0e80551f744e2fba4601e43605575677e
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java
Log Message:
-----------
Minor update to checkRemoveSeries() to ensure that the removed
SeriesProviders are unique.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 5dee3a0e631b1c7d7b89e585d37197b6e317846f
https://github.com/eclipse/ice/commit/5dee3a0e631b1c7d7b89e585d37197b6e317846f
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/PlotProvider.java
M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java
Log Message:
-----------
Merge remote-tracking branch 'origin/anna/gridlayout'
Conflicts:
src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
Merged recent updates to the CSVPlot into master. You should now be able
to change the plot category and type for CSV plots by right-clicking
them and choosing from the "Set Plot Type" sub-menu.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 8355b1575f64240e24af5607d29f261ed1c208f6
https://github.com/eclipse/ice/commit/8355b1575f64240e24af5607d29f261ed1c208f6
Author: Jordan Deyton <deytonjh@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java
Log Message:
-----------
Fixing the CSVPlotTester, which had bad plot categories defined.
Signed-off-by: Jordan Deyton <deytonjh@xxxxxxxx>
Commit: 22194b815297baa9a906fad7f8dc9c3108055272
https://github.com/eclipse/ice/commit/22194b815297baa9a906fad7f8dc9c3108055272
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
Log Message:
-----------
MOOSE Model now automatically changes the AdaptiveTreeComposite.type of
the Mesh block to "FileEntry" if a filename is entered. Fixes bug
459692.
Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Commit: deec4b7eda752a0fdb13516e2e73b88acf9ebab2
https://github.com/eclipse/ice/commit/deec4b7eda752a0fdb13516e2e73b88acf9ebab2
Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/PlotProvider.java
M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java
M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java
Log Message:
-----------
Merge branch 'master' of https://github.com/eclipse/ice
Commit: c1004dd310a1c2a752ff3dbe0ec165e5a893879a
https://github.com/eclipse/ice/commit/c1004dd310a1c2a752ff3dbe0ec165e5a893879a
Author: Jay Jay Billings <billingsjj@xxxxxxxx>
Date: 2015-04-15 (Wed, 15 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/LabelContribution.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/SpinnerContribution.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/PlotProvider.java
M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java
M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java
M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into jay/reflectivity
Conflicts:
src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>
Commit: 3af10a6b970e37b9895bd354852163e9c0c6b256
https://github.com/eclipse/ice/commit/3af10a6b970e37b9895bd354852163e9c0c6b256
Author: Jay Jay Billings <billingsjj@xxxxxxxx>
Date: 2015-04-15 (Wed, 15 Apr 2015)
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into jay/reflectivity
Conflicts:
src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>
Compare: https://github.com/eclipse/ice/compare/d1920f2899d5...3af10a6b970e