Commit graph

384 commits

Author SHA1 Message Date
Max Schenkelberg
dac8374f52 Issue #697 fixed join issues with GFE
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012

Former-commit-id: e648206c2e8129b2d63b9309f67e1ce46a1edbf0
2012-06-14 14:18:02 -05:00
Nate Jensen
6ecd868ddd Issue #716 better tooltip
Change-Id: I9db709540cb6ac25893756139b3269adf9d4551b

Former-commit-id: 4181cc97d769bfead6f5425ec4740ab90c8b57a5
2012-06-14 11:20:16 -05:00
Max Schenkelberg
e92eb6366e Issue #697 added drawing indicator for shared display for data provider, fixed shutdown issue
Change-Id: Iccfb92e3155e8be5c780e601fb8c31ef2c74f39f

Former-commit-id: c00c45f5ba1ae3bb0a0a246d1435bd10b3a8aa51
2012-06-14 11:16:11 -05:00
Max Schenkelberg
dd99479eeb Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a
2012-06-13 17:52:11 -05:00
Matt Nash
a9d225066a Issue #711 add roles and site capability
Former-commit-id: a49eee36dac39f172d7c4fa723a297d7cf94d5db
2012-06-13 12:58:11 -05:00
Matt Nash
96bf8b356a Issue #659 fix floating view issue when minimize happened
Former-commit-id: 82f0b55ac176aad663d7febe94c64d2982bcc45c
2012-06-13 10:04:12 -05:00
Nate Jensen
619d3062c2 Issue #716 fix lots of minor issues, fix merge problem
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575

Former-commit-id: ae131c0d05148e58ba445e5f144aa21c8c5c12c3
2012-06-13 09:39:19 -05:00
Steve Harris
5f66b0995a Removed duplicate method created by merge
Former-commit-id: 90fc678948690cc74488e6e1fd18cf8c72c5c0c9
2012-06-13 08:41:24 -05:00
Steve Harris
2f20a86a30 Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
	cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java

Former-commit-id: 9e83341a16b6e68f9bfe579dff60271553c3db82
2012-06-12 14:37:12 -05:00
Nate Jensen
07d44ae528 Issue #716 removing unnecessary file
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba

Former-commit-id: 5ade0f2437308ab21429432746cf4e71afc33c93
2012-06-11 17:34:21 -05:00
Nate Jensen
d2bb1b6e0c Issue #716 fix disabled toolbar
Change-Id: I464d0560cf7462b37d324db368411f3867e53602

Former-commit-id: d32771cbbe72a32965c50aacd7ede3383a5fff23
2012-06-11 17:33:48 -05:00
Matt Nash
9f2d97fa68 issue #693 always allow to invite users after opening create session dialog
Former-commit-id: 204c35530bbe8c7e39749d70331ceb93c4d4a790
2012-06-11 15:34:49 -05:00
Matt Nash
73da2b1fe8 Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321
2012-06-11 10:24:35 -05:00
Matt Nash
9d187cc362 Issue #703 can change font size in sessions
Former-commit-id: 0e7af586cd96a21540263474f321bd224c45ad54
2012-06-11 10:23:45 -05:00
Matt Nash
cc5c172a77 Issue #659 make fixes to float/dock
Former-commit-id: 6ce7d566d2da59436b6d141ad96503873b11f1aa
2012-06-11 10:21:40 -05:00
Nate Jensen
db3027c0d6 Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8

Former-commit-id: 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a
2012-06-08 16:10:57 -05:00
Nate Jensen
05389dac56 Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74

Former-commit-id: 2306edfd4e11b512a68320ae7dc4edbcfa474934
2012-06-08 15:15:03 -05:00
Steve Harris
b13cbb7e00 12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Max Schenkelberg
49fa818762 Issue #697 Made multiple editors display on single participant editor properly. Made participant editors more restrictive so they can not be attempted to be used by the perspective since they are perspective agnostic
Change-Id: I6605e82c428bda79162adaccea2808f197eba440

Former-commit-id: 20e6ddde20749721784a80a4bb78736de1140a40
2012-06-07 18:22:01 -05:00
Max Schenkelberg
e10ece6081 Issue #697 Fixed recycling of grid vector resource, and made cursor change when drawing and only send clear_all if session leader
Change-Id: I78fbb17c7513e881ddf47d0bcd0ce8333e5740ff

