Slav Korolev
|
e93a7d45d6
|
Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors.
Former-commit-id: 9190c56fc3 [formerly c91e636d98] [formerly 1f4ed7fd1b] [formerly 1f4ed7fd1b [formerly 9c369a9c5c]] [formerly 9190c56fc3 [formerly c91e636d98] [formerly 1f4ed7fd1b] [formerly 1f4ed7fd1b [formerly 9c369a9c5c]] [formerly 8971f40dc2 [formerly 1f4ed7fd1b [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]]]]
Former-commit-id: 8971f40dc2
Former-commit-id: fbbf54983c [formerly 042bf2b482] [formerly 19db4c34bb] [formerly fed8506db7f7a89ab94f70d558a9b66def0858f6 [formerly 726de9ad3e8e7237b0a845990c102ba09fdadeed] [formerly 19db4c34bb [formerly e517a73d81]]]
Former-commit-id: c92f22ae4f15a4e28ef95929d079252139e9b230 [formerly 15e97a6a51d909c6ddad439e6a80921dbeecac9b] [formerly 8a6f3b4749 [formerly de09cba07a]]
Former-commit-id: 8a6f3b4749
Former-commit-id: 2e67cc2d9f
|
2014-10-20 15:06:05 -04: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 |
|
Slav Korolev
|
6403c022a2
|
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
Former-commit-id: 3c3c8b3158 [formerly 87c7787cb2] [formerly 1120f9a440] [formerly 1120f9a440 [formerly 7b1a4c6774]] [formerly 3c3c8b3158 [formerly 87c7787cb2] [formerly 1120f9a440] [formerly 1120f9a440 [formerly 7b1a4c6774]] [formerly ce2ef5019b [formerly 1120f9a440 [formerly 7b1a4c6774] [formerly ce2ef5019b [formerly d7a921d6206f5b09e7a6784c7e86b9167b74685f]]]]]
Former-commit-id: ce2ef5019b
Former-commit-id: 1862f7b442 [formerly 2272e5581a] [formerly 7e739e4197] [formerly cd73a2297c5e52462c33663a03b09240c1fa4bf1 [formerly ff4736b57ad7b9270a66a08b26833bcbbe520650] [formerly 7e739e4197 [formerly 11ee774939]]]
Former-commit-id: 019d11a31d79ca7a70e3a22cb941c9f819e7f586 [formerly aca0ddcbd2e670daff2cd8182a38f2ae07972d37] [formerly 27f8c438d2 [formerly 3033eba2f3]]
Former-commit-id: 27f8c438d2
Former-commit-id: 8ed04b61f1
|
2014-09-25 09:02:27 -04:00 |
|
Slav Korolev
|
2fe0a3aef3
|
Issue #2757 - Fixed problem with adding and removing zones.
Former-commit-id: 38cc81f9f9 [formerly d8f3f75c07] [formerly 4c209b4958] [formerly fa76420af3747729103225928cbcb7ee8ee3c133 [formerly 4c209b4958 [formerly 443c7c7482]]] [formerly 38cc81f9f9 [formerly d8f3f75c07] [formerly 4c209b4958] [formerly fa76420af3747729103225928cbcb7ee8ee3c133 [formerly 4c209b4958 [formerly 443c7c7482]]] [formerly a4914bd85d [formerly 4c209b4958 [formerly 443c7c7482] [formerly a4914bd85d [formerly 31ccaf218df628327fe4b27d69a4500eb1dc8d84]]]]]
Former-commit-id: a4914bd85d
Former-commit-id: d61167a571 [formerly 90b3e23aac] [formerly 1596ad20b6] [formerly 6d68a6ecfd10030d589897df97c8ecd5969e4b58 [formerly b3531890f44af7788db8826f064c5a69cb875795] [formerly 1596ad20b6 [formerly d08b42a7de]]]
Former-commit-id: c4823a1d5cccfc21b2eaae4145cfe5e830115c6e [formerly 88c32de2eac43d023c6b67f9e8ee0834d7094648] [formerly a0a543439f [formerly 512ca34484]]
Former-commit-id: a0a543439f
Former-commit-id: de8fd3acb9
|
2014-09-24 09:34:43 -04:00 |
|
Slav Korolev
|
24f18b101e
|
Issue #2757 - Updated handlers for dialog buttons.
Former-commit-id: caa969df9d [formerly ba5acfdda0] [formerly d2dd00d2ae] [formerly 17599a9fbeb3f91ce886f3fa7ad1d0c36abccfd0 [formerly d2dd00d2ae [formerly 71c4d8db07]]] [formerly caa969df9d [formerly ba5acfdda0] [formerly d2dd00d2ae] [formerly 17599a9fbeb3f91ce886f3fa7ad1d0c36abccfd0 [formerly d2dd00d2ae [formerly 71c4d8db07]]] [formerly 23ec338be0 [formerly d2dd00d2ae [formerly 71c4d8db07] [formerly 23ec338be0 [formerly 69a82633c287bf18c9f436014bb552829dcb62ea]]]]]
Former-commit-id: 23ec338be0
Former-commit-id: 26a49160ed [formerly cad2fc287e] [formerly 6b67a43b72] [formerly 30cc49f9d872ccc2dfb703e7cf711261644e1045 [formerly 5df7ec46207367810cbdd758111e799776aa334a] [formerly 6b67a43b72 [formerly 780dedce8a]]]
Former-commit-id: 9e5f9a0bf67a1a2cf42c8dcb5e2a0368f2e1b43c [formerly e9a0630ba840449ff9ac04e5b73d1d8f7d1f9d0f] [formerly 48cf5d015d [formerly d576d1d2fd]]
Former-commit-id: 48cf5d015d
Former-commit-id: 7bb7350a8c
|
2014-09-19 15:02:59 -04:00 |
|
Nate Jensen
|
05fdcfc7e6
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 48e85580e2 [formerly d61c65787b] [formerly 253198b5bc] [formerly 253198b5bc [formerly b3083a663e]] [formerly 48e85580e2 [formerly d61c65787b] [formerly 253198b5bc] [formerly 253198b5bc [formerly b3083a663e]] [formerly 9b72a1399d [formerly 253198b5bc [formerly b3083a663e] [formerly 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]]]
Former-commit-id: 9b72a1399d
Former-commit-id: e0328eddc2 [formerly e7b11aaf88] [formerly 58a4cb95c1] [formerly 8f077fe127a08e65001a02bd37b66aeb527c2ca4 [formerly 1fed4e6852cd8eca79ebee598c5badd5a0a3fe14] [formerly 58a4cb95c1 [formerly d67083655a]]]
Former-commit-id: b64298a90fcca2ad20ae920c1205c27ce153e775 [formerly 7e191ad12969bca5c4c6b83a1e9488c58f4c6928] [formerly 7336692b85 [formerly 951feab33d]]
Former-commit-id: 7336692b85
Former-commit-id: f7ae70ac02
|
2014-08-14 10:22:37 -05:00 |
|
Nate Jensen
|
86312db3be
|
Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui
since those plugins don't even have buddy policies
Change-Id: Ib81ac30111b9c3020e486d6db52dde3e15d7dacf
Former-commit-id: 64fb217979 [formerly f83883f478] [formerly 92b1fb11e5] [formerly 92b1fb11e5 [formerly 6e94ea9d2b]] [formerly 64fb217979 [formerly f83883f478] [formerly 92b1fb11e5] [formerly 92b1fb11e5 [formerly 6e94ea9d2b]] [formerly f8d9235104 [formerly 92b1fb11e5 [formerly 6e94ea9d2b] [formerly f8d9235104 [formerly 4f691341c0368c3e015c73f25aab0cf8877802ac]]]]]
Former-commit-id: f8d9235104
Former-commit-id: da6583f81e [formerly 6b7c0607bb] [formerly 8e6d26df88] [formerly 28bb41fd6920511ed137c9ea996a85e58692b905 [formerly 758558f07df22f2211e130fe18c672ae61e217f5] [formerly 8e6d26df88 [formerly 619f0ac245]]]
Former-commit-id: 25a60ed189334dad1d112c27750b76d9649a5e63 [formerly 3a6313d5f51de9ac207b2ba1e2d49787937b4db6] [formerly 875a4ae026 [formerly 2889a0fedb]]
Former-commit-id: 875a4ae026
Former-commit-id: cf101fa32d
|
2014-08-04 18:03:15 -05:00 |
|
Slav Korolev
|
58c725dd5b
|
Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
Former-commit-id: fcaba2e92a [formerly 78d009705b] [formerly adba0cd20a] [formerly adba0cd20a [formerly e3fe3c9736]] [formerly fcaba2e92a [formerly 78d009705b] [formerly adba0cd20a] [formerly adba0cd20a [formerly e3fe3c9736]] [formerly 81033087ea [formerly adba0cd20a [formerly e3fe3c9736] [formerly 81033087ea [formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]]]]
Former-commit-id: 81033087ea
Former-commit-id: d37b2694b4 [formerly 2d330b6849] [formerly 55b01dce6d] [formerly 9b09d509b32ff7b4b3f83a45c341e51f2aa0d10b [formerly ffff3de7255ddc5811bb800ab442d18dc7fb0afc] [formerly 55b01dce6d [formerly 4a8e7fc38e]]]
Former-commit-id: e593bea7f715b491e8ba1b33a6902e51d92ee368 [formerly 4e04ae2abf2ea5763d2bc71363ef09579b4737e9] [formerly bcc5a458b3 [formerly ced313a7f1]]
Former-commit-id: b73feb7ea04a254194feb5627cc2e5e48f8d09d3 [formerly bcc5a458b3]
Former-commit-id: 18134b5093
|
2014-05-27 12:24:50 -04:00 |
|
Nate Jensen
|
e1b94dbc53
|
Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851
Former-commit-id: 4cb30d8b24 [formerly 11db335c3a] [formerly e464500dfc] [formerly e464500dfc [formerly 07426ce408]] [formerly 4cb30d8b24 [formerly 11db335c3a] [formerly e464500dfc] [formerly e464500dfc [formerly 07426ce408]] [formerly 174fae77d1 [formerly e464500dfc [formerly 07426ce408] [formerly 174fae77d1 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]]]]]
Former-commit-id: 174fae77d1
Former-commit-id: 175b651efb [formerly 5b8f3aada2] [formerly c31080d705] [formerly 3a20f586d050d6770667df3702c670e416974a6d [formerly 59ddbe2030bf3ffb614a1ba31e37cfb021339cfb] [formerly c31080d705 [formerly ea7b123eef]]]
Former-commit-id: f19a462812e24a55d59f8baec6fc739319ea9520 [formerly d3e19b5f43cade3b4e741900facacc51b5142159] [formerly 824c2f805d [formerly 4a18f1e24b]]
Former-commit-id: 824c2f805d
Former-commit-id: 14c3cb008b
|
2014-05-13 13:12:54 -05:00 |
|
Slav Korolev
|
312e85fb9e
|
Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
Former-commit-id: ca340f35e4 [formerly f39c9c151d] [formerly 150a132320] [formerly 150a132320 [formerly 689930c484]] [formerly ca340f35e4 [formerly f39c9c151d] [formerly 150a132320] [formerly 150a132320 [formerly 689930c484]] [formerly f458f75ecf [formerly 150a132320 [formerly 689930c484] [formerly f458f75ecf [formerly 879a50a60209abf95752c178a0266cdd42bde012]]]]]
Former-commit-id: f458f75ecf
Former-commit-id: 535ce6428e [formerly 4dca796283] [formerly 27095ecca8] [formerly 6d2dc2ea51faa72c922ad10f350eb15da18ba853 [formerly 72ea0b9194f024a8e7ff25eef75d71cd7b0f041d] [formerly 27095ecca8 [formerly e78c6edb8c]]]
Former-commit-id: b05d4f36df72f46636a2195dbda175edf482878f [formerly 8dff33928d12bb7f6066533d4e9a0cc09195cf1f] [formerly cd38f3636d [formerly 1bf6d72572]]
Former-commit-id: cd38f3636d
Former-commit-id: d5438ccac5
|
2014-04-24 15:40:52 -04:00 |
|
Nate Jensen
|
5ca3153fdc
|
Issue #2984 remove unnecessary dependencies on edex
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746
Former-commit-id: a9a2a4f082 [formerly 2561050293] [formerly ef43b2d325] [formerly ef43b2d325 [formerly 2253938ed5]] [formerly a9a2a4f082 [formerly 2561050293] [formerly ef43b2d325] [formerly ef43b2d325 [formerly 2253938ed5]] [formerly df4171b29d [formerly ef43b2d325 [formerly 2253938ed5] [formerly df4171b29d [formerly 39d1f72292414d008c0899dac616e76c8c0f2512]]]]]
Former-commit-id: df4171b29d
Former-commit-id: 2b90e19c75 [formerly d6a968cac2] [formerly 4011b1351f] [formerly ea48f9007827b14252155543b6528836847d4783 [formerly 024b55876a4025da8b49a4ff3d68557b772e23a5] [formerly 4011b1351f [formerly 24c8b0a327]]]
Former-commit-id: cb359779e995e2e3601136640467cfa8d9982cb5 [formerly 25c60d2192a236220a6b597edaac8c5cc4d3c07b] [formerly cc150c8a1a [formerly 5795254827]]
Former-commit-id: cc150c8a1a
Former-commit-id: f84adac681
|
2014-04-21 11:32:41 -05:00 |
|
Everett Kladstrup
|
0071c738d4
|
Issue #2725 Move derived parameters logic to common
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
to the common hierarchy
* Move data cube classes that don't depend on derived parameters
to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
viz.core to viz.datacube
Former-commit-id: 853bc4ad0b [formerly eab1358602] [formerly 8b19b3601a] [formerly 8b19b3601a [formerly 06d6961c0f]] [formerly 853bc4ad0b [formerly eab1358602] [formerly 8b19b3601a] [formerly 8b19b3601a [formerly 06d6961c0f]] [formerly 0699041518 [formerly 8b19b3601a [formerly 06d6961c0f] [formerly 0699041518 [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]]
Former-commit-id: 0699041518
Former-commit-id: 4c60039942 [formerly 29ce7781c9] [formerly 86bf2b5ea0] [formerly 1ffb072e3ddcc73123d0d9bf8e3ed1cb9a342b66 [formerly eb5b00071037510aefc04c8c20411cc18c44abb0] [formerly 86bf2b5ea0 [formerly 260d0beddc]]]
Former-commit-id: c5e0dbcd1c615a2e22f6ed46d6ca3390f60edfd7 [formerly 41d01092799ccea952f65c9d6b66d93b56557541] [formerly 7b2683532a [formerly d96b56c91a]]
Former-commit-id: 7b2683532a
Former-commit-id: f815fbcb60
|
2014-04-09 09:31:12 -05:00 |
|
Max Schenkelberg
|
e75f1c3dbb
|
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: 75d19d6be6 [formerly dbc6cc3fc6] [formerly 59434c8a60] [formerly 59434c8a60 [formerly a01a6d68d0]] [formerly 75d19d6be6 [formerly dbc6cc3fc6] [formerly 59434c8a60] [formerly 59434c8a60 [formerly a01a6d68d0]] [formerly cbf8b9249c [formerly 59434c8a60 [formerly a01a6d68d0] [formerly cbf8b9249c [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: cef1660684 [formerly d85fd52c26] [formerly 39e1c4fa46] [formerly 98b658ee3024e50c70a3a9e734120a03e368a302 [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2] [formerly 39e1c4fa46 [formerly 654da3c0a2]]]
Former-commit-id: 0af58fe5c63d46e47391570eeddad5b3cae58623 [formerly 22a289abbef9ce66bd6d9f68b9610a2b65dc9258] [formerly c6cf08db73 [formerly f509321134]]
Former-commit-id: 9eadbcf5b459cbf8e5d87871218bd1a78327a18f [formerly c6cf08db73]
Former-commit-id: 7c66cf792b
|
2014-03-04 09:23:36 -06:00 |
|
Slav Korolev
|
85372d8ce7
|
Issue #2757. Added filter for removed stations and cleaned code.
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534
Former-commit-id: 6860535350 [formerly 91972c1b42] [formerly cbd17ea025] [formerly cbd17ea025 [formerly c7c40a3467]] [formerly 6860535350 [formerly 91972c1b42] [formerly cbd17ea025] [formerly cbd17ea025 [formerly c7c40a3467]] [formerly fa59172d87 [formerly cbd17ea025 [formerly c7c40a3467] [formerly fa59172d87 [formerly b613a9d5b7e9b1c17fa354c9c6b617da040d1d71]]]]]
Former-commit-id: fa59172d87
Former-commit-id: bf19a3b769 [formerly 0ebbffc8fc] [formerly aea166d7b9] [formerly 25f4362e2693fa831194d45ea5636ec2a5c292f8 [formerly 9e17821f974894adbc9405dc7e9472062b30ba3c] [formerly aea166d7b9 [formerly 4ec22d9530]]]
Former-commit-id: 9c2fd041eafa3fa0c30b3a6739b32f556ff87798 [formerly 9d5d14a3e49ab60496fd1e6b5d14e240364fd62b] [formerly bd2141d123 [formerly 65ea06a366]]
Former-commit-id: bd2141d123
Former-commit-id: 1964f52bc0
|
2014-02-04 15:21:22 -05:00 |
|
Slav Korolev
|
d8cec43983
|
Issue #2757. Fixed issues in Area Configuration Dialogs.
Change-Id: Ic3d3d5c41df6c8d80aac8e434e4c42a5ef9d1ecf
Former-commit-id: b0ce18a8bf [formerly 7b3702c186] [formerly 6013121a99] [formerly 6013121a99 [formerly ea573d2c30]] [formerly b0ce18a8bf [formerly 7b3702c186] [formerly 6013121a99] [formerly 6013121a99 [formerly ea573d2c30]] [formerly a768f540f0 [formerly 6013121a99 [formerly ea573d2c30] [formerly a768f540f0 [formerly 81826338bda946aff4ac8a7b9ea83c2eb72397d5]]]]]
Former-commit-id: a768f540f0
Former-commit-id: e45691b6d5 [formerly f6ea436e80] [formerly d2d4672a46] [formerly 6483fb5be1915744c3badb428f9abfd2df744293 [formerly a981a42007f76a4e25e017ce265ad6fb22a436d4] [formerly d2d4672a46 [formerly 6d9a066c36]]]
Former-commit-id: 7a12d00f677dc5fe1d905be4535fe373eef75e1f [formerly 4f37da138bfd1a624cb5c2b39655d2127c907a2a] [formerly 559d0f9499 [formerly baf598a6ff]]
Former-commit-id: 559d0f9499
Former-commit-id: 4cac912be3
|
2014-02-03 09:50:01 -05:00 |
|
Slav Korolev
|
182a9a80bc
|
Issue #2653. Corrected decoding of SNOW monitor data.
Former-commit-id: cedd4ac102 [formerly 696728bafd] [formerly 5bbb774073] [formerly 5bbb774073 [formerly 714fd018ef]] [formerly cedd4ac102 [formerly 696728bafd] [formerly 5bbb774073] [formerly 5bbb774073 [formerly 714fd018ef]] [formerly ab7fc816b4 [formerly 5bbb774073 [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]]]
Former-commit-id: ab7fc816b4
Former-commit-id: 522b1bb2b9 [formerly 679b61deea] [formerly eb5ec35275] [formerly 451eb73baaec00dcfa9888e1a298a6cacb3f2457 [formerly 5aa04e4abf5d9d29b644d2a212f6393c065cce96] [formerly eb5ec35275 [formerly 0fb9810e91]]]
Former-commit-id: 64a0b82f681a39356467ee0a666dbdbfcfcfb172 [formerly 9c64be7095aadcd4adef7f3b53b64c6684b3b86d] [formerly 4c3ce254b6 [formerly 4fd070dd46]]
Former-commit-id: 4c3ce254b6
Former-commit-id: ac5540213e
|
2014-01-07 11:48:13 -05:00 |
|
Richard Peter
|
b218c42551
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: c8e42bc4ae [formerly ba577ff354] [formerly b3b23647b4] [formerly b3b23647b4 [formerly 0c4ae068ad]] [formerly c8e42bc4ae [formerly ba577ff354] [formerly b3b23647b4] [formerly b3b23647b4 [formerly 0c4ae068ad]] [formerly a0b6ea8bb2 [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: f82ffb09ae [formerly 530b3bd588] [formerly 60679a818a] [formerly 760dcf122f206c1a059e2ae1bc1fe6dfedb8ff47 [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215] [formerly 60679a818a [formerly da027298d4]]]
Former-commit-id: ab3a026945d3ed98f11acdfbc661ef575858f342 [formerly 53e9784af497b834229cb70070f6499791f6f567] [formerly ae6e34be4b [formerly fd93b7d85e]]
Former-commit-id: ae6e34be4b
Former-commit-id: f362062048
|
2013-12-05 12:12:27 -06:00 |
|
Steve Harris
|
331d0dfe44
|
14.1.1-12 baseline
Former-commit-id: 55fbdca04f [formerly f53eb87892] [formerly 371d1ca63c] [formerly 371d1ca63c [formerly b24d9c80b0]] [formerly 55fbdca04f [formerly f53eb87892] [formerly 371d1ca63c] [formerly 371d1ca63c [formerly b24d9c80b0]] [formerly a3ec45a99f [formerly 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: e2cc80debe [formerly 1e4b2bac7b] [formerly 4e6f319422] [formerly a824c99a6e079d9c557dc96a800f3e69390eb9a1 [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4] [formerly 4e6f319422 [formerly 14421048af]]]
Former-commit-id: 8f61c91746184c6dcddeeb270197a75995c2c9d9 [formerly e177b16a88af27dc0abf4496fe58fbe454cfa8c9] [formerly 60f062ea59 [formerly 234ca267ed]]
Former-commit-id: 60f062ea59
Former-commit-id: 31c94115c7
|
2013-12-04 16:47:59 -05:00 |
|
Richard Peter
|
c84a8f297b
|
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 7827335af6 [formerly 6502f1f695] [formerly 2c753c427c] [formerly 2c753c427c [formerly 79bdd34f4f]] [formerly 7827335af6 [formerly 6502f1f695] [formerly 2c753c427c] [formerly 2c753c427c [formerly 79bdd34f4f]] [formerly 0074b774f0 [formerly 2c753c427c [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]]]
Former-commit-id: 0074b774f0
Former-commit-id: c68faceb0c [formerly 625647a717] [formerly b4aac09ff4] [formerly c6b0f50bf98bad8774714a0a2af24c321c675953 [formerly 9dbc5783e450aca6291faa5547b5b3369711eda7] [formerly b4aac09ff4 [formerly 96b4944b41]]]
Former-commit-id: 23f1516a8d596f72d8ef1601a64d3c6dc7a13242 [formerly 2067b058e879c394c330dccfc1994698c7f7cb05] [formerly 705339a320 [formerly e2a16fd876]]
Former-commit-id: 705339a320
Former-commit-id: d289419c40
|
2013-11-14 14:40:23 -06:00 |
|
Steve Harris
|
deb7f8007c
|
14.1.1-8 baseline
Former-commit-id: 087aef994f [formerly 8606fed724] [formerly 90bc008a50] [formerly 90bc008a50 [formerly aa6c977e7b]] [formerly 087aef994f [formerly 8606fed724] [formerly 90bc008a50] [formerly 90bc008a50 [formerly aa6c977e7b]] [formerly c7d36eb6ad [formerly 90bc008a50 [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: b5a4997cb5 [formerly 1902ca9cfb] [formerly b7ca6163e3] [formerly 03df84ac5f9dd38b080ba0831ba156f377fa54bb [formerly 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7] [formerly b7ca6163e3 [formerly 0123596fd9]]]
Former-commit-id: 3d51417a06af433a423ecdcf2f45120d141d0a37 [formerly 299bb48cc93fac70de777c99a73fd516cc085238] [formerly d2104614be [formerly 42ece4fb6a]]
Former-commit-id: d2104614be
Former-commit-id: 7facd4fe25
|
2013-11-13 12:32:17 -05:00 |
|
Ben Steffensmeier
|
023d5ca8dc
|
Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: 687e7b005e [formerly c91c0d3f1a] [formerly d386c6bc76] [formerly d386c6bc76 [formerly ff5f08d23a]] [formerly 687e7b005e [formerly c91c0d3f1a] [formerly d386c6bc76] [formerly d386c6bc76 [formerly ff5f08d23a]] [formerly 5a928e6ad5 [formerly d386c6bc76 [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: 54c98f7eb0 [formerly dd2bb59742] [formerly d38879158d] [formerly 170900399f562dca708656a6b98a331deb5880f8 [formerly c694721b6dae8a56fdf9390a3bc7d8934e8b3711] [formerly d38879158d [formerly 08e73de883]]]
Former-commit-id: 238d67dea81406390eeaadc791ff3f554405b1d7 [formerly 6bf4ce1b85d10c2151244620ecdee96d3fb2244e] [formerly dacf863d66 [formerly a0f4c08cfd]]
Former-commit-id: dacf863d66
Former-commit-id: 4dfe17eca2
|
2013-11-04 13:01:49 -06:00 |
|
Nate Jensen
|
9b35082330
|
Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: 4e64ac9803 [formerly bd9578dd6d] [formerly 65d7d4dac9] [formerly 65d7d4dac9 [formerly 477c64c8bd]] [formerly 4e64ac9803 [formerly bd9578dd6d] [formerly 65d7d4dac9] [formerly 65d7d4dac9 [formerly 477c64c8bd]] [formerly 2f79b34a77 [formerly 65d7d4dac9 [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]]]
Former-commit-id: 2f79b34a77
Former-commit-id: 7f28d2af7a [formerly d2af0d52a6] [formerly 2419a99ac7] [formerly 13a3a7a6ae34057370ff8b55199f7e9b45e8a559 [formerly a01d69eb125667dc0511591658732e612649a73e] [formerly 2419a99ac7 [formerly 1adac8829f]]]
Former-commit-id: b3e0f9c6cf180a1532c8f00ce10b571d51041a41 [formerly a2aea41bda81ba451fdb55f8030f7d56d6699493] [formerly 41dab56b49 [formerly c9cdcc056a]]
Former-commit-id: 41dab56b49
Former-commit-id: 360066e5b8
|
2013-10-23 14:52:29 -05:00 |
|
Lee Venable
|
1d3aa2319d
|
Issue #2443 - fixed image memory leak.
Former-commit-id: 7e31450370 [formerly 7dae2b36cf] [formerly 1021c25d9d] [formerly 1021c25d9d [formerly 0bacce33bc]] [formerly 7e31450370 [formerly 7dae2b36cf] [formerly 1021c25d9d] [formerly 1021c25d9d [formerly 0bacce33bc]] [formerly 47f8200757 [formerly 1021c25d9d [formerly 0bacce33bc] [formerly 47f8200757 [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]]]]
Former-commit-id: 47f8200757
Former-commit-id: 282c01a1c3 [formerly fc98572a27] [formerly 03c4e9a287] [formerly 9d81c48cd8cca18338f4041e681c8af5e0863c8e [formerly 43dc0958942086502dfa768b01124fa7746d0abb] [formerly 03c4e9a287 [formerly cd63ee8644]]]
Former-commit-id: 9d1eb158ccba80e87001c7e5dceffa9977e7f837 [formerly ba282d5c92d098a16eba78a72542a536bd52ee6b] [formerly e2b44eac03 [formerly 162df3c8d2]]
Former-commit-id: e2b44eac03
Former-commit-id: cdba1e48df
|
2013-10-08 09:39:00 -05:00 |
|
Lee Venable
|
905873e1a9
|
Issue #2436 - disposed of the sort color
Former-commit-id: a4ba355169 [formerly f27781b74e] [formerly 8c8adf8be6] [formerly 8c8adf8be6 [formerly 9c97908f36]] [formerly a4ba355169 [formerly f27781b74e] [formerly 8c8adf8be6] [formerly 8c8adf8be6 [formerly 9c97908f36]] [formerly c4ddd46b44 [formerly 8c8adf8be6 [formerly 9c97908f36] [formerly c4ddd46b44 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]]]
Former-commit-id: c4ddd46b44
Former-commit-id: 44c47d86e3 [formerly ccbc44f9d3] [formerly 2ed106cac4] [formerly ed77fa3c8112f6aa7a0adaa23cbfad2968c0e127 [formerly b50a8d2a19218358b07a31a6ee2f605c0ead6152] [formerly 2ed106cac4 [formerly 46db8998a6]]]
Former-commit-id: 78a08380a35cf7a9d6da44f56a31ca753afeada3 [formerly d130264f10b1958114f77cf64c39663d19c8c154] [formerly b0af7745a6 [formerly 1000147d0c]]
Former-commit-id: b0af7745a6
Former-commit-id: c328869516
|
2013-10-07 09:11:25 -05:00 |
|
Max Schenkelberg
|
7c00da5089
|
Issue #2277 Remove more ScriptCreator references
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747
Former-commit-id: 8b8f5bcb4f [formerly 84377d3e8c] [formerly 487775918d] [formerly 487775918d [formerly 17b38d9f72]] [formerly 8b8f5bcb4f [formerly 84377d3e8c] [formerly 487775918d] [formerly 487775918d [formerly 17b38d9f72]] [formerly 63e90f6955 [formerly 487775918d [formerly 17b38d9f72] [formerly 63e90f6955 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]]]]]
Former-commit-id: 63e90f6955
Former-commit-id: 0f5d2a78ae [formerly bfb43525f4] [formerly 96852b88ec] [formerly ee6c3b46418a95db4d90f6c5278faca5d5ac5297 [formerly 59063b336b6f01e333d1863cd1bfa081ea66cd8d] [formerly 96852b88ec [formerly e4b18ef410]]]
Former-commit-id: b4b150f42bcc403c9d1ec28d9b339d5b98c1a2b8 [formerly bbd77f752997e583b5b69ab5e3012b80b3da1622] [formerly 00364668a4 [formerly 87d33eb32f]]
Former-commit-id: 00364668a4
Former-commit-id: b5300b8f15
|
2013-09-11 16:32:00 -05:00 |
|
David Gillingham
|
3f4e85e123
|
Issue #2262: Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
Java. Convert to use of these new methods where possible. Create unit tests.
Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d
Former-commit-id: 6f33dfc736 [formerly bd9b224ff5] [formerly c17f8b4409] [formerly c17f8b4409 [formerly 0b6b0e06cc]] [formerly 6f33dfc736 [formerly bd9b224ff5] [formerly c17f8b4409] [formerly c17f8b4409 [formerly 0b6b0e06cc]] [formerly 40b5d54bf3 [formerly c17f8b4409 [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 5992197809236553e9c021526e42d28ed327b413]]]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 1b480fcc4d [formerly 218ec39696] [formerly 9c656c28b9] [formerly 2125b63344364089b916887a86c7ec9e3cbcce63 [formerly 677ad3a406560b6ea868401e4fe7be87a4817e25] [formerly 9c656c28b9 [formerly 8d347252d2]]]
Former-commit-id: a1fd2652354d2af1a0b83fc2fa60a853a69b4797 [formerly c1a7c1d2b9b5f35177db262289e7dc470702f3ad] [formerly a217ce6044 [formerly f46f62ff2e]]
Former-commit-id: a217ce6044
Former-commit-id: 2e5e666153
|
2013-08-15 11:30:45 -05:00 |
|
Nate Jensen
|
f94c950804
|
Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c
Former-commit-id: af358f6fe2 [formerly 178107c128] [formerly bcdaae1922] [formerly bcdaae1922 [formerly 22438766b4]] [formerly af358f6fe2 [formerly 178107c128] [formerly bcdaae1922] [formerly bcdaae1922 [formerly 22438766b4]] [formerly 4c9cc211ec [formerly bcdaae1922 [formerly 22438766b4] [formerly 4c9cc211ec [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 31e13f0cf5 [formerly 78e718122d] [formerly a51d424851] [formerly 9eed93c9515cb0ec015ed44f40dab04dde618090 [formerly 3dc4b88484b3a717a07e85e47dd00b4cd0dcaaee] [formerly a51d424851 [formerly 797760bb71]]]
Former-commit-id: 92475a017bdeab4e7c8668c9421bac76e76ae688 [formerly c97be13fa7db2191a5a8ef2ef39d349d3dc46e1b] [formerly 3e7f3c66a8 [formerly c28a52bee8]]
Former-commit-id: 3e7f3c66a8
Former-commit-id: 325654d640
|
2013-07-22 12:20:43 -05:00 |
|
Max Schenkelberg
|
b1a5c51237
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 5e50837d4c [formerly cd88054e2b] [formerly 94fa6f0e30] [formerly 94fa6f0e30 [formerly 63421a4819]] [formerly 5e50837d4c [formerly cd88054e2b] [formerly 94fa6f0e30] [formerly 94fa6f0e30 [formerly 63421a4819]] [formerly 50825200a1 [formerly 94fa6f0e30 [formerly 63421a4819] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]]
Former-commit-id: 50825200a1
Former-commit-id: 04f82b063f [formerly f025c05d04] [formerly d1881ffa51] [formerly f2a28ca47fdd75f8c3b1d3ff2694ff5c589ea2c2 [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f] [formerly d1881ffa51 [formerly 1610826d2e]]]
Former-commit-id: 0cb89f5ac334e5eca960f634833c12e40bf541ef [formerly a38fe0e4cd744ea32b4c88e97305cabc3dbac06f] [formerly 5ba50b4476 [formerly a47f187f4f]]
Former-commit-id: 5ba50b4476
Former-commit-id: ad32bbd91d
|
2013-07-15 14:26:15 -05:00 |
|
Steve Harris
|
b7a2a121a5
|
13.3.1-12 baseline
Former-commit-id: 76903d9542 [formerly 6f374b35d0] [formerly be96282207] [formerly be96282207 [formerly 0be473728a]] [formerly 76903d9542 [formerly 6f374b35d0] [formerly be96282207] [formerly be96282207 [formerly 0be473728a]] [formerly aaac0b51e5 [formerly be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: 80fbff6238 [formerly bb30a41300] [formerly f80f98cee2] [formerly 3f6c338606243084087e2839cfb2192f51e70c5c [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481] [formerly f80f98cee2 [formerly bc439aee4f]]]
Former-commit-id: e7d76e18893645eb9cf3a95047cd126da090ed66 [formerly 5c941816ce99cd7acc86ec8198a9c8d060f02007] [formerly 120fc26670 [formerly f1d156779a]]
Former-commit-id: 120fc26670
Former-commit-id: fd735b8ff8
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
5dac0b2fc0
|
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: edf9cdad39 [formerly 3ec20c1689] [formerly 61a19a460b] [formerly 61a19a460b [formerly 305dd72969]] [formerly edf9cdad39 [formerly 3ec20c1689] [formerly 61a19a460b] [formerly 61a19a460b [formerly 305dd72969]] [formerly 57f42761d7 [formerly 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 0192d8db81 [formerly 7ff64bf8cc] [formerly b423579e4a] [formerly 440becff6c9991032ebd9ae7879765c36112a5f0 [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c] [formerly b423579e4a [formerly a8e1557c62]]]
Former-commit-id: 80e385fafa882a8927d2b3ebdec5e7f9bf7cdf13 [formerly 276acc0cf2f69b884f078f338890570213eec929] [formerly d842ed88a7 [formerly b630339eb7]]
Former-commit-id: d842ed88a7
Former-commit-id: 2104c8b533
|
2013-03-05 12:27:49 -06:00 |
|
Steve Harris
|
05db9b8904
|
13.3.1-5 baseline
Former-commit-id: d37129e5c6 [formerly e4a1c61ad5] [formerly 8123d5ac45] [formerly 8123d5ac45 [formerly a89221c75b]] [formerly d37129e5c6 [formerly e4a1c61ad5] [formerly 8123d5ac45] [formerly 8123d5ac45 [formerly a89221c75b]] [formerly e26f7eb151 [formerly 8123d5ac45 [formerly a89221c75b] [formerly e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]]
Former-commit-id: e26f7eb151
Former-commit-id: 03ffc359fb [formerly aabd5cd51f] [formerly a240379588] [formerly b670e107919a03a4c3a0d0aefa93fc97cf46b7a2 [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170] [formerly a240379588 [formerly a40c9136fe]]]
Former-commit-id: 2d92b684aca8e0a0ef133ce949f3776762ef52f8 [formerly 8b4bd6790f2136380dbac557b452d873c77bacc6] [formerly 79ff805090 [formerly 1f98e01c57]]
Former-commit-id: 79ff805090
Former-commit-id: f20c87110e
|
2013-03-05 10:47:06 -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
|
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 |
|
Roger Ferrel
|
2facecba39
|
Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg.
Change-Id: Ia57cfe88e22544260bbc03483b4c852843f67b42
Former-commit-id: 10a2b86fbe [formerly 3275e6adfe] [formerly 24c88a1673] [formerly 24c88a1673 [formerly 130fa3f73d]] [formerly 10a2b86fbe [formerly 3275e6adfe] [formerly 24c88a1673] [formerly 24c88a1673 [formerly 130fa3f73d]] [formerly 873f932f8e [formerly 24c88a1673 [formerly 130fa3f73d] [formerly 873f932f8e [formerly 64c6e3b9812dc7232bd36feff181805c4fd504d9]]]]]
Former-commit-id: 873f932f8e
Former-commit-id: 61ad148769 [formerly 26059ae7e0] [formerly 940d442f6f] [formerly df67dfcc96589ebcaae53adfddd4c1124b480881 [formerly 55ef04696c780948659739ded23b8f7dfe6ff66c] [formerly 940d442f6f [formerly f30b5846c1]]]
Former-commit-id: d8ed99fae3fbd1e76acde7aaf2db81e5e3f18f21 [formerly 3ca8ee1793c0ddeed4459318c7900a91dedca32b] [formerly 06db554bbe [formerly 0f1f4fb42f]]
Former-commit-id: 06db554bbe
Former-commit-id: 1384a98c4c
|
2013-02-07 12:46:01 -06: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
|
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 |
|
Slav Korolev
|
50a44e789a
|
Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file.
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6
Former-commit-id: a7ef077d06 [formerly 466abfbc1c] [formerly 829899374d] [formerly 829899374d [formerly 48f074eb72]] [formerly a7ef077d06 [formerly 466abfbc1c] [formerly 829899374d] [formerly 829899374d [formerly 48f074eb72]] [formerly 1a510a9f61 [formerly 829899374d [formerly 48f074eb72] [formerly 1a510a9f61 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]]]]
Former-commit-id: 1a510a9f61
Former-commit-id: 30ff8a4029 [formerly 46dfd61a44] [formerly a0d07a46f9] [formerly 7c6d76a05e343b15ec5e66aaa78ef56604975608 [formerly 20c7c17714ef04302d273f0fbac8ec2a7208298e] [formerly a0d07a46f9 [formerly 6bf265624d]]]
Former-commit-id: 557c18aada9ef20cab22b43d077d1932b6e48f17 [formerly 12c5585c0e0ccb7bda561900b86f3f8c4fae5f7b] [formerly 2d3674e3c2 [formerly 0b82d18c64]]
Former-commit-id: 2d3674e3c2
Former-commit-id: f900e2b22f
|
2012-12-07 15:18:03 -05:00 |
|
Slav Korolev
|
c0b567805b
|
Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments.
Change-Id: I605f6819def85f197e37e13803627baec67e6786
Former-commit-id: 9dd8b27cdd [formerly 81d98a46f1] [formerly 349ea52e2b] [formerly 349ea52e2b [formerly a284f0f50f]] [formerly 9dd8b27cdd [formerly 81d98a46f1] [formerly 349ea52e2b] [formerly 349ea52e2b [formerly a284f0f50f]] [formerly b650fa6675 [formerly 349ea52e2b [formerly a284f0f50f] [formerly b650fa6675 [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]]]]]
Former-commit-id: b650fa6675
Former-commit-id: dcb82a190f [formerly 59753c678d] [formerly b5fc4b6800] [formerly 225b8978477ae4abb4bb599708729e88e1e2014e [formerly ab9c4b8c7dbfa4854adca6dd7fb1a100ffd79506] [formerly b5fc4b6800 [formerly 1c16ed59c1]]]
Former-commit-id: bab4ffa845415ac56b910c93c47c24a08b204cb0 [formerly 14e2d036ba5337bb7759432348ef01359a1f5aaf] [formerly 02ea1250da [formerly 61d69bbccf]]
Former-commit-id: 02ea1250da
Former-commit-id: a9fabaf914
|
2012-12-07 12:23:39 -05:00 |
|
Slav Korolev
|
8b06759fef
|
Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables.
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2
Former-commit-id: 28ba049b81 [formerly 32f192134d] [formerly 153af1673a] [formerly 153af1673a [formerly 5e4bbc03a4]] [formerly 28ba049b81 [formerly 32f192134d] [formerly 153af1673a] [formerly 153af1673a [formerly 5e4bbc03a4]] [formerly af101861e4 [formerly 153af1673a [formerly 5e4bbc03a4] [formerly af101861e4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]]]]]
Former-commit-id: af101861e4
Former-commit-id: 1158a52387 [formerly d9710603e7] [formerly fd46994bb9] [formerly 7839c997a092259419d48447ec5304fb245c71e4 [formerly d7de73f56f69ac57bd4c037b1331da78ad5eafa0] [formerly fd46994bb9 [formerly a6241ff4d8]]]
Former-commit-id: e74e092a58df03f6d85f289167d456637a01f0fa [formerly ea094f0bb19456530bb0dfb6f5a0181129fb8e44] [formerly 627c3987ea [formerly 7b66b5258d]]
Former-commit-id: 627c3987ea
Former-commit-id: 47fcfda6da
|
2012-12-06 12:42:06 -05:00 |
|
Slav Korolev
|
3b338185d8
|
Issue #1297. Changed non-blocking ZoneTableDlg. Next patch.
Changes from reviewers comments.
Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682
Former-commit-id: fa1c5d5e38 [formerly a519f985ec] [formerly 487a9eabb8] [formerly 487a9eabb8 [formerly d220f74018]] [formerly fa1c5d5e38 [formerly a519f985ec] [formerly 487a9eabb8] [formerly 487a9eabb8 [formerly d220f74018]] [formerly 4560efe149 [formerly 487a9eabb8 [formerly d220f74018] [formerly 4560efe149 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]]]]]
Former-commit-id: 4560efe149
Former-commit-id: eeb168e794 [formerly 9bb8e24c52] [formerly 063c155818] [formerly ad4167540b0bdae036630c03497c9ff048362bdf [formerly 513793f8cfb0f26fa9576ec1dfb831fc65d80eec] [formerly 063c155818 [formerly 765dbd8766]]]
Former-commit-id: 2e63ef68e2e9d1d60352280b23fb19db3747cc5f [formerly c377dec9d403627caffad2d4a3d988df6b86227a] [formerly 5c09c11912 [formerly 711ba6b2b5]]
Former-commit-id: 5c09c11912
Former-commit-id: fdcb811cad
|
2012-11-16 11:08:42 -05:00 |
|
Dustin Johnson
|
8863642277
|
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly 1dbeb22893 [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: e9b7956d0f [formerly cd5faf58bf] [formerly 2d1e886cf3] [formerly e239f886daa359a6280760b8fa6b78b5c8380ec8 [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc] [formerly 2d1e886cf3 [formerly 4222b24d09]]]
Former-commit-id: 807d5554bc7b021defe634c74b7c5d059408a145 [formerly 58274565203c021076e001f24f089a98cd2216f6] [formerly b4a13190ad [formerly 6613c51d3b]]
Former-commit-id: b4a13190ad
Former-commit-id: eb82c7672b
|
2012-11-08 09:57:16 -06:00 |
|
Steve Harris
|
fcfbf33aaf
|
12.12.1-1 baseline
Former-commit-id: 3d71d17432 [formerly 8278cac143] [formerly c2839cc86d] [formerly c2839cc86d [formerly e4bd20a515]] [formerly 3d71d17432 [formerly 8278cac143] [formerly c2839cc86d] [formerly c2839cc86d [formerly e4bd20a515]] [formerly e1498006c7 [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]]
Former-commit-id: e1498006c7
Former-commit-id: 22747b1324 [formerly 3cb24c1d06] [formerly 4f243de928] [formerly 8273040ac06f4e59a144b7b49a341b74f0fea7f9 [formerly cc5d9cd9866ef60af47606a02772dd35474145e9] [formerly 4f243de928 [formerly 214fcd3b63]]]
Former-commit-id: b6d0613d6947345a3bbbc02e64885564c1baaf25 [formerly 5b863edab7014aa1117ea6831f473bf942ace0fe] [formerly af59663a99 [formerly a5be98d6de]]
Former-commit-id: 08c503e8c0836c8692962bb45c5eabf16e31d611 [formerly af59663a99]
Former-commit-id: 94cd5a1388
|
2012-11-07 12:41:20 -06:00 |
|
Slav Korolev
|
9e63cb0d36
|
Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format.
Change-Id: I26af77a545c1ecd76dc6a15111e73d580992d77d
Former-commit-id: ef0e534a2e [formerly eefd20833a] [formerly 2beb1dbc67] [formerly 2beb1dbc67 [formerly 52601577db]] [formerly ef0e534a2e [formerly eefd20833a] [formerly 2beb1dbc67] [formerly 2beb1dbc67 [formerly 52601577db]] [formerly 8c1719f248 [formerly 2beb1dbc67 [formerly 52601577db] [formerly 8c1719f248 [formerly d97fb49f2574dc320366475e02a5784be33bbaaf]]]]]
Former-commit-id: 8c1719f248
Former-commit-id: 19467f30a3 [formerly a02d2ab1af] [formerly 14c942cf5d] [formerly a8caf5ab22542ae93b1ce2ab59e5df3a9d75097f [formerly d0f3bb9f14ff41751a8ee2f8310b8ef7955fb539] [formerly 14c942cf5d [formerly 0e7baf252a]]]
Former-commit-id: 004bfa2a532281fdc7f0ddbc133ed836fd23a7f5 [formerly 53cddfca717322febcb7858ebc0200e38a72c502] [formerly c66954b14b [formerly f3dfa16b3a]]
Former-commit-id: c66954b14b
Former-commit-id: c405886581
|
2012-10-24 09:24:02 -04:00 |
|
Steve Harris
|
a2164a88d8
|
12.9.1-5 baseline
Former-commit-id: 4fec0b9354 [formerly 77cbd6c1e5] [formerly a1d931fd44] [formerly a1d931fd44 [formerly 61f269f54c]] [formerly 4fec0b9354 [formerly 77cbd6c1e5] [formerly a1d931fd44] [formerly a1d931fd44 [formerly 61f269f54c]] [formerly f2fac39428 [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]]
Former-commit-id: f2fac39428
Former-commit-id: c68ab3311a [formerly d9faed979f] [formerly 7fb0b17bd5] [formerly 5b54a131b7dd8cd501953ba8fd918503d0851b4c [formerly 54140b7733222bbc423315196e9781453b12f896] [formerly 7fb0b17bd5 [formerly 72824561cb]]]
Former-commit-id: a2129aca55a7ff6fdaf13fb64bacec56ad158149 [formerly 84e9e52a92ae5e740b0daf680a98316f7435f7f7] [formerly 2d928d328e [formerly 9b5c2094ed]]
Former-commit-id: b40318710922ff74b3d17e2773847774993ac0db [formerly 2d928d328e]
Former-commit-id: 98059f9ef1
|
2012-08-21 15:27:03 -05:00 |
|
root
|
f8e8a4e323
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 72a84e92a2 [formerly bb7b5341dd] [formerly 0987fc6b3d] [formerly 0987fc6b3d [formerly cb46f57879]] [formerly 72a84e92a2 [formerly bb7b5341dd] [formerly 0987fc6b3d] [formerly 0987fc6b3d [formerly cb46f57879]] [formerly 5a453ee984 [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]]
Former-commit-id: 5a453ee984
Former-commit-id: b2baa9d974 [formerly 791f3f5b85] [formerly 537dbadf64] [formerly 939672b9d6f9101662c8b04b0e01c6067990a9b2 [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26] [formerly 537dbadf64 [formerly 8a66b2f209]]]
Former-commit-id: c5d95d7f10d3a024e103b25f46e99ec3a51b8ea7 [formerly 167e4e289205b778c1de6873be7610daf3a39f5f] [formerly 0eb9520e15 [formerly 1792158ef8]]
Former-commit-id: 5f772656ceebacffd86ed423513dc7acb6d26bda [formerly 0eb9520e15]
Former-commit-id: 73466bae44
|
2012-08-15 22:15:20 +00:00 |
|
Steve Harris
|
880136b156
|
12.9.1-1 baseline
Former-commit-id: 271239613a [formerly b9fb1c89d4] [formerly 8309193ce9] [formerly 8309193ce9 [formerly 31ae7ea218]] [formerly 271239613a [formerly b9fb1c89d4] [formerly 8309193ce9] [formerly 8309193ce9 [formerly 31ae7ea218]] [formerly 79ce6cfd97 [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 27b7ae1e73 [formerly d3023f15ac] [formerly aed7a644df] [formerly 5dcf0426d8d0f18086cfe9370c5dbe558f4d1d46 [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b] [formerly aed7a644df [formerly 0c5d9e2416]]]
Former-commit-id: 230b902c8c186b9b77da9141c06a1ac7a55c0e28 [formerly b1b11fe00755e632d56330d48d6e1eee387eeef8] [formerly 16d7d955fc [formerly 63bcadf121]]
Former-commit-id: 16d7d955fc
Former-commit-id: 31353e2296
|
2012-08-15 13:59:00 -05:00 |
|
Nate Jensen
|
d3651bcad4
|
Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: 14b597a66f [formerly baff86f951] [formerly 6f90bfa61c] [formerly 6f90bfa61c [formerly a65e9608fd]] [formerly 14b597a66f [formerly baff86f951] [formerly 6f90bfa61c] [formerly 6f90bfa61c [formerly a65e9608fd]] [formerly 4a2841b287 [formerly 6f90bfa61c [formerly a65e9608fd] [formerly 4a2841b287 [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]]]
Former-commit-id: 4a2841b287
Former-commit-id: 0f807a3e84 [formerly 6d8ac0455e] [formerly 7d478ac74c] [formerly ecbfa5389c23e5dd555021d7949e34d954234769 [formerly 3ab4b622030a864dcf04c61605009347c3550e9a] [formerly 7d478ac74c [formerly 8fa0eb70db]]]
Former-commit-id: 897ceb95c48ed4f3f817777142ebe460ffddb352 [formerly bc2d3c00a3e2d4d029b3e992acb5ae8618d96464] [formerly e1321b8bc9 [formerly 04a7e5a8c0]]
Former-commit-id: e1321b8bc9
Former-commit-id: 06b3b8368d
|
2012-07-31 08:57:54 -05:00 |
|
Steve Harris
|
d60e78a9ee
|
12.6.1-9 baseline
Former-commit-id: 56ce907ff2 [formerly 32fdf6ed3b] [formerly 7c064b6868] [formerly 7c064b6868 [formerly 2c0ff851ca]] [formerly 56ce907ff2 [formerly 32fdf6ed3b] [formerly 7c064b6868] [formerly 7c064b6868 [formerly 2c0ff851ca]] [formerly 27afa60345 [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]]
Former-commit-id: 27afa60345
Former-commit-id: 9fc0cbac36 [formerly e528bb0df2] [formerly dc50bc8443] [formerly 202bf137851885adaaf1ac7f8ae4b23be4084de6 [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d] [formerly dc50bc8443 [formerly 4f7bb90bb0]]]
Former-commit-id: 94f256444a3b2e57847ac115fc0d1511e30f8e94 [formerly 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4] [formerly 37f2b6e138 [formerly d5fa61041b]]
Former-commit-id: 37f2b6e138
Former-commit-id: c74431ba29
|
2012-07-10 07:53:49 -05:00 |
|
Bryan Kowal
|
398cd87bbd
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 978eab748d [formerly 455d7b90a9] [formerly b1b294c401] [formerly b1b294c401 [formerly a33740e915]] [formerly 978eab748d [formerly 455d7b90a9] [formerly b1b294c401] [formerly b1b294c401 [formerly a33740e915]] [formerly b87b66abc5 [formerly b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]]
Former-commit-id: b87b66abc5
Former-commit-id: d2402aac6a [formerly dfd75b4c72] [formerly b4917e6708] [formerly df0481cfe5ddd39b2b6ab8841f8bc16a28fd08b0 [formerly 351fe6f4caaff528740139f88451b1dae35f0c83] [formerly b4917e6708 [formerly 9a7d0492fe]]]
Former-commit-id: bc8f760d2ce5b89f086e111f874c20ba4296a5dd [formerly 0eec5560d9e68707684a8349e50debb048bda384] [formerly 2e5a850d28 [formerly 611925412d]]
Former-commit-id: 2e5a850d28
Former-commit-id: e05b247e3b
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
d633d4fa6b
|
12.6.1-10 baseline
Former-commit-id: d97af08a30 [formerly a9742f306e] [formerly edac4d827c] [formerly edac4d827c [formerly 8dc4a774e2]] [formerly d97af08a30 [formerly a9742f306e] [formerly edac4d827c] [formerly edac4d827c [formerly 8dc4a774e2]] [formerly 3cd0902b49 [formerly edac4d827c [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 1cc115f8d7 [formerly 7550311ef6] [formerly efe25edfad] [formerly 56ba24e7306d231999968cc21d29c3a451b9c19e [formerly 1a8021953ed3a77781e285be5837377b59afd5e3] [formerly efe25edfad [formerly eacd5aeb7f]]]
Former-commit-id: 7ef56e4ae9652c71f6fcae16df2f6ffd850ed0f9 [formerly 032c121c88e37cbeafabb63e30162517b2659626] [formerly 56f8cf00a8 [formerly df59dc7c44]]
Former-commit-id: 56f8cf00a8
Former-commit-id: 8080ea523b
|
2012-06-21 08:58:00 -05:00 |
|