Commit graph

982 commits

Author SHA1 Message Date
Roger Ferrel
824a1f8699 Fix for TextEditorDialog in merge of 12.11.1-4 baseline
Change-Id: I5e5e39af2bd7f2bfc9dd10ab0ddf87ff80cb7b76

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

Former-commit-id: 66c3185920 [formerly af51b81d11] [formerly 1e53f0122a] [formerly f578372896 [formerly 1e53f0122a [formerly 89a30cf738bb64b26da16048f61af0585ded97e7]]]
Former-commit-id: f578372896
Former-commit-id: da21be0511d2ce69e4f7a5ad4cdd62679b6f415e [formerly 9524cca5b1]
Former-commit-id: 6c5447b952
2012-10-17 08:50:00 -05:00
Lee Venable
a4c0402b9d Merge "Issue #1229 Changes for non-blocking SaveColorMapDialog." into development
Former-commit-id: fb9b07ce94 [formerly 6e7446c66c] [formerly 526085140a] [formerly a256a54ab7 [formerly 526085140a [formerly 191537fbfc3e1933121cf133f7b906a9f59cab3d]]]
Former-commit-id: a256a54ab7
Former-commit-id: 7cb2760c34c3c9577542005b541d7f6fdaedd277 [formerly 78eb24ee17]
Former-commit-id: e8195b2e52
2012-10-17 08:26:53 -05:00
Steve Harris
6a81945d07 Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 21136b0560 [formerly 18ec4b5933] [formerly 559540ffbbcbfef9a40622bca48b2ab297be7483 [formerly 34e7b3f4a3]] [formerly 8703ff00c7 [formerly 34e7b3f4a3 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]]
Former-commit-id: 8703ff00c7
Former-commit-id: a128d53471bbb82cdb98a297cb2308d5a1ee6417 [formerly dc5eba737d]
Former-commit-id: 31253e2949
2012-10-17 08:21:19 -05:00
Roger Ferrel
98f56ba457 Issue #1229 Changes for non-blocking SaveColorMapDialog.
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc

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

Former-commit-id: 947b8762e8 [formerly ac30143335] [formerly 057f350d4752f372e69f416f727706cdfbadd9f5 [formerly 59a2dd6a3a]] [formerly d60b4ca396 [formerly 59a2dd6a3a [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]]
Former-commit-id: d60b4ca396
Former-commit-id: 20ecbdaaa964dc53cac032342d78e7104ac0ed46 [formerly 757affcc66]
Former-commit-id: f253f2191b
2012-10-16 17:00:11 -05:00
Steve Harris
d88afce365 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 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]
Former-commit-id: d0e91329b4
2012-10-16 15:48:14 -05:00
Roger Ferrel
d488733f34 Issue #1229 Changes for non-blocking ProcedureListDlg.
Change-Id: I5c955c9d07e104809e2a72de0f5ec998f13d797f

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

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

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

Former-commit-id: 132e821d51 [formerly 7e3068734e] [formerly 59f21825ae] [formerly acb0ca9c6f [formerly 59f21825ae [formerly fa1a55648d6d98104b0861db5e45c5de73612a09]]]
Former-commit-id: acb0ca9c6f
Former-commit-id: e7f79630554b65039b699f71e9a8036e8636084c [formerly 4ea86be01d]
Former-commit-id: 83ebc25c26
2012-10-16 10:28:15 -05:00
Steve Harris
691858f2d7 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: cf9207bf91 [formerly a2d9207ebc] [formerly e38fc1e5c9] [formerly 615042859f [formerly e38fc1e5c9 [formerly 16bfc9f7e68cc45b44867fc41cf62cd12f323390]]]
Former-commit-id: 615042859f
Former-commit-id: d54e3b2ddd567e71254ce2974078444ad1e6a18a [formerly 5384c8fa71]
Former-commit-id: 24681cb342
2012-10-16 09:21:22 -05:00
Steve Harris
1b5f2c2f54 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 63ffdac2b7 [formerly 0a42cb87a4 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]]
Former-commit-id: 63ffdac2b7
Former-commit-id: 317e3e14ff2323c9c71ba64860412db38413e9d9 [formerly 63da835aef]
Former-commit-id: f0121b6fa8
2012-10-16 09:20:37 -05:00
Roger Ferrel
15cf4b6e74 Issue #1229 Changes to non-blocking ImageBlinkDialog.
Change-Id: Ifec323bfc7c44b928d0d135c346c3536fe7ceb96

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

Former-commit-id: c3654af713 [formerly a633a43f29] [formerly a24e115402cbb3ce707d2e69b859df3c186f389b [formerly a495dee0c9]] [formerly 566ce2d976 [formerly a495dee0c9 [formerly 3cf1be917057f6a3db71ae3b408e46ca1e972f11]]]
Former-commit-id: 566ce2d976
Former-commit-id: e92a62d69078b2faf32013f2d39608c7c4a0a921 [formerly 80c2beec21]
Former-commit-id: ea271fa511
2012-10-16 08:02:23 -05:00
Roger Ferrel
e96956f65d Issue #1229 Changes to make non-blocking CreateProjectionDialog.
Change-Id: Ic7150a3e0dc5fb0cf0c5f4f32c3d107b6c7f7d1c

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

