Commit graph

784 commits

Author SHA1 Message Date
Lee Venable
38c2168e52 Merge "Issue #1229 Changes for stand along componets using non-blocking dialogs." into development
Former-commit-id: 2c52dde01c [formerly e73ceb7797] [formerly 505b0e4786 [formerly 49c70dc1f55f0456b96e69d526554be40b2e8fa7]]
Former-commit-id: 505b0e4786
Former-commit-id: 53d1dce044
2012-10-19 11:49:17 -05:00
Greg Armendariz
e6b8019a64 Removing duplicate line
Former-commit-id: a752fa4944 [formerly e456a622a5] [formerly b6f47d116f [formerly 6bbb49dff7c8f6c31d7053e32466695bc36d8b02]]
Former-commit-id: b6f47d116f
Former-commit-id: 987868d8e3
2012-10-19 08:48:32 -05:00
Roger Ferrel
8f8862c014 Issue #1229 Changes for stand along componets using non-blocking dialogs.
Change-Id: Ie394cc559501359074c15c60779331d9e922379a

Former-commit-id: 9b48ec6203 [formerly 2d9805411f] [formerly 2c279a6704 [formerly 3f007ecd4def67cb8152f60ee0dec9656a90a03d]]
Former-commit-id: 2c279a6704
Former-commit-id: 55bd3fcf27
2012-10-18 16:09:15 -05:00
Steve Harris
6e89edaa37 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 4823017ff1 [formerly 8a574a91cf] [formerly 0bb64a8706 [formerly f3d80ac86697be7042fa20d52e3116e72b77f2a6]]
Former-commit-id: 0bb64a8706
Former-commit-id: 2a9f8eaa4d
2012-10-18 16:06:05 -05:00
Steve Harris
8486da2fd3 Merge branch 'ss_builds' (12.11.1-6) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 3eff876edd [formerly a7337d9160] [formerly 1807100932 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]
Former-commit-id: 1807100932
Former-commit-id: 892e4df811
2012-10-18 16:01:05 -05:00
Steve Harris
8beb6fc0b8 12.11.1-6 baseline
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
2012-10-18 15:53:01 -05:00
Steve Harris
85ad066b70 12.11.1-5 baseline
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
2012-10-18 15:46:42 -05:00
Roger Ferrel
2ddf95c587 Issue #1229 Changes for non-blocking SWTMessageBox.
Change-Id: Id9954878c2764f4527e85b958a0fec7a05548db9

Former-commit-id: e17d8d4c37 [formerly 610444ee88] [formerly 38ae2b122e [formerly b073d27b36543630e3fd04623e22cd5242e5ed1f]]
Former-commit-id: 38ae2b122e
Former-commit-id: db1a29205a
2012-10-18 14:06:02 -05:00
Jonathan Sanchez
c2f01b17a1 Issue #1126 Fixed refactor bugs.
Former-commit-id: a326889adc [formerly 4cf0b68aa2] [formerly d1bf86e2fe [formerly eb95e6227b229cc8d627b4ac24254c2f2c2e3023]]
Former-commit-id: d1bf86e2fe
Former-commit-id: 86e07328db
2012-10-18 11:32:01 -05:00
Lee Venable
c3d4eca33c Merge "Issue #1275 Merged code from 1225 on top of SS changes." into development
Former-commit-id: fa7a0ef83d [formerly dde9d4b802] [formerly ea61e22d2e [formerly ca3b359ba6a8b3131f32b9341781d19378240402]]
Former-commit-id: ea61e22d2e
Former-commit-id: fd9338320f
2012-10-18 11:16:37 -05:00
Roger Ferrel
d51dc93248 Issue #1229 Changes for non-blocking SetTimeDialog.
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3

Former-commit-id: abd0476b6a [formerly 40fb3f9729] [formerly 4cd2f1c851 [formerly 5e4edda802714c236334500a12c2020386770dd2]]
Former-commit-id: 4cd2f1c851
Former-commit-id: 7a095d2d99
2012-10-18 07:36:31 -05:00
Roger Ferrel
4d39ffd53d Issue #1229 Changes for non-blocking LabelOffsetDialog.
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e

