Commit graph

939 commits

Author SHA1 Message Date
Lee Venable
c67e955324 Merge "Issue #1275 Merged code from 1225 on top of SS changes." into development
Former-commit-id: 5c4f39965f [formerly fa7a0ef83d] [formerly dde9d4b802] [formerly 5c4f39965f [formerly fa7a0ef83d] [formerly dde9d4b802] [formerly ea61e22d2e [formerly dde9d4b802 [formerly ca3b359ba6a8b3131f32b9341781d19378240402]]]]
Former-commit-id: ea61e22d2e
Former-commit-id: a2bc7293b8 [formerly c3d4eca33c] [formerly 6f7ee1f7f4eb29bca5ab7d62724d2565e87dbeee [formerly fd9338320f]]
Former-commit-id: 104f767045861190be12db3b9d2dec1a9e98b98f [formerly db8be823fc]
Former-commit-id: 9aa92e0d99
2012-10-18 11:16:37 -05:00
Roger Ferrel
0cc966a2a7 Issue #1229 Changes for non-blocking SetTimeDialog.
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3

Former-commit-id: 55954ce256 [formerly abd0476b6a] [formerly 40fb3f9729] [formerly 55954ce256 [formerly abd0476b6a] [formerly 40fb3f9729] [formerly 4cd2f1c851 [formerly 40fb3f9729 [formerly 5e4edda802714c236334500a12c2020386770dd2]]]]
Former-commit-id: 4cd2f1c851
Former-commit-id: 59b171d6dc [formerly d51dc93248] [formerly a77c3dafa757a1372691237bce3bc51d14c2aa81 [formerly 7a095d2d99]]
Former-commit-id: 0821b117fba04f2928948dea37ab16e131737030 [formerly 05c83289b6]
Former-commit-id: 6aa28a9ede
2012-10-18 07:36:31 -05:00
Bryan Kowal
fd0d60a61c Updates due to the dependencies of com.raytheon.viz.pointdata
Former-commit-id: 68a9aa26d7 [formerly fb1551d0ff] [formerly 0d15294ef7] [formerly 68a9aa26d7 [formerly fb1551d0ff] [formerly 0d15294ef7] [formerly c40473c4b8 [formerly 0d15294ef7 [formerly d53baa69e9db62dd3ee4fead01589d087bdda97b]]]]
Former-commit-id: c40473c4b8
Former-commit-id: bd615f81a7 [formerly 8fcc0462a9] [formerly 9cefbfcdb86b630e992a7a3601e114a581bbc1ad [formerly ffd200b558]]
Former-commit-id: 0e536ed287e5bc107a6a8dd500f69159c12993cf [formerly 8634b7c28b]
Former-commit-id: d271830cbe
2012-10-17 17:42:39 -05:00
Roger Ferrel
1292f09634 Issue #1229 Changes for non-blocking LabelOffsetDialog.
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e

Former-commit-id: b8b908e88a [formerly 3af99829a6] [formerly 66379c3210] [formerly b8b908e88a [formerly 3af99829a6] [formerly 66379c3210] [formerly d319101ed9 [formerly 66379c3210 [formerly f1131f2d9d1d5e0194a65e787e2628e733563683]]]]
Former-commit-id: d319101ed9
Former-commit-id: 2244937369 [formerly 4d39ffd53d] [formerly a9fe91c0e3e73e4f0133a7162ed7354d9298871b [formerly 928e9f6a1d]]
Former-commit-id: 723713284d5324c9c73bd35c86c268f1dd674b8c [formerly fae6e2ec44]
Former-commit-id: e676beaa66
2012-10-17 15:12:55 -05:00
Roger Ferrel
4ee7afd8de Issue #1229 Changes for non-blocking ImagingDialog.
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468

