Ron Anderson
5831f8d79e
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: 049424e5f045ccac08594364e7497c2db5f268404364e7497c2db5f268403b2ea2d6ac7d3af157f8
2014-02-24 13:46:48 -06:00
Brian Clements
743c6cd74b
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: a1739724379217ba24c53f362519aa386e9cc96a3f362519aa386e9cc96ab9c9be4c4f73cb7b7313
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
d27c21b9f6
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
...
Former-commit-id: 152980350c780dc19fac70ae372303e08d4f77c370ae372303e08d4f77c3a6bf8965937aca322faa
2014-02-21 17:37:19 -06:00
Brian.Dyke
5a11fbbfdb
OB_14.1.1-19 baseline
...
Former-commit-id: 3508e488f5779553142ccfa499797810b723647bcfa499797810b723647b64044e7ce5c41dd22ff2
2014-02-21 06:50:59 -05:00
Mike Duff
5754117aad
Issue #2631 - Set preference defaults in the Activator.
...
Removed unused file.
Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e
Former-commit-id: 9eafacaac2a96a833f51ed5cb91406a7b1e79d2ded5cb91406a7b1e79d2dd90f4495c2f98eec12b9
2014-02-20 15:09:10 -06:00
Brian Clements
e7584f3a49
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: 8bbf2bb6bda2bdfa25ccaaa2de20f489a48c3f6baaa2de20f489a48c3f6b4b7ba54dc304697836b8
2014-02-20 11:50:54 -06:00
Brian Clements
08a0e5baf2
Issue #2751 implemented room/topic ownership transfer
...
Former-commit-id: 4e165aba58a8ff1effc1c3cadff705ab72938246c3cadff705ab72938246d9ac2c00379d00fe2bab
2014-02-20 11:10:14 -06:00
Nate Jensen
5d5518e29f
Issue #2704 fix startup issues where settings are valid but dialog
...
doens't realize it
Former-commit-id: 6973755f4e6ef26a636c32bd9fd6350f81b8046732bd9fd6350f81b804679f33e97c1b6e2150ccd7
2014-02-20 10:53:21 -06:00
Nate Jensen
08ede8e9f3
Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
...
Former-commit-id: adb51300d84563e38db23078b692735856957c573078b692735856957c575412b72c57c936a659a5
2014-02-19 17:22:00 -06:00
Nate Jensen
8a564e9987
Merge "Issue #2761 add region level to localization" into development
...
Former-commit-id: f939d93d7f3782880dac9011e1b31e6e59175ce49011e1b31e6e59175ce4b1e27889589394879520
2014-02-19 17:18:24 -06:00
Nate Jensen
eeac24c773
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
...
Former-commit-id: f545a8a74da241472c34df376abcb7f99cf7df47df376abcb7f99cf7df478b152a8027d3ec0da1bb
2014-02-19 16:19:27 -06:00
Ron Anderson
efbe57d909
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
...
Former-commit-id: dab0ebc99e8703c4393798d2417f94b8c00d8ead98d2417f94b8c00d8ead7e7f0abfdcb9904edc3a
2014-02-19 15:39:56 -06:00
Mike Duff
a723f69ad9
Issue #2631 - Add sound preference for users joining a room.
...
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: 659cb1f2a0e2a6251a6b663ea8decd95fcee385a663ea8decd95fcee385a3100a71f3489c4a3e04b
2014-02-19 15:26:14 -06:00
Mike Duff
10765884a3
Issue #2628 - Change cast from short to int for MPE colorbar
...
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c
Former-commit-id: 8a29af489448a0b34b5f682c6af456183657fb33682c6af456183657fb3386fce9d5478be2622f85
2014-02-19 15:20:29 -06:00
Nate Jensen
7f1665f2eb
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: 72acab26c3b4ac1867284b4cca776fc72e2be9694b4cca776fc72e2be9697099b450235ef747c703
2014-02-19 14:52:24 -06:00
Ron Anderson
84bea14340
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5f3248574f663cb4cb625258aecf45419e9d0b8d5258aecf45419e9d0b8d8a41723ba6908e43039e
2014-02-19 11:55:11 -06:00
Mike Duff
bac3c86658
Issue #2734 - default time range to 24 hours.
...
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d
Former-commit-id: c7e22b7b3bbc180503b119033601bf0b316f7bd919033601bf0b316f7bd97710724c5a06ed3db690
2014-02-19 10:23:48 -06:00
Matt Nash
9cb0b6d530
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: 1d6e1d443c3f67324d7c2d20e84f6a18350195672d20e84f6a1835019567bb10484bd0ae1d36b6d0
2014-02-19 10:01:25 -06:00
Brian Clements
30027665ac
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: abc01f547506c16118e1dc074a96503a135b8eacdc074a96503a135b8eacbee7cdb71a77bb396c9a
2014-02-19 08:32:26 -06:00
Mike Duff
5b1250208e
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: a370e81065283b0c670ca6509aad8c9754f0d8dda6509aad8c9754f0d8ddecb0d45b2440b0540830
2014-02-18 17:32:32 -06:00
Nate Jensen
2f1c0109b1
Merge "Issue #2756 new collaboration openfire plugin and http service" into development
...
Former-commit-id: 961239e181ac0a10678b020d54c48ab08d96b1e8020d54c48ab08d96b1e8a6bb05f2e34bb0997749
2014-02-18 14:51:13 -06:00
Nate Jensen
61ec0df1c9
Merge "Issue #2793 improved collaboration disconnect handling" into development
...
Former-commit-id: d4cc8b18271738248facc63289fa14b3c45b303cc63289fa14b3c45b303c173c6465762e468e9ec1
2014-02-18 11:22:19 -06:00
Brian Clements
0d7ae9a2ff
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: 1c8f5dd5799095a1584fa28fcf0dc57028f7fd4da28fcf0dc57028f7fd4d510c39713f9d9c4c7c27
2014-02-18 11:11:33 -06:00
Brad Gonzales
ae35320dd6
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: 1d57e9f5f7379c0fb46c19460ed0d7ba4e30832819460ed0d7ba4e3083283be33809441b76488111
2014-02-18 11:10:44 -06:00
Ron Anderson
8779564e3a
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: 410f956cffe7f2b6883d32bcf9d0d014a082a4e932bcf9d0d014a082a4e9d4ba9eba940135771eec
2014-02-18 10:45:20 -06:00
Brian Clements
74d08f1d19
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: 68fac79fe7f0c89ef6c6f6b28274345b4f1e8288f6b28274345b4f1e8288a1d9e40bd402319f36e4
2014-02-18 10:03:12 -06:00
Nate Jensen
f348686037
Merge "Issue #2751 fixed blocked icon for roster entries" into development
...
Former-commit-id: 35b4de06400228d24f1de70f0d21abaa7413fd4ce70f0d21abaa7413fd4cf1b7bf1c2ac3756326a6
2014-02-18 08:48:00 -06:00
Brian Clements
f5a25c9030
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: ab8f47413fe894019715a94b366e263307f5ea5ea94b366e263307f5ea5e476d0c325702d3a9ae7e
2014-02-17 17:11:36 -06:00
Nate Jensen
60fd298721
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 742217ded00160ab04640c4de502184d689945250c4de502184d68994525228ab8dd60121bcd184a
2014-02-17 17:10:07 -06:00
Brian Clements
430832e3e5
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: ca8869b8ef6d716863323b5648c0553dfd8fbafb3b5648c0553dfd8fbafb9dc2967e3f0d07e417fc
2014-02-17 16:39:43 -06:00
Nate Jensen
7ad4c20f9c
Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
...
Former-commit-id: a416577b252367c79c1c5675869906f4260a617e5675869906f4260a617e96014c806d1639f43f50
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
028bfc35f6
Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
...
Former-commit-id: 386b6a24992cf496ca84937b3071d4ca90137801937b3071d4ca901378010f6f60a132fb5b367ecc
2014-02-17 14:02:57 -06:00
Nate Jensen
62739b7936
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 34c7c3cba1c8e70cd6b115ff4ab5d72486e3919215ff4ab5d72486e391920314d61773b801b36ca7
2014-02-17 11:58:04 -06:00
Nate Jensen
0f317fd808
Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
...
Former-commit-id: ed76393cd80fe984258230632fbd84063d85ee2230632fbd84063d85ee22996663ccee1169f85a3b
2014-02-17 11:22:53 -06:00
Max Schenkelberg
748a81d884
Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
...
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc
Former-commit-id: 554e0caec51de140a526acad6702296a2a33abe1acad6702296a2a33abe191f707537bff9fdc63b0
2014-02-17 11:07:45 -06:00
Steve Harris
1fbbb6e73f
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 1b7e02636dd0352c69d4267cc881a49fcc5ad930267cc881a49fcc5ad930e115197bb7146412a8bd
2014-02-17 08:54:34 -06:00
Nate Jensen
d3c66cb748
Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
...
Former-commit-id: fa87ba313856aa06888f723ff23ee9f3d107580f723ff23ee9f3d107580fdbc420e917b1c976ac17
2014-02-14 10:50:38 -06:00
Max Schenkelberg
db72c9efca
Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
...
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df
Former-commit-id: 38aae37f014d656b5d066309f9b34bc8e93190f26309f9b34bc8e93190f23571135645b311aba5d5
2014-02-14 10:47:42 -06:00
Mike Duff
fad65749a8
Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
...
Former-commit-id: b34c9eedd043ea3b0918ac62d322ed346dc4afffac62d322ed346dc4afff5b3a55d11f6601dff483
2014-02-14 08:53:40 -06:00
Nate Jensen
740e71adba
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: 47b27c602f63d5f94cbbe05f1eae96a85575a763e05f1eae96a85575a76311fb06810f139479b4e1
2014-02-13 15:35:53 -06:00
Nate Jensen
2772ad3c9c
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: ec6d8585e1f2b32fa1ae2643d01b74d8e2d2837e2643d01b74d8e2d2837eb31470f7e31f3c4090a0
2014-02-13 14:02:55 -06:00
Brian Clements
21b1a6844a
Issue #2751 user identity refactor
...
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types
Former-commit-id: 01653c76de16ed18e0c6ef529089060ac7ff81cfef529089060ac7ff81cf3ec3ad0543e6de3a118d
2014-02-13 13:51:39 -06:00
Ron Anderson
c2e56111c1
Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
...
Former-commit-id: ce72867ab921e95cc2f051c9d27a3942fd9c8f9a51c9d27a3942fd9c8f9ab84a83eb6fca11555427
2014-02-13 10:46:27 -06:00
Ron Anderson
4d8ebf6712
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 69ee4792ad3e78908bb5fcf45916f42f067699f2fcf45916f42f067699f22d7c87ac84d9b82b4ebe
2014-02-13 10:10:34 -06:00
Brian Clements
d4afb01ecc
Issue #2700 fixed subscribe request group input
...
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once
Former-commit-id: a0eb8342bf2d72c0f475579f7c826dcaa8360ac7579f7c826dcaa8360ac7bafe2972a446ea69990d
2014-02-13 09:47:02 -06:00
Nate Jensen
906e7f679a
Merge "Issue #2799 fixed double click chat not working for roster entries" into development
...
Former-commit-id: 1841c4f7bfed87998c31609331286194b8b7eb04609331286194b8b7eb04b9e027059ff53e9523f3
2014-02-12 17:34:27 -06:00
Brian Clements
0145571fe4
Issue #2799 fixed double click chat not working for roster entries
...
Former-commit-id: 2a687e7ac51e19c8d62c1bf3a090569d7490a1581bf3a090569d7490a158f22268295e667a1450cf
2014-02-12 17:06:44 -06:00
Brian Clements
c322557870
Issue #2797 fixed presence bug
...
a defensive copy was needed when sending presence to rooms
Former-commit-id: b8a1c8f56d22031aa87d81ddf87b0423e203902881ddf87b0423e203902809859bdee9a1ba9c6b9d
2014-02-12 16:54:46 -06:00
Nate Jensen
fc4670578b
Merge "Issue #2793 improved error handling for packet extension" into development
...
Former-commit-id: 1bf941fc58fa42c40bc7eec72c59565e6656581beec72c59565e6656581b7247d69202bac84c698f
2014-02-12 15:06:43 -06:00
Brian Clements
85e92777e3
Issue #2793 improved error handling for packet extension
...
any exception thrown while parsing packets disconnects stream
changed to logging parsing problems and returning empty payload so we stay connected
added null check when sending to topic
Former-commit-id: 87a7bf82e53034ac5994e381edcd60b0714ba659e381edcd60b0714ba6594406477877b94bc84429
2014-02-12 14:22:33 -06:00