Former-commit-id: 3af99829a6 [formerly 66379c3210] [formerly d319101ed9 [formerly f1131f2d9d1d5e0194a65e787e2628e733563683]]
Former-commit-id: d319101ed9
Former-commit-id: 928e9f6a1d
2012-10-17 15:12:55 -05:00
Roger Ferrel
a9cb110036 Issue #1229 Changes for non-blocking ImagingDialog.
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468

Former-commit-id: 3d15bf8be1 [formerly c73acb0c30] [formerly 460acb4337 [formerly 185024d06da214041273674716a7efce4b2a98f1]]
Former-commit-id: 460acb4337
Former-commit-id: b42cae4034
2012-10-17 13:53:29 -05:00
Jonathan Sanchez
fd0b09aa77 Issue #1275 Merged code from 1225 on top of SS changes.
Former-commit-id: 5c181fede4 [formerly 36efd259d5] [formerly 9017f4b046 [formerly ace2ccf5653fcd791bc049ca17986b233a6a54cc]]
Former-commit-id: 9017f4b046
Former-commit-id: ecfc924a4b
2012-10-17 13:30:44 -05:00
Roger Ferrel
1075e8ba16 Issues #1229 Changes for non-blocking ColormapDialog.
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: cdf5c546ab [formerly 8e86f32714] [formerly 6833c7e04c [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]
Former-commit-id: 6833c7e04c
Former-commit-id: d5acf40cc2
2012-10-17 10:20:18 -05:00
Roger Ferrel
ab10bc88a8 Fix for TextEditorDialog in merge of 12.11.1-4 baseline
Change-Id: I5e5e39af2bd7f2bfc9dd10ab0ddf87ff80cb7b76

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I4704a93fab83b88041eb942c9a163a6f117a70ea

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

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

Former-commit-id: 329db1fa5a [formerly 5b967cd04d] [formerly ba6ff53d4d [formerly 022d0f76b455d6136ee88572bf95cafc1f35863b]]
Former-commit-id: ba6ff53d4d
Former-commit-id: 3f45b19774
2012-10-15 09:05:16 -05:00
Lee Venable
e44f243654 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: c4d301c955 [formerly 5fd8873145] [formerly 5a296b682c [formerly ee68220587fcd4ea191fc9d269a7f01ee17f538e]]
Former-commit-id: 5a296b682c
Former-commit-id: 9d847ee437
2012-10-15 08:59:39 -05:00
Nate Jensen
93143bbda0 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: cbc2da0c06 [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 5bdf9d4d38
2012-10-12 15:16:27 -05:00
Roger Ferrel
8b31eb04ab Issue #1229 Refactored OpenSaveDlg to OpenDlg and made non-blocking.
Change-Id: I4641260558b289bf7b29462032015b38ff6219a3

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

Former-commit-id: f76e6d3eae [formerly efb13c2b94] [formerly 42c7ef3ef6 [formerly 9e039290f43cff3faae208a39286c99e83978e17]]
Former-commit-id: 42c7ef3ef6
Former-commit-id: 901fc10336
2012-10-12 14:13:18 -05:00
Nate Jensen
30c6faf44f Merge "Issue #1229 Changes for non-blocking MessageViewerDlg. Reviewer comment corrections." into development
Former-commit-id: 9aaeea3337 [formerly 2fe7afd8d7] [formerly dd7f1fe5f1 [formerly 55a7f25e74ab71a83053b54a8214e949516058ea]]
Former-commit-id: dd7f1fe5f1
Former-commit-id: 227fc6259e
2012-10-12 12:57:23 -05:00
James Korman
883a2780cf Issue #1229 - Removed dialog no longer needed.
Change-Id: Ib5330088f94932c4d8797b89eaf42bb62b57ab4d

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

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

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

Former-commit-id: eacd9d817c [formerly 03b8991ec0] [formerly bfbca13dc9 [formerly 91a283a721f55dfe00f9bd0d2f57def122eb6be4]]
Former-commit-id: bfbca13dc9
Former-commit-id: 71b1beece8
2012-10-12 09:43:52 -05:00