Ron Anderson
ec78a52086
Issue #2997 Fix Geostationary projection to work with GeoTools 10.5
...
Change-Id: Id9f3dc3af07548039509e4121cafd2e02a01453c
Former-commit-id: 0097799e2c
[formerly 8aac4d32b1
] [formerly 665246d72e
] [formerly 0097799e2c
[formerly 8aac4d32b1
] [formerly 665246d72e
] [formerly c4a0a4ef6e
[formerly 665246d72e
[formerly 2b67417e6128e3cd4cafa5c8f2ac23c10be2b300]]]]
Former-commit-id: c4a0a4ef6e
Former-commit-id: d851b549ef
[formerly b5dc730fea
] [formerly 9ccb16c1887bb7f23193c421183a85e48e5cb136 [formerly e515f42b94
]]
Former-commit-id: 1fe57e954c23ec9694d882a83316be137c064cd2 [formerly d728020a70
]
Former-commit-id: 0cbbc279f0
2014-04-21 14:25:53 -05:00
Richard Peter
5350b3eac8
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 909571ebca
[formerly e4be1f24e7
] [formerly dbba727f3d
] [formerly 909571ebca
[formerly e4be1f24e7
] [formerly dbba727f3d
] [formerly 17196b5dcd
[formerly dbba727f3d
[formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]]
Former-commit-id: 17196b5dcd
Former-commit-id: b5fa843960
[formerly ff87317bd4
] [formerly f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1
]]
Former-commit-id: b1349363c5b25965107de3827211c7bcc6b9e98b [formerly b3fd8e5480
]
Former-commit-id: de624d87d3
2014-04-14 13:10:11 -05:00
Everett Kladstrup
f815fbcb60
Issue #2725 Move derived parameters logic to common
...
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
to the common hierarchy
* Move data cube classes that don't depend on derived parameters
to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
viz.core to viz.datacube
Former-commit-id: eab1358602
[formerly 8b19b3601a
] [formerly 06d6961c0f
] [formerly eab1358602
[formerly 8b19b3601a
] [formerly 06d6961c0f
] [formerly 0699041518
[formerly 06d6961c0f
[formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]
Former-commit-id: 0699041518
Former-commit-id: 29ce7781c9
[formerly 86bf2b5ea0
] [formerly eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc
]]
Former-commit-id: 41d01092799ccea952f65c9d6b66d93b56557541 [formerly d96b56c91a
]
Former-commit-id: 7b2683532a
2014-04-09 09:31:12 -05:00
Nate Jensen
61e4984dda
Merge "Issue #2920 Allow strings to use mulitple styles." into development
...
Former-commit-id: f0ef64f03c
[formerly b793ce20bc
] [formerly 811364eb73
] [formerly f0ef64f03c
[formerly b793ce20bc
] [formerly 811364eb73
] [formerly 3fff4e77d4
[formerly 811364eb73
[formerly 1b07e87178947df4d579dbc32057e883b61a7de2]]]]
Former-commit-id: 3fff4e77d4
Former-commit-id: df17c66980
[formerly 41a7098166
] [formerly db49414e20c75fd602d8f320d136a06df8df5843 [formerly 2fdac5fec2
]]
Former-commit-id: fa99e30081c43e0fe28d6f3d4ff05fc9846c5074 [formerly a87b131d94
]
Former-commit-id: 7d8ea4b1cb
2014-04-08 14:28:44 -05:00
Nate Jensen
2feed8888a
Issue #2968 improve efficiency by only compressing/serializing persisted
...
objects once
Change-Id: Iba90717d049571b801254852a7fd5a73202701f2
Former-commit-id: 0949264e48
[formerly 579584c346
] [formerly e3df98635a
] [formerly 0949264e48
[formerly 579584c346
] [formerly e3df98635a
] [formerly aaf2d3c8a4
[formerly e3df98635a
[formerly a35a103be0818ec80c7e2d98a74782b8278b4383]]]]
Former-commit-id: aaf2d3c8a4
Former-commit-id: c557c6570a
[formerly 45ccb7d7fe
] [formerly a6b37f03d074f8bb7e3b6be39e76118f7884e57e [formerly 8cb284d2c2
]]
Former-commit-id: 358a7f70cc06dacaf01c661c62b6e51041329f7c [formerly 773dad337d
]
Former-commit-id: 65e26b4418
2014-04-08 12:59:16 -05:00
Ben Steffensmeier
85c4c3e521
Issue #2920 Allow strings to use mulitple styles.
...
Former-commit-id: 72f68e9e2b
[formerly ddc97933b8
] [formerly 32016d5401
] [formerly 72f68e9e2b
[formerly ddc97933b8
] [formerly 32016d5401
] [formerly bb205cdef9
[formerly 32016d5401
[formerly ba3638effd48445bd00b8ef5e3771f05910c2af1]]]]
Former-commit-id: bb205cdef9
Former-commit-id: 045013ad87
[formerly 963901f6b1
] [formerly 1b839595fb2bd5d3a3b79985f5a8779a7a6342be [formerly 5b55eb6e39
]]
Former-commit-id: cd2a4bf854578bc0dfbb8d4d1b3ef54ce43089f6 [formerly 5b23b2f5b0
]
Former-commit-id: 0ab850c00f
2014-04-04 16:16:06 -05:00
Ben Steffensmeier
fd2fbe839d
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: 094086b5c2
[formerly c0b478eb97
] [formerly 9122b6da99
] [formerly 094086b5c2
[formerly c0b478eb97
] [formerly 9122b6da99
] [formerly 8650074737
[formerly 9122b6da99
[formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]]
Former-commit-id: 8650074737
Former-commit-id: bf5b777b0d
[formerly 5e4c35e93f
] [formerly b86eb15482eef7c6ed811b7be5a9d782dbcfa838 [formerly d3043fda5a
]]
Former-commit-id: 97f709f323c3b2bc50eb72f596874288c2f388b5 [formerly a1ac082c94
]
Former-commit-id: ad4ce67e85
2014-03-07 18:15:32 -06:00
Nate Jensen
222c9cce6d
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: d0fd1154d4
[formerly 54d015cb4f
] [formerly 59dcb3a97d
] [formerly d0fd1154d4
[formerly 54d015cb4f
] [formerly 59dcb3a97d
] [formerly 2eea0b9205
[formerly 59dcb3a97d
[formerly e108aa41bb586593f50970da53109a82d2bb8452]]]]
Former-commit-id: 2eea0b9205
Former-commit-id: 12e353a3d6
[formerly 2def452e2c
] [formerly dbdb17eebbf238d2f134aa977e9bff14bc685964 [formerly 17ee130b2a
]]
Former-commit-id: 5c28c8136285e34a68583c52929831d84fd9bf5c [formerly f8e7bfa835
]
Former-commit-id: d7b438bccf
2014-03-05 14:14:25 -06:00
Max Schenkelberg
d26bd1b3d6
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: 1dad35e391
[formerly 83ac37724e
] [formerly 10bfa59aef
] [formerly 1dad35e391
[formerly 83ac37724e
] [formerly 10bfa59aef
] [formerly b5ed7ac361
[formerly 10bfa59aef
[formerly 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede]]]]
Former-commit-id: b5ed7ac361
Former-commit-id: 035d96ce04
[formerly a8b436c867
] [formerly 71e348fc3ebb000927a4b5fcacb3a3ed1a3931df [formerly 0fbc2df17d
]]
Former-commit-id: 8592b8675d7935c017f6b4c0dadcc51fc7542fa0 [formerly 9b26076206
]
Former-commit-id: 7f9bea7552
2014-03-05 13:51:06 -06:00
Ben Steffensmeier
424d4da21f
Issue #2843 Harden recycle.
...
Former-commit-id: 291d5f55df
[formerly 22adc336df
] [formerly 26c1a8e494
] [formerly 291d5f55df
[formerly 22adc336df
] [formerly 26c1a8e494
] [formerly 3cd6b29e75
[formerly 26c1a8e494
[formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: be60a9564d
[formerly ed0ec90407
] [formerly 202049adf2dd36c8c9f4cee72fdf77a6f408f169 [formerly af1bdf1b53
]]
Former-commit-id: 8c49c3bbe4c3c8e4454bff4e5d906233823d63d5 [formerly 2c687a4064
]
Former-commit-id: 4b966138f6
2014-03-05 11:16:12 -06:00
Richard Peter
9bacf68628
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: 83b99aad5c
[formerly 090829f75e
] [formerly f87a913017
] [formerly 83b99aad5c
[formerly 090829f75e
] [formerly f87a913017
] [formerly 873fa00fac
[formerly f87a913017
[formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]]
Former-commit-id: 873fa00fac
Former-commit-id: 7e096adc4a
[formerly 3a96d0758a
] [formerly 31ea5b7bbf5848e0ada30ca517c3c6b17e7d4154 [formerly 2a5b0fb3ba
]]
Former-commit-id: 20555b967806297585643060463c34a49a7adbb0 [formerly dfa3f06e8e
]
Former-commit-id: 13bad4e99e
2014-03-04 12:43:17 -06:00
Nate Jensen
af047be03c
Merge "Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done." into development
...
Former-commit-id: b0e727938b
[formerly 75611f0631
] [formerly f50a2789dd
] [formerly b0e727938b
[formerly 75611f0631
] [formerly f50a2789dd
] [formerly 7ac7dd5f01
[formerly f50a2789dd
[formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]]]
Former-commit-id: 7ac7dd5f01
Former-commit-id: b3a4e1d562
[formerly 44e9b34927
] [formerly 9ffb218b0f72703775dd6d2766c567fee092b78a [formerly a2b3bc717e
]]
Former-commit-id: 87a0bdce28aac08b5040af41b1ac94bb28c275ad [formerly cb9d2a3298
]
Former-commit-id: 1d27417675
2014-03-04 10:55:05 -06:00
Max Schenkelberg
7c66cf792b
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
...
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: dbc6cc3fc6
[formerly 59434c8a60
] [formerly a01a6d68d0
] [formerly dbc6cc3fc6
[formerly 59434c8a60
] [formerly a01a6d68d0
] [formerly cbf8b9249c
[formerly a01a6d68d0
[formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d85fd52c26
[formerly 39e1c4fa46
] [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2
]]
Former-commit-id: 22a289abbef9ce66bd6d9f68b9610a2b65dc9258 [formerly f509321134
]
Former-commit-id: c6cf08db73
2014-03-04 09:23:36 -06:00
Max Schenkelberg
bee18f29d0
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
...
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 4bcdc9f85b
[formerly 6edfb8965f
] [formerly dbcbd1b560
] [formerly 4bcdc9f85b
[formerly 6edfb8965f
] [formerly dbcbd1b560
] [formerly 1854bbb477
[formerly dbcbd1b560
[formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]
Former-commit-id: 1854bbb477
Former-commit-id: c37910a689
[formerly bff80c3ee9
] [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08 [formerly 6658c94e6e
]]
Former-commit-id: ac56a95b831199d75f4f7799c88a6cd9f119118f [formerly 96bdc00728
]
Former-commit-id: 83103254e7
2014-03-03 17:59:48 -06:00
Nate Jensen
662883bd88
Issue #2792 enforce getDensity() will not return above max
...
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1
Former-commit-id: 0044c21ad5
[formerly 7f31e34dc9
] [formerly 384b531d26
] [formerly 0044c21ad5
[formerly 7f31e34dc9
] [formerly 384b531d26
] [formerly 22153d43bb
[formerly 384b531d26
[formerly a502a64219e869401b1bff82fbb73e67565a6dae]]]]
Former-commit-id: 22153d43bb
Former-commit-id: 47deb8f80c
[formerly e40fbf0ba0
] [formerly 8163999a8004a10d68d6b96b3ec92494a440eed2 [formerly 58c9dc0c69
]]
Former-commit-id: c5c84333b34bdec81881012dcde557968d4e96f1 [formerly 6f488f855f
]
Former-commit-id: 224fd09dab
2014-03-03 14:44:16 -06:00
Ben Steffensmeier
c8bb28c753
Issue #2791 Use Data Source for all grid data access.
...
Former-commit-id: 16b6723cbb
[formerly 02cef4ddaa
] [formerly 6fa441396f
] [formerly 16b6723cbb
[formerly 02cef4ddaa
] [formerly 6fa441396f
] [formerly 05770129c1
[formerly 6fa441396f
[formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]]
Former-commit-id: 05770129c1
Former-commit-id: 374ad2c1e8
[formerly 72b117cf42
] [formerly bc40fd62dff2b342470d96a6441fc6239af6c193 [formerly 4094ef6170
]]
Former-commit-id: bdf87913f359fbfcf11e0a003cf174b9addc76f9 [formerly c6f1b922b2
]
Former-commit-id: a19e960342
2014-02-28 17:06:33 -06:00
Lee Venable
ba565d1d35
Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
...
Former-commit-id: 4631a29ca3
[formerly 40f3df6aff
] [formerly f171e3adb0
] [formerly 4631a29ca3
[formerly 40f3df6aff
] [formerly f171e3adb0
] [formerly c77634951c
[formerly f171e3adb0
[formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]]]
Former-commit-id: c77634951c
Former-commit-id: 639f66e8b2
[formerly 67f7d52f74
] [formerly 2fb1bf66c74a373156ea360fd8e8e80b7e7e7b74 [formerly 734f69403a
]]
Former-commit-id: 7099b3f18e114b9e5e6354c85499d065bd3bc5df [formerly 7bbedd6edd
]
Former-commit-id: 1ffa59cf4f
2014-02-28 13:50:15 -06:00
Mike Duff
60c471f48e
Issue #2632 - Implement buddy pounce (Contact Notifiers)
...
Review comments
Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7
Former-commit-id: 512e634a97
[formerly 377c1f9998
] [formerly 5440ff64d1
] [formerly 512e634a97
[formerly 377c1f9998
] [formerly 5440ff64d1
] [formerly 5f433b4f6b
[formerly 5440ff64d1
[formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 6c5c943a5e
[formerly 63fc5f8c66
] [formerly 0494775290c2982f78ac45adef680a21db012453 [formerly ee06fc58b5
]]
Former-commit-id: 7a26eed4e3d8caf57b1f136686d6c69b9947d11a [formerly 02fa0d3c59
]
Former-commit-id: 6c60255b75
2014-02-28 13:23:34 -06:00
Richard Peter
ef2ff1d0f7
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a
[formerly 7bd6a07913
] [formerly 0e25ae35c1
] [formerly 79d3aa4e1a
[formerly 7bd6a07913
] [formerly 0e25ae35c1
] [formerly 1c150e6e8b
[formerly 0e25ae35c1
[formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0
[formerly 50a1b270c5
] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e
]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649
]
Former-commit-id: 5fab51d41b
2014-02-27 15:18:26 -06:00
Ben Steffensmeier
18980e6a8c
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
...
Former-commit-id: 152980350c
[formerly 780dc19fac
] [formerly 70ae372303
] [formerly 152980350c
[formerly 780dc19fac
] [formerly 70ae372303
] [formerly e08d4f77c3
[formerly 70ae372303
[formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]]
Former-commit-id: e08d4f77c3
Former-commit-id: d27c21b9f6
[formerly 7aca322faa
] [formerly c293b1124e59af7c01e948de86093eee22fbb5d9 [formerly a6bf896593
]]
Former-commit-id: 38003672caef259cf47e8867a401b32fc9add635 [formerly 7e29aa25a9
]
Former-commit-id: 07ffe9f711
2014-02-21 17:37:19 -06:00
Matt Nash
fbe80195e5
Issue #2761 add region level to localization
...
Amend : Change comment now that we do not get file from localization
Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2
Former-commit-id: 1d6e1d443c
[formerly 3f67324d7c
] [formerly 2d20e84f6a
] [formerly 1d6e1d443c
[formerly 3f67324d7c
] [formerly 2d20e84f6a
] [formerly 1835019567
[formerly 2d20e84f6a
[formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]]
Former-commit-id: 1835019567
Former-commit-id: 9cb0b6d530
[formerly ae1d36b6d0
] [formerly 82cdf604370def6ebacc4f1cbb2ebeaa41b75898 [formerly bb10484bd0
]]
Former-commit-id: 936c1375ad966bfb52b19b40f76a2bb6fa4628d3 [formerly 3b39e1d2bc
]
Former-commit-id: 1814b1448e
2014-02-19 10:01:25 -06:00
Nate Jensen
8e8e9141e7
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 742217ded0
[formerly 0160ab0464
] [formerly 0c4de50218
] [formerly 742217ded0
[formerly 0160ab0464
] [formerly 0c4de50218
] [formerly 4d68994525
[formerly 0c4de50218
[formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]]
Former-commit-id: 4d68994525
Former-commit-id: 60fd298721
[formerly 121bcd184a
] [formerly 4ab3a27b137394410a2b8da012bfe21a237dd4b6 [formerly 228ab8dd60
]]
Former-commit-id: 38e7719aa70d69e4f2268ba3d82ba8df10a7cace [formerly 944df080f4
]
Former-commit-id: 0dd9cd1094
2014-02-17 17:10:07 -06:00
Nate Jensen
9c67149bf9
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 34c7c3cba1
[formerly c8e70cd6b1
] [formerly 15ff4ab5d7
] [formerly 34c7c3cba1
[formerly c8e70cd6b1
] [formerly 15ff4ab5d7
] [formerly 2486e39192
[formerly 15ff4ab5d7
[formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]]
Former-commit-id: 2486e39192
Former-commit-id: 62739b7936
[formerly b801b36ca7
] [formerly 961e5c0a4aa129e13bdd51a1f6be5cc7caf172c0 [formerly 0314d61773
]]
Former-commit-id: 991546c580399668225c99bbb7a4506b93bf17d6 [formerly e6dae7a23c
]
Former-commit-id: 695d03b815
2014-02-17 11:58:04 -06:00
Nate Jensen
aba5c50bfe
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: 24bbf4949d
[formerly c28085118f
] [formerly 75ca70fba6
] [formerly 24bbf4949d
[formerly c28085118f
] [formerly 75ca70fba6
] [formerly fd43d9e095
[formerly 75ca70fba6
[formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]]
Former-commit-id: fd43d9e095
Former-commit-id: 1dcb3a77c3
[formerly c0256ac19e
] [formerly d828ad996a7bd8eb159d4cd60c7b851fc8ac8486 [formerly 2111989497
]]
Former-commit-id: 65cd03344892f0b8870a3dcdc9e97aa695e0a8e5 [formerly 9e09da8bb6
]
Former-commit-id: 93a740106d
2014-02-10 16:48:29 -06:00
Ben Steffensmeier
f2b9191863
Issue #2211 Fix data mapped sampling.
...
Former-commit-id: e7baa5b186
[formerly d219a687c9
] [formerly 724bb85676
] [formerly e7baa5b186
[formerly d219a687c9
] [formerly 724bb85676
] [formerly 3d76d6655b
[formerly 724bb85676
[formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]]]
Former-commit-id: 3d76d6655b
Former-commit-id: 7f8ff5efc0
[formerly a37a910f67
] [formerly 6fc70ed6daf823669783c4000e189cbb10a17f8d [formerly 6a95dd6242
]]
Former-commit-id: 9362efc90ebebf4fffc157294abf0ea1f20992bc [formerly a8c075d7e3
]
Former-commit-id: eb65002cf6
2014-02-07 13:00:00 -06:00
Ben Steffensmeier
0f46b1035c
Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
...
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834
Former-commit-id: fc0d044bd9
[formerly 921401ffe9
] [formerly 8865177c6b
] [formerly fc0d044bd9
[formerly 921401ffe9
] [formerly 8865177c6b
] [formerly 97a64f89f1
[formerly 8865177c6b
[formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]]]
Former-commit-id: 97a64f89f1
Former-commit-id: a63cd52b14
[formerly 1f34342948
] [formerly e17a311de5c08292ece4f9c8f0ed3adc52531127 [formerly 2be72739b5
]]
Former-commit-id: 5f02ff107456e1919928842ef0b933df4109d5d0 [formerly d05d31fa34
]
Former-commit-id: f81c6dd1b9
2014-02-03 14:07:07 -06:00
Everett Kladstrup
ae802a042f
Issue #2725 deriv param to common stage 1
...
* Removing viz dependencys from derivparam
** Move LevelUtilities to common
** Use spring instead of eclipse plugin extentions
to configure derived parameter function types
** Use RequestRouter instead of ThriftClient so
we can use IServerRequest objects in both CAVE
and EDEX
The next stage will be to clean up exceptions in
derived parameters to stop using VizException and
VizCommunicationException.
Former-commit-id: aac0fd726e
[formerly 90df04614d
] [formerly bd50a38d87
] [formerly aac0fd726e
[formerly 90df04614d
] [formerly bd50a38d87
] [formerly 80ad25754b
[formerly bd50a38d87
[formerly 604ae156f8b235e2e1736863b419547289403240]]]]
Former-commit-id: 80ad25754b
Former-commit-id: 2c8d0df351
[formerly 40b796f59b
] [formerly 9e9dc4b990dced62032e88e880c8fd835938b081 [formerly 415ccd78fb
]]
Former-commit-id: 3e1f282c293b3f64570ac5a8f1deac12c2014e33 [formerly 57f9230654
]
Former-commit-id: 3c30f65980
2014-02-03 09:02:58 -06:00
Steve Harris
fb3a30b3b3
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java
Former-commit-id: f562540e7c
[formerly 14ba3b29f4
] [formerly 1738185503
] [formerly f562540e7c
[formerly 14ba3b29f4
] [formerly 1738185503
] [formerly 1aea63a1f6
[formerly 1738185503
[formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: cdb99cc3e0
[formerly d9cd003a5a
] [formerly 5d9047e5063900e85cef179c5be76057b8ca6cd1 [formerly 1fd5b2255f
]]
Former-commit-id: 50ad78f33f6b09f52d5450f88139cd7ee524d3fd [formerly ec69a2c4f7
]
Former-commit-id: e3d1abe909
2014-01-29 09:41:57 -06:00
Ben Steffensmeier
73582268f7
Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs.
...
Former-commit-id: 33bf8e9c44
[formerly 9c65c5b07b
] [formerly 6aa6683258
] [formerly 33bf8e9c44
[formerly 9c65c5b07b
] [formerly 6aa6683258
] [formerly a92f6e9bb6
[formerly 6aa6683258
[formerly e214a045c4d45532ed80fb4cdd51355c7884a2ee]]]]
Former-commit-id: a92f6e9bb6
Former-commit-id: 3f053ee508
[formerly 9b788b49b0
] [formerly beeaf72ec6549c4e1072090e287697ca2d2233bf [formerly b90004e46a
]]
Former-commit-id: 302e89b036ed4b5f75a49983016fe4fad5d7ce09 [formerly 8cdb888e20
]
Former-commit-id: 27cbedca7a
2014-01-23 12:41:16 -06:00
Ben Steffensmeier
b2796fad17
Issue #2602 Don't try to load classes from uninstalled bundles.
...
Former-commit-id: f1de2aaded
[formerly c7357863b9
] [formerly 0c4fc0dd01
] [formerly f1de2aaded
[formerly c7357863b9
] [formerly 0c4fc0dd01
] [formerly 3187754736
[formerly 0c4fc0dd01
[formerly 30ca0135046851884e4a07b36559fce086ccd3f2]]]]
Former-commit-id: 3187754736
Former-commit-id: 159642b200
[formerly 32bac228db
] [formerly 983c7624df570de47db5a313760f0b69fec21954 [formerly d1dbd0c9b6
]]
Former-commit-id: fefd0b88a3ec29be5c62491680dd70324b14dee9 [formerly 5c14bbf179
]
Former-commit-id: 6b7e12df21
2014-01-22 15:46:51 -06:00
Steve Harris
0a5772e795
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 56f5ae9f48
[formerly a465718a0d
] [formerly 24ab7cff49
] [formerly 56f5ae9f48
[formerly a465718a0d
] [formerly 24ab7cff49
] [formerly 69dc3d835b
[formerly 24ab7cff49
[formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 6cb92b1f57
[formerly b62efa9387
] [formerly 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a
]]
Former-commit-id: 800d6b432a0b97ae5f3b770d37e08ca17eb7e05a [formerly 2a967fc9b5
]
Former-commit-id: 69626ab704
2014-01-21 12:36:54 -06:00
Nate Jensen
00a84ac3ec
Merge "Issue #2651 Synchronize ResourceList.removeRsc." into development
...
Former-commit-id: aff68ba134
[formerly d6862c2b02
] [formerly e2dfdb01b7
] [formerly aff68ba134
[formerly d6862c2b02
] [formerly e2dfdb01b7
] [formerly 0bf6222d1e
[formerly e2dfdb01b7
[formerly af27de2a1e1d613da2b75519f4679762e32ff7d3]]]]
Former-commit-id: 0bf6222d1e
Former-commit-id: 34d3fc8290
[formerly dcd1906332
] [formerly e526a8b4b05cbced58e5a091e619c30885fbca42 [formerly 83c27d7025
]]
Former-commit-id: e50378c53850df452b2cd42a30b4de678d6328b2 [formerly b168eff914
]
Former-commit-id: 47477bc2c1
2014-01-20 09:23:24 -06:00
Ben Steffensmeier
df352ee9db
Issue #2651 Synchronize ResourceList.removeRsc.
...
Former-commit-id: 63ad599a0e
[formerly 15c08d7209
] [formerly a580fc74b7
] [formerly 63ad599a0e
[formerly 15c08d7209
] [formerly a580fc74b7
] [formerly d8263b358d
[formerly a580fc74b7
[formerly f0ecb93ab2934edaab06409b04b21d40ed6e5ff8]]]]
Former-commit-id: d8263b358d
Former-commit-id: 18d5f8e758
[formerly a4ce57502c
] [formerly b2ba0007c44eefdeb638bd1e2c75c45504ab281b [formerly 18437701d9
]]
Former-commit-id: 305f9f4f59018573893eb9f833e97c8a6a22e0d9 [formerly 72ee36b365
]
Former-commit-id: ce8619b845
2014-01-17 11:58:00 -06:00
Ben Steffensmeier
95041ecb72
Issue #2313 Image canvas rendering.
...
Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417
Former-commit-id: 7656304906
[formerly 76414243ba
] [formerly 625aac3ed3
] [formerly 7656304906
[formerly 76414243ba
] [formerly 625aac3ed3
] [formerly 16c350f0c6
[formerly 625aac3ed3
[formerly 0f8d0c52093a14d16a36ce353c2587633474007d]]]]
Former-commit-id: 16c350f0c6
Former-commit-id: 331b49ee85
[formerly 19930b7c8b
] [formerly f4c38ab8bac2347fb297605b675187a44fc3e2c2 [formerly 1973e5e015
]]
Former-commit-id: 6de57b9ef06ff9d78e5ce7e3a79a36e310918112 [formerly af39398ac3
]
Former-commit-id: 38024fb662
2014-01-16 17:05:16 -06:00
Nate Jensen
96501f3ee6
Issue #2359 printout connection exceptions to aid in diagnosing
...
connectivity problems
Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c
Former-commit-id: aa0639a878
[formerly ccaa9dbde1
] [formerly fc6b31c1c0
] [formerly aa0639a878
[formerly ccaa9dbde1
] [formerly fc6b31c1c0
] [formerly 5f39322d59
[formerly fc6b31c1c0
[formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]]]
Former-commit-id: 5f39322d59
Former-commit-id: 472cf2905c
[formerly 4533642f26
] [formerly 6ed8c7d69c73010ecba0450f2c9d1203bc9f3ab4 [formerly deb57e3b35
]]
Former-commit-id: 2fda878e376a0359217f3278b54cbfd5b9f6ba63 [formerly fd32fb6c6e
]
Former-commit-id: 2ff7910650
2014-01-15 13:39:28 -06:00
Max Schenkelberg
e0b7ba7058
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
...
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: 30059d255c
[formerly b3aed99142
] [formerly 16046a4dde
] [formerly 30059d255c
[formerly b3aed99142
] [formerly 16046a4dde
] [formerly cc2080449c
[formerly 16046a4dde
[formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]]
Former-commit-id: cc2080449c
Former-commit-id: 257553461b
[formerly 0ceaa43902
] [formerly d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460
]]
Former-commit-id: e6116ab5b34627162fc751f613c0b7f4743d9668 [formerly 789a279475
]
Former-commit-id: 783391423f
2014-01-06 17:03:45 -06:00
Steve Harris
547577784f
Merge branch 'omaha_14.2.1' into development
...
Former-commit-id: 36b228cc7f
[formerly 8aac57e096
] [formerly 0950a8a1ba
] [formerly 36b228cc7f
[formerly 8aac57e096
] [formerly 0950a8a1ba
] [formerly 64f8564cd8
[formerly 0950a8a1ba
[formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]]
Former-commit-id: 64f8564cd8
Former-commit-id: 0a47657ba3
[formerly 21aaafbd52
] [formerly d06360f4d96492a1e44ce6135ec70d7fc3b2bcbf [formerly 5d6bae317d
]]
Former-commit-id: 94eb7477ee0e10f6b0a819a42d1f575a968062b8 [formerly bb449e689e
]
Former-commit-id: afb79e8384
2013-12-18 13:14:27 -06:00
Ben Steffensmeier
dc1d7cc834
Issue #2602 Switch around the order of some things on startup to make thinclient better.
...
Former-commit-id: c92b5842ab
[formerly bf508b4455
] [formerly a37db9d1b4
] [formerly c92b5842ab
[formerly bf508b4455
] [formerly a37db9d1b4
] [formerly 922674273e
[formerly a37db9d1b4
[formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]]
Former-commit-id: 922674273e
Former-commit-id: f62b7011b7
[formerly 0fb85fe4aa
] [formerly 7b5206504ecad1e36005120b31bf8d5def0e3bf5 [formerly 4a86c90bfc
]]
Former-commit-id: ef2c2b7d0102cc8ede2fad2eb721352ddceb079c [formerly b3ef07794a
]
Former-commit-id: df1bc54013
2013-12-11 12:45:11 -06:00
Max Schenkelberg
d6ee7afe4a
Issue #2620 Fixed viz base feature dependency issues.
...
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec
Former-commit-id: 0084b5b4f1
[formerly be45102814
] [formerly 9d846aa104
] [formerly 0084b5b4f1
[formerly be45102814
] [formerly 9d846aa104
] [formerly 987d4b3a30
[formerly 9d846aa104
[formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]]
Former-commit-id: 987d4b3a30
Former-commit-id: 774859fcb9
[formerly e86e477165
] [formerly f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e
]]
Former-commit-id: db317e89829b4a77b51a6217c6048e6ba7e2f098 [formerly 5c2da4c3e3
]
Former-commit-id: ede6c2fa1e
2013-12-09 15:14:01 -06:00
Nate Jensen
84c16f84ac
Issue #2599 fix constructor
...
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e
Former-commit-id: 899bc199bb
[formerly ec6b5393ef
] [formerly 9bff38e0d3
] [formerly 899bc199bb
[formerly ec6b5393ef
] [formerly 9bff38e0d3
] [formerly 41014a105d
[formerly 9bff38e0d3
[formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]]
Former-commit-id: 41014a105d
Former-commit-id: 71bc390b4f
[formerly e8f28c6799
] [formerly 8c75e2081d678b06e6390ca47fa30f36b8fcd47a [formerly f3e455d1a3
]]
Former-commit-id: 777c0919b634d84c4f042eb949a6e3019c76a259 [formerly eb68a1be85
]
Former-commit-id: 907a6e3304
2013-12-06 12:35:22 -06:00
Richard Peter
2e90e498f3
Merge branch 'development_on_RHEL5' (GOES-R) into development
...
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
nativeLib/edexBridge/edexBridge.cpp
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 7969ef9648
[formerly 760f215e8c
] [formerly f5f75ec629
] [formerly 7969ef9648
[formerly 760f215e8c
] [formerly f5f75ec629
] [formerly e82e1137f9
[formerly f5f75ec629
[formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]]
Former-commit-id: e82e1137f9
Former-commit-id: 2cafd3a81b
[formerly ee03dcf505
] [formerly cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa
]]
Former-commit-id: d636e539a84c2fe845b3dcfc419fff85a3a47055 [formerly b0e694483f
]
Former-commit-id: 30862929e2
2013-12-03 16:25:31 -06:00
Ben Steffensmeier
bdf45ea291
Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
...
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0
Former-commit-id: dcfdc9a24b
[formerly 8a7d3ceab1
] [formerly 927801985a
] [formerly dcfdc9a24b
[formerly 8a7d3ceab1
] [formerly 927801985a
] [formerly 3696896b49
[formerly 927801985a
[formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]]
Former-commit-id: 3696896b49
Former-commit-id: 56456894f1
[formerly ca5e771451
] [formerly a7cbce5b5d72746638add296db468539851abb4e [formerly 70ca78c7b5
]]
Former-commit-id: 8c9b502d3f1a66a2504cb05bd0baf7af764cfd79 [formerly a3f5fcabf6
]
Former-commit-id: d307af23eb
2013-11-25 11:31:57 -06:00
Ben Steffensmeier
c49ae5d321
Issue #2544 Fix recycling issues with Satellite resources.
...
Former-commit-id: 0a3d78555e
[formerly 15ae95075d
] [formerly e392185d78
] [formerly 0a3d78555e
[formerly 15ae95075d
] [formerly e392185d78
] [formerly 9ff1751f4e
[formerly e392185d78
[formerly 166957a22c3447fa2407b13362eece24943675c9]]]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 00088654a0
[formerly 0788a82a99
] [formerly 775873b42354a16c60bda95506731f0ccdc6e548 [formerly 1875f56695
]]
Former-commit-id: d79a110b1a53c8b830a2684f1f2f27e3e8b4309f [formerly 55f26e277f
]
Former-commit-id: 7de35d0111
2013-11-18 11:44:56 -06:00
Nate Jensen
493fa54860
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9517c96d68
[formerly a4eb19fc79
] [formerly 9acda0b9f2
] [formerly 9517c96d68
[formerly a4eb19fc79
] [formerly 9acda0b9f2
] [formerly c5cf68cc45
[formerly 9acda0b9f2
[formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]]
Former-commit-id: c5cf68cc45
Former-commit-id: ddcca3463d
[formerly e41f57da67
] [formerly a2b53d6aca5047e5514931e92e017ed5771c890d [formerly a6be904c69
]]
Former-commit-id: 6f2e3001c41627a8a93fc22d02074369aa136e2d [formerly e83a828209
]
Former-commit-id: 6441290b40
2013-11-14 13:29:30 -06:00
Nate Jensen
40ea9ef7bc
Issue #2361 remove using SerializationUtil for processing XML colormaps
...
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: 1174d22160
[formerly 2c0c20f01e
] [formerly b52bdb1cec
] [formerly 1174d22160
[formerly 2c0c20f01e
] [formerly b52bdb1cec
] [formerly 7a73c65430
[formerly b52bdb1cec
[formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]]
Former-commit-id: 7a73c65430
Former-commit-id: f91ac1953e
[formerly 9bf83be7e9
] [formerly 760e4eea3b71bfcf5ae883d95ff74e375ec4bfc6 [formerly 5427e68fd2
]]
Former-commit-id: 79abcb5632535338409c08045b873998da0ecaef [formerly 80c38e1433
]
Former-commit-id: 273eb805c0
2013-11-12 10:37:54 -06:00
Max Schenkelberg
2dbe54cb4a
Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing.
...
Change-Id: Ic82f45447113425a08909be4c5229502882db022
Former-commit-id: 752c9574b4
[formerly 2f794486e3
] [formerly e58a5df04b
] [formerly 752c9574b4
[formerly 2f794486e3
] [formerly e58a5df04b
] [formerly bd903f6641
[formerly e58a5df04b
[formerly 58ccc575973ea9a1778659e17daff8577747dec5]]]]
Former-commit-id: bd903f6641
Former-commit-id: ad9578db6f
[formerly 3f3b244b0d
] [formerly f684ed2d6192fd370d5f9876f88c4494c40afb31 [formerly c85532a180
]]
Former-commit-id: 13938eba0ef04bbdaad219d1622f03eac1794f4a [formerly 60616f7ef0
]
Former-commit-id: 7383be61c1
2013-11-11 11:09:00 -06:00
Nate Jensen
95bea4e45d
Issue #2361 fix saving hydro table objects
...
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de
Former-commit-id: f5b461908d
[formerly 040f022e5d
] [formerly 7a27264094
] [formerly f5b461908d
[formerly 040f022e5d
] [formerly 7a27264094
] [formerly 08441efbb7
[formerly 7a27264094
[formerly 0f406375b030a87d3fa12e46255897bfa469119d]]]]
Former-commit-id: 08441efbb7
Former-commit-id: 398524b7e2
[formerly 399265e3f8
] [formerly 0f1cb8fd2bdb23523f68173edb6fddf6e99b2e4e [formerly 4958732cb2
]]
Former-commit-id: 91e834a40e3bb78aab91dc38345b88f581bfa48e [formerly 7a70c5ecce
]
Former-commit-id: 82306d6f55
2013-11-08 12:37:26 -06:00
Max Schenkelberg
fe791cc7f7
Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
...
Amend: Fixed precision issue with float comparison, made factory better synchronized.
Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2
Former-commit-id: 3af5098e1b
[formerly d7c8b8f662
] [formerly 3369fbec2d
] [formerly 3af5098e1b
[formerly d7c8b8f662
] [formerly 3369fbec2d
] [formerly c28fd2b38d
[formerly 3369fbec2d
[formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]]
Former-commit-id: c28fd2b38d
Former-commit-id: f88d913d31
[formerly e4b7f3618c
] [formerly aa835a1580556a0e2e44448d20c96e5e1b78baed [formerly d53db3ddb6
]]
Former-commit-id: 2e6b0a3f93931cd0f795d381bd6ddbc9268e4f25 [formerly 751b8f2315
]
Former-commit-id: 53363b9bf7
2013-11-06 15:07:18 -06:00
Nate Jensen
b7c11ac174
Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
...
Former-commit-id: 7648e116ad
[formerly b17891ba0e
] [formerly ccf3d5b1e9
] [formerly 7648e116ad
[formerly b17891ba0e
] [formerly ccf3d5b1e9
] [formerly de50a9214b
[formerly ccf3d5b1e9
[formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]]
Former-commit-id: de50a9214b
Former-commit-id: 2aa3471a8a
[formerly c9d9070600
] [formerly c89ecfda3d23b19bae8caa3e9277339aa3c12a03 [formerly d6fcc98e76
]]
Former-commit-id: ae9c745301a10896244f2d9c9846983381ddd2ac [formerly c24d8c63cd
]
Former-commit-id: 3c1f343be5
2013-10-31 12:24:23 -05:00
Ben Steffensmeier
e193ba7f0f
Issue #2491 Bug fixes and clean up all remaining resource datas.
...
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6
Former-commit-id: a4cbc8020a
[formerly e15fecc459
] [formerly 5b395f7417
] [formerly a4cbc8020a
[formerly e15fecc459
] [formerly 5b395f7417
] [formerly 27a392f90e
[formerly 5b395f7417
[formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]]
Former-commit-id: 27a392f90e
Former-commit-id: 8ec09e8f61
[formerly 78efdb7572
] [formerly 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567
]]
Former-commit-id: a33b0178c5a7309ae9c12ac4f7b2267997da8f07 [formerly 9d87eb50e2
]
Former-commit-id: 02b9133d50
2013-10-29 17:35:55 -05:00