Commit graph

3608 commits

Author SHA1 Message Date
Nate Jensen
760b0cb584 Omaha #3236 thin client connectivity dialog remembers past proxy servers
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a

Former-commit-id: 353872377cc3f96db4d3a22c6646fccb3edcb865
2014-06-25 08:54:24 -05:00
Nate Jensen
425651652d Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
Former-commit-id: 45ac7ca480ea49dabff490ccc5b29878f0481b90
2014-06-25 08:32:25 -05:00
Steve Harris
23d0cf81f8 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LockingFileOutputStream.java (moved to ufcore)

Former-commit-id: 11c37fed7aed29ee42661948db90fab14b49c93c
2014-06-25 07:11:58 -05:00
Ben Steffensmeier
5c4f89644c Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 664ae8372cd7df344ae66dfec599646b31dbd27b
2014-06-24 18:16:09 -05:00
Brian Clements
3b71bedd14 Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd

Former-commit-id: aceeff1e02c896ff27794755eb10fc275718a68c
2014-06-24 11:15:45 -05:00
Steve Harris
ddc6f2092a Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 174fe6d66525229f328846a1f4564300d7603c10
2014-06-24 10:57:56 -05:00
Ben Steffensmeier
46b8688597 Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: 2fdb5867131b54f5d74ef3edd8c621c8807d4d99
2014-06-24 10:57:02 -05:00
steve.naples
90ed511478 ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9

Former-commit-id: fcd20d35abf3617701cc797baf9ba2b3984379c8
2014-06-24 15:52:23 +00:00
Nate Jensen
476eda3585 Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
Former-commit-id: 83cd4ad4af6ac2f90a280fa1367ef88949870dc0
2014-06-23 17:45:11 -05:00
Ben Steffensmeier
7fe130b6e2 Omaha #3238 Implement Interrogatable in SatResource.
Former-commit-id: 698a2b174606c8425778f5672b613f2d74fb8997
2014-06-23 17:21:43 -05:00
Lee Venable
4b9c65f6c4 Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: 1c1f7dc0d3fb7627ff61032b3baa6c6781a35718
2014-06-23 16:29:24 -05:00
Lee Venable
a176a26618 Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
Former-commit-id: 363ddb4af1075686fc5a1d80df884f59d93d7b99
2014-06-23 15:37:10 -05:00
Nate Jensen
2f85537a55 Omaha #3133 remove unnecessary plugins
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09

Former-commit-id: 04d26bedbe8d6ccf7a353159f27b133aff42970e
2014-06-23 13:00:44 -05:00
Nate Jensen
172f18a5b1 Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
Former-commit-id: 449a40d7981b0814f9cc7feb62f52b2259e83e5f
2014-06-23 12:12:03 -05:00
Nate Jensen
97ef9fc343 Issue #3307 fix xml serialization of looping field
Former-commit-id: c6ce72840a4ee0f44eacff46015b5382d86dd47f
2014-06-23 09:54:11 -05:00
Steve Harris
419c5f4aba CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
2014-06-20 14:01:55 -04:00
Brian Clements
93a1ee71c4 Omaha #3281 peer2peer chat view improvements
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)

Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d

Former-commit-id: a31b7f213081f384bd23d53a431ce53593254c25
2014-06-20 09:04:15 -05:00
Brian Clements
fd95df3bc0 Omaha #3281 collaboration views persist between perspectives
fixed bug that prevented re-opening collaboration after views were closed

Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3

Former-commit-id: b84f7571415871f2983b913cf816ed227b24bbac
2014-06-20 08:53:54 -05:00
Nate Jensen
d60d2b5caf Omaha #3245 remove -vm argument
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13

Former-commit-id: 003c2d49ecc20cfae2cdefb14119e7d0b143e4c6
2014-06-19 14:44:24 -05:00
Nate Jensen
caf278ca5c Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
Former-commit-id: 741f2710372a713c53e70602395bf7c54fd17cdf
2014-06-19 13:42:06 -05:00
Nate Jensen
f01e19946c Omaha #3255 fix cave install of data delivery
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e

Former-commit-id: bc22cda0a2bcdb550ad4d57a9be522336d4bc633
2014-06-19 13:15:40 -05:00
Brian Clements
a18069809a Omaha #3214 added pulse and cloud flash rendering to cave
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: 136bb5feca753f83f53d9d1e9381061853edc402
2014-06-19 12:50:56 -05:00
Nate Jensen
27df878d86 Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1
Former-commit-id: 73c71e83588237e0a39d173c648f68a8e35bf119
2014-06-19 10:59:35 -05:00
Benjamin Phillippe
fc024e6d4c Omaha #3255 Remove cxf from cave feature to fix build
Former-commit-id: b6f01bfe3f45ab4c3299879db44763994f7f8222
2014-06-19 10:58:11 -05:00
Nate Jensen
7bb2aebd59 Omaha #3242 clean up more graphs
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4