Former-commit-id: 4c906e7d5f [formerly 3d15bf8be1] [formerly c73acb0c30] [formerly 4c906e7d5f [formerly 3d15bf8be1] [formerly c73acb0c30] [formerly 460acb4337 [formerly c73acb0c30 [formerly 185024d06da214041273674716a7efce4b2a98f1]]]]
Former-commit-id: 460acb4337
Former-commit-id: f470c8fb1d [formerly a9cb110036] [formerly 213c6a4d6d36c7d33d3c45f9001f6de42f956f28 [formerly b42cae4034]]
Former-commit-id: e2ce9bd59325cdadb7ffb5a6179be2083b7838fe [formerly b164d67e54]
Former-commit-id: e838ddc344
2012-10-17 13:53:29 -05:00
Jonathan Sanchez
a3d50002ce Issue #1275 Merged code from 1225 on top of SS changes.
Former-commit-id: 833378b654 [formerly 5c181fede4] [formerly 36efd259d5] [formerly 833378b654 [formerly 5c181fede4] [formerly 36efd259d5] [formerly 9017f4b046 [formerly 36efd259d5 [formerly ace2ccf5653fcd791bc049ca17986b233a6a54cc]]]]
Former-commit-id: 9017f4b046
Former-commit-id: 9972c305ee [formerly fd0b09aa77] [formerly 2f58c83e9cd948bf1985034ca7ec4f68c00e2b44 [formerly ecfc924a4b]]
Former-commit-id: 78f13f642c4bc80e76383834972e2773c5a0d298 [formerly 021114b9b5]
Former-commit-id: 523ecd30dd
2012-10-17 13:30:44 -05:00
Roger Ferrel
2ade635a18 Issues #1229 Changes for non-blocking ColormapDialog.
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: bacff2f0f1 [formerly cdf5c546ab] [formerly 8e86f32714] [formerly bacff2f0f1 [formerly cdf5c546ab] [formerly 8e86f32714] [formerly 6833c7e04c [formerly 8e86f32714 [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]]]
Former-commit-id: 6833c7e04c
Former-commit-id: 85fbb59441 [formerly 1075e8ba16] [formerly 68aa8f3b270c031298664186936eadb3c07db89b [formerly d5acf40cc2]]
Former-commit-id: 32cb5256c1d353286a8d4ed42615eb89d5e6975b [formerly a53f94e93d]
Former-commit-id: 382f5b234c
2012-10-17 10:20:18 -05:00
Roger Ferrel
1e098d3bcc Fix for TextEditorDialog in merge of 12.11.1-4 baseline
Change-Id: I5e5e39af2bd7f2bfc9dd10ab0ddf87ff80cb7b76

Former-commit-id: 733b6208c8 [formerly 6053b5fbc1] [formerly f4a2d13df1] [formerly 733b6208c8 [formerly 6053b5fbc1] [formerly f4a2d13df1] [formerly 8934186397 [formerly f4a2d13df1 [formerly 1cf3c76428719ebc7f06612b8525057e9345a56e]]]]
Former-commit-id: 8934186397
Former-commit-id: 824a1f8699 [formerly ab10bc88a8] [formerly c85c277e05f18e3ca20dcdf0d4f12aaf714a2869 [formerly 6199f7f516]]
Former-commit-id: 0fc2118710784fc18f6af98a8b81be28d04b0bae [formerly f891be22d1]
Former-commit-id: d92ccc692c
2012-10-17 08:51:52 -05:00
Jonathan Sanchez
6702da0108 Fixing DataAdaptorFactory blunder in merge of 12.11.1-4
Change-Id: Id8cc463b78e66632fd05675abdd144dccef5bb9f

Former-commit-id: 66c3185920 [formerly af51b81d11] [formerly 1e53f0122a] [formerly 66c3185920 [formerly af51b81d11] [formerly 1e53f0122a] [formerly f578372896 [formerly 1e53f0122a [formerly 89a30cf738bb64b26da16048f61af0585ded97e7]]]]
Former-commit-id: f578372896
Former-commit-id: 64d864f2df [formerly 6c5447b952] [formerly da21be0511d2ce69e4f7a5ad4cdd62679b6f415e [formerly 9524cca5b1]]
Former-commit-id: 38d0ef89e2ad213f4697a8fcb16aefd7575dfb26 [formerly f9d20b4775]
Former-commit-id: 9dc3068ab8
2012-10-17 08:50:00 -05:00
Lee Venable
e4f8ef1a83 Merge "Issue #1229 Changes for non-blocking SaveColorMapDialog." into development
Former-commit-id: fb9b07ce94 [formerly 6e7446c66c] [formerly 526085140a] [formerly fb9b07ce94 [formerly 6e7446c66c] [formerly 526085140a] [formerly a256a54ab7 [formerly 526085140a [formerly 191537fbfc3e1933121cf133f7b906a9f59cab3d]]]]
Former-commit-id: a256a54ab7
Former-commit-id: a4c0402b9d [formerly e8195b2e52] [formerly 7cb2760c34c3c9577542005b541d7f6fdaedd277 [formerly 78eb24ee17]]
Former-commit-id: 1a6c159821b252d8476fc8114ba11bcf09f036e8 [formerly 7be0bb0af6]
Former-commit-id: 1455dcb7bd
2012-10-17 08:26:53 -05:00
Steve Harris
856a26b5a9 Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 21136b0560 [formerly 18ec4b5933] [formerly 34e7b3f4a3] [formerly 21136b0560 [formerly 18ec4b5933] [formerly 34e7b3f4a3] [formerly 8703ff00c7 [formerly 34e7b3f4a3 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]]]
Former-commit-id: 8703ff00c7
Former-commit-id: 6a81945d07 [formerly 31253e2949] [formerly a128d53471bbb82cdb98a297cb2308d5a1ee6417 [formerly dc5eba737d]]
Former-commit-id: 3fd432466308c3a7db4ae61099388f48370c782f [formerly ea34163a1c]
Former-commit-id: 52409eaef5
2012-10-17 08:21:19 -05:00
Roger Ferrel
19479da1f3 Issue #1229 Changes for non-blocking SaveColorMapDialog.
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc

Former-commit-id: 1c4e87e968 [formerly 086223e764] [formerly 5e79024db3] [formerly 1c4e87e968 [formerly 086223e764] [formerly 5e79024db3] [formerly 7f3ab5434c [formerly 5e79024db3 [formerly b902eadfca48628bf8944d97019263e94618667a]]]]
Former-commit-id: 7f3ab5434c
Former-commit-id: 98f56ba457 [formerly e4016f2f59] [formerly a4ad194b03c39475a030ce5186fa0c8dd107d6d7 [formerly f77e146c65]]
Former-commit-id: ea7aeee0b736d993f44c252f5e6597cc42d22137 [formerly d9cfa1f2f6]
Former-commit-id: b0f167507b
2012-10-17 08:15:21 -05:00
Steve Harris
01c4fbcf8d Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 37ab3d9e65 [formerly 4ffbffe349] [formerly a63b40b17a] [formerly 37ab3d9e65 [formerly 4ffbffe349] [formerly a63b40b17a] [formerly 5e5c98b193 [formerly a63b40b17a [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]]]
Former-commit-id: 5e5c98b193
Former-commit-id: 002e4e0e8b [formerly a3a79a1a82] [formerly 15bce86b4c6e1715fae59229b3f9e7dcc1cf5721 [formerly be16909d2d]]
Former-commit-id: 233345bbb54cd1bf39eab6ecf0e32e0f86b0b4e8 [formerly b28a8e5113]
Former-commit-id: b7a76beea6
2012-10-16 21:44:49 -05:00
Roger Ferrel
d78b07ceac Issue #1229 Changes for non-blocking BackgroundColorDialog.
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9

Former-commit-id: 947b8762e8 [formerly ac30143335] [formerly 59a2dd6a3a] [formerly 947b8762e8 [formerly ac30143335] [formerly 59a2dd6a3a] [formerly d60b4ca396 [formerly 59a2dd6a3a [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]]]
Former-commit-id: d60b4ca396
Former-commit-id: 47fa3c0255 [formerly f253f2191b] [formerly 20ecbdaaa964dc53cac032342d78e7104ac0ed46 [formerly 757affcc66]]
Former-commit-id: c0f91ed42373fdd7d8ea930a4b601fa4d632929b [formerly a6e13f80d4]
Former-commit-id: a3fad37043
2012-10-16 17:00:11 -05:00
Steve Harris
ec74d87147 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]]
Former-commit-id: 751563e331
Former-commit-id: d88afce365 [formerly d0e91329b4] [formerly 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]]
Former-commit-id: 188da5301da8f47f50c81e58f02ec2fbae69747e [formerly ad78266035]
Former-commit-id: 1e4c737ff2
2012-10-16 15:48:14 -05:00
Roger Ferrel
7af1aea3c0 Issue #1229 Changes for non-blocking ProcedureListDlg.
Change-Id: I5c955c9d07e104809e2a72de0f5ec998f13d797f