Change-Id: I4704a93fab83b88041eb942c9a163a6f117a70ea

Former-commit-id: 7313cbbfee [formerly bd22b5b4f1] [formerly cc3c4f311f] [formerly dc6fa3cfd0 [formerly cc3c4f311f [formerly e6ad4922c4bc950fcf9cb184707b3e757373e851]]]
Former-commit-id: dc6fa3cfd0
Former-commit-id: fcfae301a7c36880413c26cd11509ebd87224d06 [formerly b37bea29ba]
Former-commit-id: bebf021d69
2012-10-15 15:58:30 -05:00
Roger Ferrel
5333d6a42f Issue #1229 Changes for non-blocking PrintDialog.
Change-Id: Ia47dffbc611f9214a43754b4e1f8d4c95817462b

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

Former-commit-id: f7228e3434 [formerly 329db1fa5a] [formerly 5b967cd04d] [formerly ba6ff53d4d [formerly 5b967cd04d [formerly 022d0f76b455d6136ee88572bf95cafc1f35863b]]]
Former-commit-id: ba6ff53d4d
Former-commit-id: 2dfc1461d2b65f0107a7fcfafe15472a6e3b75cf [formerly 3f45b19774]
Former-commit-id: 91e307e265
2012-10-15 09:05:16 -05:00
Lee Venable
34162dc9df 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 5a296b682c [formerly 5fd8873145 [formerly ee68220587fcd4ea191fc9d269a7f01ee17f538e]]]
Former-commit-id: 5a296b682c
Former-commit-id: 53d4a5710d0e50740d134a1b2534fc14ac69b4dd [formerly 9d847ee437]
Former-commit-id: e44f243654
2012-10-15 08:59:39 -05:00
Nate Jensen
446d7f5f13 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 8e4a7ec406 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: c35558c0281157096518a8d9e3647aa801d78a21 [formerly 5bdf9d4d38]
Former-commit-id: 93143bbda0
2012-10-12 15:16:27 -05:00
Roger Ferrel
ad92a4ee02 Issue #1229 Refactored OpenSaveDlg to OpenDlg and made non-blocking.
Change-Id: I4641260558b289bf7b29462032015b38ff6219a3

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

Former-commit-id: aba33acea4 [formerly f76e6d3eae] [formerly efb13c2b94] [formerly 42c7ef3ef6 [formerly efb13c2b94 [formerly 9e039290f43cff3faae208a39286c99e83978e17]]]
Former-commit-id: 42c7ef3ef6
Former-commit-id: 399ccfccf8ad4b7847f84cd8675594ec3c4fc718 [formerly 901fc10336]
Former-commit-id: 62b6f1cf38
2012-10-12 14:13:18 -05:00
Nate Jensen
0666ed240b Merge "Issue #1229 Changes for non-blocking MessageViewerDlg. Reviewer comment corrections." into development
Former-commit-id: 88e35349cc [formerly 9aaeea3337] [formerly 2fe7afd8d7] [formerly dd7f1fe5f1 [formerly 2fe7afd8d7 [formerly 55a7f25e74ab71a83053b54a8214e949516058ea]]]
Former-commit-id: dd7f1fe5f1
Former-commit-id: 3a3aafed39d0ec15addef58f6decffb376f9af4e [formerly 227fc6259e]
Former-commit-id: 30c6faf44f
2012-10-12 12:57:23 -05:00
Ben Steffensmeier
97c23508d7 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 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]
Former-commit-id: 266a2f317f
Former-commit-id: aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]
Former-commit-id: fde1e73d58
2012-10-12 12:45:50 -05:00
James Korman
af2f69aa26 Issue #1229 - Removed dialog no longer needed.
Change-Id: Ib5330088f94932c4d8797b89eaf42bb62b57ab4d

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

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

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

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

Change-Id: I5e7b6969a9d426fbd8b5f320dbd6914c23d0fcd0

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

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

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

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

