Commit graph

460 commits

Author SHA1 Message Date
Max Schenkelberg
f0e2ef8c91 Issue #590 fixed GFE session creation bugs. Added refresh to tool items
on undo/redo from keyboard

Former-commit-id: 8b87b6a0a1 [formerly 5c3d4a7fffe3873afbe8db60310afae2b3f0738b]
Former-commit-id: b5da470e0a
2012-06-05 16:43:27 -05:00
Brad Gonzales
9c099c7931 Issue #639 fixed archive log view secondary id.
Former-commit-id: 67e225e341 [formerly 69c774abf417049ffc343ff8ba5d2e44d05bb2e7]
Former-commit-id: 40a0e03b2d
2012-06-05 15:14:42 -05:00
Max Schenkelberg
dbb8a6b93d Issue #664 Changed hydro legend resource to be system resource
Change-Id: I769463a967ee1ec76a9a3c09d48d27106caa0937

Former-commit-id: 85a7897b1e [formerly 9a726e2686e7ed79c1a436156a16e98083608e14]
Former-commit-id: 3cd4f75170
2012-06-05 13:44:48 -05:00
Matt Nash
373db85359 Issue #659 toolbar is in session view now
Former-commit-id: e43fee4483 [formerly a516cc2073fa33c88f13678a55dda4bdbe3ed120]
Former-commit-id: 00f55c1d80
2012-06-05 13:25:36 -05:00
Nate Jensen
9d713d849c Issue #427 cleanup
Change-Id: Ieeb03e0f7457ee7dceb6241b61340e364b5aab48

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

Former-commit-id: 4dec649a97 [formerly a0481db7ccee2f656362ba63424af3c4aa49277b]
Former-commit-id: 5057c05529
2012-06-01 14:36:44 -05:00
Max Schenkelberg
b5d8d071de Issue #664 Made hydro dam resource work with collaboration
Change-Id: If6d422a937a549c9f68b8c523553179924ac2d7a

Former-commit-id: 7b95887a24 [formerly a3bfc9f4014a417205c27bbd73fc07556df007bc]
Former-commit-id: b0f729ceb2
2012-06-01 14:21:55 -05:00
Max Schenkelberg
1d9ccb6bd3 Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822

Former-commit-id: 052cc81223 [formerly a375cddf31565d6584256d2ccbe4dbea5a5ec187]
Former-commit-id: fde1e68df6
2012-05-31 16:05:25 -05:00
Matt Nash
2b1ce9e674 Issue #659 float button for cool detachable functionality
Former-commit-id: cab515cbfd [formerly 9b1c62c4851f95ad270b58ceacf756a616f7c136]
Former-commit-id: 855193aa77
2012-05-30 16:13:21 -05:00
Matt Nash
414c552462 Issue #440 fixes in group view
Former-commit-id: 7065ea8107 [formerly c4123b42e9078f2c5975da38d2aa6737348afa8a]
Former-commit-id: ad3f6cd8ad
2012-05-30 16:13:21 -05:00
Nate Jensen
06970f4d82 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: ac95fde3e5 [formerly 34be3aaf6ea41ae8366d072723c3beb8151d1f84]
Former-commit-id: 8eb5665591
2012-05-29 17:23:56 -05:00
Max Schenkelberg
71fe0a468a Issue #665 fixed bug with lat/lon vs pixel space for inspect
Change-Id: I038f9fec306e81725932ed5a17db885d251fed73

Former-commit-id: 76e99b4037 [formerly 2be9620b338140fa27efba037d0cc321558bec62]
Former-commit-id: 1934bfa28c
2012-05-29 15:15:05 -05:00
Max Schenkelberg
fe9de50746 Issue #665 Made MPEGageResource use bulk rendering for strings and points for faster shared display rendering
Change-Id: I7a734784895d406ba769f558d4b321dfe3b8dbf9

Former-commit-id: c28a586d84 [formerly 18ca6f058d810781d93ea2d0bad9b2daa161fa3a]
Former-commit-id: 34a71dbee8
2012-05-29 15:00:42 -05:00
Bryan Kowal
af04bfc6d8 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: 25b2361923 [formerly 904a05e94386bd9d71a357e374ed3c757dc08016]
Former-commit-id: 14386ad818
2012-05-29 13:06:36 -05:00
Max Schenkelberg
d071f7ea11 Issue #663 Removed references from ISerializableObject file
Former-commit-id: fec288d4bd [formerly 95da08aeabcc06f5ab46963cf4be4fb54457ff43]
Former-commit-id: 76db032da7
2012-05-29 09:10:48 -05:00
Max Schenkelberg
04c9f3a1c8 Issue #663 Fixed key binding issue, added cursor icon change when tool is selected
Change-Id: I9040da01355e64208ef54ccc6d8452ab57c9d3c5