Former-commit-id: 2a3905d036 [formerly 1dc188fb3b] [formerly 1a1f1a0601] [formerly 2a3905d036 [formerly 1dc188fb3b] [formerly 1a1f1a0601] [formerly d51ba247d1 [formerly 1a1f1a0601 [formerly ea4c2898013df2107ebded11aa1561035eaf8a00]]]]
Former-commit-id: d51ba247d1
Former-commit-id: d488733f34 [formerly 3682a16ad2] [formerly a72f8583c7b5401510e3347f30a766d38722275a [formerly 85f8c1f282]]
Former-commit-id: 4f6dcc0defbf0547c30e888aa260df4b6f37508f [formerly 840f6cd220]
Former-commit-id: bb3bd24c8f
2012-10-16 15:39:12 -05:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00
Roger Ferrel
a4db64df40 Issue #1229 Changes for non-blocking ProcedureDlg.
Change-Id: Iefdf2f8e8ceeb7af5173dd4c630b6abc2c1ce41a

Former-commit-id: b52f55d99c [formerly 185acb8d87] [formerly 683c49fc49] [formerly b52f55d99c [formerly 185acb8d87] [formerly 683c49fc49] [formerly d9fee38d21 [formerly 683c49fc49 [formerly 207c1dfec7f51a429c9db61258d09631ef2049c9]]]]
Former-commit-id: d9fee38d21
Former-commit-id: 1a1895ac93 [formerly 1572b42313] [formerly c9efa26bec3e542d6745350e252690672a230a79 [formerly f685ac224f]]
Former-commit-id: 439b0e1aeb781ee1cbfed0e9af37ac57ea2a2bb0 [formerly 8bf8bd190f]
Former-commit-id: 6f47b219fe
2012-10-16 12:53:39 -05:00
Steve Harris
d93536cb3e Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 5b8bb9ac67 [formerly e8eee3ee0c] [formerly 9853e8c53b] [formerly 5b8bb9ac67 [formerly e8eee3ee0c] [formerly 9853e8c53b] [formerly b4bb93a2c4 [formerly 9853e8c53b [formerly 8a2bda87f34ec3c1129429604de7344732d46017]]]]
Former-commit-id: b4bb93a2c4
Former-commit-id: 3b693f4c55 [formerly 11c6dd5488] [formerly da216ea6db0f46e0da0a7c2b1a92431a1c9d4e8d [formerly 3d88dcb2b8]]
Former-commit-id: cc057ada7c4fbb789b48753f130d70ed7d82b3a8 [formerly 8caedc3cec]
Former-commit-id: 5e8d96cf17
2012-10-16 11:50:37 -05:00
Roger Ferrel
770429c9e4 Issue #1229 Changes for non-blocking HistoryListDlg.
Change-Id: Iffd288fed390121dfec770fd451c028ca78face2

Former-commit-id: 688ca6d6b9 [formerly 4c69b818b4] [formerly 46eafd72e7] [formerly 688ca6d6b9 [formerly 4c69b818b4] [formerly 46eafd72e7] [formerly 23db6f4981 [formerly 46eafd72e7 [formerly d8c36ff080bf42da11ab4d770fd022a6e2359f4f]]]]
Former-commit-id: 23db6f4981
Former-commit-id: f7672f3d83 [formerly cad15f8b96] [formerly e81c7998176598be7e0b6e94bc4c5dbad22ba1c5 [formerly 5a6d2af7c8]]
Former-commit-id: db4ab191fb3c3ce541c72252b51fd6c192ce8947 [formerly e960e1acdd]
Former-commit-id: 7c99e2905e
2012-10-16 11:01:07 -05:00
Roger Ferrel
557747b645 Issue #1229 Changes for non-blocking AlterBundleDlg.
Change-Id: Icea110c4ff66360e2d406a1f2966cf6851fbddc1

