Commit graph

2856 commits

Author SHA1 Message Date
Bryan Kowal
3dda41af98 Issue #2754 - fix ant xpath error; gfe is now dependent on kml (unrelated to this change)
Former-commit-id: 6e19ac4acf [formerly 6fd129379f] [formerly 6e19ac4acf [formerly 6fd129379f] [formerly 678fb83ded [formerly e027cf42b3b395a834f91512e269e41377f673ef]]]
Former-commit-id: 678fb83ded
Former-commit-id: 9ef27edf5f [formerly 77370b4e68]
Former-commit-id: cf6c6feccc
2014-01-30 18:11:48 -06:00
Ben Steffensmeier
f4a89f93b4 Issue #2312 Java 6 compatibility, fix legend menus.
Former-commit-id: 27fbb0f870 [formerly 7ab61aaa23] [formerly 27fbb0f870 [formerly 7ab61aaa23] [formerly fe5f0118da [formerly 2853536477d39459de3cbb4eef7670734cfad5f8]]]
Former-commit-id: fe5f0118da
Former-commit-id: 1f23bb4cf7 [formerly e4232ce9a7]
Former-commit-id: 7acd053aa2
2014-01-30 16:12:10 -06:00
Bryan Kowal
25d38dd699 Issue #2754 - now more accomodative for the com.raytheon.uf.viz.application.feature feature dependency
Former-commit-id: 635548dae3 [formerly d88019d902] [formerly 635548dae3 [formerly d88019d902] [formerly ee95e4de7e [formerly 5e007018d1cd6064ba114d92d3943e23d8c3e17e]]]
Former-commit-id: ee95e4de7e
Former-commit-id: 89e0e847c9 [formerly bd88b563fe]
Former-commit-id: 1ae4a1d919
2014-01-29 14:25:38 -06:00
Ron Anderson
9dd3dbe791 Merge "Issue #2703 Hook GFEResource into KML Export. Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963" into development
Former-commit-id: d0e821e5d1 [formerly 61f35e86ec] [formerly d0e821e5d1 [formerly 61f35e86ec] [formerly f4f89c79a2 [formerly a3ea22b1db8418f5367b6ffa029f9aa159003398]]]
Former-commit-id: f4f89c79a2
Former-commit-id: ff65b54555 [formerly 2e9389293a]
Former-commit-id: a4daed8dd2
2014-01-29 14:24:26 -06:00
Nate Jensen
8d6097fd9a Merge "Issue #2698 made sessions private and invite only" into development
Former-commit-id: 1977b026ee [formerly 52c3b71049] [formerly 1977b026ee [formerly 52c3b71049] [formerly 004999bbec [formerly db4447bf109981ded541bff929687040cc28953a]]]
Former-commit-id: 004999bbec
Former-commit-id: bcf82eb692 [formerly 0a7961457e]
Former-commit-id: 3b6488cdb5
2014-01-29 11:01:45 -06:00
Brian Clements
96e89d9f83 Issue #2698 made sessions private and invite only
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config


Former-commit-id: 1f1be20d41 [formerly c498307b30] [formerly 1f1be20d41 [formerly c498307b30] [formerly 5b9f694930 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]
Former-commit-id: 5b9f694930
Former-commit-id: 07452b7778 [formerly 4a0682a9e8]
Former-commit-id: 76ec4d56c8
2014-01-29 10:16:15 -06:00
Max Schenkelberg
6953e81887 Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly f4765d1577 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]])

Former-commit-id: 122c3442f8 [formerly 0c840cf724] [formerly 122c3442f8 [formerly 0c840cf724] [formerly d566ed9927 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]]
Former-commit-id: d566ed9927
Former-commit-id: e1717b2729 [formerly f5ff746126]
Former-commit-id: 1cdbdfceba
2014-01-29 10:15:38 -06:00
Steve Harris
e3d1abe909 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java

