Commit graph

2540 commits

Author SHA1 Message Date
Mike Duff
e8d473b9c6 Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
Former-commit-id: 9bd8e84b9f [formerly bdf6a002f6] [formerly 9bd8e84b9f [formerly bdf6a002f6] [formerly 9a2d2af4a9 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]]]
Former-commit-id: 9a2d2af4a9
Former-commit-id: e929abf7d7 [formerly 9112366cae]
Former-commit-id: 8844bbbe2d
2014-01-20 17:44:02 -06:00
Lee Venable
916f05e2bd Merge "Issue #2291 - Fixed resizing of components." into omaha_14.2.1
Former-commit-id: d825d627bd [formerly b3928f4f49] [formerly d825d627bd [formerly b3928f4f49] [formerly dd12515ca2 [formerly 277513c8d810a3996d93fd04a5691eb730c78630]]]
Former-commit-id: dd12515ca2
Former-commit-id: 82eafd385d [formerly 4e121d1261]
Former-commit-id: edab55763c
2014-01-20 17:32:38 -06:00
Nate Jensen
8c247a36e6 Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1
Former-commit-id: c598185130 [formerly d78dbb85d5] [formerly c598185130 [formerly d78dbb85d5] [formerly 54262ad318 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]]]
Former-commit-id: 54262ad318
Former-commit-id: 5b84b27087 [formerly f13cb9ae26]
Former-commit-id: 1ee13de1db
2014-01-20 17:32:15 -06:00
Lee Venable
19d90c676f Issue #2291 - Fixed resizing of components.
Former-commit-id: 39e8124ef7 [formerly 1927ba49ea] [formerly 39e8124ef7 [formerly 1927ba49ea] [formerly d3eb6c16ec [formerly 9956936125611cd67aaaf6ba6e617e01b004a738]]]
Former-commit-id: d3eb6c16ec
Former-commit-id: dad11aca88 [formerly b8520d1e12]
Former-commit-id: 9bf640f116
2014-01-20 17:26:28 -06:00
Ron Anderson
385547a5e5 Issue #2717 Force use of legacy merge sort
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7