Former-commit-id: 667817cf9473889f8c5cc39dd71814f1181a3805
2014-06-18 18:23:36 -05:00
Nate Jensen
835b65b7b8 Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
Former-commit-id: 43684d4c0fe8f4b79ef384c08d01d2bdd51990e6
2014-06-18 17:17:17 -05:00
Nate Jensen
fbd7e64fe2 Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
Former-commit-id: 84257c99914950f412f1e3d8c12b691fb428086f
2014-06-18 17:17:04 -05:00
Nate Jensen
9a76fd4db0 Merge "Omaha #3242 fix errors that can occur if a user zooms or pans while the time series is still loading" into omaha_14.4.1
Former-commit-id: 968613aaa91648a8e860eff88293744ddc00464c
2014-06-18 17:07:19 -05:00
Nate Jensen
30e76a1fd5 Omaha #3242 thread safety for inset map
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857

Former-commit-id: d06eedeefc7997f6c881cf267c7f24979afbd9d7
2014-06-18 17:02:10 -05:00
Nate Jensen
3ba4931eee Omaha #3242 fix errors that can occur if a user zooms or pans while the
time series is still loading

Change-Id: Ibcdc9681c651731f7da554c8cca40e260303aebb

Former-commit-id: 7999e026e8ff02ccb0f155af8770b0d8aac43339
2014-06-18 16:48:48 -05:00
Nate Jensen
46c843f51a Omaha #3242 fix error if user zooms on cross section before it's loaded
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830

Former-commit-id: 4a7eebe03c9cd84702e6cda1258503da725a10bb
2014-06-18 16:37:49 -05:00
Nate Jensen
e10a73c17b Omaha #3242 support ensemble id in time series legends
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08

Former-commit-id: 453c1eecf4f08203b4c6e2a74ad5dc366d85d359
2014-06-18 15:37:14 -05:00
Benjamin Phillippe
7e7cecceea Omaha #3255 Fixing Build
Former-commit-id: a2a18d6f4a9f536172c264eeeee3ff51e225981f
2014-06-18 13:57:27 -05:00
Nate Jensen
9fd4e4a8d9 Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
Former-commit-id: b209ae6772fe33ca73a130468c4c314f86ffeba5
2014-06-18 12:14:45 -05:00
Nate Jensen
32bc3e4056 Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
Former-commit-id: 5d378ca9529b48bd0a1422aec3263310f8350161
2014-06-18 11:11:34 -05:00
Nate Jensen
17dc45e7ca Omaha #3274 fix generation of viz .ini files
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7

Former-commit-id: dd628b80f7798bb66d3c54568b9549e66870ddec
2014-06-18 10:03:17 -05:00
Benjamin Phillippe
c2ed8a39d1 Omaha #3255 Dependency cleanup
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e

Former-commit-id: dbac62df979f23402594dc6439b53e7884ea1bd1
2014-06-18 09:54:40 -05:00
Steve Harris
676948e239 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these go to ufcore):
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java


Former-commit-id: da50f581c90ea0cca5f43c45c44cb8ac045a6c8c
2014-06-18 08:52:25 -05:00
Brian.Dyke
8ecdd9a192 CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
2014-06-18 08:55:49 -04:00
Nate Jensen
764f977bf6 Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
Former-commit-id: 4468390aaf89456e93b45fca20aeca7fb96d8c12
2014-06-17 18:09:33 -05:00
Nate Jensen
7fc256d076 Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
Former-commit-id: c632bf24ee15cc85da9d7e7fb0a295912bf06b78
2014-06-17 17:01:46 -05:00
Brian Clements
5d03048fff Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173

Former-commit-id: 5d298b39786d37aa365ccfe2c337214d1e46f1a9
2014-06-17 17:01:23 -05:00
Nate Jensen
8ab7d86a8f Omaha #3245 fix GFE starting without a cave data
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7

Former-commit-id: 539d497c5fc80efd5099e76a9e95a4709ace041d
2014-06-17 16:31:20 -05:00
Nate Jensen
c05ae83ea2 Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
Former-commit-id: 2c2b3891003076484539ef5fa7d6772b6336c635
2014-06-17 16:24:42 -05:00
Brian Clements
add8286d52 Omaha #3078 collaboration shared display data over private chat
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf

Former-commit-id: a51847aff197f805a4e48c9ecdb0c16f874e6a78
2014-06-17 14:32:17 -05:00
Nate Jensen
acd7620d7a Merge "Omaha #3110 Fix typos in revision comment and log message. Changed to log number of messages in queue instead of number being added to queue." into omaha_14.4.1
Former-commit-id: 6efd831efcc5372c7e7bfd52265d13de382407ee
2014-06-17 14:21:55 -05:00
Ron Anderson
855b4ad7c1 Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
Former-commit-id: a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc
2014-06-17 13:54:11 -05:00
Ron Anderson
1a8ccd0181 Omaha #3110 Fix typos in revision comment and log message.
Changed to log number of messages in queue instead of number being added to queue.

Change-Id: I0f6b2be8e62be964de993c6c66f042b371a80bd7

Former-commit-id: 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527
2014-06-17 13:46:38 -05:00
Brian Clements
97a6f5bfe8 Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 93f7d7088e7d7888a878558c6f2fcc368bf3ab05
2014-06-17 11:52:58 -05:00
Nate Jensen
44cb0e6ae6 Omaha #3274 switch viz to G1 garbage collector
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 0355813f030ac996427c64dfcb6cbd4dd781ad2f
2014-06-17 10:54:57 -05:00