Former-commit-id: 132e821d51 [formerly 7e3068734e] [formerly 59f21825ae] [formerly 132e821d51 [formerly 7e3068734e] [formerly 59f21825ae] [formerly acb0ca9c6f [formerly 59f21825ae [formerly fa1a55648d6d98104b0861db5e45c5de73612a09]]]]
Former-commit-id: acb0ca9c6f
Former-commit-id: 957066f166 [formerly 83ebc25c26] [formerly e7f79630554b65039b699f71e9a8036e8636084c [formerly 4ea86be01d]]
Former-commit-id: f5126baefc5e133e1ee6bb562dc5f0dd0b06bb28 [formerly ddf627de66]
Former-commit-id: 352733b0dc
2012-10-16 10:28:15 -05:00
Steve Harris
186785eb19 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: cf9207bf91 [formerly a2d9207ebc] [formerly e38fc1e5c9] [formerly cf9207bf91 [formerly a2d9207ebc] [formerly e38fc1e5c9] [formerly 615042859f [formerly e38fc1e5c9 [formerly 16bfc9f7e68cc45b44867fc41cf62cd12f323390]]]]
Former-commit-id: 615042859f
Former-commit-id: 691858f2d7 [formerly 24681cb342] [formerly d54e3b2ddd567e71254ce2974078444ad1e6a18a [formerly 5384c8fa71]]
Former-commit-id: 7d3c94b2a27c1da631e5cb189dd57762c49e636c [formerly ff2bbbcec6]
Former-commit-id: 96940fe979
2012-10-16 09:21:22 -05:00
Steve Harris
873deef231 Merge branch 'ss_builds' (12.11.1-3) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java

Former-commit-id: 6659a96ac6 [formerly 8b7665418a] [formerly 0a42cb87a4] [formerly 6659a96ac6 [formerly 8b7665418a] [formerly 0a42cb87a4] [formerly 63ffdac2b7 [formerly 0a42cb87a4 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]]]
Former-commit-id: 63ffdac2b7
Former-commit-id: 1b5f2c2f54 [formerly f0121b6fa8] [formerly 317e3e14ff2323c9c71ba64860412db38413e9d9 [formerly 63da835aef]]
Former-commit-id: 6403b80caf09947055665a0c7024e59bfc126bc2 [formerly 99147526f9]
Former-commit-id: 0ad4e4f39a
2012-10-16 09:20:37 -05:00
Roger Ferrel
eb058b5095 Issue #1229 Changes to non-blocking ImageBlinkDialog.
Change-Id: Ifec323bfc7c44b928d0d135c346c3536fe7ceb96

Former-commit-id: cfa177f554 [formerly a4cb0a13d4] [formerly b139d0fc24] [formerly cfa177f554 [formerly a4cb0a13d4] [formerly b139d0fc24] [formerly 4792c77aab [formerly b139d0fc24 [formerly b6e7c9d63de65a9523448ff691db6f88f7514f52]]]]
Former-commit-id: 4792c77aab
Former-commit-id: 15cf4b6e74 [formerly 23baab80e8] [formerly 5203a1254e4b97bd8db278d747dcfaee59bc3526 [formerly 06a7728662]]
Former-commit-id: c3f492ac7fb419cce0a0ea4d0e661e2562c84a60 [formerly bc0088c3c1]
Former-commit-id: 3e4a67d565
2012-10-16 09:17:47 -05:00
Steve Harris
8fe85d8972 Merge "Issue #1229 Changes to make non-blocking CreateProjectionDialog." into development
Former-commit-id: 7a9ac04442 [formerly 4833a4a806] [formerly 8f1c76c3f5] [formerly 7a9ac04442 [formerly 4833a4a806] [formerly 8f1c76c3f5] [formerly 0ccb08d42a [formerly 8f1c76c3f5 [formerly ba4a18d8a7eb8cf0eae99656c48273cf5406dabf]]]]
Former-commit-id: 0ccb08d42a
Former-commit-id: a8271366f3 [formerly 0f90866e4e] [formerly d9bbaea004d8a2e8d44688d0bc2f5e3065770cc5 [formerly 0931256948]]
Former-commit-id: cd37f9c8b218a269d3778a3943bd282a663062ce [formerly 9e2854854e]
Former-commit-id: d91809f31b
2012-10-16 09:12:20 -05:00
Roger Ferrel
b4ecec93d2 Issue #1229 Changes for non-blocking DisplayPropertiesDialog.
Change-Id: If19a36fe150c85d92e85a56b931dc66ba9a251b3

Former-commit-id: c3654af713 [formerly a633a43f29] [formerly a495dee0c9] [formerly c3654af713 [formerly a633a43f29] [formerly a495dee0c9] [formerly 566ce2d976 [formerly a495dee0c9 [formerly 3cf1be917057f6a3db71ae3b408e46ca1e972f11]]]]
Former-commit-id: 566ce2d976
Former-commit-id: 777a91fba6 [formerly ea271fa511] [formerly e92a62d69078b2faf32013f2d39608c7c4a0a921 [formerly 80c2beec21]]
Former-commit-id: a6d65cdd8581746f62b2ad4ef751b490938de26c [formerly 846f2fea7e]
Former-commit-id: 2056e16e8d
2012-10-16 08:02:23 -05:00
Roger Ferrel
6f0c2c1215 Issue #1229 Changes to make non-blocking CreateProjectionDialog.
Change-Id: Ic7150a3e0dc5fb0cf0c5f4f32c3d107b6c7f7d1c

