xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1916 commits 31 branches 40 tags 3.8 GiB
Commit graph

674 commits

Author SHA1 Message Date
Jonathan Sanchez
acf62bb8d9 Issue #1006 Implemented urban areas. Cherry picked from development on SS builds 
Conflicts:

	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java

Change-Id: Ife20e07ccffeb6e6f5cc4aabdc6c57c9ed6e9ff8

Former-commit-id: 1b45f1b6d9 [formerly 1b45f1b6d9 [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]
Former-commit-id: f646b185da
Former-commit-id: a09fa0b649
 2012-08-23 09:27:46 -05:00
Richard Peter
4a1c27bd22 Merge "Issue #798 - Correct for hdfFileId" into development 
Former-commit-id: 6c1690e063 [formerly 6c1690e063 [formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]]
Former-commit-id: 4c56f4e20d
Former-commit-id: 252e8e7e2e
 2012-08-22 17:07:17 -05:00
Steve Harris
8f1120f6d8 12.9.1-5 baseline (with forgotten bin files now included) 
Former-commit-id: b8ab6066f6 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b77a4d40d7
Former-commit-id: b2c0dd1abb
 2012-08-22 16:00:33 -05:00
James Korman
36e4ea8147 Issue #798 - Correct for hdfFileId 
Former-commit-id: 56d6b1e886 [formerly 56d6b1e886 [formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]]
Former-commit-id: c2c228b429
Former-commit-id: 654ecefd3e
 2012-08-22 13:24:28 -05:00
Benjamin Phillippe
d8680dc631 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories 
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: a501aacb3b [formerly a501aacb3b [formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]]
Former-commit-id: a5c57e8d24
Former-commit-id: c7bc786a60
 2012-08-22 13:03:24 -05:00
Steve Harris
bbe382231f Issue #915 Set the user data. (cherry picked from development_on_ss_builds) 
Conflicts:

	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java


Former-commit-id: 8e3ecc1efd [formerly 8e3ecc1efd [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]
Former-commit-id: b8629a0f20
Former-commit-id: 9565d18b96
 2012-08-22 13:01:08 -05:00
Steve Harris
445d1a6a0d Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
	edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
	nativeLib/rary.cots.jasper/jasper-1.900.1/configure
	rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
	rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/i386/build.sh
	tools/scripts/commit-msg
	tools/scripts/git-u-setup
	tools/scripts/uamend
	tools/scripts/ucommit
	tools/scripts/upull
	tools/scripts/upush
	tools/scripts/ustat

Former-commit-id: d38f8b80f0 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 77369f78a6
 2012-08-21 16:17:58 -05:00
Steve Harris
9b5c2094ed 12.9.1-5 baseline 
Former-commit-id: 61f269f54c [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
 2012-08-21 15:27:03 -05:00
Ron Anderson
1b655b0826 Issue #436 Made hazardDict an OrderedDict so order of entries is preserved. 
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.

Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff

Former-commit-id: d7a818fd1d [formerly d7a818fd1d [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]
Former-commit-id: 7662d249ab
Former-commit-id: d3693827a1
 2012-08-17 12:41:49 -05:00
Ron Anderson
f7b9190b51 Issue #436 merging elevation base changes into branch off of development baseline. 
Former-commit-id: 1321db6a99 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]
Former-commit-id: 819b9c8e56
Former-commit-id: 6eafdda705
 2012-08-17 12:20:08 -05:00
root
d1f2ac6698 Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds 
Former-commit-id: 342bda7e5f [formerly 342bda7e5f [formerly 2368421395496141fdc6467fd165babc282b65ac]]
Former-commit-id: 6eec24180e
Former-commit-id: b3217ad886
 2012-08-15 22:29:38 +00:00
root
64c3ccb4a4 Merge branch 'reconcile' into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java

Former-commit-id: b93989daaf [formerly b93989daaf [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]
Former-commit-id: ba40e18fb2
Former-commit-id: 3e9d1fa430
 2012-08-15 22:29:07 +00:00
root
1792158ef8 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: cb46f57879 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
 2012-08-15 22:15:20 +00:00
Benjamin Phillippe
e23523ad80 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories 
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: 72c63e1a6f [formerly 72c63e1a6f [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]
Former-commit-id: 7bad34f906
Former-commit-id: 91493ee0b9
 2012-08-15 16:22:39 -05:00
Steve Harris
de9b64b501 12.9.1-4 baseline 
Former-commit-id: dcda3a2290 [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
 2012-08-15 15:19:10 -05:00
Steve Harris
8c5c5ad6eb 12.9.1-3 baseline 
Former-commit-id: 36d80b1f60 [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 84bbf2573e
Former-commit-id: edbbacfa8a
 2012-08-15 14:26:10 -05:00
Steve Harris
ed416f241e 12.9.1-2 baseline 
Former-commit-id: d1d877d319 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: a198b3a807
Former-commit-id: 448ed038c2
 2012-08-15 14:12:24 -05:00
Jonathan Sanchez
38bb2743e5 Issue #915 Set the user data. 
Former-commit-id: 865136f6ef [formerly 865136f6ef [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: e584d728f0
 2012-08-15 14:05:50 -05:00
Steve Harris
63bcadf121 12.9.1-1 baseline 
Former-commit-id: 31ae7ea218 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
 2012-08-15 13:59:00 -05:00
Steve Harris
14923a89e9 Merge branch 'development' into Enhanced_points 
Former-commit-id: 346d775f57 [formerly 346d775f57 [formerly 25026a4d9955b76039bf25861380cadebff19665]]
Former-commit-id: f7f97d9f54
Former-commit-id: 031b655ab5
 2012-08-15 13:35:47 -05:00
Ron Anderson
3d0d4e9b09 Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate. 
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 17f636c2a2 [formerly 17f636c2a2 [formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]
Former-commit-id: 81abb2c60b
Former-commit-id: 7cde30681b
 2012-08-14 16:27:11 -05:00
Ben Steffensmeier
242cc34efe Issue #947 revert changes to dataTime format 
Former-commit-id: 50cb7383a6 [formerly 50cb7383a6 [formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]
Former-commit-id: 70ba8d82db
Former-commit-id: 77b7c4c517
 2012-08-14 16:20:36 -05:00
Ron Anderson
13d7576686 Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate. 
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 71d74b1dcf [formerly 71d74b1dcf [formerly 564b72997c59a665398c8687d6bafdb54c469881]]
Former-commit-id: 985167892d
Former-commit-id: 9bf0166f13
 2012-08-14 16:20:23 -05:00
Ben Steffensmeier
f50c979293 Issue #947 revert changes to dataTime format 
Former-commit-id: ce689ad5fa [formerly ce689ad5fa [formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]
Former-commit-id: 434193b34b
Former-commit-id: 15977fdba2
 2012-08-14 16:12:02 -05:00
Ben Steffensmeier
dc8d05c1be Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings. 
Former-commit-id: c6a121962f [formerly c6a121962f [formerly 06c2c85159598ca803c663de97caed4b6841c135]]
Former-commit-id: 1e527f83f0
Former-commit-id: c9ff69014b
 2012-08-09 17:53:19 -05:00
Ben Steffensmeier
fafea907c7 Issue #947 fix parsing of DataTime. 
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 525c0b21a9 [formerly 525c0b21a9 [formerly 045952304218c867d8fe89df9828f70632df2d00]]
Former-commit-id: b53fe917bc
Former-commit-id: 4ed3d04e64
 2012-08-09 17:50:23 -05:00
Nate Jensen
0df3ab80eb Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds 
Former-commit-id: eeaa2c798f [formerly eeaa2c798f [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]
Former-commit-id: 4211a8deac
Former-commit-id: 2cc3c63ba7
 2012-08-09 17:18:38 -05:00
Ben Steffensmeier
70f8f93f81 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings. 
Former-commit-id: 066a5af2a6 [formerly 066a5af2a6 [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]
Former-commit-id: ad1415948f
Former-commit-id: 65c33256d9
 2012-08-09 17:16:38 -05:00
Nate Jensen
135239eaee Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds 
Former-commit-id: a88d7bcedc [formerly a88d7bcedc [formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]
Former-commit-id: fbbf74eb50
Former-commit-id: 1214c05b72
 2012-08-08 16:10:13 -05:00
Ben Steffensmeier
726e934763 Issue #947 fix parsing of DataTime. 
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 97ba96759c [formerly 97ba96759c [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]
Former-commit-id: 5da238c8b9
Former-commit-id: b6cc71bf75
 2012-08-08 14:41:33 -05:00
Steve Harris
9d5b631109 Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java 
Former-commit-id: bbf4b18204 [formerly bbf4b18204 [formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]]
Former-commit-id: d538fd8913
Former-commit-id: 0ef9f1c86e
 2012-08-08 13:57:46 -05:00
Roger Ferrel
4e356b8a13 Issue #875 Markers and group added to Cave. 
Amend: Removed python file

Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.

Amend: deleted unwanted .project file

Amend: Removed comment out code and fix class descriptions

Amend: Changes based on reviewer comments.

Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8

Former-commit-id: 2e3fc4b400 [formerly 2e3fc4b400 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]
Former-commit-id: f4ae8eb150
Former-commit-id: ae41499ba2
 2012-08-08 13:35:47 -05:00
Steve Harris
3eefb26e94 Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java 
Former-commit-id: 926ff5dc5a [formerly 926ff5dc5a [formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]]
Former-commit-id: 9e2e0fa166
Former-commit-id: 15753699bd
 2012-08-07 15:29:25 -05:00
Steve Harris
57d749c037 Fixed merge of development / 12.8.1-5 versions of HttpClient.java 
Former-commit-id: 6dae0398d3 [formerly 6dae0398d3 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]
Former-commit-id: 3f88fa9078
Former-commit-id: 9387e8b2d0
 2012-08-07 10:04:39 -05:00
Steve Harris
0428530b73 Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: d90c5f989d [formerly d90c5f989d [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]
Former-commit-id: f3babcf1a1
Former-commit-id: 62e9207ba7
 2012-08-06 11:13:47 -05:00
Max Schenkelberg
92df0af108 Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment 
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b

Former-commit-id: 36bf80d13e [formerly 36bf80d13e [formerly b0466e68bea4102f397db214bb58b66c10a338ed]]
Former-commit-id: 0031d21292
Former-commit-id: 482dfb4711
 2012-08-06 09:44:44 -05:00
Steve Harris
dcc56b8a23 Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds 
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: f0b7d5e4c5 [formerly f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]
Former-commit-id: 85f82b18b3
Former-commit-id: b2432e096f
 2012-08-06 09:38:26 -05:00
Steve Harris
46daa48f1c 12.8.1-10 baseline 
Former-commit-id: b5e8fee24d [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: ca25d508ec
Former-commit-id: d5563fc340
 2012-08-06 09:34:26 -05:00
Jonathan Sanchez
549b50ea40 Issue #1006 Implemented urban areas. 
Former-commit-id: dbd30e3b67 [formerly dbd30e3b67 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]
Former-commit-id: 62db15b6f4
Former-commit-id: f26cce33a9
 2012-08-06 08:41:52 -05:00
Steve Harris
d507458b9b Merge branch 'development' into development_on_ss_builds 
Former-commit-id: 24799cd93d [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]
Former-commit-id: a1071e3204
Former-commit-id: 8f4ddad22c
 2012-08-06 08:23:04 -05:00
Bryan Kowal
f064d0cf6c Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties. 
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36

Former-commit-id: c6b2d65308 [formerly c6b2d65308 [formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]
Former-commit-id: 5ca4a66fdc
Former-commit-id: f295ee11ea
 2012-08-02 10:33:55 -05:00
James Korman
af41598a7b Issue #798 - Updates to satellite 
Former-commit-id: 7928d912e1 [formerly 7928d912e1 [formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]]
Former-commit-id: 2ddb2f6df0
Former-commit-id: 241303f9a0
 2012-08-01 16:31:59 -05:00
Steve Harris
e892eb4628 Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 6d77b94217 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 51e38ca887
Former-commit-id: 3476fe755b
 2012-08-01 12:43:12 -05:00
Max Schenkelberg
7d99688c6a Issue #626 Fixed changes to GridDownscaler in SatelliteDao 
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90

Former-commit-id: 2d36eb040d [formerly 2d36eb040d [formerly 1370a27f85173509b66a7ea861ed0b04225709e0]]
Former-commit-id: d89b58f7fd
Former-commit-id: 9f34d7a5f3
 2012-08-01 11:36:44 -05:00
Max Schenkelberg
40e6cd390e Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet. 
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac

Former-commit-id: f635e9c332 [formerly f635e9c332 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]
Former-commit-id: cc0a1fbca3
Former-commit-id: 74f0179b92
 2012-08-01 10:51:32 -05:00
Steve Harris
e86949a8d3 12.8.1-5 baseline 
Former-commit-id: fd2abfb6f1 [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
 2012-08-01 10:45:37 -05:00
James Korman
f50359ba1d Issue #798 - Code review changes 
Former-commit-id: 14e68406b4 [formerly 14e68406b4 [formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]]
Former-commit-id: 39a32d7c91
Former-commit-id: 15af4ada93
 2012-07-31 14:34:27 -05:00
James Korman
41a80adfb1 Issue #798 - Code review changes 
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 38a2e426d9 [formerly 38a2e426d9 [formerly cb05a9f95384806537106dc804833331d6c7db48]]
Former-commit-id: 4cbbc59278
Former-commit-id: 5df52e38f9
 2012-07-31 13:38:23 -05:00
Richard Peter
347398d655 Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development 
Former-commit-id: 97a1d083cd [formerly 97a1d083cd [formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]]
Former-commit-id: 8631b64e75
Former-commit-id: c379c2f884
 2012-07-31 09:16:23 -05:00
Nate Jensen
04a7e5a8c0 Issue #882 improved use of SimulatedTime 
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: a65e9608fd [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]
Former-commit-id: 4a2841b287
Former-commit-id: 8fa0eb70db
 2012-07-31 08:57:54 -05:00