Commit graph

2797 commits

Author SHA1 Message Date
Brian.Dyke
2613e13e08 OB_14.1.1-20 baseline
Former-commit-id: 2bad40cfee [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]
Former-commit-id: 324696c436
Former-commit-id: b2401d2f0d
2014-02-26 17:39:15 -05:00
Lee Venable
191ca5f9ca Issue #2795 - added code to check for null images.
Former-commit-id: 49530206f4 [formerly 0c7395d423 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]
Former-commit-id: 0c7395d423
Former-commit-id: 5546b537cf
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
3d9b435262 Issue #2711 Use level factory more.
Former-commit-id: 3da086b71f [formerly d7a3ae4fdb [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]
Former-commit-id: d7a3ae4fdb
Former-commit-id: 1069ef8d67
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
ee8f345cb2 Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: 6d0a78e233 [formerly e1dc75f97a [formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]
Former-commit-id: e1dc75f97a
Former-commit-id: 2fd8351874
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
fa6dcaac84 Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: 07bc9f075f [formerly d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]
Former-commit-id: d8bfdd1a7e
Former-commit-id: 2425b9665c
2014-02-26 14:45:19 -06:00
Lee Venable
d74b2c0118 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: e0ee93bab3 [formerly 94cede8153 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]
Former-commit-id: 94cede8153
Former-commit-id: bb4b034375
2014-02-26 13:21:58 -06:00
Brian Clements
9597ce5cd9 Issue #2751 fixed webDAV path issue
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded


Former-commit-id: 3d365a4cd2 [formerly eef242194a [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]
Former-commit-id: eef242194a
Former-commit-id: 3f0e9d7a77
2014-02-25 09:17:36 -06:00
Nate Jensen
055caba2bf Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 060eafc272 [formerly 279f05a1d5 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]
Former-commit-id: 279f05a1d5
Former-commit-id: 8ef957d2f0
2014-02-24 16:17:20 -06:00
Nate Jensen
a201d43d63 Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: f353c44cc0 [formerly 8a00a419a1 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]
Former-commit-id: 8a00a419a1
Former-commit-id: 230b8bf117
2014-02-24 15:35:13 -06:00
Brian.Dyke
9158806dd2 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]
Former-commit-id: 2faab606e5
Former-commit-id: 363403fb34
2014-02-24 14:51:00 -05:00
Ron Anderson
049424e5f0 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]
Former-commit-id: 4364e7497c
Former-commit-id: 45ccac0859
2014-02-24 13:46:48 -06:00
Brian Clements
a173972437 Issue #2751 fixed leader transfer infinite loop, added event validation
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed


Former-commit-id: 386e9cc96a [formerly 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]
Former-commit-id: 3f362519aa
Former-commit-id: 9217ba24c5
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
152980350c Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: e08d4f77c3 [formerly 70ae372303 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]
Former-commit-id: 70ae372303
Former-commit-id: 780dc19fac
2014-02-21 17:37:19 -06:00
Brian.Dyke
3508e488f5 OB_14.1.1-19 baseline
Former-commit-id: 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: cfa4997978
Former-commit-id: 779553142c
2014-02-21 06:50:59 -05:00
Mike Duff
9eafacaac2 Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: a7b1e79d2d [formerly ed5cb91406 [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]
Former-commit-id: ed5cb91406
Former-commit-id: a96a833f51
2014-02-20 15:09:10 -06:00
Brian Clements
8bbf2bb6bd Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog


Former-commit-id: 89a48c3f6b [formerly aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]
Former-commit-id: aaa2de20f4
Former-commit-id: a2bdfa25cc
2014-02-20 11:50:54 -06:00
Brian Clements
4e165aba58 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]
Former-commit-id: c3cadff705
Former-commit-id: a8ff1effc1
2014-02-20 11:10:14 -06:00
Nate Jensen
6973755f4e Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 0f81b80467 [formerly 32bd9fd635 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]
Former-commit-id: 32bd9fd635
Former-commit-id: 6ef26a636c
2014-02-20 10:53:21 -06:00
Nate Jensen
adb51300d8 Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: 5856957c57 [formerly 3078b69273 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]
Former-commit-id: 3078b69273
Former-commit-id: 4563e38db2
2014-02-19 17:22:00 -06:00
Nate Jensen
f939d93d7f Merge "Issue #2761 add region level to localization" into development
Former-commit-id: 6e59175ce4 [formerly 9011e1b31e [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]
Former-commit-id: 9011e1b31e
Former-commit-id: 3782880dac
2014-02-19 17:18:24 -06:00
Nate Jensen
f545a8a74d Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: f99cf7df47 [formerly df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]
Former-commit-id: df376abcb7
Former-commit-id: a241472c34
2014-02-19 16:19:27 -06:00
Ron Anderson
dab0ebc99e Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: b8c00d8ead [formerly 98d2417f94 [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]
Former-commit-id: 98d2417f94
Former-commit-id: 8703c43937
2014-02-19 15:39:56 -06:00
Mike Duff
659cb1f2a0 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 95fcee385a [formerly 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]
Former-commit-id: 663ea8decd
Former-commit-id: e2a6251a6b
2014-02-19 15:26:14 -06:00
Mike Duff
8a29af4894 Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c

Former-commit-id: 183657fb33 [formerly 682c6af456 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]
Former-commit-id: 682c6af456
Former-commit-id: 48a0b34b5f
2014-02-19 15:20:29 -06:00
Nate Jensen
72acab26c3 Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: c72e2be969 [formerly 4b4cca776f [formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]
Former-commit-id: 4b4cca776f
Former-commit-id: b4ac186728
2014-02-19 14:52:24 -06:00
Ron Anderson
5f3248574f Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]
Former-commit-id: 5258aecf45
Former-commit-id: 663cb4cb62
2014-02-19 11:55:11 -06:00
Mike Duff
c7e22b7b3b Issue #2734 - default time range to 24 hours.
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d

Former-commit-id: 0b316f7bd9 [formerly 19033601bf [formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]]
Former-commit-id: 19033601bf
Former-commit-id: bc180503b1
2014-02-19 10:23:48 -06:00
Matt Nash
1d6e1d443c Issue #2761 add region level to localization
Amend : Change comment now that we do not get file from localization

Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2

Former-commit-id: 1835019567 [formerly 2d20e84f6a [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]
Former-commit-id: 2d20e84f6a
Former-commit-id: 3f67324d7c
2014-02-19 10:01:25 -06:00
Brian Clements
abc01f5475 Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]
Former-commit-id: dc074a9650
Former-commit-id: 06c16118e1
2014-02-19 08:32:26 -06:00
Mike Duff
a370e81065 Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: 9754f0d8dd [formerly a6509aad8c [formerly 11f3705080210161e6915309a4aec423b307cce8]]
Former-commit-id: a6509aad8c
Former-commit-id: 283b0c670c
2014-02-18 17:32:32 -06:00
Nate Jensen
961239e181 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: b08d96b1e8 [formerly 020d54c48a [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]
Former-commit-id: 020d54c48a
Former-commit-id: ac0a10678b
2014-02-18 14:51:13 -06:00
Nate Jensen
d4cc8b1827 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: b3c45b303c [formerly c63289fa14 [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]
Former-commit-id: c63289fa14
Former-commit-id: 1738248fac
2014-02-18 11:22:19 -06:00
Brian Clements
1c8f5dd579 Issue #2793 improved collaboration disconnect handling
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails


Former-commit-id: 7028f7fd4d [formerly a28fcf0dc5 [formerly 231c3cd84e3c86caba81708581be911e771aa774]]
Former-commit-id: a28fcf0dc5
Former-commit-id: 9095a1584f
2014-02-18 11:11:33 -06:00
Brad Gonzales
1d57e9f5f7 Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]
Former-commit-id: 19460ed0d7
Former-commit-id: 379c0fb46c
2014-02-18 11:10:44 -06:00
Ron Anderson
410f956cff Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]
Former-commit-id: 32bcf9d0d0
Former-commit-id: e7f2b6883d
2014-02-18 10:45:20 -06:00
Brian Clements
68fac79fe7 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]
Former-commit-id: f6b2827434
Former-commit-id: f0c89ef6c6
2014-02-18 10:03:12 -06:00
Nate Jensen
35b4de0640 Merge "Issue #2751 fixed blocked icon for roster entries" into development
Former-commit-id: aa7413fd4c [formerly e70f0d21ab [formerly 4f02e79ed2211fa9e406e3bc2c633256c6e85faf]]
Former-commit-id: e70f0d21ab
Former-commit-id: 0228d24f1d
2014-02-18 08:48:00 -06:00
Brian Clements
ab8f47413f Issue #2751 fixed blocked icon for roster entries
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels


Former-commit-id: 3307f5ea5e [formerly a94b366e26 [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]
Former-commit-id: a94b366e26
Former-commit-id: e894019715
2014-02-17 17:11:36 -06:00
Nate Jensen
742217ded0 Issue #2704 fix alertviz connectivity checks
Former-commit-id: 4d68994525 [formerly 0c4de50218 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]
Former-commit-id: 0c4de50218
Former-commit-id: 0160ab0464
2014-02-17 17:10:07 -06:00
Brian Clements
ca8869b8ef Issue #2800 added equals/hashcode to classes used in roster tree
tree view uses hashmap to decide if a node is new
tree was collapsing groups/sessions on refresh since it thought they were new nodes


Former-commit-id: 3dfd8fbafb [formerly 3b5648c055 [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]
Former-commit-id: 3b5648c055
Former-commit-id: 6d71686332
2014-02-17 16:39:43 -06:00
Nate Jensen
a416577b25 Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
Former-commit-id: f4260a617e [formerly 5675869906 [formerly ef860082c4cd6159233323b89e0b73e272224f38]]
Former-commit-id: 5675869906
Former-commit-id: 2367c79c1c
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
386b6a2499 Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
Former-commit-id: ca90137801 [formerly 937b3071d4 [formerly 3f7342fc4f280180af46290b9afc7a047e16ce4a]]
Former-commit-id: 937b3071d4
Former-commit-id: 2cf496ca84
2014-02-17 14:02:57 -06:00
Nate Jensen
34c7c3cba1 Issue #2812 made getHostname() use getWsId().getHostname for consistency
and working on windows


Former-commit-id: 2486e39192 [formerly 15ff4ab5d7 [formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]
Former-commit-id: 15ff4ab5d7
Former-commit-id: c8e70cd6b1
2014-02-17 11:58:04 -06:00
Nate Jensen
ed76393cd8 Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
Former-commit-id: 063d85ee22 [formerly 30632fbd84 [formerly 4778976c7175121841fc9ca69a814daf9d466c6c]]
Former-commit-id: 30632fbd84
Former-commit-id: 0fe9842582
2014-02-17 11:22:53 -06:00
Max Schenkelberg
554e0caec5 Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc

Former-commit-id: 6a2a33abe1 [formerly acad670229 [formerly e0a5ec0a713f06eab93d86671a43334110b60b0c]]
Former-commit-id: acad670229
Former-commit-id: 1de140a526
2014-02-17 11:07:45 -06:00
Steve Harris
1b7e02636d Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]
Former-commit-id: 267cc881a4
Former-commit-id: d0352c69d4
2014-02-17 08:54:34 -06:00
Nate Jensen
fa87ba3138 Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
Former-commit-id: f3d107580f [formerly 723ff23ee9 [formerly 4b48313cb3509bebcfdd79e1df3d746a2d12c6af]]
Former-commit-id: 723ff23ee9
Former-commit-id: 56aa06888f
2014-02-14 10:50:38 -06:00
Max Schenkelberg
38aae37f01 Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df

Former-commit-id: c8e93190f2 [formerly 6309f9b34b [formerly 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4]]
Former-commit-id: 6309f9b34b
Former-commit-id: 4d656b5d06
2014-02-14 10:47:42 -06:00
Mike Duff
b34c9eedd0 Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
Former-commit-id: 346dc4afff [formerly ac62d322ed [formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]
Former-commit-id: ac62d322ed
Former-commit-id: 43ea3b0918
2014-02-14 08:53:40 -06:00
Nate Jensen
47b27c602f Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]
Former-commit-id: e05f1eae96
Former-commit-id: 63d5f94cbb
2014-02-13 15:35:53 -06:00