Former-commit-id: b726991322 [formerly aa3f30eec5] [formerly 96a6dc145c] [formerly b726991322 [formerly aa3f30eec5] [formerly 96a6dc145c] [formerly a3fbfef3ce [formerly 96a6dc145c [formerly 0e5aed1eb8a1edcf0a6bce196fdbcaf65cf6bc62]]]]
Former-commit-id: a3fbfef3ce
Former-commit-id: e96956f65d [formerly 548f7f510f] [formerly b4f620f526f8b23a9711b534a4077ac124ef7383 [formerly 8f33c1d0a6]]
Former-commit-id: 8a63a5cdb218c99a4a9429d1258818606b5312ca [formerly 8c8ae4940f]
Former-commit-id: 7b2062810a
2012-10-16 07:33:39 -05:00
Lee Venable
08e3ecb410 Merge "Issue #1229 Changes for non-blocking PrintDialog." into development
Former-commit-id: 5baaea5b25 [formerly e59ff7722a] [formerly 143ba131d0] [formerly 5baaea5b25 [formerly e59ff7722a] [formerly 143ba131d0] [formerly 552224976e [formerly 143ba131d0 [formerly 17b7e3bbae7230bfa40490b84b7b13cf41881649]]]]
Former-commit-id: 552224976e
Former-commit-id: 2702091cde [formerly ed1e6d6f57] [formerly 3d7a4c5bad83f11d6442745a0729c74e903ae24e [formerly 99faa86fe5]]
Former-commit-id: 034b367dafc249dfb210295d4713158ff93f1f36 [formerly cfdb6d837f]
Former-commit-id: 1eb08174d7
2012-10-15 16:45:52 -05:00
Steve Harris
e42c12350b 12.11.1-3 baseline
Former-commit-id: a65c057df5 [formerly 196afa0e5f] [formerly 2d0c424713] [formerly a65c057df5 [formerly 196afa0e5f] [formerly 2d0c424713] [formerly 5d796f775c [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]]
Former-commit-id: 5d796f775c
Former-commit-id: 7fcbb49a3e [formerly 725b2f8ba5] [formerly 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031]]
Former-commit-id: eaae8c3b883f287ffd1c17522c62444fa45a6410 [formerly bf1f88482b]
Former-commit-id: c25ebcdc41
2012-10-15 16:30:31 -05:00
Roger Ferrel
26d2793977 Issue #1229 Changes for non-blocking HelpUsageDlg.
Reviewer comments.

Change-Id: I4704a93fab83b88041eb942c9a163a6f117a70ea

Former-commit-id: 7313cbbfee [formerly bd22b5b4f1] [formerly cc3c4f311f] [formerly 7313cbbfee [formerly bd22b5b4f1] [formerly cc3c4f311f] [formerly dc6fa3cfd0 [formerly cc3c4f311f [formerly e6ad4922c4bc950fcf9cb184707b3e757373e851]]]]
Former-commit-id: dc6fa3cfd0
Former-commit-id: 93ae653ccb [formerly bebf021d69] [formerly fcfae301a7c36880413c26cd11509ebd87224d06 [formerly b37bea29ba]]
Former-commit-id: f3e4332162693f67ab421d5f458b9d39c1d77dfc [formerly 2aec2fe200]
Former-commit-id: 9f5d4b7d7e
2012-10-15 15:58:30 -05:00
Roger Ferrel
dfebfd5a26 Issue #1229 Changes for non-blocking PrintDialog.
Change-Id: Ia47dffbc611f9214a43754b4e1f8d4c95817462b

Former-commit-id: 4e15ac8495 [formerly 8533066287] [formerly b27323c29e] [formerly 4e15ac8495 [formerly 8533066287] [formerly b27323c29e] [formerly 059c8a4d7c [formerly b27323c29e [formerly c748615380d65d7a105ffd2e46cf1eba3cb035b9]]]]
Former-commit-id: 059c8a4d7c
Former-commit-id: 5333d6a42f [formerly c1bc223001] [formerly 66a46c4ca75e26ed2506596ce47a60c40310c433 [formerly a664fc8b8b]]
Former-commit-id: 26525604f852832116edb12918c61af4aee8923b [formerly 47d3d275f5]
Former-commit-id: c40f4d5d95
2012-10-15 15:24:04 -05:00
Roger Ferrel
321bee14e1 Issue #1229 Changes for non-blockig TextEditorSetupDlg.
Change-Id: Ia63762fbba6c89a60302d56158f846e3cc3e53cc

Former-commit-id: f7228e3434 [formerly 329db1fa5a] [formerly 5b967cd04d] [formerly f7228e3434 [formerly 329db1fa5a] [formerly 5b967cd04d] [formerly ba6ff53d4d [formerly 5b967cd04d [formerly 022d0f76b455d6136ee88572bf95cafc1f35863b]]]]
Former-commit-id: ba6ff53d4d
Former-commit-id: eeb244f177 [formerly 91e307e265] [formerly 2dfc1461d2b65f0107a7fcfafe15472a6e3b75cf [formerly 3f45b19774]]
Former-commit-id: d088b35189137e0446ebc62fd0b6b5057728bc97 [formerly 0e01f75e00]
Former-commit-id: cc73d463bb
2012-10-15 09:05:16 -05:00
Lee Venable
053d023877 Merge changes I46412605,If726affd into development
* changes:
  Issue #1229 Refactored OpenSaveDlg to OpenDlg and made non-blocking.
  Issue #1229 changes for non-blocking MonitoringCriteriaDlg, TafProductConfigDlg and TafSiteInfoEditorDlg.


