xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2147 commits 31 branches 40 tags 3.8 GiB
Commit graph

78 commits

Author SHA1 Message Date
Steve Harris
2b489e4e40 Merge branch 'omaha_13.3.1' into development 
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 4a0b8772ec [formerly b9563da8a8]
Former-commit-id: 46d0c9fcee
 2013-03-05 12:29:44 -06:00
Steve Harris
d842ed88a7 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1 
Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: b423579e4a [formerly a8e1557c62]
Former-commit-id: b630339eb7
 2013-03-05 12:27:49 -06:00
Steve Harris
153aadc1d7 13.3.1-4 baseline 
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: 3e0614b43a [formerly 5e55ded3a9]
Former-commit-id: 0df35cc5ec
 2013-03-05 10:39:59 -06:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind. 
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
 2013-02-28 17:00:56 -06:00
Steve Harris
b5d9e75b95 Merge branch 'development' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1]
Former-commit-id: f3c3191a1c
 2013-02-21 15:41:39 -06:00
Ben Steffensmeier
efe423c8be Issue #1609 update style rules for msl-P contours 
Former-commit-id: 6bf304ab80 [formerly e7f73db73c] [formerly 6bf304ab80 [formerly e7f73db73c] [formerly f029f74a4f [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]]
Former-commit-id: f029f74a4f
Former-commit-id: 894c7e7e62 [formerly 5b9e13aa3d]
Former-commit-id: c46775f84a
 2013-02-20 17:27:16 -06:00
Steve Harris
8c828dbd75 13.3.1-1 baseline 
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
 2013-02-20 16:19:40 -06:00
Steve Harris
dc55ef579a 13.2.1-6 baseline 
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: bbe92e6824 [formerly 30d38334cc]
Former-commit-id: 0c128dd8f0
 2013-02-07 16:00:39 -06:00
Brad Gonzales
7253bbf20e Issue #1517 Added SPC Prob menu changes. 
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 35cc853c74 [formerly f459554e33] [formerly 35cc853c74 [formerly f459554e33] [formerly 5bc6dd5498 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 8fc5c18ebd [formerly f3ef309293]
Former-commit-id: adbfa7ced1
 2013-02-04 08:52:33 -06:00
Max Schenkelberg
23a67773f6 Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel 
Change-Id: I39f6d119360b6c43b2ba4667321e4119d312f721

Former-commit-id: d0c9157e2a [formerly ed4a9023da] [formerly d0c9157e2a [formerly ed4a9023da] [formerly 95d3706969 [formerly b5f53d6b332c8f4b24462d0d42ff1d07cb31830b]]]
Former-commit-id: 95d3706969
Former-commit-id: a1d92fa99f [formerly 0f9f51fb14]
Former-commit-id: 621f71977e
 2013-01-31 15:34:46 -06:00
Steve Harris
2779f5c6d9 13.2.1-2 baseline 
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
 2013-01-23 11:18:44 -05:00
Steve Harris
08bf724a6c 13.2.1-1 baseline 
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf]
Former-commit-id: 9146e727f9
 2013-01-23 11:13:03 -05:00
Max Schenkelberg
5d6421259b Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously. 
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: 9aac1d2871 [formerly 02e7c79de9] [formerly 9aac1d2871 [formerly 02e7c79de9] [formerly aa88b83859 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]
Former-commit-id: aa88b83859
Former-commit-id: 410abb1144 [formerly c6b6823228]
Former-commit-id: f35d30e675
 2013-01-15 14:13:36 -06:00
Richard Peter
e838f2db25 Merge branch 'ss_builds' (13.2.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838 [formerly 345dfd2ca9]
Former-commit-id: cd2014bf8d
 2013-01-14 18:07:17 -06:00
Steve Harris
b4556ea28f 13.2.1-1 baseline 
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca]
Former-commit-id: ebff2a6275
 2013-01-14 18:42:21 -05:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline 
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
 2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
 2013-01-06 14:32:24 -06:00
Steve Harris
b0a60923c4 Merge branch 'ss_builds' (12.12.1-12) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: f02c1ef71d [formerly 6287b32e7d]
Former-commit-id: ebcc9975c4
 2012-12-11 08:45:53 -06:00
Steve Harris
f8a9ae24cb 12.12.1-12 baseline 
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 69ab975fab [formerly 7bb37caa23]
Former-commit-id: 190378beeb
 2012-12-06 09:18:28 -06:00
Max Schenkelberg
a7b239f9c1 Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins 
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: 56ae27e172 [formerly b648c5828e] [formerly 56ae27e172 [formerly b648c5828e] [formerly ed77d56a84 [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]
Former-commit-id: ed77d56a84
Former-commit-id: f681c1304c [formerly b24440cc37]
Former-commit-id: b8b98a78c3
 2012-11-29 10:29:36 -06:00
Steve Harris
af59663a99 12.12.1-1 baseline 
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928 [formerly 214fcd3b63]
Former-commit-id: a5be98d6de
 2012-11-07 12:41:20 -06:00
Roger Ferrel
a3fad37043 Issue #1229 Changes for non-blocking BackgroundColorDialog. 
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9

Former-commit-id: ac30143335 [formerly 59a2dd6a3a] [formerly ac30143335 [formerly 59a2dd6a3a] [formerly d60b4ca396 [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]]
Former-commit-id: d60b4ca396
Former-commit-id: f253f2191b [formerly 757affcc66]
Former-commit-id: a6e13f80d4
 2012-10-16 17:00:11 -05:00
Roger Ferrel
bb3bd24c8f Issue #1229 Changes for non-blocking ProcedureListDlg. 
Change-Id: I5c955c9d07e104809e2a72de0f5ec998f13d797f

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

Former-commit-id: 185acb8d87 [formerly 683c49fc49] [formerly 185acb8d87 [formerly 683c49fc49] [formerly d9fee38d21 [formerly 207c1dfec7f51a429c9db61258d09631ef2049c9]]]
Former-commit-id: d9fee38d21
Former-commit-id: 1572b42313 [formerly f685ac224f]
Former-commit-id: 8bf8bd190f
 2012-10-16 12:53:39 -05:00
Roger Ferrel
7c99e2905e Issue #1229 Changes for non-blocking HistoryListDlg. 
Change-Id: Iffd288fed390121dfec770fd451c028ca78face2

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

Former-commit-id: 7e3068734e [formerly 59f21825ae] [formerly 7e3068734e [formerly 59f21825ae] [formerly acb0ca9c6f [formerly fa1a55648d6d98104b0861db5e45c5de73612a09]]]
Former-commit-id: acb0ca9c6f
Former-commit-id: 83ebc25c26 [formerly 4ea86be01d]
Former-commit-id: ddf627de66
 2012-10-16 10:28:15 -05:00
Roger Ferrel
3e4a67d565 Issue #1229 Changes to non-blocking ImageBlinkDialog. 
Change-Id: Ifec323bfc7c44b928d0d135c346c3536fe7ceb96

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

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

Former-commit-id: aa3f30eec5 [formerly 96a6dc145c] [formerly aa3f30eec5 [formerly 96a6dc145c] [formerly a3fbfef3ce [formerly 0e5aed1eb8a1edcf0a6bce196fdbcaf65cf6bc62]]]
Former-commit-id: a3fbfef3ce
Former-commit-id: 548f7f510f [formerly 8f33c1d0a6]
Former-commit-id: 8c8ae4940f
 2012-10-16 07:33:39 -05:00
Roger Ferrel
c40f4d5d95 Issue #1229 Changes for non-blocking PrintDialog. 
Change-Id: Ia47dffbc611f9214a43754b4e1f8d4c95817462b

Former-commit-id: 8533066287 [formerly b27323c29e] [formerly 8533066287 [formerly b27323c29e] [formerly 059c8a4d7c [formerly c748615380d65d7a105ffd2e46cf1eba3cb035b9]]]
Former-commit-id: 059c8a4d7c
Former-commit-id: c1bc223001 [formerly a664fc8b8b]
Former-commit-id: 47d3d275f5
 2012-10-15 15:24:04 -05:00
Roger Ferrel
7044db959a Issue #1248 Changes to allow change listeners on Alter Bundles. 
Changes from code review 2.

Change-Id: I8f8640a9c90c0191179c74570855a67370617a20

Former-commit-id: 65a19e48b0 [formerly e7d27f4aab] [formerly 65a19e48b0 [formerly e7d27f4aab] [formerly 03070aded9 [formerly de530f99fcc7f68a1bd84ed399ff04eac63e7a58]]]
Former-commit-id: 03070aded9
Former-commit-id: 09bb914dc0 [formerly f4861554cd]
Former-commit-id: 8982e1baf9
 2012-10-10 06:52:09 -05:00
Steven Harris
2f855322f6 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
 2012-09-27 15:57:45 -05:00
Nate Jensen
284ab4c3bf Merge "Issue #1192 Changed rename dialog to allow specifying a directory path along with the new file name. Made so directories can be attempted to be deleted as well. Cleaned up FileTreeView code so directory and file deletions show up in tree correctly" into development 
Former-commit-id: 00cc58cbb5 [formerly 78169b1bf1] [formerly 00cc58cbb5 [formerly 78169b1bf1] [formerly 6a5f700bce [formerly 9615c1149f086af6a9d8657ad4c36bcc8f5aade2]]]
Former-commit-id: 6a5f700bce
Former-commit-id: 720986610b [formerly 6d292c35c3]
Former-commit-id: f91a543f23
 2012-09-24 14:26:54 -05:00
Max Schenkelberg
8a68ac417e Issue #1192 Changed rename dialog to allow specifying a directory path along with the new file name. Made so directories can be attempted to be deleted as well. Cleaned up FileTreeView code so directory and file deletions show up in tree correctly 
Change-Id: I3080a03fcbed0de39908945d899e0c8200c2dc9a

Former-commit-id: 7a53736cf3 [formerly 22be9bee2e] [formerly 7a53736cf3 [formerly 22be9bee2e] [formerly adbeffbb25 [formerly 5397776e07902b1deb68259128ae536fafa1d844]]]
Former-commit-id: adbeffbb25
Former-commit-id: 03146b0a16 [formerly ab58fcb601]
Former-commit-id: 4b2023b359
 2012-09-24 11:33:03 -05:00
Ben Steffensmeier
9c23c42218 Issue #1208 change density and mag handlers in d2d to not throw exceptions. 
Former-commit-id: 0bc73bb5aa [formerly f20812bc11] [formerly 0bc73bb5aa [formerly f20812bc11] [formerly 3f4bfb8efe [formerly b7c0ef15d9e8c27cd3ce646b393c6c44315eabef]]]
Former-commit-id: 3f4bfb8efe
Former-commit-id: 3256de1093 [formerly 6e8bca348f]
Former-commit-id: 4372a4e0d6
 2012-09-21 11:11:24 -05:00
Steve Harris
40ddaa276f Merge branch 'development' into Enhanced_points 
Former-commit-id: 2e47ad78bc [formerly 321e2191b1] [formerly 2e47ad78bc [formerly 321e2191b1] [formerly 6146f56ce4 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]
Former-commit-id: 6146f56ce4
Former-commit-id: bc86013d8f [formerly 9ca736f901]
Former-commit-id: 69b6272658
 2012-09-13 15:25:12 -05:00
Steve Harris
30b0700044 Merge branch 'ss_builds' (12.10.1-4) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 04de1d5857 [formerly 29e7427dc3] [formerly 04de1d5857 [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: e23b030dfd [formerly 53673f63e6]
Former-commit-id: f80fb62837
 2012-09-13 13:26:13 -05:00
Steve Harris
f61c5114e8 12.10.1-4 baseline 
Former-commit-id: 9cd1f3ec0f [formerly 791ef6cedf] [formerly 9cd1f3ec0f [formerly 791ef6cedf] [formerly 92cc2d8605 [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]
Former-commit-id: 92cc2d8605
Former-commit-id: f641cdd4e0 [formerly b4d2a0e8dd]
Former-commit-id: 451459d8cb
 2012-09-13 12:33:36 -05:00
Steve Harris
e57e7237a9 12.10.1-4 baseline 
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5 [formerly 2ba58a3576]
Former-commit-id: 26b7d083ec
 2012-09-13 12:08:11 -05:00
Steve Harris
73b1005512 Merge branch 'development' into Enhanced_points 
Former-commit-id: 892598dc66 [formerly 1dd1305a5d] [formerly 892598dc66 [formerly 1dd1305a5d] [formerly ada1066831 [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]]
Former-commit-id: ada1066831
Former-commit-id: e0ee6bbf96 [formerly d85659d9de]
Former-commit-id: d20a1de861
 2012-09-12 14:14:56 -05:00
Steve Harris
5030894212 12.10.1-3 baseline 
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db [formerly 438d139fdd]
Former-commit-id: faadb51529
 2012-09-11 16:00:38 -05:00
Ben Steffensmeier
44d8021a72 Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors 
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8

Former-commit-id: dc6f5805ef [formerly 4272f4c885] [formerly dc6f5805ef [formerly 4272f4c885] [formerly c618ee9057 [formerly 5da7b54e1bff66ed46400bc624b9d881d0b967ce]]]
Former-commit-id: c618ee9057
Former-commit-id: 66e9b24e51 [formerly e0a4fe2c43]
Former-commit-id: 64ef6f58f1
 2012-09-04 13:41:10 -05:00
Steve Harris
f8e7459dfb Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: 0e046d847a [formerly bba4eb12d0] [formerly 0e046d847a [formerly bba4eb12d0] [formerly af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: f224e3e8ad [formerly 53e29f59e4]
Former-commit-id: e9582cb789
 2012-09-04 12:11:03 -05:00
Steve Harris
a924a8347a 12.10.1-1 baseline 
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
 2012-09-04 12:07:27 -05:00
Steve Harris
7c1cebf5b1 Merge branch 'development' into Enhanced_points 
Former-commit-id: fa7c31206b [formerly 5feac55dbd] [formerly fa7c31206b [formerly 5feac55dbd] [formerly 32cf7fd764 [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]]
Former-commit-id: 32cf7fd764
Former-commit-id: 5a8e58eda5 [formerly 592ab923bb]
Former-commit-id: 66ac1051bc
 2012-08-30 15:43:06 -05:00
Steve Harris
3f44e46a6f Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development 
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 51eb89eb2a [formerly 91e39617cb] [formerly 51eb89eb2a [formerly 91e39617cb] [formerly a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: dbcb28ce77 [formerly 87a602dfee]
Former-commit-id: 0b647c0c9d
 2012-08-27 09:53:55 -05:00
Steve Harris
2d928d328e 12.9.1-5 baseline 
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
 2012-08-21 15:27:03 -05:00
root
0eb9520e15 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
 2012-08-15 22:15:20 +00:00