Nate Jensen
|
eedc68c32c
|
Issue #716 fix lots of minor issues, fix merge problem
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575
Former-commit-id: 47e8561dd0 [formerly ae131c0d05148e58ba445e5f144aa21c8c5c12c3]
Former-commit-id: 619d3062c2
|
2012-06-13 09:39:19 -05:00 |
|
Steve Harris
|
282682ccc1
|
Removed duplicate method created by merge
Former-commit-id: 308737bff8 [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]
Former-commit-id: 5f66b0995a
|
2012-06-13 08:41:24 -05:00 |
|
Steve Harris
|
af6c0529ad
|
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: 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]
Former-commit-id: 2f20a86a30
|
2012-06-12 14:37:12 -05:00 |
|
Nate Jensen
|
4b54691479
|
Issue #716 removing unnecessary file
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba
Former-commit-id: cd14177a84 [formerly 5ade0f2437308ab21429432746cf4e71afc33c93]
Former-commit-id: 07d44ae528
|
2012-06-11 17:34:21 -05:00 |
|
Nate Jensen
|
c3c4a8519a
|
Issue #716 fix disabled toolbar
Change-Id: I464d0560cf7462b37d324db368411f3867e53602
Former-commit-id: 0c869f599e [formerly d32771cbbe72a32965c50aacd7ede3383a5fff23]
Former-commit-id: d2bb1b6e0c
|
2012-06-11 17:33:48 -05:00 |
|
Steve Harris
|
09f73b0601
|
12.6.1-5 baseline
Former-commit-id: 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: c99afab05f
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
7c5306b795
|
12.6.1-3 baseline
Former-commit-id: d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]
Former-commit-id: 42f3513175
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
0ca936807e
|
12.5.1-15 baseline
Former-commit-id: cee20d8656 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]
Former-commit-id: d5c238de07
|
2012-06-11 16:02:30 -05:00 |
|
Matt Nash
|
179f2d7ffe
|
issue #693 always allow to invite users after opening create session dialog
Former-commit-id: b78d86bf04 [formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]
Former-commit-id: 9f2d97fa68
|
2012-06-11 15:34:49 -05:00 |
|
Steve Harris
|
c7024992a3
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]
Former-commit-id: 37793c86b1
|
2012-06-11 15:24:03 -05:00 |
|
Matt Nash
|
c3b17038f9
|
Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: 022e982aae [formerly b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321]
Former-commit-id: 73da2b1fe8
|
2012-06-11 10:24:35 -05:00 |
|
Matt Nash
|
73ad806eb2
|
Issue #703 can change font size in sessions
Former-commit-id: 4b72bb3d8e [formerly 0e7af586cd96a21540263474f321bd224c45ad54]
Former-commit-id: 9d187cc362
|
2012-06-11 10:23:45 -05:00 |
|
Matt Nash
|
5accda84c9
|
Issue #659 make fixes to float/dock
Former-commit-id: 1f54c2d09d [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]
Former-commit-id: cc5c172a77
|
2012-06-11 10:21:40 -05:00 |
|
Nate Jensen
|
1b03a14b23
|
Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8
Former-commit-id: 14c2b1271e [formerly 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a]
Former-commit-id: db3027c0d6
|
2012-06-08 16:10:57 -05:00 |
|
Nate Jensen
|
8d741bc4a1
|
Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74
Former-commit-id: 28f779e7b9 [formerly 2306edfd4e11b512a68320ae7dc4edbcfa474934]
Former-commit-id: 05389dac56
|
2012-06-08 15:15:03 -05:00 |
|
Steve Harris
|
8552902906
|
12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
b6a93f9d41
|
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: ef669a0297 [formerly 20e6ddde20749721784a80a4bb78736de1140a40]
Former-commit-id: 49fa818762
|
2012-06-07 18:22:01 -05:00 |
|
Max Schenkelberg
|
9d96a272ec
|
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: 048484f689 [formerly 08d8389ea3b23e7fe209d12ff45275f86d3c5883]
Former-commit-id: e10ece6081
|
2012-06-07 10:25:03 -05:00 |
|
Max Schenkelberg
|
0adccb8b12
|
Issue #697 Fixed session closing issues and null pointer in gfe
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10
Former-commit-id: 6a0ed72e5e [formerly 695134c3139868d6e9ace9dca7757368e0bfa5ec]
Former-commit-id: 7d5d086fe1
|
2012-06-07 09:44:40 -05:00 |
|
Max Schenkelberg
|
492adb92ae
|
Issue #697 Added support for procedure loading which magically made swapping appear to work too
Change-Id: I86c69781514709df4c6a23bdabfb63a2c103a9ed
Former-commit-id: 0776af95e7 [formerly e1bf6a3b576da036478cd1415856a64ebc606640]
Former-commit-id: e0b7693686
|
2012-06-06 15:57:16 -05:00 |
|
Matt Nash
|
0e3b539ada
|
Issue #659 fix GFE issue with mouse handlers
Former-commit-id: ed0b70501f [formerly 43f277de57d148c2d742266d8346b9b93cbcb82f]
Former-commit-id: c4d26f8b1b
|
2012-06-06 14:13:55 -05:00 |
|
Max Schenkelberg
|
2750c4ba08
|
Issue #590 Fixed gfe edit area selection issue
Change-Id: I67029301f515583a7ca3eea408513d9310e3fd35
Former-commit-id: fbd269f4c7 [formerly 6588f58c80782f793c3621a2fd7ec81be2d1ead2]
Former-commit-id: b8bedd1247
|
2012-06-06 12:05:47 -05:00 |
|
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 |
|
Steve Harris
|
b8de76b45e
|
12.5.1-9 baseline
Former-commit-id: 1f542697cb [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]
Former-commit-id: 8f3c9ebfb7
|
2012-05-21 17:48:55 -05:00 |
|