Former-commit-id: 08d8389ea3b23e7fe209d12ff45275f86d3c5883
2012-06-07 10:25:03 -05:00
Max Schenkelberg
7d5d086fe1 Issue #697 Fixed session closing issues and null pointer in gfe
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10

Former-commit-id: 695134c3139868d6e9ace9dca7757368e0bfa5ec
2012-06-07 09:44:40 -05:00
Max Schenkelberg
e0b7693686 Issue #697 Added support for procedure loading which magically made swapping appear to work too
Change-Id: I86c69781514709df4c6a23bdabfb63a2c103a9ed

Former-commit-id: e1bf6a3b576da036478cd1415856a64ebc606640
2012-06-06 15:57:16 -05:00
Matt Nash
c4d26f8b1b Issue #659 fix GFE issue with mouse handlers
Former-commit-id: 43f277de57d148c2d742266d8346b9b93cbcb82f
2012-06-06 14:13:55 -05:00
Max Schenkelberg
b8bedd1247 Issue #590 Fixed gfe edit area selection issue
Change-Id: I67029301f515583a7ca3eea408513d9310e3fd35

Former-commit-id: 6588f58c80782f793c3621a2fd7ec81be2d1ead2
2012-06-06 12:05:47 -05:00
Max Schenkelberg
b5da470e0a Issue #590 fixed GFE session creation bugs. Added refresh to tool items
on undo/redo from keyboard

Former-commit-id: 5c3d4a7fffe3873afbe8db60310afae2b3f0738b
2012-06-05 16:43:27 -05:00
Brad Gonzales
40a0e03b2d Issue #639 fixed archive log view secondary id.
Former-commit-id: 69c774abf417049ffc343ff8ba5d2e44d05bb2e7
2012-06-05 15:14:42 -05:00
Max Schenkelberg
3cd4f75170 Issue #664 Changed hydro legend resource to be system resource
Change-Id: I769463a967ee1ec76a9a3c09d48d27106caa0937

Former-commit-id: 9a726e2686e7ed79c1a436156a16e98083608e14
2012-06-05 13:44:48 -05:00
Matt Nash
00f55c1d80 Issue #659 toolbar is in session view now
Former-commit-id: a516cc2073fa33c88f13678a55dda4bdbe3ed120
2012-06-05 13:25:36 -05:00
Nate Jensen
7f6bc2df93 Issue #427 cleanup
Change-Id: Ieeb03e0f7457ee7dceb6241b61340e364b5aab48

Former-commit-id: 49d468829654697d266a551452edf6a2de66edce
2012-06-05 10:50:08 -05:00
Matt Nash
77d150bf6c Issue #642 fixing merge mistake
Former-commit-id: 2e699d0cd90d2f61ff211b601300ab17cf9c5a40
2012-06-04 09:25:13 -05:00
Matt Nash
acc5d69e59 Issue #642 removing update code
Former-commit-id: 510ca9d1234dba1b4e76f05536fb24c7fd693a76
2012-06-04 09:13:23 -05:00
Matt Nash
82cad97932 Issue #642 alert words now filter what directory is shown
Former-commit-id: df7971ed32994f6ac52ac10fcb03945d57eb5872
2012-06-04 07:33:30 -05:00
Brad Gonzales
4135176198 Issue #639 fixed the previouse and next selection listeners, and renamed an inner class in the SearchComposite.
Former-commit-id: 31b09e378571ce6f8b4a6bd99cfb49b3d8b51045
2012-06-03 10:53:31 -05:00
Brad Gonzales
3795f90712 Issue #639 adding new files missed in last commit
Former-commit-id: 26ada47164c9b004cff5e869735ee11655af6a40
2012-06-01 18:20:24 -05:00
Brad Gonzales
78e44746d6 Issue #639 added view for collaboration chat logs. added search control for logs, sessions, and chats
Former-commit-id: e72e6741925cff7821816daf208cf2a1da5229ce
2012-06-01 18:18:11 -05:00
Max Schenkelberg
5057c05529 Issue #664 fixed name vs id text for dam resource
Change-Id: I1fd50dde00cdf7fa35ba9eda93721d132a6dfbd5