Former-commit-id: 14ba3b29f4 [formerly 1738185503] [formerly 14ba3b29f4 [formerly 1738185503] [formerly 1aea63a1f6 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: d9cd003a5a [formerly 1fd5b2255f]
Former-commit-id: ec69a2c4f7
2014-01-29 09:41:57 -06:00
Greg Armendariz
91d14d6f32 Issue #2754 - Remove extra character
Former-commit-id: 6ff868a167 [formerly 9cc089b369] [formerly 6ff868a167 [formerly 9cc089b369] [formerly 1017abdc78 [formerly 5979ad555987210e07e32eb5336e7cb427ac06c3]]]
Former-commit-id: 1017abdc78
Former-commit-id: 4e092b5810 [formerly a8c75ce81e]
Former-commit-id: b37096a395
2014-01-29 08:43:09 -06:00
Brian Clements
ad3939140c Issue #2700 added contact request dialog
user is now prompted to accept contact request
added support for managing contacts that haven't accepted contact requests
contacts list shows new icon for contacts that haven't accepted contact requests


Former-commit-id: b4d930bcb9 [formerly 6b1843f19a] [formerly b4d930bcb9 [formerly 6b1843f19a] [formerly bd19366ada [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]]
Former-commit-id: bd19366ada
Former-commit-id: bffa4d84fe [formerly f22052321b]
Former-commit-id: 737745ade7
2014-01-28 10:07:11 -06:00
Richard Peter
b9f6b88091 Merge "Issue #2711 Get All levels from the database for derived parameters." into development
Former-commit-id: 766af8b281 [formerly 90dd7474b3] [formerly 766af8b281 [formerly 90dd7474b3] [formerly 5c1de78c24 [formerly b238a853283cc1b71ce290b233db5f174e486c9f]]]
Former-commit-id: 5c1de78c24
Former-commit-id: 953925d24b [formerly e9bc96c37e]
Former-commit-id: bc9789fee5
2014-01-27 11:36:55 -06:00
Ben Steffensmeier
88f17f6f92 Issue #2711 Get All levels from the database for derived parameters.
Former-commit-id: fdb67f9979 [formerly 08d277fe62] [formerly fdb67f9979 [formerly 08d277fe62] [formerly 3ca92176ac [formerly 0b36f91188c458532eb26d8b4a01e7f8954eba5a]]]
Former-commit-id: 3ca92176ac
Former-commit-id: c42af67f51 [formerly bedec49852]
Former-commit-id: 4e0013ae24
2014-01-27 11:12:08 -06:00
Brian Clements
ff1882e80a Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: b86ad8ca6f [formerly f615f2226f] [formerly b86ad8ca6f [formerly f615f2226f] [formerly 26ac549096 [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]
Former-commit-id: 26ac549096
Former-commit-id: cfe945d76b [formerly 8944860cbb]
Former-commit-id: dd9b3ca640
2014-01-27 10:14:10 -06:00
Mike Duff
c030596afe Issue #2459 - Last change from unscheduled to deactivated.
Former-commit-id: 3766f6a0f4 [formerly e46c226489] [formerly 3766f6a0f4 [formerly e46c226489] [formerly 81aa9ce0cb [formerly 09494558cae046e97ff2126673c5a5c4fd1f0105]]]
Former-commit-id: 81aa9ce0cb
Former-commit-id: ef5d3f370c [formerly 5fc96739b9]
Former-commit-id: 0b39c2977b
2014-01-26 18:57:26 -06:00
Mike Duff
c9ca18c0ef Issue #2452 - Changed label based on feedback.
Former-commit-id: fb6194c464 [formerly 1da1285311] [formerly fb6194c464 [formerly 1da1285311] [formerly 6dcd1a7969 [formerly dd74aef827f0892c64a7efd60b0edd1156ef31ec]]]
Former-commit-id: 6dcd1a7969
Former-commit-id: eaaab3b082 [formerly be59be53d4]
Former-commit-id: df6c94e317
2014-01-25 14:41:20 -06:00
Nate Jensen
ff4eb32010 Issue #2359 printout shutdown of application to try and detect kills
Change-Id: I113890428cfd5a22c2fbb0a4abdcff18a4ccd11e

Former-commit-id: f5ce7b485d [formerly 47d6e5b54f] [formerly f5ce7b485d [formerly 47d6e5b54f] [formerly cdbd05b293 [formerly 34b2c7a402bcf7f3b04ea1e98090f7e0df48566f]]]
Former-commit-id: cdbd05b293
Former-commit-id: e6e9cab9f9 [formerly 7dd0b1c978]
Former-commit-id: 0c9e613674
2014-01-23 19:02:37 -06:00
Ben Steffensmeier
4b8491c85b Issue #2703 Hook GFEResource into KML Export.
Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963

Former-commit-id: 48bb8a59a1 [formerly 1897336455] [formerly 48bb8a59a1 [formerly 1897336455] [formerly 7b1245b0cf [formerly 547e9ac7212b5a9842d064d5669772e8e50a4828]]]
Former-commit-id: 7b1245b0cf
Former-commit-id: c9a89659c3 [formerly 76e76198d6]
Former-commit-id: d1781763ab
2014-01-23 18:43:14 -06:00
Ben Steffensmeier
27cbedca7a Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs.
Former-commit-id: 9c65c5b07b [formerly 6aa6683258] [formerly 9c65c5b07b [formerly 6aa6683258] [formerly a92f6e9bb6 [formerly e214a045c4d45532ed80fb4cdd51355c7884a2ee]]]
Former-commit-id: a92f6e9bb6
Former-commit-id: 9b788b49b0 [formerly b90004e46a]
Former-commit-id: 8cdb888e20
2014-01-23 12:41:16 -06:00
Nate Jensen
71a87d2ffe Merge "Issue #2667 added bin lightning data access factory" into development
Former-commit-id: 922cd8c3a2 [formerly 27b07e27f1] [formerly 922cd8c3a2 [formerly 27b07e27f1] [formerly db10439844 [formerly beede8dc30f5497c5769f78a46642d31c4b61cb0]]]
Former-commit-id: db10439844
Former-commit-id: 423e8f7fb5 [formerly 00bfd9d5bb]
Former-commit-id: 690c149d30
2014-01-23 10:32:17 -06:00
Brian Clements
abb1c97149 Issue #2667 added bin lightning data access factory
renamed lightning record's lightSource field to source
added delta script for db column change
added attribute method comments for IData and DefaultGeometryData


Former-commit-id: 54516275f1 [formerly 402bef9c5b] [formerly 54516275f1 [formerly 402bef9c5b] [formerly bd9fbc5f38 [formerly b6c50729919ea8a9b29ca963e18f68268c3a0b7f]]]
Former-commit-id: bd9fbc5f38
Former-commit-id: 265137fd91 [formerly 83ed9dc04d]
Former-commit-id: 77e31f815e
2014-01-23 09:32:18 -06:00
Ben Steffensmeier
c20b169454 Issue #2312 Add extra frame selection option to GFE image export.
Change-Id: Ic62448c703e59a5318f361e141de7ffb65055f74

Former-commit-id: 3196471d18 [formerly 81b38e2ddf] [formerly 3196471d18 [formerly 81b38e2ddf] [formerly 4f9e60c658 [formerly cb4db2bfd5a659c59d5c5e450c92207b3a81088c]]]
Former-commit-id: 4f9e60c658
Former-commit-id: 831d904de2 [formerly 85eb694b23]
Former-commit-id: 5dfa58dc98
2014-01-22 16:53:04 -06:00
Ben Steffensmeier
6b7e12df21 Issue #2602 Don't try to load classes from uninstalled bundles.
Former-commit-id: c7357863b9 [formerly 0c4fc0dd01] [formerly c7357863b9 [formerly 0c4fc0dd01] [formerly 3187754736 [formerly 30ca0135046851884e4a07b36559fce086ccd3f2]]]
Former-commit-id: 3187754736
Former-commit-id: 32bac228db [formerly d1dbd0c9b6]
Former-commit-id: 5c14bbf179
2014-01-22 15:46:51 -06:00
Nate Jensen
91396bb5a7 Merge "Issue #2312 Add ability to export gif and image export dialog. Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05" into development
Former-commit-id: 1f5a26dc30 [formerly e2f9e86659] [formerly 1f5a26dc30 [formerly e2f9e86659] [formerly 738c70e8ea [formerly 8c8215778f5e37dfa4ec2df000db90f1193107ac]]]
Former-commit-id: 738c70e8ea
Former-commit-id: 96ad72aa9e [formerly 10f9feddba]
Former-commit-id: db7e3f7368
2014-01-22 09:36:33 -06:00
Ben Steffensmeier
9a87e95aac Issue #2312 Add ability to export gif and image export dialog.
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05

Former-commit-id: b70faf1f7d [formerly fc1c56f9cb] [formerly b70faf1f7d [formerly fc1c56f9cb] [formerly 4ad4b4a859 [formerly e2159c422ca93aa76c6ba7a30a09234e8f9da4ce]]]
Former-commit-id: 4ad4b4a859
Former-commit-id: cd295e4172 [formerly 8b2e5a06bc]
Former-commit-id: 7d083a08c5
2014-01-21 18:09:13 -06:00
Steve Harris
69626ab704 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: a465718a0d [formerly 24ab7cff49] [formerly a465718a0d [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: b62efa9387 [formerly 252c7ee40a]
Former-commit-id: 2a967fc9b5
2014-01-21 12:36:54 -06:00
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
Max Schenkelberg
d99c6b49e3 Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 1256748c42 [formerly 68aa666045] [formerly 1256748c42 [formerly 68aa666045] [formerly 87a6db7853 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]]
Former-commit-id: 87a6db7853
Former-commit-id: 424f2282f0 [formerly 2574685291]
Former-commit-id: 9903335f77
2014-01-20 13:54:27 -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
Nate Jensen
47477bc2c1 Merge "Issue #2651 Synchronize ResourceList.removeRsc." into development
Former-commit-id: d6862c2b02 [formerly e2dfdb01b7] [formerly d6862c2b02 [formerly e2dfdb01b7] [formerly 0bf6222d1e [formerly af27de2a1e1d613da2b75519f4679762e32ff7d3]]]
Former-commit-id: 0bf6222d1e
Former-commit-id: dcd1906332 [formerly 83c27d7025]
Former-commit-id: b168eff914
2014-01-20 09:23:24 -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
Ben Steffensmeier
ce8619b845 Issue #2651 Synchronize ResourceList.removeRsc.
Former-commit-id: 15c08d7209 [formerly a580fc74b7] [formerly 15c08d7209 [formerly a580fc74b7] [formerly d8263b358d [formerly f0ecb93ab2934edaab06409b04b21d40ed6e5ff8]]]
Former-commit-id: d8263b358d
Former-commit-id: a4ce57502c [formerly 18437701d9]
Former-commit-id: 72ee36b365
2014-01-17 11:58:00 -06:00
Nate Jensen
588fe6ffa3 Merge "Issue #2313 Image canvas rendering. Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417" into development
Former-commit-id: 1bf74c5919 [formerly a431fa2bd9] [formerly 1bf74c5919 [formerly a431fa2bd9] [formerly 2d5dede634 [formerly f343371577210225865239aef14a40b529de86ad]]]
Former-commit-id: 2d5dede634
Former-commit-id: 4aa2dbfbc5 [formerly 1405fb3376]
Former-commit-id: 0faecb7c6e
2014-01-17 11:36:30 -06:00
Nate Jensen
40ee467a10 Merge "Issue #2646 Fix Drawing layer NPE." into development
Former-commit-id: 211f7a1bf0 [formerly bad984f103] [formerly 211f7a1bf0 [formerly bad984f103] [formerly f85f54d2ae [formerly c8975c8b00feb8ab5dfa97d8f78bf54ab7290b90]]]
Former-commit-id: f85f54d2ae
Former-commit-id: e8bfb55387 [formerly edc2c700c8]
Former-commit-id: 08ebba2423
2014-01-17 10:50:38 -06:00
Ben Steffensmeier
711472433f Issue #2646 Fix Drawing layer NPE.
Former-commit-id: f31f7dc53a [formerly 068a9c6efb] [formerly f31f7dc53a [formerly 068a9c6efb] [formerly 5cbe38aade [formerly 1e5f3e1375ec3d9485863b38e6926e95e7b3921e]]]
Former-commit-id: 5cbe38aade
Former-commit-id: d43a97c51e [formerly e1fe6136ee]
Former-commit-id: 8a1de3a0bd
2014-01-17 10:41:53 -06:00
Ben Steffensmeier
38024fb662 Issue #2313 Image canvas rendering.
Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417

Former-commit-id: 76414243ba [formerly 625aac3ed3] [formerly 76414243ba [formerly 625aac3ed3] [formerly 16c350f0c6 [formerly 0f8d0c52093a14d16a36ce353c2587633474007d]]]
Former-commit-id: 16c350f0c6
Former-commit-id: 19930b7c8b [formerly 1973e5e015]
Former-commit-id: af39398ac3
2014-01-16 17:05:16 -06:00
gerritcm
6bf3189db9 14.1.1-16 baseline
Former-commit-id: 9e935404d8 [formerly 6be938e6eb] [formerly 9e935404d8 [formerly 6be938e6eb] [formerly b84f7d4203 [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]
Former-commit-id: b84f7d4203
Former-commit-id: b72cd19055 [formerly 644da23327]
Former-commit-id: 5f79da2501
2014-01-16 16:43:05 -05:00
Lee Venable
39c7b5dffb Issue #2691 - Fixed null pointer exception when closing MPE perspective.
Former-commit-id: 24a4cafd0c [formerly 8405e235e6] [formerly 24a4cafd0c [formerly 8405e235e6] [formerly b435fd3050 [formerly fa5315a2874b91acaac4f5eb58142804a6a09ef8]]]
Former-commit-id: b435fd3050
Former-commit-id: a859b50881 [formerly bc07967e3b]
Former-commit-id: a49baddf98
2014-01-16 10:35:12 -06:00
Nate Jensen
5ec7ca620c Merge "Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D. Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69" into development
Former-commit-id: 65306a503e [formerly a71ef7b581] [formerly 65306a503e [formerly a71ef7b581] [formerly 518a3165e4 [formerly 56fd57c3e00926c95ab05297772161e960586e8f]]]
Former-commit-id: 518a3165e4
Former-commit-id: d4db973df1 [formerly 104a0a2de2]
Former-commit-id: 58c1ba12e5
2014-01-16 09:06:10 -06:00
Ben Steffensmeier
6d8adaccb2 Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D.
Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69

Former-commit-id: 8b23f32311 [formerly ee11e5d13c] [formerly 8b23f32311 [formerly ee11e5d13c] [formerly ac33fb9463 [formerly a8bcec4a2fa9ddd49dc300ebd63aebfdfb41723e]]]
Former-commit-id: ac33fb9463
Former-commit-id: b2b2136868 [formerly be163ebf2a]
Former-commit-id: 182a717b00
2014-01-16 09:03:50 -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
51df7b69cc Merge "Issue #2630 added away timeout for collaboration inactivity" into development
Former-commit-id: 8420f87348 [formerly bdb4d8bdeb] [formerly 8420f87348 [formerly bdb4d8bdeb] [formerly eafe61cd37 [formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]]]
Former-commit-id: eafe61cd37
Former-commit-id: 5504ec1efd [formerly 46dfbe9334]
Former-commit-id: b7a74dcb74
2014-01-15 13:48:13 -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
Brian Clements
72b75a821d Issue #2630 added away timeout for collaboration inactivity
eclipse job in connection subscriber
preferences added to collaboration prefs page


Former-commit-id: 7e952c5ba8 [formerly 24190efb75] [formerly 7e952c5ba8 [formerly 24190efb75] [formerly 57fb953b8d [formerly c6fded1429e44033bb989c1d9caaac87c72eb440]]]
Former-commit-id: 57fb953b8d
Former-commit-id: 7410c36783 [formerly 53273c4e5a]
Former-commit-id: 07b9ab8b7b
2014-01-15 13:20:25 -06:00
Brian Clements
67e65db850 Issue #2630 fixed status parsing bug
status from preference store wasn't being parsed correctly
changed connection data to store as Mode object instead of string
added parse method to collaboration utils


Former-commit-id: 45b5df24d4 [formerly 79446d983b] [formerly 45b5df24d4 [formerly 79446d983b] [formerly bf6cf2f2ee [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]]
Former-commit-id: bf6cf2f2ee
Former-commit-id: bfbcbf382a [formerly 1219713128]
Former-commit-id: 7afcf37c11
2014-01-15 10:24:09 -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