Former-commit-id: 34d1b95a79 [formerly de97ec032f] [formerly 34d1b95a79 [formerly de97ec032f] [formerly 66bbc99784 [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]
Former-commit-id: 66bbc99784
Former-commit-id: 0048ef6a96 [formerly 61d8aec23c]
Former-commit-id: 841504f145
2014-01-20 17:22:26 -06:00
Richard Peter
d0ef42d528 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: e6bc012925 [formerly 6b859c9a42] [formerly e6bc012925 [formerly 6b859c9a42] [formerly 29ba337367 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]]
Former-commit-id: 29ba337367
Former-commit-id: 4796beec29 [formerly 4887054146]
Former-commit-id: b147653a66
2014-01-20 17:21:21 -06:00
Steve Harris
ccd2f6cdaa Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 5fcccbff1b [formerly 454d557884] [formerly 5fcccbff1b [formerly 454d557884] [formerly 9371eeeee0 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 7ea285c48b [formerly 0ba307d616]
Former-commit-id: b5f7f35ccb
2014-01-20 10:17:44 -06:00
Mike Duff
45bef29f75 Issue #2459 - Remove unscheduled status from UI
Former-commit-id: 0cfa9ee36c [formerly 93cb80cfc7] [formerly 0cfa9ee36c [formerly 93cb80cfc7] [formerly 25d1d39fc2 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]]
Former-commit-id: 25d1d39fc2
Former-commit-id: a492ec6a4d [formerly a04430e334]
Former-commit-id: dcb5b4a111
2014-01-17 15:34:48 -06:00
Nate Jensen
86b9311ed4 Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 9028260386 [formerly ae10129713] [formerly 9028260386 [formerly ae10129713] [formerly 9d529b3b21 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 98e1bf9194 [formerly 1be41d69c6]
Former-commit-id: 3d6d9118ea
2014-01-15 17:36:30 -06:00
Nate Jensen
2ff7910650 Issue #2359 printout connection exceptions to aid in diagnosing
connectivity problems

Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c

Former-commit-id: ccaa9dbde1 [formerly fc6b31c1c0] [formerly ccaa9dbde1 [formerly fc6b31c1c0] [formerly 5f39322d59 [formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]]
Former-commit-id: 5f39322d59
Former-commit-id: 4533642f26 [formerly deb57e3b35]
Former-commit-id: fd32fb6c6e
2014-01-15 13:39:28 -06:00
Mike Duff
c8f7edbcad Issue #2459 - Refactor the subscription status
Former-commit-id: d03c012a54 [formerly f94593867e] [formerly d03c012a54 [formerly f94593867e] [formerly 245d76358e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]
Former-commit-id: 245d76358e
Former-commit-id: 9a45b95db6 [formerly d96a9d2937]
Former-commit-id: 3c0634b1e8
2014-01-15 09:21:30 -06:00
Ron Anderson
77c132f706 Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 0bde38cef3 [formerly ba7a25a88f] [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: dca7f21f7b [formerly 624375267e]
Former-commit-id: 5076217d8f
2014-01-13 17:45:20 -06:00
Richard Peter
d047e8210a Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
Former-commit-id: bc4ad18fe9 [formerly 7bbefddcc1] [formerly bc4ad18fe9 [formerly 7bbefddcc1] [formerly e6d7acb609 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]
Former-commit-id: e6d7acb609
Former-commit-id: 5b687c7bd5 [formerly 527408ddd4]
Former-commit-id: b14835bae6
2014-01-10 15:42:48 -06:00
Mike Duff
0823eab3bf Issue #2452 - Add label stating all lat/lons will be converted to easting.
Former-commit-id: 67f6311354 [formerly 69ca0dd0d2] [formerly 67f6311354 [formerly 69ca0dd0d2] [formerly 7081c26823 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]
Former-commit-id: 7081c26823
Former-commit-id: b616f34af2 [formerly 17d19cc0bb]
Former-commit-id: c1e3dd57b6
2014-01-10 12:05:30 -06:00
Mike Duff
ca2667855c Issue #2642 - Update header comment
Former-commit-id: 5d669a97af [formerly 101d9939d6] [formerly 5d669a97af [formerly 101d9939d6] [formerly 28114764a5 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]
Former-commit-id: 28114764a5
Former-commit-id: 12c47ea375 [formerly 7d25b33cb6]
Former-commit-id: 2906b0bed2
2014-01-10 10:57:18 -06:00
Richard Peter
e60037e842 Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
Former-commit-id: b37d6e9c91 [formerly 8ca1217f03] [formerly b37d6e9c91 [formerly 8ca1217f03] [formerly 52850fe95a [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]
Former-commit-id: 52850fe95a
Former-commit-id: b833c4333c [formerly 690f1b15dd]
Former-commit-id: fd7fde3cdf
2014-01-09 16:58:39 -06:00
Richard Peter
255358f37a Merge "Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible." into omaha_14.2.1
Former-commit-id: 0bd52b65e7 [formerly b711c35c68] [formerly 0bd52b65e7 [formerly b711c35c68] [formerly f45a281935 [formerly 8f3f97302417e256cd110feb4ed56ca366cb1db8]]]
Former-commit-id: f45a281935
Former-commit-id: f4108b8be2 [formerly 0459cd237e]
Former-commit-id: 5bb2869ca4
2014-01-09 16:53:52 -06:00
Mike Duff
04646a9a21 Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible.
Former-commit-id: e4f56affd3 [formerly 16a8f16ee4] [formerly e4f56affd3 [formerly 16a8f16ee4] [formerly 9b5adfaba2 [formerly 87dd0df07a9ef0e7881ed0cf7b8aa1d41f0c9d4d]]]
Former-commit-id: 9b5adfaba2
Former-commit-id: d2f74b6238 [formerly 7a1712acd6]
Former-commit-id: 698a84e1f3
2014-01-09 13:02:08 -06:00
Mike Duff
901838b7d3 Issue #2643 - Fixed the mouse checking on DD maps
Former-commit-id: 7b8964d9b2 [formerly 4fe2dc76af] [formerly 7b8964d9b2 [formerly 4fe2dc76af] [formerly 56499a77c3 [formerly 775e99924e098387e4ca5042823ef20d1a0d2afe]]]
Former-commit-id: 56499a77c3
Former-commit-id: 1c3b700563 [formerly 09c5f29395]
Former-commit-id: 94848592d1
2014-01-09 10:18:34 -06:00
Mike Duff
194a348ce2 Issue #2642 - Make shared sub deletions remove the site from the list
Former-commit-id: 0cb61d4d50 [formerly 6cff7aaf0c] [formerly 0cb61d4d50 [formerly 6cff7aaf0c] [formerly 4e6b4eaa4c [formerly a8f57c338a8a06c6d40842f56c329fd9f215bc5b]]]
Former-commit-id: 4e6b4eaa4c
Former-commit-id: 0e081e8ee2 [formerly fdef5e97e2]
Former-commit-id: 49dc635963
2014-01-09 10:15:48 -06:00
Ben Steffensmeier
7303bd3b62 Issue #2537 Split modelsounding into common/edex plugins.
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: f516a684d4 [formerly f520a26fbd] [formerly f516a684d4 [formerly f520a26fbd] [formerly d79f804d4e [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]
Former-commit-id: d79f804d4e
Former-commit-id: 9913e51429 [formerly fac9fd296f]
Former-commit-id: 4fef47c0a8
2014-01-06 16:02:59 -06:00
Steve Harris
1ca553385c 14.1.1-15 baseline
Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 282d10fe6d [formerly 35d8f5a281]
Former-commit-id: cd4a09623c
2014-01-06 14:08:08 -05:00
Steve Harris
5862555160 14.1.1-14 baseline
Former-commit-id: 6df7c67f95 [formerly f2ad9da4eb] [formerly 6df7c67f95 [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0989c17710 [formerly 43cc501e0d]
Former-commit-id: a2bdee5cc1
2014-01-06 14:02:30 -05:00
David Gillingham
203e25ab3c Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: c48c0523ff [formerly 136265183d] [formerly c48c0523ff [formerly 136265183d] [formerly 09bfdc49e3 [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]]]
Former-commit-id: 09bfdc49e3
Former-commit-id: 6e642b81fe [formerly 8f3802eecf]
Former-commit-id: 24c8fc930e
2013-12-18 16:18:47 -06:00
Richard Peter
1c743d4d44 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
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.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: e4f59ea119 [formerly 1de516964b] [formerly e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 5c0cf804f1 [formerly 62fa535744]
Former-commit-id: 4059813742
2013-12-17 21:04:53 -06:00
Mike Duff
707ac59a98 Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
Former-commit-id: e26bea423e [formerly 66f5585774] [formerly e26bea423e [formerly 66f5585774] [formerly 6406bcdd05 [formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]
Former-commit-id: 6406bcdd05
Former-commit-id: 0232f16e7a [formerly 54f7feef03]
Former-commit-id: b54ab4df6a
2013-12-17 09:41:30 -06:00
Bryan Kowal
fad82481c1 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: 0c3b22c8f2 [formerly 43008f4698] [formerly 0c3b22c8f2 [formerly 43008f4698] [formerly 120ebd045a [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]
Former-commit-id: 120ebd045a
Former-commit-id: 68181d3f62 [formerly fac9d72cc8]
Former-commit-id: 9e0e6662c8
2013-12-16 16:39:10 -06:00
Lee Venable
b95b380eb2 Issue #2583 - Procedure dialog fixes and clean up.
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10

Former-commit-id: d6eb7534f5 [formerly aa0e9121f8] [formerly d6eb7534f5 [formerly aa0e9121f8] [formerly 7ee6053c22 [formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]
Former-commit-id: 7ee6053c22
Former-commit-id: d05d650430 [formerly f3c8b69e2e]
Former-commit-id: b7d5aa748a
2013-12-12 16:15:56 -06:00
Steve Harris
800136d61b 14.1.1-13 baseline
Former-commit-id: 85eebac7e2 [formerly c88b10039a] [formerly 85eebac7e2 [formerly c88b10039a] [formerly b0b55a676b [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: 5368f23247 [formerly 61d4adc979]
Former-commit-id: ff08301890
2013-12-12 16:59:57 -05:00
Ben Steffensmeier
df1bc54013 Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: bf508b4455 [formerly a37db9d1b4] [formerly bf508b4455 [formerly a37db9d1b4] [formerly 922674273e [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]
Former-commit-id: 922674273e
Former-commit-id: 0fb85fe4aa [formerly 4a86c90bfc]
Former-commit-id: b3ef07794a
2013-12-11 12:45:11 -06:00
Slav Korolev
65720fea82 Issue #2570. Show All subscriptions in Subscription manager.
Former-commit-id: 85bc26b5a3 [formerly b59e9499d2] [formerly 85bc26b5a3 [formerly b59e9499d2] [formerly 67e18055cc [formerly 27e177b2425db0a0241884b18e2501a923d02be4]]]
Former-commit-id: 67e18055cc
Former-commit-id: 746157755b [formerly 6811b0e5c1]
Former-commit-id: 04bc1a3052
2013-12-11 08:57:13 -05:00
Mike Duff
bddf555eab Issue #2601 - Fix NullPointerException.
Former-commit-id: 773e546f62 [formerly 9e9706f55f] [formerly 773e546f62 [formerly 9e9706f55f] [formerly d2fe42c27c [formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]]
Former-commit-id: d2fe42c27c
Former-commit-id: 02bbd4eaa6 [formerly 32b468023d]
Former-commit-id: dd1af02457
2013-12-10 09:03:42 -06:00
Lee Venable
099f3f504a Merge "Issue #2271 - Fix menu problem with previously selected points being selectable again" into omaha_14.2.1
Former-commit-id: 997c575919 [formerly 249435f17c] [formerly 997c575919 [formerly 249435f17c] [formerly 2c6b4309f0 [formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: 4850830125 [formerly cc7885610d]
Former-commit-id: 291c7f95c4
2013-12-09 09:51:41 -06:00
Mike Duff
74b19522a2 Issue #2271 - Fix menu problem with previously selected points being selectable again
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee

Former-commit-id: 850e4dfbde [formerly 0a5f2e3484] [formerly 850e4dfbde [formerly 0a5f2e3484] [formerly ebc730ac2d [formerly 959fcd37424b6261606d2ae65663403764be9c39]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 1925177772 [formerly 4d210517bd]
Former-commit-id: 96de34b2c1
2013-12-06 12:58:38 -06:00
Nate Jensen
907a6e3304 Issue #2599 fix constructor
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e

Former-commit-id: ec6b5393ef [formerly 9bff38e0d3] [formerly ec6b5393ef [formerly 9bff38e0d3] [formerly 41014a105d [formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]
Former-commit-id: 41014a105d
Former-commit-id: e8f28c6799 [formerly f3e455d1a3]
Former-commit-id: eb68a1be85
2013-12-06 12:35:22 -06:00
Ben Steffensmeier
fe53e49cb3 Issue #2537 Fix feature for poitndata dependency on dataaccess.
Former-commit-id: 067c510315 [formerly 59c6a24b68] [formerly 067c510315 [formerly 59c6a24b68] [formerly d883f8dbb1 [formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 899cb2628c [formerly 99afa17fd2]
Former-commit-id: c27934d7ad
2013-12-06 09:14:01 -06:00
Richard Peter
8cde2b5e9d Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: df4a4c5121 [formerly d0b50eee3c] [formerly df4a4c5121 [formerly d0b50eee3c] [formerly 6fde307f0a [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]
Former-commit-id: 6fde307f0a
Former-commit-id: 45889cb80f [formerly 9f4dfc9051]
Former-commit-id: ef7ba1f1ee
2013-12-05 14:54:46 -06:00
Mike Duff
0885df1d3f Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: a412a19583 [formerly 4796f43495] [formerly a412a19583 [formerly 4796f43495] [formerly 0c452e2434 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]
Former-commit-id: 0c452e2434
Former-commit-id: 45cf9384d8 [formerly 7f2ddb1360]
Former-commit-id: d3c5ee0468
2013-12-05 13:35:31 -06:00
Nate Jensen
9740b5349b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: b16c88133b [formerly c47f6546dd] [formerly b16c88133b [formerly c47f6546dd] [formerly ae0bd2a86f [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: 15fee953f5 [formerly 7163e28d35]
Former-commit-id: bd4e9158f0
2013-12-05 12:59:58 -06:00
Richard Peter
ae6e34be4b 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: b3b23647b4 [formerly 0c4ae068ad] [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a [formerly da027298d4]
Former-commit-id: fd93b7d85e
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
2eb9a45951 Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 7c2a4ef72c [formerly f682e66e9b] [formerly 7c2a4ef72c [formerly f682e66e9b] [formerly 46a466497c [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]
Former-commit-id: 46a466497c
Former-commit-id: fde968a834 [formerly ad9fee446d]
Former-commit-id: 956e8b04f2
2013-12-05 10:54:28 -06:00
Lee Venable
0ef3c4386d Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 67accdb7e3 [formerly 4f1b663b37] [formerly 67accdb7e3 [formerly 4f1b663b37] [formerly b7be687903 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]
Former-commit-id: b7be687903
Former-commit-id: 40dc07e0ff [formerly 3a3333e4ec]
Former-commit-id: 195162014d
2013-12-05 08:30:28 -06:00
Lee Venable
24102d052b Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

Former-commit-id: 9c64148733 [formerly 266d4884da] [formerly 9c64148733 [formerly 266d4884da] [formerly a385ec612c [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]]
Former-commit-id: a385ec612c
Former-commit-id: cddca699c6 [formerly d433717c8c]
Former-commit-id: ef61348fb8
2013-12-05 08:25:46 -06:00
Ron Anderson
bbd7ea36a1 Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 497236ca74 [formerly b5906249cc] [formerly 497236ca74 [formerly b5906249cc] [formerly 20eeb2796e [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: e30d6041ee [formerly 103fed386f]
Former-commit-id: 89e87a1683
2013-12-04 17:10:48 -06:00
Steve Harris
60f062ea59 14.1.1-12 baseline
Former-commit-id: 371d1ca63c [formerly b24d9c80b0] [formerly 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 4e6f319422 [formerly 14421048af]
Former-commit-id: 234ca267ed
2013-12-04 16:47:59 -05:00
Ron Anderson
95d6bebb13 Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 54219aa03d [formerly 7459d65134] [formerly 54219aa03d [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: a99197c5c2 [formerly 75d2dd7a29]
Former-commit-id: 1988e86bbd
2013-12-04 15:29:28 -06:00
Nate Jensen
b6f9b78e92 Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 286539f323 [formerly 020c4de47d] [formerly 286539f323 [formerly 020c4de47d] [formerly 0ead2a03ea [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 331df460ff [formerly 78629260d9]
Former-commit-id: 35abe8c3af
2013-12-04 11:54:11 -06:00
Dave Hladky
393d4a2967 Issue #2607 Fixed Nullpointer
Former-commit-id: 4b81f76ce3 [formerly 25ce37d2d8] [formerly 4b81f76ce3 [formerly 25ce37d2d8] [formerly 25f745bc12 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]
Former-commit-id: 25f745bc12
Former-commit-id: c93d7b57a1 [formerly b0f12b6613]
Former-commit-id: 3cf23e1e4d
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
ea09aaff72 Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: 80a98a3d7e [formerly 3c8962fb96] [formerly 80a98a3d7e [formerly 3c8962fb96] [formerly 0b4eaac59e [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]]
Former-commit-id: 0b4eaac59e
Former-commit-id: d6640590e9 [formerly d1b4fdd9c8]
Former-commit-id: cb6d8f6070
2013-12-04 11:22:47 -06:00
Nate Jensen
92fb530969 Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: ee18295efe [formerly cc53373478] [formerly ee18295efe [formerly cc53373478] [formerly c29836abd7 [formerly 947196e8ac4bb82536102bb56413d94589569599]]]
Former-commit-id: c29836abd7
Former-commit-id: cb3d6e2de3 [formerly bad9e2ab44]
Former-commit-id: b58a9fbed7
2013-12-03 17:44:55 -06:00