Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ice-build] [eclipse/ice] 644523: Merging master in but keeping EntryComposite-relat...

  Branch: refs/heads/master
  Home:   https://github.com/eclipse/ice
  Commit: 644523a75437e4debc4b0aa5230903acbf01910b
      https://github.com/eclipse/ice/commit/644523a75437e4debc4b0aa5230903acbf01910b
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/DataComponentComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEDataComponentSectionPart.java

  Log Message:
  -----------
  Merging master in but keeping EntryComposite-related changes that are
reverted in master.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: f2a47f5f2adb31174ad5dc3d791092f46f47dc83
      https://github.com/eclipse/ice/commit/f2a47f5f2adb31174ad5dc3d791092f46f47dc83
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/DataComponentComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEDataComponentSectionPart.java

  Log Message:
  -----------
  Made sure to sync DataComponent Entry values with EntryComposite Entry
values when widgets are changed in the UI.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: d42e55da5f1ef259dd287d6bd08960054549c5f5
      https://github.com/eclipse/ice/commit/d42e55da5f1ef259dd287d6bd08960054549c5f5
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M features/org.eclipse.ice.feature/feature.xml
    M src/org.eclipse.ice.analysistool/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.compatibility/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.rcp/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.reactoreditor.grid/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.reactoreditor.lwr/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.reactoreditor.sfr/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets.reactoreditor/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.client/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/Entry.java
    M src/org.eclipse.ice.kdd/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.mesh/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.nek5000/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.persistence.xml/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.reactor.plant/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.reactor.sfr/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.reactor/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.reactorAnalyzer/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.vibe/META-INF/MANIFEST.MF
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionManager.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/ConnectionPlotRender.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionAdapter.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionClient.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/KeyEntryContentProvider.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/PortEntry.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/PortEntryContentProvider.java
    M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/SecretEntry.java
    M tests/org.eclipse.ice.client.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.client.widgets.rcp.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.client.widgets.reactoreditor.grid.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.client.widgets.reactoreditor.lwr.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.client.widgets.reactoreditor.sfr.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.client.widgets.reactoreditor.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.client.widgets.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.core.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EntryTester.java
    M tests/org.eclipse.ice.filesimulation/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.item.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.kdd.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.nek5000.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.persistence.xml.test/META-INF/MANIFEST.MF
    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.reactorAnalyzer.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.servicetester/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.tablecomponenttester/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.vibe.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.viz.service.test/META-INF/MANIFEST.MF
    M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/ConectionManagerTester.java
    M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/ConnectionAdapterTester.java
    M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/ConnectionPlotRenderTester.java
    M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/ConnectionPlotTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/KeyEntryContentProviderTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/KeyEntryTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/PortEntryContentProviderTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/PortEntryTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/SecretEntryTester.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/SimpleCountKeyManager.java
    A tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/connections/test/SimpleDiscreteKeyManager.java
    A utils/EEfixer.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into anna/entrycompredraw


  Commit: d1186e190b01b4ad297abe12d49c178a7ada5880
      https://github.com/eclipse/ice/commit/d1186e190b01b4ad297abe12d49c178a7ada5880
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/DataComponentComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java

  Log Message:
  -----------
  Committing work so far. Limited the number of times MOOSELauncher
updates the "Input File" EntryComposite to only when the value changes;
this reduces the number of times JobLauncher.updateFileDependencies(...)
is called and redraws all the 'dependent' EntryComposites. Partially
fixes bug 465727.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: f4a676b1f89f775806c77ed42f121eb7b7a68b0a
      https://github.com/eclipse/ice/commit/f4a676b1f89f775806c77ed42f121eb7b7a68b0a
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-05-01 (Fri, 01 May 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/DataComponentComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java

  Log Message:
  -----------
  Fixed the JobLauncher to also remove data from the inputFileNameMap when
updateFileDependencies is deleting Entries. The inputFileNameMap was
keeping data related to Entries that were long discarded, which caused
the MOOSE Launcher to sometimes have "leftover" Entries after switching
between *.i input files. Fixes bug 465997.

Also removed stuff from other classes that I was using for debugging.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 658345f5bf7c3110c2da552373de8e3f4a4bd599
      https://github.com/eclipse/ice/commit/658345f5bf7c3110c2da552373de8e3f4a4bd599
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-05-01 (Fri, 01 May 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/DataComponentComposite.java

  Log Message:
  -----------
  Since EntryComposites now individually redraw themselves, this means
they can get out of order (since new Controls are always put at the end
by default). DataComponentComposite will now make sure to re-order
EntryComposites that have lost their way, according to the order they
are in the entryMap.

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


  Commit: 19e227421714473f75f8a4c69f36d8af6431f93e
      https://github.com/eclipse/ice/commit/19e227421714473f75f8a4c69f36d8af6431f93e
  Author: Anna Wojtowicz <wojtowicza@xxxxxxxx>
  Date:   2015-05-04 (Mon, 04 May 2015)

  Changed paths:
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/DataComponentComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
    M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEDataComponentSectionPart.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/anna/entrycompredraw'

Signed-off-by: Anna Wojtowicz <wojtowicza@xxxxxxxx>


Compare: https://github.com/eclipse/ice/compare/160b4647aad7...19e227421714

Back to the top