Commit graph

426 commits

Author SHA1 Message Date
Steve Harris
98ed677ecb 13.3.1-4 baseline
Former-commit-id: ecde92a410 [formerly 9066d511fe] [formerly d79303de13] [formerly d79303de13 [formerly 8c0b90f292]] [formerly ecde92a410 [formerly 9066d511fe] [formerly d79303de13] [formerly d79303de13 [formerly 8c0b90f292]] [formerly 2edca90902 [formerly d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]]]
Former-commit-id: 2edca90902
Former-commit-id: 90dcfb152e [formerly 4bfbb518c0] [formerly 3e0614b43a] [formerly 47b53720bf00577d5c09b29d66582e87b67c8e28 [formerly c3fe7088594b70139dad19673128f3fd665d1be1] [formerly 3e0614b43a [formerly 5e55ded3a9]]]
Former-commit-id: 3e2304a0bd23eb553105cc55f600474d23306831 [formerly e4eaa93661df211ab065d6c9dd5f042f5011f151] [formerly 153aadc1d7 [formerly 0df35cc5ec]]
Former-commit-id: 30675a72ac887d30d06cca68222aa4c6612e04b3 [formerly 153aadc1d7]
Former-commit-id: 52aae101cc
2013-03-05 10:39:59 -06:00
Ben Steffensmeier
50ea967e33 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 46d8520044 [formerly 8e2333d0d7] [formerly d27d30c2db] [formerly d27d30c2db [formerly f46686a6e2]] [formerly 46d8520044 [formerly 8e2333d0d7] [formerly d27d30c2db] [formerly d27d30c2db [formerly f46686a6e2]] [formerly 2ca86633d6 [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 56eb58960c [formerly 4936191404] [formerly 334af0001b] [formerly 68273db77cd70e3fc68bd95dcbd3120191896b86 [formerly fa7abe8431fbbdea60e6504cd61a867956d20856] [formerly 334af0001b [formerly 5068b18c6a]]]
Former-commit-id: 87b9989dac7f6ec4c8fc10b54fb9c4c73b385ccb [formerly 387e3e95805ed9aa6efd193b1112d4ae6d8ac95a] [formerly 866c873f71 [formerly 0778375180]]
Former-commit-id: 866c873f71
Former-commit-id: c903521884
2013-02-28 17:00:56 -06:00
Ben Steffensmeier
d27d30c2db Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]
Former-commit-id: f46686a6e2
2013-02-28 17:00:56 -06:00
Ben Steffensmeier
2ca86633d6 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 7c24d10acae9dee7ec03edd471983e0b80d58092
2013-02-28 17:00:56 -06:00
Steve Harris
418c06202c 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: e4a0759555 [formerly abdc733151] [formerly 64744fdb19] [formerly 64744fdb19 [formerly a0573644c4]] [formerly e4a0759555 [formerly abdc733151] [formerly 64744fdb19] [formerly 64744fdb19 [formerly a0573644c4]] [formerly 2641d578e2 [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 09d69dbd9a [formerly 7e48d3e684] [formerly 4f155a183a] [formerly 8f5f5cac829fb199ef190abb566cd001cea1b223 [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b] [formerly 4f155a183a [formerly 33dd2589f1]]]
Former-commit-id: 3ec373f83d89d49802de9d70b75cd01681b92a5d [formerly 52ef36f1490e95f8582d69438eed38f21061eafb] [formerly b5d9e75b95 [formerly f3c3191a1c]]
Former-commit-id: b5d9e75b95
Former-commit-id: 34d0f59592
2013-02-21 15:41:39 -06:00
Steve Harris
64744fdb19 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: 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]
Former-commit-id: a0573644c4
2013-02-21 15:41:39 -06:00
Steve Harris
2641d578e2 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: e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c
2013-02-21 15:41:39 -06:00
Ben Steffensmeier
5e8ae4e175 Issue #1609 update style rules for msl-P contours
Former-commit-id: f14041faf2 [formerly bf9f3344d1] [formerly 6bf304ab80] [formerly 6bf304ab80 [formerly e7f73db73c]] [formerly f14041faf2 [formerly bf9f3344d1] [formerly 6bf304ab80] [formerly 6bf304ab80 [formerly e7f73db73c]] [formerly f029f74a4f [formerly 6bf304ab80 [formerly e7f73db73c] [formerly f029f74a4f [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]]]]
Former-commit-id: f029f74a4f
Former-commit-id: 0286faea3b [formerly 070d80adf5] [formerly 894c7e7e62] [formerly c80e1b6ec8648b5d7db5cb88b2903f45740cc1e3 [formerly f250772b236ea3b33c3494e51227e59db759d9a3] [formerly 894c7e7e62 [formerly 5b9e13aa3d]]]
Former-commit-id: ace3b6177257fd350cde4d858fa789fc89166a66 [formerly ed9d727925cc8953906081c442b4a6718dc5a1b4] [formerly efe423c8be [formerly c46775f84a]]
Former-commit-id: efe423c8be
Former-commit-id: 666d742d4b
2013-02-20 17:27:16 -06:00
Ben Steffensmeier
6bf304ab80 Issue #1609 update style rules for msl-P contours
Former-commit-id: f029f74a4f [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]
Former-commit-id: e7f73db73c
2013-02-20 17:27:16 -06:00
Ben Steffensmeier
f029f74a4f Issue #1609 update style rules for msl-P contours
Former-commit-id: 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8
2013-02-20 17:27:16 -06:00
Steve Harris
8ae397085e 13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
2013-02-20 16:19:40 -06:00
Steve Harris
d2a654625f 13.3.1-1 baseline
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
915a15006f 13.3.1-1 baseline
Former-commit-id: 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly d2a654625f [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]]
Former-commit-id: d2a654625f
Former-commit-id: ea9303b160 [formerly db712e1fcf] [formerly e4435815c9] [formerly c996cf8cb561399a370ef3580c705465d6fa20ac [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0] [formerly e4435815c9 [formerly 46d28be4a4]]]
Former-commit-id: 4e2c476e2dfb865dde40c9f94f4d16824ed729f6 [formerly 30806b31de967d82824f245a2f6cb89f081cfd19] [formerly 8c828dbd75 [formerly b3b56830b0]]
Former-commit-id: 35d8262ef1ba032fcf5d8ea707ad15ee533bd1a9 [formerly 8c828dbd75]
Former-commit-id: fac2d20002
2013-02-20 16:19:40 -06:00
Steve Harris
d66ad2f77b 13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]
Former-commit-id: d0752de66c
2013-02-07 16:00:39 -06:00
Steve Harris
a46e33f06e 13.2.1-6 baseline
Former-commit-id: 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb
2013-02-07 16:00:39 -06:00
Steve Harris
3c85f63935 13.2.1-6 baseline
Former-commit-id: f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly a46e33f06e [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 6b128749f2 [formerly 5027d2365b] [formerly bbe92e6824] [formerly f3506870f6207481b364a8cfac79c7de4d08f83e [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d] [formerly bbe92e6824 [formerly 30d38334cc]]]
Former-commit-id: 99ffc46efa72b085e555d1c7d241e0316fa33b30 [formerly 0cd3f4b5889bda9de32b546358edf3d8210d3ad8] [formerly dc55ef579a [formerly 0c128dd8f0]]
Former-commit-id: dc55ef579a
Former-commit-id: b43935a991
2013-02-07 16:00:39 -06:00
Brad Gonzales
a3332b8082 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: 2ec0406230 [formerly 7cef72a460] [formerly 35cc853c74] [formerly 35cc853c74 [formerly f459554e33]] [formerly 2ec0406230 [formerly 7cef72a460] [formerly 35cc853c74] [formerly 35cc853c74 [formerly f459554e33]] [formerly 5bc6dd5498 [formerly 35cc853c74 [formerly f459554e33] [formerly 5bc6dd5498 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 90aae805a9 [formerly 3e4338339b] [formerly 8fc5c18ebd] [formerly cfe8215c73604506b758c0542ce4fa704c5ee637 [formerly 62d4c20906235f41b4a9b49850da7af9a09a8dfd] [formerly 8fc5c18ebd [formerly f3ef309293]]]
Former-commit-id: 92587e7f7792c488296cf2cf4910c49dff652e64 [formerly 8092a6222319cfb79a0aacf062d8e75239f377da] [formerly 7253bbf20e [formerly adbfa7ced1]]
Former-commit-id: 3a9c5d37e1268f76e5b3ec195777be7b7af653c0 [formerly 7253bbf20e]
Former-commit-id: b27bb93cf7
2013-02-04 08:52:33 -06:00
Brad Gonzales
35cc853c74 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: 5bc6dd5498 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]
Former-commit-id: f459554e33
2013-02-04 08:52:33 -06:00
Brad Gonzales
5bc6dd5498 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: a84415dcfc5dd1d330ef8022f496b2e2ee45c54d
2013-02-04 08:52:33 -06:00
Max Schenkelberg
d30742b256 Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel
Change-Id: I39f6d119360b6c43b2ba4667321e4119d312f721

Former-commit-id: 143180a32b [formerly d617eb3070] [formerly d0c9157e2a] [formerly d0c9157e2a [formerly ed4a9023da]] [formerly 143180a32b [formerly d617eb3070] [formerly d0c9157e2a] [formerly d0c9157e2a [formerly ed4a9023da]] [formerly 95d3706969 [formerly d0c9157e2a [formerly ed4a9023da] [formerly 95d3706969 [formerly b5f53d6b332c8f4b24462d0d42ff1d07cb31830b]]]]]
Former-commit-id: 95d3706969
Former-commit-id: 68a33e0f15 [formerly 86bf0ba125] [formerly a1d92fa99f] [formerly 5c047c6c09633c05353f469718b7b0d4d5372072 [formerly a95b0e6ddb561754bc961f3806861099650f8fc0] [formerly a1d92fa99f [formerly 0f9f51fb14]]]
Former-commit-id: df60b1636cb33c40661dc1fc6b0c3e71c8265bbe [formerly 3a7756f5acb07c9bbd6a66e4512025d26d95413f] [formerly 23a67773f6 [formerly 621f71977e]]
Former-commit-id: 23a67773f6
Former-commit-id: decd42b4a4
2013-01-31 15:34:46 -06:00
Max Schenkelberg
d0c9157e2a Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel
Change-Id: I39f6d119360b6c43b2ba4667321e4119d312f721

Former-commit-id: 95d3706969 [formerly b5f53d6b332c8f4b24462d0d42ff1d07cb31830b]
Former-commit-id: ed4a9023da
2013-01-31 15:34:46 -06:00
Max Schenkelberg
95d3706969 Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel
Change-Id: I39f6d119360b6c43b2ba4667321e4119d312f721

Former-commit-id: b5f53d6b332c8f4b24462d0d42ff1d07cb31830b
2013-01-31 15:34:46 -06:00
Steve Harris
33bc5fd816 13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
2013-01-23 11:18:44 -05:00
Steve Harris
328c6dccad 13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
ccbd8dde52 13.2.1-2 baseline
Former-commit-id: 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 328c6dccad [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]]
Former-commit-id: 328c6dccad
Former-commit-id: 19f4c6b47d [formerly ce726fadc7] [formerly d9be4dce21] [formerly 2627373644ec7ef09825bbc0c168afd0abd1a3fe [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050] [formerly d9be4dce21 [formerly 47cc08ac79]]]
Former-commit-id: dc8171a7281c254994a85334494b23b7e0b2a8db [formerly 281ab815ed143a9ff49cedae7054da06195e3c69] [formerly 2779f5c6d9 [formerly 547c1dedd1]]
Former-commit-id: 2779f5c6d9
Former-commit-id: b92dfd1b62
2013-01-23 11:18:44 -05:00
Steve Harris
48d1aa7732 13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]
Former-commit-id: 9771dfae6b
2013-01-23 11:13:03 -05:00
Steve Harris
c63f9bcae0 13.2.1-1 baseline
Former-commit-id: 6831a29efca54cfde39ab6a462f76ca2ac206f49
2013-01-23 11:13:03 -05:00
Steve Harris
1f170e8765 13.2.1-1 baseline
Former-commit-id: 4b7d7080da [formerly 11b05eedeb] [formerly 48d1aa7732] [formerly 48d1aa7732 [formerly 9771dfae6b]] [formerly 4b7d7080da [formerly 11b05eedeb] [formerly 48d1aa7732] [formerly 48d1aa7732 [formerly 9771dfae6b]] [formerly c63f9bcae0 [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 46f6234fee [formerly 1d1791b3b4] [formerly 8ed6a53113] [formerly bb767e361cdfb041151a683d1320598e24b0a18f [formerly b971e3aabeeb8f14462f7ad6502dafe876153e63] [formerly 8ed6a53113 [formerly f6670806bf]]]
Former-commit-id: a056e51cd8d6c11482497d22c5d4d8645b842c5d [formerly c7cd6e75591b001d138f41ea10b2ed691477e255] [formerly 08bf724a6c [formerly 9146e727f9]]
Former-commit-id: 08bf724a6c
Former-commit-id: 2c834d0f58
2013-01-23 11:13:03 -05:00
Max Schenkelberg
22da635030 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: 438316f63e [formerly f51398595e] [formerly 9aac1d2871] [formerly 9aac1d2871 [formerly 02e7c79de9]] [formerly 438316f63e [formerly f51398595e] [formerly 9aac1d2871] [formerly 9aac1d2871 [formerly 02e7c79de9]] [formerly aa88b83859 [formerly 9aac1d2871 [formerly 02e7c79de9] [formerly aa88b83859 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]]]
Former-commit-id: aa88b83859
Former-commit-id: 46cc2ce5a5 [formerly cea378c445] [formerly 410abb1144] [formerly e294fa3739e361239bf991bccf45ba825d47f8cc [formerly 451ec6f6d7261a1c251d7e39253fc41e3af7c367] [formerly 410abb1144 [formerly c6b6823228]]]
Former-commit-id: 24fa77963e512c750348e86a9071be7500b7bcaf [formerly 12984637b106529c3322a63eb74880567de70ad5] [formerly 5d6421259b [formerly f35d30e675]]
Former-commit-id: 5d6421259b
Former-commit-id: 7f857992b6
2013-01-15 14:13:36 -06:00
Max Schenkelberg
9aac1d2871 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: aa88b83859 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]
Former-commit-id: 02e7c79de9
2013-01-15 14:13:36 -06:00
Max Schenkelberg
aa88b83859 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: 86aa1a7febbd1b8671e546c2b9eaca10f82860a4
2013-01-15 14:13:36 -06:00
Richard Peter
1d63bd3c95 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: 3a4d6bfdf4 [formerly 6e42fa32d3] [formerly a966546e31] [formerly a966546e31 [formerly 3fb7d96ec1]] [formerly 3a4d6bfdf4 [formerly 6e42fa32d3] [formerly a966546e31] [formerly a966546e31 [formerly 3fb7d96ec1]] [formerly 1dbb34523b [formerly a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: a98d51f235 [formerly d880361e06] [formerly 79ef100838] [formerly 012e0b3dd0096d17d087554979fa3b09439335aa [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62] [formerly 79ef100838 [formerly 345dfd2ca9]]]
Former-commit-id: ed079c67ada00b0d627d488ae097a2c6fcec49a2 [formerly ef42f50f6a062518b4a0d8effc537eaf4c7292a1] [formerly e838f2db25 [formerly cd2014bf8d]]
Former-commit-id: 3642ca7c12e7c6ab5b034d3d926937840b40ebab [formerly e838f2db25]
Former-commit-id: 0a55bcfd67
2013-01-14 18:07:17 -06:00
Richard Peter
a966546e31 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: 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]
Former-commit-id: 3fb7d96ec1
2013-01-14 18:07:17 -06:00
Richard Peter
1dbb34523b 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: 1a07daa97b2000f31ea4fd98890a15477b85b5f3
2013-01-14 18:07:17 -06:00
Steve Harris
8443221766 13.2.1-1 baseline
Former-commit-id: 468d53034a [formerly 8dd688c878] [formerly 5dfe4d10f1] [formerly 5dfe4d10f1 [formerly e62172c8c7]] [formerly 468d53034a [formerly 8dd688c878] [formerly 5dfe4d10f1] [formerly 5dfe4d10f1 [formerly e62172c8c7]] [formerly 81849e3cbb [formerly 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 55aa9409e9 [formerly 3d35fd52d5] [formerly e34695538d] [formerly 042a8f89e6d3e7e57d6427ec61955e9d2caa784a [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6] [formerly e34695538d [formerly 8713dfc5ca]]]
Former-commit-id: de466ba3938b61683e2c66ece380528b7b290855 [formerly d5a28dcde502767d0f84d7301207580849e0a584] [formerly b4556ea28f [formerly ebff2a6275]]
Former-commit-id: b4556ea28f
Former-commit-id: e5f32a2bbe
2013-01-14 18:42:21 -05:00
Steve Harris
5dfe4d10f1 13.2.1-1 baseline
Former-commit-id: 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]
Former-commit-id: e62172c8c7
2013-01-14 18:42:21 -05:00
Steve Harris
81849e3cbb 13.2.1-1 baseline
Former-commit-id: 30d12654dea302c2bb0546edcb3b7ddd04ddd046
2013-01-14 18:42:21 -05:00
Steve Harris
efd3392abe 13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 8e5f9e0e6c
2013-01-06 14:55:11 -06:00
Steve Harris
59969775ad 13.1.2-6 baseline
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
2013-01-06 14:55:11 -06:00
Steve Harris
a2241acbc5 13.1.2-6 baseline
Former-commit-id: 750f03f602 [formerly 1d4d25b49b] [formerly efd3392abe] [formerly efd3392abe [formerly 8e5f9e0e6c]] [formerly 750f03f602 [formerly 1d4d25b49b] [formerly efd3392abe] [formerly efd3392abe [formerly 8e5f9e0e6c]] [formerly 59969775ad [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]]
Former-commit-id: 59969775ad
Former-commit-id: 7058edde32 [formerly fe763963e9] [formerly 82a1ed77a4] [formerly e0da2714c31e9f48ef47551baeecd5541fe2e224 [formerly fa884fbcd584330564fea44a1538e11036e753a8] [formerly 82a1ed77a4 [formerly dbcae57f57]]]
Former-commit-id: f1899c432c7f194616c4f9d49b19f53f87a0c962 [formerly 385d5b42196eb703cc60637c47506c02c454b5fc] [formerly b7f180d9d3 [formerly 05bdc0ecd2]]
Former-commit-id: b7f180d9d3
Former-commit-id: 3e63f280a2
2013-01-06 14:55:11 -06:00
Steve Harris
51208e5515 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
2013-01-06 14:32:24 -06:00
Steve Harris
4ba416aeb3 13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Steve Harris
2827d6bd6e 13.1.2-2 baseline
Former-commit-id: e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly 4ba416aeb3 [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 771913b0c7 [formerly 82cdde8491] [formerly cd4185ef5c] [formerly 315d42e07d543cb65d6e601e1e21011082db86e5 [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a] [formerly cd4185ef5c [formerly 941337c553]]]
Former-commit-id: 5cd56308fe7c05824700e702851648ed30cdff6e [formerly c69e1900269e630aefc061c2464bc8fea1c9776a] [formerly f52ec0b0a0 [formerly b6fa9b4858]]
Former-commit-id: f52ec0b0a0
Former-commit-id: 745f2c6409
2013-01-06 14:32:24 -06:00
Steve Harris
b0f02cc419 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: 036c9c394b [formerly d27c5237c3] [formerly 4d4771ee3a] [formerly 4d4771ee3a [formerly 43ddfe98c4]] [formerly 036c9c394b [formerly d27c5237c3] [formerly 4d4771ee3a] [formerly 4d4771ee3a [formerly 43ddfe98c4]] [formerly f6988eefff [formerly 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]]
Former-commit-id: f6988eefff
Former-commit-id: 25383b8789 [formerly 377804398b] [formerly f02c1ef71d] [formerly 0771cf2edc110a5bd4b553d44389a4bd3f189cc2 [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00] [formerly f02c1ef71d [formerly 6287b32e7d]]]
Former-commit-id: bd50a367081ef81c3500b70f9446ebd881fcaebb [formerly 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479] [formerly b0a60923c4 [formerly ebcc9975c4]]
Former-commit-id: b0a60923c4
Former-commit-id: 179755f156
2012-12-11 08:45:53 -06:00
Steve Harris
4d4771ee3a 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: f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]
Former-commit-id: 43ddfe98c4
2012-12-11 08:45:53 -06:00
Steve Harris
f6988eefff 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: e733dd9d05d3704f86e2a711607a1834df1a56f2
2012-12-11 08:45:53 -06:00
Steve Harris
89def5cf03 12.12.1-12 baseline
Former-commit-id: 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]
Former-commit-id: e8e41630e8
2012-12-06 09:18:28 -06:00
Steve Harris
6d610f8e8a 12.12.1-12 baseline
Former-commit-id: ae5110532f5ac5c7842a5483a8e2c3dc299ae814
2012-12-06 09:18:28 -06:00
Steve Harris
165df11c16 12.12.1-12 baseline
Former-commit-id: f65390b7dd [formerly 8b74846a1b] [formerly 89def5cf03] [formerly 89def5cf03 [formerly e8e41630e8]] [formerly f65390b7dd [formerly 8b74846a1b] [formerly 89def5cf03] [formerly 89def5cf03 [formerly e8e41630e8]] [formerly 6d610f8e8a [formerly 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 3f005a2c7d [formerly 79b0e973ef] [formerly 69ab975fab] [formerly 2b1834bdae667df665b8919c2cf78480f01b458e [formerly 033c9cde2068548258f7d65e7f805b1255162c44] [formerly 69ab975fab [formerly 7bb37caa23]]]
Former-commit-id: 7753d74e1a1efd1668fa76aeced4721614d36693 [formerly 54c80ccffc60d6ee8a544b475ed12355b32a2f26] [formerly f8a9ae24cb [formerly 190378beeb]]
Former-commit-id: f8a9ae24cb
Former-commit-id: cedbde75e3
2012-12-06 09:18:28 -06:00
Max Schenkelberg
78200e9b05 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: 8a406fff01 [formerly a113ecd2ea] [formerly 56ae27e172] [formerly 56ae27e172 [formerly b648c5828e]] [formerly 8a406fff01 [formerly a113ecd2ea] [formerly 56ae27e172] [formerly 56ae27e172 [formerly b648c5828e]] [formerly ed77d56a84 [formerly 56ae27e172 [formerly b648c5828e] [formerly ed77d56a84 [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]]]
Former-commit-id: ed77d56a84
Former-commit-id: 927b1a217e [formerly 1f8c88490a] [formerly f681c1304c] [formerly 2bcc06e3a80e8cea040442298377186f5eea6961 [formerly 9fbbf5fdd49d3393d497c172fb165e221cdc3c0c] [formerly f681c1304c [formerly b24440cc37]]]
Former-commit-id: 0d54b226ff9c7dbc8fd7ea4ca3f6ec7fab903bf0 [formerly c5ee37a2251945312e76e97b444e5dc6495a440a] [formerly a7b239f9c1 [formerly b8b98a78c3]]
Former-commit-id: a7b239f9c1
Former-commit-id: 8215537399
2012-11-29 10:29:36 -06:00