Former-commit-id: e00ecea528 [formerly c4d301c955] [formerly 5fd8873145] [formerly e00ecea528 [formerly c4d301c955] [formerly 5fd8873145] [formerly 5a296b682c [formerly 5fd8873145 [formerly ee68220587fcd4ea191fc9d269a7f01ee17f538e]]]]
Former-commit-id: 5a296b682c
Former-commit-id: 34162dc9df [formerly e44f243654] [formerly 53d4a5710d0e50740d134a1b2534fc14ac69b4dd [formerly 9d847ee437]]
Former-commit-id: ddae3fe5435d16cae131e0c75533934e8fbdb33b [formerly c100c268a1]
Former-commit-id: 5e282b1ca8
2012-10-15 08:59:39 -05:00
Nate Jensen
b625256d61 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: 134d8a2e3b [formerly cbc2da0c06] [formerly f2cbf0c5c3] [formerly 134d8a2e3b [formerly cbc2da0c06] [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 446d7f5f13 [formerly 93143bbda0] [formerly c35558c0281157096518a8d9e3647aa801d78a21 [formerly 5bdf9d4d38]]
Former-commit-id: 39c9b14c28231eba502ff6ceadb2e1e6bddcb180 [formerly 319c4cda2b]
Former-commit-id: 1efcd36987
2012-10-12 15:16:27 -05:00
Roger Ferrel
40e4930c65 Issue #1229 Refactored OpenSaveDlg to OpenDlg and made non-blocking.
Change-Id: I4641260558b289bf7b29462032015b38ff6219a3

Former-commit-id: 37eba01683 [formerly 45918c826f] [formerly 82637bea2a] [formerly 37eba01683 [formerly 45918c826f] [formerly 82637bea2a] [formerly ceabf8446e [formerly 82637bea2a [formerly 2131624d82de6ae90929be45b4a706080b889699]]]]
Former-commit-id: ceabf8446e
Former-commit-id: ad92a4ee02 [formerly 8b31eb04ab] [formerly f623a5e7082e2291ddd805a7d91303e2664b9915 [formerly 72df39c19b]]
Former-commit-id: c5f75480695c4f38ca71883043f751d9922da798 [formerly 7ab07b4861]
Former-commit-id: b77f5a1207
2012-10-12 15:04:17 -05:00
Roger Ferrel
c7792e5517 Issue #1229 changes for non-blocking MonitoringCriteriaDlg, TafProductConfigDlg and TafSiteInfoEditorDlg.
Change-Id: If726affda56d435cc15506dcd3a5439f7f476e35

Former-commit-id: aba33acea4 [formerly f76e6d3eae] [formerly efb13c2b94] [formerly aba33acea4 [formerly f76e6d3eae] [formerly efb13c2b94] [formerly 42c7ef3ef6 [formerly efb13c2b94 [formerly 9e039290f43cff3faae208a39286c99e83978e17]]]]
Former-commit-id: 42c7ef3ef6
Former-commit-id: 6454410868 [formerly 62b6f1cf38] [formerly 399ccfccf8ad4b7847f84cd8675594ec3c4fc718 [formerly 901fc10336]]
Former-commit-id: 6c6c5da8460caa71eccff4964f71277d39809561 [formerly e72f086cbc]
Former-commit-id: ed06158d02
2012-10-12 14:13:18 -05:00
Nate Jensen
ea34a3896f Merge "Issue #1229 Changes for non-blocking MessageViewerDlg. Reviewer comment corrections." into development
Former-commit-id: 88e35349cc [formerly 9aaeea3337] [formerly 2fe7afd8d7] [formerly 88e35349cc [formerly 9aaeea3337] [formerly 2fe7afd8d7] [formerly dd7f1fe5f1 [formerly 2fe7afd8d7 [formerly 55a7f25e74ab71a83053b54a8214e949516058ea]]]]
Former-commit-id: dd7f1fe5f1
Former-commit-id: 0666ed240b [formerly 30c6faf44f] [formerly 3a3aafed39d0ec15addef58f6decffb376f9af4e [formerly 227fc6259e]]
Former-commit-id: 617f9537bbea52ed571780d1f33de7d691563368 [formerly 15d7976da9]
Former-commit-id: eb1ff7c402
2012-10-12 12:57:23 -05:00
Ben Steffensmeier
51d1c03c36 Merge branch 'ss_builds' into Unified_Grid
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]]
Former-commit-id: 266a2f317f
Former-commit-id: 97c23508d7 [formerly fde1e73d58] [formerly aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]]
Former-commit-id: 4391a50cd6a1b526355ffcad5b2b61ac30604784 [formerly b2fdd9283d]
Former-commit-id: 29777154bb
2012-10-12 12:45:50 -05:00
James Korman
001ae1a10a Issue #1229 - Removed dialog no longer needed.
Change-Id: Ib5330088f94932c4d8797b89eaf42bb62b57ab4d

