[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[ice-build] [eclipse/ice] 83dcf9: Merge remote-tracking branch 'upstream/master' int...
|
Branch: refs/heads/jay/reflectivity
Home: https://github.com/eclipse/ice
Commit: 83dcf9c79239473c665bc9b392db9dacc122a9d7
https://github.com/eclipse/ice/commit/83dcf9c79239473c665bc9b392db9dacc122a9d7
Author: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Date: 2015-06-23 (Tue, 23 Jun 2015)
Changed paths:
M org.eclipse.ice.build/pom.xml
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlotRender.java
A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/widgets/BinarySearchTree.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/widgets/TimeSliderComposite.java
A tests/org.eclipse.ice.client.widgets.test.utils/.classpath
A tests/org.eclipse.ice.client.widgets.test.utils/.gitignore
A tests/org.eclipse.ice.client.widgets.test.utils/.project
A tests/org.eclipse.ice.client.widgets.test.utils/.settings/org.eclipse.jdt.core.prefs
A tests/org.eclipse.ice.client.widgets.test.utils/META-INF/MANIFEST.MF
A tests/org.eclipse.ice.client.widgets.test.utils/build.properties
A tests/org.eclipse.ice.client.widgets.test.utils/pom.xml
A tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractICEUITester.java
A tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractSWTTester.java
A tests/org.eclipse.ice.client.widgets.test.utils/src/org/eclipse/ice/client/widgets/test/utils/AbstractWorkbenchTester.java
M tests/org.eclipse.ice.client.widgets.test/META-INF/MANIFEST.MF
R tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractICEUITester.java
R tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractSWTTester.java
R tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/AbstractWorkbenchTester.java
M tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/EntryCompositeTester.java
M tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java
M tests/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/PlotGridCompositeTester.java
M tests/org.eclipse.ice.viz.service.visit.test/.gitignore
M tests/org.eclipse.ice.viz.service.visit.test/META-INF/MANIFEST.MF
M tests/org.eclipse.ice.viz.service.visit.test/pom.xml
A tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/BinarySearchTreeTester.java
A tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/TimeSliderCompositeTester.java
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into jay/reflectivity
Commit: 0a3391041194e3d5d068f9c37ee9ba4d71c78d63
https://github.com/eclipse/ice/commit/0a3391041194e3d5d068f9c37ee9ba4d71c78d63
Author: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Date: 2015-06-23 (Tue, 23 Jun 2015)
Changed paths:
M src/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF
M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
Log Message:
-----------
Added fields for deltaq0, deltaq1byq, and wave length for input.
Implemented reading of those fields when the model is processing.
Signed-off-by: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Commit: 2f110058b3099e30aeb4abba7841a95c7c1dd245
https://github.com/eclipse/ice/commit/2f110058b3099e30aeb4abba7841a95c7c1dd245
Author: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
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
Log Message:
-----------
Made reflectivity model finally write its data to the files. Confirmed
that the model works, however it is plagued still by bugs. Working on
those next.
Signed-off-by: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Commit: 88551943f89a56d7d4720a76640139340d014dc6
https://github.com/eclipse/ice/commit/88551943f89a56d7d4720a76640139340d014dc6
Author: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
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
Log Message:
-----------
Made reflectivity model finally write its data to the files. Confirmed
that the model works, however it is plagued still by bugs. Working on
those next.
Signed-off-by: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Commit: b562b4fe131a201d95795c02cc6680a5df8f711b
https://github.com/eclipse/ice/commit/b562b4fe131a201d95795c02cc6680a5df8f711b
Author: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Log Message:
-----------
Merge branch 'jay/reflectivity' of https://github.com/KasperGam/ice into jay/reflectivity
Commit: 53380c2151a4f1c9fe75e0c4af1e09d75b8f63f8
https://github.com/eclipse/ice/commit/53380c2151a4f1c9fe75e0c4af1e09d75b8f63f8
Author: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Date: 2015-06-25 (Thu, 25 Jun 2015)
Changed paths:
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/BasicEntryContentProvider.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/IEntryContentProvider.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/MatrixComponent.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/TableComponent.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/jobLauncher/SuiteLauncher.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/Model.java
M src/org.eclipse.ice.kdd/src/org/eclipse/ice/kdd/kddmath/KDDMatrix.java
M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/AddMaterialWizardPage.java
M src/org.eclipse.ice.materials.ui/src/org/eclipse/ice/materials/ui/MaterialsDatabaseMasterDetailsBlock.java
M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/PlotEntryContentProvider.java
M tests/org.eclipse.ice.client.widgets.test/META-INF/MANIFEST.MF
M tests/org.eclipse.ice.client.widgets.test/build.properties
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
Log Message:
-----------
Merged changes from master yesterday.
Signed-off-by: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Commit: 0d526775e5363bb2441c5f1965ac76dc59021a33
https://github.com/eclipse/ice/commit/0d526775e5363bb2441c5f1965ac76dc59021a33
Author: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Date: 2015-06-25 (Thu, 25 Jun 2015)
Changed paths:
A org.eclipse.ice.build/.gitignore
M org.eclipse.ice.build/pom.xml
Log Message:
-----------
Merge remote-tracking branch 'upstream/jay/reflectivity' into jay/reflectivity
Commit: 7c25e8673c15f00b802a59f93f1872628b691df3
https://github.com/eclipse/ice/commit/7c25e8673c15f00b802a59f93f1872628b691df3
Author: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Date: 2015-06-25 (Thu, 25 Jun 2015)
Changed paths:
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/Model.java
Log Message:
-----------
Cleaned up the Model and added a bit of documentation in the new copy
routine.
Signed-off-by: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Commit: 2371bac2a267c733ef5d2b810a18f3240029b707
https://github.com/eclipse/ice/commit/2371bac2a267c733ef5d2b810a18f3240029b707
Author: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Date: 2015-06-25 (Thu, 25 Jun 2015)
Changed paths:
M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
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
Log Message:
-----------
Reverting to version of these files at commit
88551943f89a56d7d4720a76640139340d014dc6. They were accidentally written
over by merging from upstream.
Signed-off-by: Kasper Gammeltoft <kaspergam@xxxxxxxxxxxxx>
Commit: 6aac1f5ecb514526a9b09a0d4d4e06eda42d675c
https://github.com/eclipse/ice/commit/6aac1f5ecb514526a9b09a0d4d4e06eda42d675c
Author: Jay Jay Billings <jayjaybillings@xxxxxxxxx>
Date: 2015-06-25 (Thu, 25 Jun 2015)
Changed paths:
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/Model.java
M src/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF
M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
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
Log Message:
-----------
Merge pull request #14 from KasperGam/jay/reflectivity
Merged eclipse/master. Flushed out last implementation for the Reflectivity Model.
Compare: https://github.com/eclipse/ice/compare/a310363da756...6aac1f5ecb51
