Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ice-build] [eclipse/ice] bc266c: Re-organized the code in CSVPlot.load(). The code ...

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

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

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

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

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


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

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

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

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


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

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

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

Organized imports in the other two classes to clear warnings.

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


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

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

  Log Message:
  -----------
  Fixed the launch configuration.


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

  Changed paths:
    M src/org.eclipse.ice.core/.classpath
    M src/org.eclipse.ice.core/.settings/org.eclipse.jdt.core.prefs
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/iCore/ICore.java
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/BasicAuthSecuredContext.java
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java

  Log Message:
  -----------
  Committing ComponentContext NullPointerException fix to the Core. Added
private startHttpService that creates the actual http connection, and
invoked it from the start method. Tested this with the new python
connection script.

Also cleaned up all the old UML generated stuff. 

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


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

  Changed paths:
    M features/org.eclipse.ice.feature/feature.xml
    M repository/org.eclipse.ice.repository/ice.macosx_product.launch
    M repository/org.eclipse.ice.repository/ice.product
    M repository/org.eclipse.ice.repository/ice.product.launch
    M src/org.eclipse.ice.core/META-INF/MANIFEST.MF

  Log Message:
  -----------
  Fixing org.eclipse.ice.core build error, forgot to change the min exec
env to Java 1.7 since I added a multi-exception catch statement.

Removed a few test bundles from the launch configurations. 

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


  Commit: 503aac7e6a8b69671716e21b2384083e8f0f95a1
      https://github.com/eclipse/ice/commit/503aac7e6a8b69671716e21b2384083e8f0f95a1
  Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

  Changed paths:
    M features/org.eclipse.ice.feature/feature.xml
    M repository/org.eclipse.ice.repository/ice.product
    M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkHandler.java
    M src/org.eclipse.ice.core/.classpath
    M src/org.eclipse.ice.core/.settings/org.eclipse.jdt.core.prefs
    M src/org.eclipse.ice.core/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/iCore/ICore.java
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/BasicAuthSecuredContext.java
    M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.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/CSVDataProvider.java
    M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataTableViewer.java
    M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotTreeContentProviderTester.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into
mccaskey/moose_fork_stork

Conflicts:
	repository/org.eclipse.ice.repository/ice.macosx_product.launch
	repository/org.eclipse.ice.repository/ice.product.launch
	src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java


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


Compare: https://github.com/eclipse/ice/compare/81bb57d483ed...503aac7e6a8b

Back to the top