Greg Armendariz
b6f47d116f
Removing duplicate line
...
Former-commit-id: 6bbb49dff7c8f6c31d7053e32466695bc36d8b02
2012-10-19 08:48:32 -05:00
Steve Harris
0bb64a8706
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: f3d80ac86697be7042fa20d52e3116e72b77f2a6
2012-10-18 16:06:05 -05:00
Steve Harris
1807100932
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: de600d1a0e309ddbb4838526a9f92af05282cd1a
2012-10-18 16:01:05 -05:00
Steve Harris
5c1f3cdc46
12.11.1-6 baseline
...
Former-commit-id: 18939af3b7cf54a36970d65d528003f4fe489eb7
2012-10-18 15:53:01 -05:00
Steve Harris
a0eaf651ff
12.11.1-5 baseline
...
Former-commit-id: a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7
2012-10-18 15:46:42 -05:00
Roger Ferrel
38ae2b122e
Issue #1229 Changes for non-blocking SWTMessageBox.
...
Change-Id: Id9954878c2764f4527e85b958a0fec7a05548db9
Former-commit-id: b073d27b36543630e3fd04623e22cd5242e5ed1f
2012-10-18 14:06:02 -05:00
Jonathan Sanchez
d1bf86e2fe
Issue #1126 Fixed refactor bugs.
...
Former-commit-id: eb95e6227b229cc8d627b4ac24254c2f2c2e3023
2012-10-18 11:32:01 -05:00
Lee Venable
ea61e22d2e
Merge "Issue #1275 Merged code from 1225 on top of SS changes." into development
...
Former-commit-id: ca3b359ba6a8b3131f32b9341781d19378240402
2012-10-18 11:16:37 -05:00
Roger Ferrel
4cd2f1c851
Issue #1229 Changes for non-blocking SetTimeDialog.
...
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3
Former-commit-id: 5e4edda802714c236334500a12c2020386770dd2
2012-10-18 07:36:31 -05:00
Roger Ferrel
d319101ed9
Issue #1229 Changes for non-blocking LabelOffsetDialog.
...
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e
Former-commit-id: f1131f2d9d1d5e0194a65e787e2628e733563683
2012-10-17 15:12:55 -05:00
Roger Ferrel
460acb4337
Issue #1229 Changes for non-blocking ImagingDialog.
...
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468
Former-commit-id: 185024d06da214041273674716a7efce4b2a98f1
2012-10-17 13:53:29 -05:00
Jonathan Sanchez
9017f4b046
Issue #1275 Merged code from 1225 on top of SS changes.
...
Former-commit-id: ace2ccf5653fcd791bc049ca17986b233a6a54cc
2012-10-17 13:30:44 -05:00
Roger Ferrel
6833c7e04c
Issues #1229 Changes for non-blocking ColormapDialog.
...
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d
Former-commit-id: 88476b683c5c480395edacd2920e32a0589a92e5
2012-10-17 10:20:18 -05:00
Roger Ferrel
8934186397
Fix for TextEditorDialog in merge of 12.11.1-4 baseline
...
Change-Id: I5e5e39af2bd7f2bfc9dd10ab0ddf87ff80cb7b76
Former-commit-id: 1cf3c76428719ebc7f06612b8525057e9345a56e
2012-10-17 08:51:52 -05:00
Jonathan Sanchez
f578372896
Fixing DataAdaptorFactory blunder in merge of 12.11.1-4
...
Change-Id: Id8cc463b78e66632fd05675abdd144dccef5bb9f
Former-commit-id: 89a30cf738bb64b26da16048f61af0585ded97e7
2012-10-17 08:50:00 -05:00
Lee Venable
a256a54ab7
Merge "Issue #1229 Changes for non-blocking SaveColorMapDialog." into development
...
Former-commit-id: 191537fbfc3e1933121cf133f7b906a9f59cab3d
2012-10-17 08:26:53 -05:00
Steve Harris
8703ff00c7
Fixing fields duplicated in merge of 12.11.1-4 baseline
...
Former-commit-id: 477c64cbd4614e080d84fe1b0b5733274eeee838
2012-10-17 08:21:19 -05:00
Roger Ferrel
7f3ab5434c
Issue #1229 Changes for non-blocking SaveColorMapDialog.
...
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc
Former-commit-id: b902eadfca48628bf8944d97019263e94618667a
2012-10-17 08:15:21 -05:00
Steve Harris
5e5c98b193
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: ecb6a8876078dcff3414ff2a33aa14bf130fa075
2012-10-16 21:44:49 -05:00
Roger Ferrel
d60b4ca396
Issue #1229 Changes for non-blocking BackgroundColorDialog.
...
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9
Former-commit-id: 23c93af437fa662cc7df98e69a8bd383aabbab41
2012-10-16 17:00:11 -05:00
Steve Harris
751563e331
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: 07beab271f793ae79fcf9233f9d384702ead22a9
2012-10-16 15:48:14 -05:00
Roger Ferrel
d51ba247d1
Issue #1229 Changes for non-blocking ProcedureListDlg.
...
Change-Id: I5c955c9d07e104809e2a72de0f5ec998f13d797f
Former-commit-id: ea4c2898013df2107ebded11aa1561035eaf8a00
2012-10-16 15:39:12 -05:00
Steve Harris
6958b861f0
12.11.1-4 baseline
...
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
2012-10-16 13:27:07 -05:00
Roger Ferrel
d9fee38d21
Issue #1229 Changes for non-blocking ProcedureDlg.
...
Change-Id: Iefdf2f8e8ceeb7af5173dd4c630b6abc2c1ce41a
Former-commit-id: 207c1dfec7f51a429c9db61258d09631ef2049c9
2012-10-16 12:53:39 -05:00
Steve Harris
b4bb93a2c4
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 8a2bda87f34ec3c1129429604de7344732d46017
2012-10-16 11:50:37 -05:00
Roger Ferrel
23db6f4981
Issue #1229 Changes for non-blocking HistoryListDlg.
...
Change-Id: Iffd288fed390121dfec770fd451c028ca78face2
Former-commit-id: d8c36ff080bf42da11ab4d770fd022a6e2359f4f
2012-10-16 11:01:07 -05:00
Roger Ferrel
acb0ca9c6f
Issue #1229 Changes for non-blocking AlterBundleDlg.
...
Change-Id: Icea110c4ff66360e2d406a1f2966cf6851fbddc1
Former-commit-id: fa1a55648d6d98104b0861db5e45c5de73612a09
2012-10-16 10:28:15 -05:00
Steve Harris
615042859f
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 16bfc9f7e68cc45b44867fc41cf62cd12f323390
2012-10-16 09:21:22 -05:00
Steve Harris
63ffdac2b7
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: 5ebfa0e773d325c57ac8097b46537817d5d47842
2012-10-16 09:20:37 -05:00
Roger Ferrel
4792c77aab
Issue #1229 Changes to non-blocking ImageBlinkDialog.
...
Change-Id: Ifec323bfc7c44b928d0d135c346c3536fe7ceb96
Former-commit-id: b6e7c9d63de65a9523448ff691db6f88f7514f52
2012-10-16 09:17:47 -05:00
Steve Harris
0ccb08d42a
Merge "Issue #1229 Changes to make non-blocking CreateProjectionDialog." into development
...
Former-commit-id: ba4a18d8a7eb8cf0eae99656c48273cf5406dabf
2012-10-16 09:12:20 -05:00
Roger Ferrel
566ce2d976
Issue #1229 Changes for non-blocking DisplayPropertiesDialog.
...
Change-Id: If19a36fe150c85d92e85a56b931dc66ba9a251b3
Former-commit-id: 3cf1be917057f6a3db71ae3b408e46ca1e972f11
2012-10-16 08:02:23 -05:00
Roger Ferrel
a3fbfef3ce
Issue #1229 Changes to make non-blocking CreateProjectionDialog.
...
Change-Id: Ic7150a3e0dc5fb0cf0c5f4f32c3d107b6c7f7d1c
Former-commit-id: 0e5aed1eb8a1edcf0a6bce196fdbcaf65cf6bc62
2012-10-16 07:33:39 -05:00
Lee Venable
552224976e
Merge "Issue #1229 Changes for non-blocking PrintDialog." into development
...
Former-commit-id: 17b7e3bbae7230bfa40490b84b7b13cf41881649
2012-10-15 16:45:52 -05:00
Steve Harris
5d796f775c
12.11.1-3 baseline
...
Former-commit-id: 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86
2012-10-15 16:30:31 -05:00
Roger Ferrel
dc6fa3cfd0
Issue #1229 Changes for non-blocking HelpUsageDlg.
...
Reviewer comments.
Change-Id: I4704a93fab83b88041eb942c9a163a6f117a70ea
Former-commit-id: e6ad4922c4bc950fcf9cb184707b3e757373e851
2012-10-15 15:58:30 -05:00
Roger Ferrel
059c8a4d7c
Issue #1229 Changes for non-blocking PrintDialog.
...
Change-Id: Ia47dffbc611f9214a43754b4e1f8d4c95817462b
Former-commit-id: c748615380d65d7a105ffd2e46cf1eba3cb035b9
2012-10-15 15:24:04 -05:00
Roger Ferrel
ba6ff53d4d
Issue #1229 Changes for non-blockig TextEditorSetupDlg.
...
Change-Id: Ia63762fbba6c89a60302d56158f846e3cc3e53cc
Former-commit-id: 022d0f76b455d6136ee88572bf95cafc1f35863b
2012-10-15 09:05:16 -05:00
Lee Venable
5a296b682c
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: ee68220587fcd4ea191fc9d269a7f01ee17f538e
2012-10-15 08:59:39 -05:00
Nate Jensen
8e4a7ec406
Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
...
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae
Former-commit-id: 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1
2012-10-12 15:16:27 -05:00
Roger Ferrel
ceabf8446e
Issue #1229 Refactored OpenSaveDlg to OpenDlg and made non-blocking.
...
Change-Id: I4641260558b289bf7b29462032015b38ff6219a3
Former-commit-id: 2131624d82de6ae90929be45b4a706080b889699
2012-10-12 15:04:17 -05:00
Roger Ferrel
42c7ef3ef6
Issue #1229 changes for non-blocking MonitoringCriteriaDlg, TafProductConfigDlg and TafSiteInfoEditorDlg.
...
Change-Id: If726affda56d435cc15506dcd3a5439f7f476e35
Former-commit-id: 9e039290f43cff3faae208a39286c99e83978e17
2012-10-12 14:13:18 -05:00
Nate Jensen
dd7f1fe5f1
Merge "Issue #1229 Changes for non-blocking MessageViewerDlg. Reviewer comment corrections." into development
...
Former-commit-id: 55a7f25e74ab71a83053b54a8214e949516058ea
2012-10-12 12:57:23 -05:00
James Korman
b995faf77a
Issue #1229 - Removed dialog no longer needed.
...
Change-Id: Ib5330088f94932c4d8797b89eaf42bb62b57ab4d
Former-commit-id: 985db9c6aa1d3339647a3be12ee776d3f90993ae
2012-10-12 11:50:49 -05:00
Ron Anderson
678110fd31
Merge "Issue #1091 Fixed combination file generation." into development
...
Former-commit-id: f9431f2bd771225cac164a0d7ecf04166844d213
2012-10-12 11:44:28 -05:00
Roger Ferrel
34ef8d5a47
Issue #1229 FindReplaceDlg II fixes to work with hidable TafViewerEdtiorDlg.
...
Change-Id: Id865a77ccb0c376f303d4f5a2c718a4ba33fd94a
Former-commit-id: 8120a2f6e4cf96e5d11a24a5cfddbe709798eecc
2012-10-12 11:03:08 -05:00
Ron Anderson
510cabe655
Issue #1091 Fixed combination file generation.
...
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2
Former-commit-id: 0c4bf9ce1271334d2a07205a42efc60cf7c397f0
2012-10-12 10:32:36 -05:00
Roger Ferrel
bfbca13dc9
Issue #1229 Changes for non-blocking FindReplaceDlg.
...
Change-Id: I9bb97051cb15f84fde8540056a78f29420d2c665
Former-commit-id: 91a283a721f55dfe00f9bd0d2f57def122eb6be4
2012-10-12 09:43:52 -05:00
Roger Ferrel
38ad9ea5bb
Issue #1229 Changes for non-blocking MessageViewerDlg.
...
Reviewer comment corrections.
Change-Id: I5e7b6969a9d426fbd8b5f320dbd6914c23d0fcd0
Former-commit-id: 5cbd3685e7a612394fd6b0e1315656727f320726
2012-10-12 09:14:37 -05:00
Roger Ferrel
b6e20b0d46
Issue #1229 Changes to make non-blocking TafViewerEditorDlg.
...
Change-Id: Ib68b4fcca708d75d86642ae49be2506df9d20e62
Former-commit-id: 9929ff90e05c98410e26e538ce47ff642407a77b
2012-10-12 07:21:28 -05:00