Former-commit-id: 2058b7f0ea [formerly 5c240b5224ee93a36c5e05ddb15b373645222081]
Former-commit-id: 8c9c33ef9f
2012-05-25 16:28:53 -05:00
Max Schenkelberg
f7183f8212 Issue #663 Commented out drawing tool loading from group view and removed transfer role code
Change-Id: Ie910b19d477a1281231486bc8f96083ea7598a0b

Former-commit-id: 854f41eb7f [formerly 209d658e61d7b595d4effbfb87f65b87a5f196a9]
Former-commit-id: 7bae56e8b5
2012-05-25 15:24:18 -05:00
Max Schenkelberg
2838c08685 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: f6f2e1a4fb [formerly d15821c57b49090863e9c22455d06c94da6fcaf9]
Former-commit-id: 8773dbdf62
2012-05-25 14:37:25 -05:00
Bryan Kowal
8ee68911fb 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: 0f0bab6e54 [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]
Former-commit-id: a808bc245f
2012-05-24 16:51:35 -05:00
Max Schenkelberg
c98b6e28c7 Issue #239 Got IColormapShadedShapeExtension implemented
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f

Former-commit-id: 1c11323103 [formerly 6ddfe51e93d62145678d87ed3db208e90d3146e3]
Former-commit-id: ae8236aa21
2012-05-23 09:14:21 -05:00
Max Schenkelberg
4c0a18894c Issue #239 Moved initialization code in GFE resources so recycle() works properly
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5

Former-commit-id: 52a78af98c [formerly 1f092691e6e43bd8f6d10c2b8fab0a68eca38992]
Former-commit-id: e81a9ee935
2012-05-22 09:56:27 -05:00
Max Schenkelberg
950f857a5f Issue #239 Cleaned up DispatchingWireframeShape code to send world coordinates separate from pixel coordinates
Change-Id: I1c7eb9b19ea8d816eb3e81901ecf5574877a5212

Former-commit-id: 2bc9a18957 [formerly 0a3d69b5bb8ca31d8db8148225f7e1ef85778919]
Former-commit-id: 9c1f14a0a6
2012-05-21 14:57:37 -05:00
Matt Nash
116ba7901f Issue #642 match longest keyword
Former-commit-id: eabc2032b4 [formerly 1dc9f3ad1f5c68dbe6a515eb990f23a8f20139d6]
Former-commit-id: 94746c169e
2012-05-21 11:12:52 -05:00
Matt Nash
bfd11e6a96 Issue #642 change font changer to FontDialog
Former-commit-id: 8b71b3058b [formerly 8f4c3b9d9769bf34e7c4744dd80b603d445b6270]
Former-commit-id: f1301645e7
2012-05-21 10:39:03 -05:00
Matt Nash
35713ca625 Issue #642 fix for finding double instances of words
Former-commit-id: bed5ec6876 [formerly 5d3001a8bdd5ab6b89efe54e7d3c6b3266e880ec]
Former-commit-id: 253b5fe2e8
2012-05-21 08:43:37 -05:00
Max Schenkelberg
fc8ddc8613 Issue #239 Added support for rectangle drawing
Change-Id: I38c086a9a80652ce9e5da3ed4db1776877cc4635

Former-commit-id: cb4b153cad [formerly e4417a1f938ceddcc4d44d45af60b0f2d1b580fd]
Former-commit-id: da7b6ceb27
2012-05-18 14:17:43 -05:00
Max Schenkelberg
83ea7d24ae Issue #239 Added drawing of lines so baslines would work
Change-Id: Id8ca06b2fc38ab0db5b167d33aeae5af974c30cc

Former-commit-id: 0c92536bb3 [formerly 063e7ac34a6b5a6c43cf7927a1a2980f79efb24c]
Former-commit-id: 80828b8441
2012-05-18 12:34:00 -05:00
Matt Nash
b83871cec2 Issue #642 remove debugging code
Former-commit-id: 385d7e3d7f [formerly 23669c3d390b3cc0aeb6228247ea0b0512bdfb80]
Former-commit-id: ca6731acfc
2012-05-18 11:02:27 -05:00
Matt Nash
eeb82184d0 Issue #642 add ability for keywords in collaboration
Former-commit-id: 4e9b3ca786 [formerly 098e51414d1c148e55e6dd17b0f7b8d579f204fd]
Former-commit-id: d8e64039dc
2012-05-18 10:49:15 -05:00
Max Schenkelberg
80a7110f21 Issue #239 Added circle drawing, fixed jumpiness issues
Change-Id: I3003fc4fd132dde2108ada5cb5ad1152bb8b4566

Former-commit-id: ab314d0333 [formerly fbf7ea43b20bff1c97dc38265d9dfae091e5dcb4]
Former-commit-id: 4add8c7c8e
2012-05-17 16:07:23 -05:00
Max Schenkelberg
fdcc024dd7 Issue #639 Cleaned up chat logging a bit
Change-Id: Iba4e2a935dfdca9518ac0184fc53acfad2306c32

