mjames-upc
|
5e6a40e37c
|
various D2D menu updates
|
2016-04-30 17:37:50 -05:00 |
|
mjames-upc
|
a80fdb578e
|
DefaultRadarComposite default to 3 hr loop
|
2016-04-29 20:23:49 -05:00 |
|
mjames-upc
|
3951e80394
|
new colormap for NEXRCOMP DHR, fade to black -5dBZ
|
2016-04-29 19:20:11 -05:00 |
|
mjames-upc
|
43513162db
|
typo fix for DrawableString: verticallAlignment -> verticalAlignment
|
2016-04-27 10:09:41 -05:00 |
|
mjames-upc
|
09a9b4eac0
|
removed avn/aviation viz plugins; minor edits to radar and volume bundles
|
2016-04-20 15:32:02 -05:00 |
|
mjames-upc
|
4b76ff83b5
|
two panel / two column layout handler, menu action, bundles
|
2016-04-20 10:10:09 -05:00 |
|
mjames-upc
|
e2d9ba9a4c
|
merge unidata_15.1.1 to unidata_16.1.4
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
|
2016-03-25 13:09:32 -05:00 |
|
mjames-upc
|
739226d2f8
|
further model menu reorg / additions
Former-commit-id: 8d7f86057a
|
2016-01-17 15:04:52 -06:00 |
|
mjames-upc
|
5ff1082a72
|
MRMS menu updates
Former-commit-id: 9cffafefff
|
2016-01-08 14:44:21 -07:00 |
|
mjames-upc
|
3a59fefb09
|
cleaning up unidata_15.1.1 enough to launch in eclipse
Former-commit-id: 0b01029e68
|
2015-12-29 20:15:31 -07:00 |
|
Ben Steffensmeier
|
e4bd45b579
|
Omaha #5071 Fix Time Query of radar Unit Status
Former-commit-id: bc4f038cafec429af677b80fd583110aee7f7e66
|
2015-11-02 10:13:15 -06:00 |
|
AWIPS User
|
66e8a08554
|
MRMS submenu moved to radar menu; gfe viz plugins turned off; product browser added to d2d toolbar
Former-commit-id: 455a42ec86
Former-commit-id: 3986948487
|
2015-10-23 13:05:00 -06:00 |
|
AWIPS User
|
d619eb74a2
|
sat and radar menu organization
Former-commit-id: ea2729b8d4 [formerly affd4212ed] [formerly 698c0b5166] [formerly 2b0c20177d193699d51d49a8fe1e0b22057117c0 [formerly 8f8b9dd16ea8ae10522f0f5092dcc20a9676444f] [formerly 698c0b5166 [formerly 0943c3edd5]]]
Former-commit-id: c2658d1e39033b56f602a9ebe312abcdfea4f307 [formerly fe06833d7f0b88c2fd77bec7b274dfbdaa6ab9cd] [formerly d3b35a2e3a [formerly 4c91c17326]]
Former-commit-id: d3b35a2e3a
Former-commit-id: 1c682e0af1
|
2015-07-22 10:31:01 -06:00 |
|
Ana Rivera
|
9a33597d6e
|
Merge branch 'omaha_16.1.1' into field_16.1.1
Change-Id: I9da773e70da7bb8d62253093f20aebd8aea328f6
Former-commit-id: 0c909272ebdaf4ce94195b54a021a38c1e174ff3
|
2015-07-20 15:56:51 +00:00 |
|
Steve Harris
|
55b82a66ff
|
Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java
Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
|
2015-07-13 18:39:29 -05:00 |
|
Ben Steffensmeier
|
8eab6ddd38
|
Omaha #4461 enable sails by default.
Former-commit-id: 8369548e5ae8551bca537c8679ac157c8ea87e51
|
2015-07-01 09:56:37 -05:00 |
|
mjames-upc
|
c61f0ea15f
|
FNEXRAD menu config changes, labeling rule and colormap updates.
Former-commit-id: d2c19d4dc1 [formerly ac7ae413d6] [formerly ca188dd577] [formerly 3b2bdfc01a2cd6b5c4009713b6bf28f5c9b454bb [formerly 6b86850d998657483ef8cce38bfa4163e72fa6c7] [formerly ca188dd577 [formerly a5e9391e16]]]
Former-commit-id: 6c629d1893114c7849283baff4dab519a799ca87 [formerly 51a6be2ce13b111b12a8ec1d4c6007df11276969] [formerly d4eacc8497 [formerly 749eef0c44]]
Former-commit-id: d4eacc8497
Former-commit-id: 5fbb381419
|
2015-06-25 14:41:12 -06:00 |
|
Ana Rivera
|
bb83439ad7
|
Merge "VLab Issue #8522 - DCS_17133 Add dual pol raw products; fixes #8522" into field_16.1.1
Former-commit-id: d32df4699a822d2def6022990cfca72470d313fc
|
2015-06-25 13:29:10 +00:00 |
|
AWIPS User
|
d943666d54
|
FNEXRAD colormap updates and sat plugin style rule additions for labeling and scaling.
Former-commit-id: 530d87ad47 [formerly f2686ee818] [formerly 12671eeb72] [formerly f1474fffb987bd6b9eb69516edfd9a3d27601507 [formerly 8649b7addd8eb1a89c378e6c9f62d6d27140ae0b] [formerly 12671eeb72 [formerly 4fe8043de6]]]
Former-commit-id: d132548a94edd451f0d33735ffca3f5ad762fd03 [formerly d4fda9d5ab85f0cba5a47539b0329c106488d457] [formerly 698a833291 [formerly 941abfbb43]]
Former-commit-id: 698a833291
Former-commit-id: 933f773bd3
|
2015-06-24 20:31:12 -06:00 |
|
Zihou Wang
|
965f8af88b
|
VLab Issue #8522 - DCS_17133 Add dual pol raw products; fixes #8522
Change-Id: I4b9ac2e31ba030278af80936fdf216115ea593ad
Former-commit-id: 6733b483cd785e96924f4d96034766f212002181
|
2015-06-24 14:50:57 +00:00 |
|
Zihou Wang
|
284103c481
|
VLab Issue #8523 - DR_17385 displayUnits in style rules should be used in sampling; fixes #8523
Change-Id: Id28d28312fd35f7b7ff1f37c405d190b6839a0c7
Former-commit-id: d3914c4a3e96fb11079daa6278e084e137c54fab
|
2015-06-24 14:30:15 +00:00 |
|
Nate Jensen
|
921761af36
|
Merge "Omaha #4507 Set the color map no data value for radar images." into omaha_16.1.1
Former-commit-id: 085d61762eb8c358283bcbb69fbfd751f2baeb6d
|
2015-06-09 17:33:55 -05:00 |
|
Ben Steffensmeier
|
63dec83741
|
Omaha #4153 Give Product Browser Preference Pages unique ids.
Former-commit-id: 95c2f643e7f5af3495b8655ea7c421c6c6324063
|
2015-06-09 17:16:49 -05:00 |
|
Ben Steffensmeier
|
28f3648f81
|
Omaha #4153 Move radar product browser to use data listing.
Former-commit-id: a36870ed40331ec3d40ee15f80085ffc16b9b19d
|
2015-06-09 14:33:47 -05:00 |
|
Ben Steffensmeier
|
4f3d77ecd2
|
Omaha #4507 Set the color map no data value for radar images.
Former-commit-id: 5ae95381ec3653661d7303eab2fc37760861456c
|
2015-06-09 13:20:09 -05:00 |
|
David Lovely
|
80dc4c85d9
|
Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
|
2015-05-19 10:23:35 -05:00 |
|
Ben Steffensmeier
|
72d601a2a7
|
Omaha #4079 Extract core grid and point rendering capabilities.
Former-commit-id: a0caefe923b18859fd89cb36749b31e3b24eecbe
|
2015-05-15 13:55:10 -05:00 |
|
Ben Steffensmeier
|
8073d3709f
|
Omaha #4461 Create a custom frame coordinator for radar.
Former-commit-id: ed815b7ae8533cc3b9fb12b7b9bf201f8f145a9a
|
2015-05-14 11:26:38 -05:00 |
|
AWIPS User
|
f6ab773f6d
|
begin 2-panel
Former-commit-id: 9491c7e8e0 [formerly 8ca2df2d9a] [formerly fe5d6b1a65] [formerly b9a54e2364a3a878ebcc4cb1db3d27674249f9eb [formerly 6c8438aafb6c192434d78d7bdab4e2dcdc7f773b] [formerly fe5d6b1a65 [formerly 801bc8f96e]]]
Former-commit-id: fb00f635c163fbb35196042703833f7a837966a5 [formerly 100d3b6d9f954a34bacc0a60e25e617b8ea47550] [formerly 008922e706 [formerly 6370b56276]]
Former-commit-id: 008922e706
Former-commit-id: 025140281f
|
2015-05-09 00:38:51 -05:00 |
|
AWIPS User
|
9000e540aa
|
if all radar stations are localized then no radar stations are localized pt 2
Former-commit-id: 7f4bf25f61 [formerly 67dbd65694] [formerly f5d6e70fc1] [formerly e02b7422af8031a4ff39a706f1441471e7a499b7 [formerly 5a1d329f0fb5dcb06db5f4d178298a1be09a3c39] [formerly f5d6e70fc1 [formerly cac9357045]]]
Former-commit-id: 9f3c7b0bdc5f2f688b9ab53f8db5243ba5d76b68 [formerly 13487885209935c8e800a7c10c4e6076d6c2f6fc] [formerly 651fe231bb [formerly aceefa8715]]
Former-commit-id: 651fe231bb
Former-commit-id: c02444fc90
|
2015-04-22 17:17:32 -06:00 |
|
AWIPS User
|
eb359bceb0
|
File menu reorg + radar menu fix + renaming in bundle delete
Former-commit-id: 419c37ac47 [formerly 07c918b72e] [formerly 16520fd68f] [formerly 6c08f4e474b4b5e0fcaa8a50fe38d3023efbff85 [formerly 4286609de3875bd8c298549695db8c2cbfa64f5f] [formerly 16520fd68f [formerly ff5add010b]]]
Former-commit-id: 250c6a70734ff5d0c29225e92eb6becd7fae881d [formerly fc5f790c5cd280828b3f43a841b8422a5186ec56] [formerly 89cf3a574d [formerly 1c75b81943]]
Former-commit-id: 89cf3a574d
Former-commit-id: 26978b0d35
|
2015-04-22 15:02:34 -06:00 |
|
mjames-upc
|
9fa5e6e9ee
|
Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: 95cd21246b [formerly a2e6b5e6ed] [formerly f71c396cef] [formerly 999c47a3a6437f22b3abc1d05eff866853b93d9b [formerly 8624f9707276ae6bc8c638a057eaf9e7e1d2716a] [formerly f71c396cef [formerly 2288995260]]]
Former-commit-id: b90a1e3192524bea70619c5bc3af4ed100cf7e6c [formerly 7a2ac36eca3df270f4afc658f6f3530848347ee4] [formerly 93b22eeb17 [formerly cd4cb8eb1d]]
Former-commit-id: 93b22eeb17
Former-commit-id: d33cf5cbc8
|
2015-04-22 15:11:19 -06:00 |
|
AWIPS User
|
7375e1ac0c
|
d2d radar menus
Former-commit-id: 567e02948a [formerly 80f9b83794] [formerly b62741733e] [formerly 0e86931cd1c14e9de4cc6b5c14d0d7ab97354b1c [formerly 0a260fd1822c766049733a4a8d4d37ac8654953c] [formerly b62741733e [formerly 0a0496f549]]]
Former-commit-id: 7d041e22a1cf1b5d7f27eaff277119fcc7c11258 [formerly 97fd20431ed8f85a101a68c85b7fab6402f32915] [formerly 50d3bb6627 [formerly 93bc0e3be6]]
Former-commit-id: 50d3bb6627
Former-commit-id: fc206a7919
|
2015-04-18 22:11:14 -06:00 |
|
AWIPS User
|
9e5dc96fc4
|
tdwr menu initial add
Former-commit-id: 7cd72ef285 [formerly 2fe128be79] [formerly f6474a0a1b] [formerly 0606901aa039e4e280acb618f0b2d671aa1a4339 [formerly e3d3ff7ca83160c94a7300603e89df350555ae1f] [formerly f6474a0a1b [formerly fb63ce429c]]]
Former-commit-id: 478488f90232f8cc63ddbd8eafedf0396505ecfe [formerly 297f91df1b2129708c28a1dcd4c502ac60b6a51e] [formerly ac16f7fd47 [formerly ded7ca2c0f]]
Former-commit-id: e02b4610bb232d3dc5c019b74d51b23ba06aa14c [formerly ac16f7fd47]
Former-commit-id: 5f6a72ac75
|
2015-04-18 22:10:52 -06:00 |
|
mjames-upc
|
ba80d4303b
|
modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: e104fc35e2
|
2015-01-12 14:07:28 -07:00 |
|
mjames-upc
|
886cd5940f
|
Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
|
2015-01-12 14:02:58 -07:00 |
|
Zihou Wang
|
1ea6c4dfba
|
VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d
Former-commit-id: 6c1945e85f [formerly 3ea0e0d218] [formerly 8d24be996a] [formerly 8d24be996a [formerly 4fe74892ea]] [formerly 6c1945e85f [formerly 3ea0e0d218] [formerly 8d24be996a] [formerly 8d24be996a [formerly 4fe74892ea]] [formerly 5c86a177b7 [formerly 8d24be996a [formerly 4fe74892ea] [formerly 5c86a177b7 [formerly e5e15da2f57e336d8f23444ab0932b710ad2c033]]]]]
Former-commit-id: 5c86a177b7
Former-commit-id: ddeb874e68 [formerly c754ac5448] [formerly 30be251dc9] [formerly 84d92bfa6cea83a0c14574b1ca4eabf6a55c4b93 [formerly 973f3734dffa4498dfb2ae9312c2b68cc51c9bcd] [formerly 30be251dc9 [formerly d4ca49f01d]]]
Former-commit-id: 6498f0a3912381c89681731c8d6d4d0e79c4d3a9 [formerly e3714090e20a831caf11746053ae333eb208870b] [formerly de979397f4 [formerly a47f4908e7]]
Former-commit-id: daa4aceab6a78a283e71abb1a1fb52228a3a4f4b [formerly de979397f4]
Former-commit-id: e9c3965738
|
2014-11-21 15:42:48 +00:00 |
|
Zihou Wang
|
5c86a177b7
|
VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d
Former-commit-id: e5e15da2f57e336d8f23444ab0932b710ad2c033
|
2014-11-21 15:42:48 +00:00 |
|
Zihou Wang
|
8d24be996a
|
VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d
Former-commit-id: 5c86a177b7 [formerly e5e15da2f57e336d8f23444ab0932b710ad2c033]
Former-commit-id: 4fe74892ea
|
2014-11-21 15:42:48 +00:00 |
|
Ana Rivera
|
4315145238
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: c5a9871924 [formerly 147ea30ebb] [formerly 69832d1fe3] [formerly 69832d1fe3 [formerly 999c66b3e4]] [formerly c5a9871924 [formerly 147ea30ebb] [formerly 69832d1fe3] [formerly 69832d1fe3 [formerly 999c66b3e4]] [formerly 86648e0a20 [formerly 69832d1fe3 [formerly 999c66b3e4] [formerly 86648e0a20 [formerly 875c825320bdfb0e051b6d0ad2e530f7a7a16d19]]]]]
Former-commit-id: 86648e0a20
Former-commit-id: 2ebd8e60e9 [formerly 6c35db8d4d] [formerly aa06e38595] [formerly 9effb77e90dd4fb30219f147440fc430cf1bc50c [formerly 82e20f8fa6aa3851192c68860e5e7f1c90601c75] [formerly aa06e38595 [formerly 0a2ecb9beb]]]
Former-commit-id: d905244b61a57862f47e7080fac99801ccfa2d63 [formerly 12a6d9a20deebb092f64f070247578918326d56d] [formerly fc74bce6b8 [formerly 8770ba8303]]
Former-commit-id: fc74bce6b8
Former-commit-id: ad4a87da6e
|
2014-10-22 12:58:09 +00:00 |
|
Ana Rivera
|
86648e0a20
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 875c825320bdfb0e051b6d0ad2e530f7a7a16d19
|
2014-10-22 12:58:09 +00:00 |
|
Ana Rivera
|
69832d1fe3
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 86648e0a20 [formerly 875c825320bdfb0e051b6d0ad2e530f7a7a16d19]
Former-commit-id: 999c66b3e4
|
2014-10-22 12:58:09 +00:00 |
|
David Lovely
|
0e9d54a663
|
Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block.
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d
Former-commit-id: 2f0bd73bed [formerly 7b66037194] [formerly f83eb3e69b] [formerly f83eb3e69b [formerly d7cd4cc845]] [formerly 2f0bd73bed [formerly 7b66037194] [formerly f83eb3e69b] [formerly f83eb3e69b [formerly d7cd4cc845]] [formerly 2e7cade8d6 [formerly f83eb3e69b [formerly d7cd4cc845] [formerly 2e7cade8d6 [formerly 68d3cede303b82dd3fde23255d830289f967a889]]]]]
Former-commit-id: 2e7cade8d6
Former-commit-id: 48555b8648 [formerly 4044f76e3c] [formerly 1eac8ddbe8] [formerly 35d21f08cfef252ed43ce821ab03fa7588e38c8e [formerly 01bc0440f5e4d8f0aaf9707d9b22d8b27b08328c] [formerly 1eac8ddbe8 [formerly 9e1b263569]]]
Former-commit-id: ae7fe93cd37b9aadc0dc2deffc1a430306315597 [formerly cd51c7b044b380ed845833050ac954706860e142] [formerly 8487137803 [formerly a9b97bbd58]]
Former-commit-id: 8487137803
Former-commit-id: bad100f9df
|
2014-10-20 14:42:39 -05:00 |
|
David Lovely
|
2e7cade8d6
|
Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block.
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d
Former-commit-id: 68d3cede303b82dd3fde23255d830289f967a889
|
2014-10-20 14:42:39 -05:00 |
|
David Lovely
|
f83eb3e69b
|
Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block.
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d
Former-commit-id: 2e7cade8d6 [formerly 68d3cede303b82dd3fde23255d830289f967a889]
Former-commit-id: d7cd4cc845
|
2014-10-20 14:42:39 -05:00 |
|
Ana Rivera
|
e9a1c8adb8
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 8aecfeb9fa [formerly 056592daa1] [formerly 9c54ea5b56] [formerly 9c54ea5b56 [formerly 5894102a1b]] [formerly 8aecfeb9fa [formerly 056592daa1] [formerly 9c54ea5b56] [formerly 9c54ea5b56 [formerly 5894102a1b]] [formerly ec6502df64 [formerly 9c54ea5b56 [formerly 5894102a1b] [formerly ec6502df64 [formerly 972e3d5117a3df147eaa83429f3649b1c1fb7a3f]]]]]
Former-commit-id: ec6502df64
Former-commit-id: 12bf487b79 [formerly 916f0bbe49] [formerly 71fbcb1537] [formerly cfe7a75a6a197e84e3ff5b223e0374eb355e90be [formerly b54f72b4007bdc1417b21cfad790d8cdfa05ef2a] [formerly 71fbcb1537 [formerly e1a4a48258]]]
Former-commit-id: 843fbc2f4e22aa8ac0d85bec0f80ae292ec665bd [formerly 7ce6d020324fb4838133cfb05fe3af33466efd1b] [formerly ab39d4d2a5 [formerly 73f7caea8b]]
Former-commit-id: ab39d4d2a5
Former-commit-id: 7f6d4599e9
|
2014-10-17 17:42:56 +00:00 |
|
Ana Rivera
|
ec6502df64
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: 972e3d5117a3df147eaa83429f3649b1c1fb7a3f
|
2014-10-17 17:42:56 +00:00 |
|
Ana Rivera
|
9c54ea5b56
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Former-commit-id: ec6502df64 [formerly 972e3d5117a3df147eaa83429f3649b1c1fb7a3f]
Former-commit-id: 5894102a1b
|
2014-10-17 17:42:56 +00:00 |
|
Steve Harris
|
d407129dba
|
Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java
Former-commit-id: 3c91dfd8b7 [formerly c0c1ce7700] [formerly 39b2199cec] [formerly 39b2199cec [formerly ad4393bea3]] [formerly 3c91dfd8b7 [formerly c0c1ce7700] [formerly 39b2199cec] [formerly 39b2199cec [formerly ad4393bea3]] [formerly c9e37bf440 [formerly 39b2199cec [formerly ad4393bea3] [formerly c9e37bf440 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]]]
Former-commit-id: c9e37bf440
Former-commit-id: 85a84d662d [formerly e80527ade2] [formerly fc424d7336] [formerly fa0b744e662436c2fbdc7bc093ef8e612411dade [formerly 669e99e1efdfc40962f1589446fe9efe4b3f8b52] [formerly fc424d7336 [formerly fc35b7313d]]]
Former-commit-id: 68fd5903e9fff2e0e8a9aea68086bd4cb62bb006 [formerly 292297ad70be43ccc935b96eca7a8409d4033fc4] [formerly 7c4bb336e1 [formerly f370a2f54e]]
Former-commit-id: 7c4bb336e1
Former-commit-id: 118c19a83d
|
2014-10-07 13:35:58 -05:00 |
|
Steve Harris
|
c9e37bf440
|
Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java
Former-commit-id: 6bb7a7312a22a9585d2f5981d873751879082cb1
|
2014-10-07 13:35:58 -05:00 |
|