Former-commit-id: d846b77c71 [formerly 7569aac1ea] [formerly d256be6980] [formerly cdbf9085f5 [formerly d256be6980 [formerly b68db18e4d20db986844bf3fdb44d74f31308539]]]
Former-commit-id: cdbf9085f5
Former-commit-id: c9e3a1e3e95f65b0ef41eba9e051999723d04708 [formerly 12ba9d630f]
Former-commit-id: 26e22665c2
2012-10-11 10:02:53 -05:00
Ben Steffensmeier
21ce531c20 Issue #189 minor fixes to grid for issues discovered during dev tests
Former-commit-id: 735099e934 [formerly fa380d06c1] [formerly 23da6e6494] [formerly 509c09ebb0 [formerly 23da6e6494 [formerly 4ae112f6fcc9c2d0bb8715033a80d265dbdfe8b4]]]
Former-commit-id: 509c09ebb0
Former-commit-id: 627ed14f2e45b950eb951d0e5438cdc4375e3303 [formerly 59754c0f6a]
Former-commit-id: 4cacd4a7b1
2012-10-10 16:32:36 -05:00
Ben Steffensmeier
788cd01af7 Issue #189 update grid resource reprojection to match ss_builds
Former-commit-id: b6c6543bed [formerly 326acb6c15] [formerly c503a9b94c] [formerly a6168a2e88 [formerly c503a9b94c [formerly 4a2a57ae5e7b380141910106aa016c6c4ef46d82]]]
Former-commit-id: a6168a2e88
Former-commit-id: 07a39cc465cd988ae0573e4334384317c8422139 [formerly 8c21bc8510]
Former-commit-id: 2c82f142ca
2012-10-10 16:32:33 -05:00
Roger Ferrel
00c21d3942 Issue #1229 Changes for non-blocking TransmissionQueueDlg.
Change-Id: Iec8ffefbde98e0e86433592562a0f0f15b0c8a86

Former-commit-id: 7420b0877d [formerly 295a3ab808] [formerly d734ffe25a] [formerly 3f942e3fb3 [formerly d734ffe25a [formerly 1b1b5a0f1c3966524c3e634bf53502d08c3fb80d]]]
Former-commit-id: 3f942e3fb3
Former-commit-id: c78faafcef5f679da11e773468fb9c4f2588c0f9 [formerly 6f8ffc346f]
Former-commit-id: c3c445b2e2
2012-10-10 16:30:59 -05:00
Nate Jensen
96b99d8839 Merge "Issue #1229 Chagnes for non-blocking TransmissionViewerDlg." into development
Former-commit-id: f5ec5d124c [formerly da243b4eaf] [formerly e2f314bf5d] [formerly 15c49c9d28 [formerly e2f314bf5d [formerly 8b2095a8ff67f207b93fd2c7650efc42de76d56e]]]
Former-commit-id: 15c49c9d28
Former-commit-id: 22071ff9bda974755d97b9644dd47faef73e5211 [formerly b120e91cce]
Former-commit-id: 5ee3ef5772
2012-10-10 16:20:56 -05:00
Nate Jensen
e57c0104b2 Merge "Issue #1229 Changes for non-blocking /SendDialog." into development
Former-commit-id: c80e9ee7cb [formerly c2d63ba74a] [formerly 7c76c9e169] [formerly 469a155107 [formerly 7c76c9e169 [formerly 0f10e8442ad8cef0cb13e68aec158f8a6bb3d23e]]]
Former-commit-id: 469a155107
Former-commit-id: 5122ce5099398f1b62ca4fd8771ac000d5ba1a2a [formerly 38d4ac0f89]
Former-commit-id: 55e59df001
2012-10-10 15:35:30 -05:00
Roger Ferrel
8a0bc9aa08 Issue #1229 Chagnes for non-blocking TransmissionViewerDlg.
Change-Id: I6f274a5add6bdf4c5d74109df7fdeed6ac31d879

Former-commit-id: 1cff75a489 [formerly 9177814726] [formerly 85024ea361] [formerly e0a9838019 [formerly 85024ea361 [formerly fb76068864dc1d5d528fa6ff793cc7aff7eef95e]]]
Former-commit-id: e0a9838019
Former-commit-id: 0fef9053a659e297ee5d1faad58b95177f5413eb [formerly c0c56c61bd]
Former-commit-id: cbf43b3de9
2012-10-10 14:30:39 -05:00
Roger Ferrel
4682b90d0e Issue #1229 Changes for non-blocking TimeSelectorDialog.
Change-Id: I4826e62fe68fb128b8d146f6d386101adc758a37

Former-commit-id: 2fe1272447 [formerly 6098efb4a1] [formerly 624f6bfd01] [formerly 53d6dde72f [formerly 624f6bfd01 [formerly fcca46a4698610dd8a3124ab7e23a3b88913cd6a]]]
Former-commit-id: 53d6dde72f
Former-commit-id: 155d3f61ca4d31ab7a9523ae541e9a14176d01b6 [formerly b5ada2917e]
Former-commit-id: 3e638f6622
2012-10-10 13:17:29 -05:00
Roger Ferrel
d38ee54c09 Issue #1229 Changes for non-blocking ResourceEditorDlg.
Change-Id: I2cc2bb30efd3236ec1c207e72f59352d6a266764

Former-commit-id: 697fa1f4e1 [formerly 4208dafcfa] [formerly e49a28b546] [formerly 5a3b0339b9 [formerly e49a28b546 [formerly 50739bb740c150b10c3cbde3581fe57fbd48295e]]]
Former-commit-id: 5a3b0339b9
Former-commit-id: 4dadfb9b5dd913ca14fecee0c4a98c76080cd7bc [formerly f699a83fec]
Former-commit-id: 713f85c33d
2012-10-10 09:47:44 -05:00