Former-commit-id: dce9ee1905 [formerly 19f338e41a81b50e57fe13b969c2b3a80f78ace0]
Former-commit-id: d9c1499311
2012-05-17 13:58:33 -05:00
Brad Gonzales
954324a221 Issue #639 added collaboration chat logging to localization.
Former-commit-id: 892b6d83e5 [formerly bf4e1e674e7461871ce19fe7ea74da7ef4db48ae]
Former-commit-id: 5935fd7091
2012-05-17 12:13:30 -05:00
Max Schenkelberg
193bc7e249 Issue #239 Added IShadedShape capability to remote target
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad

Former-commit-id: 0e5fd5cd15 [formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]
Former-commit-id: 1ca2a9ce13
2012-05-16 15:01:41 -05:00
Brad Gonzales
6e170a377f Issue #628 Backing out PGEN changes with remote target checking
Former-commit-id: 0db325a1cd [formerly b5babbb4b852c83680b93b35311d14297f41532e]
Former-commit-id: 4e629cc7e4
2012-05-16 14:43:53 -05:00
Brad Gonzales
d44a07d33f Issue #628 changed NCEP PGEN PgenStaticDataProder.java to cause the staticdataprovider Activator to be loaded. in PgenResource.drawGhost() check for dispatch target before drawing.
Former-commit-id: 11b93412bf [formerly b4229b04a76044a10848460f01b2b500add537e1]
Former-commit-id: b732df5f1c
2012-05-16 13:09:52 -05:00
Brad Gonzales
85f331b8b0 Issue #628 Nate's additional ncep pgen changes including PGEN's SymbolSetElement.java
Former-commit-id: d7babbaebd [formerly 23e99f88390a6865e0ba5d449402b4ef2febbd34]
Former-commit-id: 50eba2317a
2012-05-16 10:12:27 -05:00
Matt Nash
ced182100b Issue #440 username/password logging fixes, synchronize all times collaboratorShapes are manipulated
Former-commit-id: 096b526e7a [formerly 9255532085a1d43955345092d567e04222bbb06d]
Former-commit-id: f1ea85ea44
2012-05-15 16:08:29 -05:00
Max Schenkelberg
df5cc2e0c3 Issue #588 Added canvas size to construction of editor
Change-Id: I72a634c2b15f654474557ec9824fa11550a6a2a7

Former-commit-id: f3277ca807 [formerly 82ef715dda2308686870e18aca6184ea2f0f71f2]
Former-commit-id: f3ec9008f2
2012-05-14 17:13:54 -05:00
Max Schenkelberg
40b7dbd920 Issue #588 Fixed bug with participant resizing window
Change-Id: I9a4fca76fdc0f81a8f55135402efcf187c684915

Former-commit-id: a709f9a491 [formerly c31c62f94799322fc5811c8f38afdb01c9c49c2c]
Former-commit-id: 7d02ae3404
2012-05-14 16:35:28 -05:00
Matt Nash
966dbbf836 Issue #444 minor cleanup
Former-commit-id: ba73d47044 [formerly b601ea017e09c9fcd74e974d3f5ce2f0104a75fc]
Former-commit-id: 1c7f6861e4
2012-05-14 15:25:03 -05:00
Max Schenkelberg
d44ba58859 Issue #588 Made Canvas sizes stay in sync to fix text size issues
Change-Id: I1a9bff16168eda355850d47983fe479853e2e907

Former-commit-id: c7ea0894bb [formerly 8b6bb90e6ba0f1b21e78594ff3b3604924662138]
Former-commit-id: fdbd626715
2012-05-14 12:38:19 -05:00
Matt Nash
01f852004b Issue #444 add further capability of transferring session leader
Former-commit-id: b2621eb89e [formerly 49a19d4b6a56252e4e17f4563cdd4f94ef0ab3cc]
Former-commit-id: 746fd1464c
2012-05-11 16:29:27 -05:00
Nate Jensen
fd766443b7 Issue #427 clean up telestrator rsc on session exit
Change-Id: I14b5603f480e15537aa42eb2d8e5eebad87d09de

Former-commit-id: 56a8c1f937 [formerly 9908d7d3de10ac919c550995ce0ba766f67096ee]
Former-commit-id: 46e165ef69
2012-05-11 16:09:29 -05:00
Nate Jensen
797f1e5ec1 Issue #427 cleanup properly on exiting session
Change-Id: I4779ce49f9a9ee6d64cd908e04b007d808cb3bc6

Former-commit-id: 057b5eb3b9 [formerly c42b670e619beaba9b22bfa3bbdc6e1f0b9da075]
Former-commit-id: e68e75d735
2012-05-11 15:30:06 -05:00