Former-commit-id: 82aecc925b [formerly 6b6d9f4e39] [formerly 9b244417a8] [formerly 82aecc925b [formerly 6b6d9f4e39] [formerly 9b244417a8] [formerly b995faf77a [formerly 9b244417a8 [formerly 985db9c6aa1d3339647a3be12ee776d3f90993ae]]]]
Former-commit-id: b995faf77a
Former-commit-id: af2f69aa26 [formerly 883a2780cf] [formerly aa68092c045e4a71fb9f0151acd0f1729903f1f1 [formerly 1ca63e7520]]
Former-commit-id: 40d7ff7e2ce4f9cf3c117e2b00a43d9879482740 [formerly f3c51bcbf2]
Former-commit-id: c6ff1442a2
2012-10-12 11:50:49 -05:00
Ron Anderson
72f631b171 Merge "Issue #1091 Fixed combination file generation." into development
Former-commit-id: e51c2567e9 [formerly 7640b281fa] [formerly 5064bd8734] [formerly e51c2567e9 [formerly 7640b281fa] [formerly 5064bd8734] [formerly 678110fd31 [formerly 5064bd8734 [formerly f9431f2bd771225cac164a0d7ecf04166844d213]]]]
Former-commit-id: 678110fd31
Former-commit-id: 1eb99581f6 [formerly c82da89068] [formerly 025aae997d99fa01fa41e8feee2ee8232c72f10a [formerly 6ab5f4d00c]]
Former-commit-id: 9d3039662e4409af2b62bfd18cd533685f23c400 [formerly 9b345dea77]
Former-commit-id: 33051b9799
2012-10-12 11:44:28 -05:00
Roger Ferrel
5cb70e269a Issue #1229 FindReplaceDlg II fixes to work with hidable TafViewerEdtiorDlg.
Change-Id: Id865a77ccb0c376f303d4f5a2c718a4ba33fd94a

Former-commit-id: e82cdf216d [formerly b49ca90d6c] [formerly 3b6823a45c] [formerly e82cdf216d [formerly b49ca90d6c] [formerly 3b6823a45c] [formerly 34ef8d5a47 [formerly 3b6823a45c [formerly 8120a2f6e4cf96e5d11a24a5cfddbe709798eecc]]]]
Former-commit-id: 34ef8d5a47
Former-commit-id: ff1a539431 [formerly bf038b25c4] [formerly fedf5feade756f02c3d3a0f0a76ba6f35723375a [formerly e2382e026e]]
Former-commit-id: 5df2788a397df18f95b818876bfcb44217ac5763 [formerly 78d00f247f]
Former-commit-id: 5dff0d695d
2012-10-12 11:03:08 -05:00
Ron Anderson
21e4866c3b Issue #1091 Fixed combination file generation.
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

Former-commit-id: e3d598d337 [formerly c264f72a53] [formerly 4ca413a222] [formerly e3d598d337 [formerly c264f72a53] [formerly 4ca413a222] [formerly 510cabe655 [formerly 4ca413a222 [formerly 0c4bf9ce1271334d2a07205a42efc60cf7c397f0]]]]
Former-commit-id: 510cabe655
Former-commit-id: d4eaa7a659 [formerly 488d357413] [formerly db13c0f5d9711fc778c639ebf3e3fedd6dee6c74 [formerly e0fc2a36c6]]
Former-commit-id: 9dd0497e892d907423f733d65f93e3fd05c58b4f [formerly 47da164ca6]
Former-commit-id: 9a588ce114
2012-10-12 10:32:36 -05:00
Roger Ferrel
9ee7904bf1 Issue #1229 Changes for non-blocking FindReplaceDlg.
Change-Id: I9bb97051cb15f84fde8540056a78f29420d2c665

Former-commit-id: c5a14be236 [formerly eacd9d817c] [formerly 03b8991ec0] [formerly c5a14be236 [formerly eacd9d817c] [formerly 03b8991ec0] [formerly bfbca13dc9 [formerly 03b8991ec0 [formerly 91a283a721f55dfe00f9bd0d2f57def122eb6be4]]]]
Former-commit-id: bfbca13dc9
Former-commit-id: c685310d6d [formerly f86ef0dec3] [formerly 49ac6d9a3fc035c60d6dcc99545e476319e25f32 [formerly 71b1beece8]]
Former-commit-id: 54883a384d79c94f83af659bc4661fc25e5cc577 [formerly 1d3257d7ef]
Former-commit-id: a0b2cdcf0c
2012-10-12 09:43:52 -05:00
Roger Ferrel
f0943da36e Issue #1229 Changes for non-blocking MessageViewerDlg.
Reviewer comment corrections.

Change-Id: I5e7b6969a9d426fbd8b5f320dbd6914c23d0fcd0

Former-commit-id: c68776fdb5 [formerly 8fffc0ba1e] [formerly 1849ac40d5] [formerly c68776fdb5 [formerly 8fffc0ba1e] [formerly 1849ac40d5] [formerly 38ad9ea5bb [formerly 1849ac40d5 [formerly 5cbd3685e7a612394fd6b0e1315656727f320726]]]]
Former-commit-id: 38ad9ea5bb
Former-commit-id: a60cf9498a [formerly d14610bf35] [formerly fe1307b02d2f96d59cb7edddc6f7ea95cd260846 [formerly 415d85cd54]]
Former-commit-id: e02aa762079e1a0d65fa7d62121e8af428c6b301 [formerly a269951f3e]
Former-commit-id: be85ae4337
2012-10-12 09:14:37 -05:00
Roger Ferrel
6cb5edeebc Issue #1229 Changes to make non-blocking TafViewerEditorDlg.
Change-Id: Ib68b4fcca708d75d86642ae49be2506df9d20e62