Former-commit-id: a0481db7ccee2f656362ba63424af3c4aa49277b
2012-06-01 14:36:44 -05:00
Max Schenkelberg
b0f729ceb2 Issue #664 Made hydro dam resource work with collaboration
Change-Id: If6d422a937a549c9f68b8c523553179924ac2d7a

Former-commit-id: a3bfc9f4014a417205c27bbd73fc07556df007bc
2012-06-01 14:21:55 -05:00
Max Schenkelberg
fde1e68df6 Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822

Former-commit-id: a375cddf31565d6584256d2ccbe4dbea5a5ec187
2012-05-31 16:05:25 -05:00
Matt Nash
855193aa77 Issue #659 float button for cool detachable functionality
Former-commit-id: 9b1c62c4851f95ad270b58ceacf756a616f7c136
2012-05-30 16:13:21 -05:00
Matt Nash
ad3f6cd8ad Issue #440 fixes in group view
Former-commit-id: c4123b42e9078f2c5975da38d2aa6737348afa8a
2012-05-30 16:13:21 -05:00
Nate Jensen
8eb5665591 Merge "Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session"." into 11-Collaboration
Former-commit-id: 34be3aaf6ea41ae8366d072723c3beb8151d1f84
2012-05-29 17:23:56 -05:00
Max Schenkelberg
1934bfa28c Issue #665 fixed bug with lat/lon vs pixel space for inspect
Change-Id: I038f9fec306e81725932ed5a17db885d251fed73

Former-commit-id: 2be9620b338140fa27efba037d0cc321558bec62
2012-05-29 15:15:05 -05:00
Max Schenkelberg
34a71dbee8 Issue #665 Made MPEGageResource use bulk rendering for strings and points for faster shared display rendering
Change-Id: I7a734784895d406ba769f558d4b321dfe3b8dbf9

Former-commit-id: 18ca6f058d810781d93ea2d0bad9b2daa161fa3a
2012-05-29 15:00:42 -05:00
Bryan Kowal
14386ad818 Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session".
Change-Id: Ie7e419bc47a2451eef5a25456fa767fc0156cc27

Former-commit-id: 904a05e94386bd9d71a357e374ed3c757dc08016
2012-05-29 13:06:36 -05:00
Max Schenkelberg
76db032da7 Issue #663 Removed references from ISerializableObject file
Former-commit-id: 95da08aeabcc06f5ab46963cf4be4fb54457ff43
2012-05-29 09:10:48 -05:00
Max Schenkelberg
8c9c33ef9f Issue #663 Fixed key binding issue, added cursor icon change when tool is selected
Change-Id: I9040da01355e64208ef54ccc6d8452ab57c9d3c5

Former-commit-id: 5c240b5224ee93a36c5e05ddb15b373645222081
2012-05-25 16:28:53 -05:00
Max Schenkelberg
7bae56e8b5 Issue #663 Commented out drawing tool loading from group view and removed transfer role code
Change-Id: Ie910b19d477a1281231486bc8f96083ea7598a0b

Former-commit-id: 209d658e61d7b595d4effbfb87f65b87a5f196a9
2012-05-25 15:24:18 -05:00
Max Schenkelberg
8773dbdf62 Issue #663 Fixed clearing of display in D2D, resources can now be specified to be readded when unloaded during a session
Change-Id: I77b448ad4af60bf8d1afb3b50a5575ad82c4ae22

Former-commit-id: d15821c57b49090863e9c22455d06c94da6fcaf9
2012-05-25 14:37:25 -05:00
Bryan Kowal
a808bc245f Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16
Change-Id: I5350ed2293b78a743fc0e5b4cd9bcd6f02eafbd1

Former-commit-id: f4ac8e99d3f2f98af4ea5f383630395705e6da96
2012-05-24 16:51:35 -05:00
Max Schenkelberg
ae8236aa21 Issue #239 Got IColormapShadedShapeExtension implemented
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f

Former-commit-id: 6ddfe51e93d62145678d87ed3db208e90d3146e3
2012-05-23 09:14:21 -05:00