Former-commit-id: e75aaaf37d [formerly fabce96eed] [formerly 1c2981ebbe] [formerly e75aaaf37d [formerly fabce96eed] [formerly 1c2981ebbe] [formerly b6e20b0d46 [formerly 1c2981ebbe [formerly 9929ff90e05c98410e26e538ce47ff642407a77b]]]]
Former-commit-id: b6e20b0d46
Former-commit-id: 9c7e442828 [formerly ef7a896a78] [formerly 92546fa2b2ce346dd4907422246eac78fb739946 [formerly 094200fc1a]]
Former-commit-id: 0d988c32c308ca835ab05d36d78c951a67d54782 [formerly 06ec0c9c3c]
Former-commit-id: c5bd781e8b
2012-10-12 07:21:28 -05:00
James Korman
a6c9f82b8f Issue #1229 - Change to use non-blocking
Change-Id: I98d8549345ea4450342c17f23649cd14c29f666d

Former-commit-id: a1a454eac4 [formerly f6018e03d1] [formerly f4a7a5c2d5] [formerly a1a454eac4 [formerly f6018e03d1] [formerly f4a7a5c2d5] [formerly 2fefd0c8a2 [formerly f4a7a5c2d5 [formerly 982bf7b1bd34b93c227b722deb41f516d8b51e82]]]]
Former-commit-id: 2fefd0c8a2
Former-commit-id: a3d9bb7f2c [formerly bd0d2ce10d] [formerly 9f7088f87e86b351f6aab11f517246ee9d95c71e [formerly 3641b1fe46]]
Former-commit-id: 2c06deebf9c4bcb600fd9172f768d9e6ae149fe8 [formerly 33bc60e74f]
Former-commit-id: ecfb8e5074
2012-10-11 15:09:30 -05:00
James Korman
81adb155bf Issue #1229 - Issue #1229 - Change to use non-blocking.
Change-Id: I2da0ebd176f7f50d63d70aed28bfe3385ac39a48

Former-commit-id: 97c98fc2c8 [formerly 0bffd25bdc] [formerly 7769d4cc14] [formerly 97c98fc2c8 [formerly 0bffd25bdc] [formerly 7769d4cc14] [formerly 860bd4af04 [formerly 7769d4cc14 [formerly ae8a0dcce3055931c901093e148639f959c70a97]]]]
Former-commit-id: 860bd4af04
Former-commit-id: 54c43b7e91 [formerly 502510ff48] [formerly 875897cead3d9e2048b0e2e955f787dc2f140d48 [formerly 3be1610080]]
Former-commit-id: ad7c54996415b3cf327f99c7ce0fe8a1efbb18f1 [formerly d53badbe68]
Former-commit-id: f8fd2ba572
2012-10-11 11:31:43 -05:00
Nate Jensen
15fb3a2edf Merge "Issue #1229 Changes for non-blocking TimeSelectorDialog." into development
Former-commit-id: 27f75f7832 [formerly 15da1de9a4] [formerly a2c665644d] [formerly 27f75f7832 [formerly 15da1de9a4] [formerly a2c665644d] [formerly f224d8df27 [formerly a2c665644d [formerly 8fad036c514ec9c55e38888ce9013c983665fb8a]]]]
Former-commit-id: f224d8df27
Former-commit-id: 906c8f4791 [formerly 4ac301ad02] [formerly 99b53b109be851f52a974a3389132f61f1c83780 [formerly 2415539d60]]
Former-commit-id: 94e8f3d700a14171f35be0e813480915144570a5 [formerly c38683d92d]
Former-commit-id: 2077544d17
2012-10-11 11:18:14 -05:00
James Korman
9d2afcb88c Issue #1229 - Change to use non-blocking.
Change-Id: I9989b5b37e39a553434d4c104bfe9577925a6bd7

Former-commit-id: d846b77c71 [formerly 7569aac1ea] [formerly d256be6980] [formerly d846b77c71 [formerly 7569aac1ea] [formerly d256be6980] [formerly cdbf9085f5 [formerly d256be6980 [formerly b68db18e4d20db986844bf3fdb44d74f31308539]]]]
Former-commit-id: cdbf9085f5
Former-commit-id: 7153359bca [formerly 26e22665c2] [formerly c9e3a1e3e95f65b0ef41eba9e051999723d04708 [formerly 12ba9d630f]]
Former-commit-id: 96cc142f294a44894c6319eb41e69ba711440313 [formerly 4511b4141a]
Former-commit-id: 22fbf6625a
2012-10-11 10:02:53 -05:00
Ben Steffensmeier
4c897de4a8 Issue #189 minor fixes to grid for issues discovered during dev tests
Former-commit-id: 735099e934 [formerly fa380d06c1] [formerly 23da6e6494] [formerly 735099e934 [formerly fa380d06c1] [formerly 23da6e6494] [formerly 509c09ebb0 [formerly 23da6e6494 [formerly 4ae112f6fcc9c2d0bb8715033a80d265dbdfe8b4]]]]
Former-commit-id: 509c09ebb0
Former-commit-id: 21ce531c20 [formerly 4cacd4a7b1] [formerly 627ed14f2e45b950eb951d0e5438cdc4375e3303 [formerly 59754c0f6a]]
Former-commit-id: f6701bf3b87cd3a761f14792a180ae78fbb00546 [formerly b3a945b203]
Former-commit-id: 069958385b
2012-10-10 16:32:36 -05:00