Commit graph

571 commits

Author SHA1 Message Date
Nate Jensen
71a1826611 Merge "Issue #704 fixes to random resources and optimization of radar projection transforms" into development
Former-commit-id: 96c4d9301f [formerly 995d7e08ade1a3e10ac8ab51aa24f900091054de]
Former-commit-id: 22d4de96fd
2012-06-21 10:04:51 -05:00
Steve Harris
eacd5aeb7f 12.6.1-10 baseline
Former-commit-id: 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]
Former-commit-id: 3cd0902b49
2012-06-21 08:58:00 -05:00
Steve Harris
8367fb50f5 Revert "12.6.1-10 baseline"
This reverts commit b33c5bdfcf [formerly a2c0893d1a] [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].


Former-commit-id: b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: 25198a5cd6
2012-06-21 08:51:08 -05:00
Steve Harris
b33c5bdfcf 12.6.1-10 baseline
Former-commit-id: ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: a2c0893d1a
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
cf35d99036 Issue #704 fixes to random resources and optimization of radar projection transforms
Former-commit-id: 601d46661c [formerly 7619165ce45efe9dbad045adfaaf978acee782be]
Former-commit-id: 16e4fe8ce2
2012-06-20 18:07:17 -05:00
Nate Jensen
f4db55cd46 Merge "Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later" into development
Former-commit-id: 121d68b8c4 [formerly 5e8d1cbc132dbd69b86342234631f3d11e3bdb3d]
Former-commit-id: 133cd9994e
2012-06-20 17:56:50 -05:00
Max Schenkelberg
66a60a7b7b Issue #590 Fixed GFE colorbar when changing parms after setting up collaboration session. Needed to move adding of listeners to initInternal and not the constructor so recycling readds them after dispose removes them
Change-Id: Ieb5fc7786682b5b442deccf4a5292374a4a7de47

Former-commit-id: ab871d218b [formerly c0d7f68bed2b141240d2e2a695c8439f7a4ffa67]
Former-commit-id: 61e0ea0516
2012-06-20 15:32:27 -05:00
Ben Steffensmeier
b55a4f026c Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: d317777ee6 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]
Former-commit-id: 0c69731e18
2012-06-20 14:13:37 -05:00
Bryan Kowal
94e4af6d47 Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: 207bbd3087 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]
Former-commit-id: 25addabe64
2012-06-19 15:03:57 -05:00
Bryan Kowal
ff0c86f857 Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: 96f987631c [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]
Former-commit-id: 966c50ed06
2012-06-18 11:51:47 -05:00
Bryan Kowal
1ee59eac71 Merge branch '11-Collaboration' into development
Conflicts:
	cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java

Former-commit-id: f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]
Former-commit-id: f0e3b957e3
2012-06-18 11:16:28 -05:00
Ben Steffensmeier
dd496b3d90 Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97

Former-commit-id: aad1eb18b0 [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]
Former-commit-id: 9068e049cb
2012-06-14 16:44:19 -05:00
Ben Steffensmeier
e604271c54 Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16

Former-commit-id: d187436589 [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]
Former-commit-id: 58356c49cb
2012-06-14 16:41:05 -05:00
Max Schenkelberg
475623fe22 Issue #697 fixed join issues with GFE
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012

Former-commit-id: dac8374f52 [formerly e648206c2e8129b2d63b9309f67e1ce46a1edbf0]
Former-commit-id: 576dbcf340
2012-06-14 14:18:02 -05:00
Bryan Kowal
c608fc959c Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: dcc5675564 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]
Former-commit-id: c0aaac4a07
2012-06-14 11:35:15 -05:00
Nate Jensen
161159172e Issue #716 better tooltip
Change-Id: I9db709540cb6ac25893756139b3269adf9d4551b

Former-commit-id: 6ecd868ddd [formerly 4181cc97d769bfead6f5425ec4740ab90c8b57a5]
Former-commit-id: 475a9a76b5
2012-06-14 11:20:16 -05:00
Max Schenkelberg
c2d278d75b Issue #697 added drawing indicator for shared display for data provider, fixed shutdown issue
Change-Id: Iccfb92e3155e8be5c780e601fb8c31ef2c74f39f

Former-commit-id: e92eb6366e [formerly c00c45f5ba1ae3bb0a0a246d1435bd10b3a8aa51]
Former-commit-id: 4c8b468854
2012-06-14 11:16:11 -05:00
Max Schenkelberg
e5e1a4de6a Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

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

Former-commit-id: 619d3062c2 [formerly ae131c0d05148e58ba445e5f144aa21c8c5c12c3]
Former-commit-id: 47e8561dd0
2012-06-13 09:39:19 -05:00
Steve Harris
55b4d7c5da Removed duplicate method created by merge
Former-commit-id: 5f66b0995a [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]
Former-commit-id: 308737bff8
2012-06-13 08:41:24 -05:00
Steve Harris
27b50c57bd 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: 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]
Former-commit-id: 48860df690
2012-06-12 14:37:12 -05:00
Nate Jensen
090bb2918b Issue #716 removing unnecessary file
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba

Former-commit-id: 07d44ae528 [formerly 5ade0f2437308ab21429432746cf4e71afc33c93]
Former-commit-id: cd14177a84
2012-06-11 17:34:21 -05:00
Nate Jensen
ea33fc82fe Issue #716 fix disabled toolbar
Change-Id: I464d0560cf7462b37d324db368411f3867e53602

Former-commit-id: d2bb1b6e0c [formerly d32771cbbe72a32965c50aacd7ede3383a5fff23]
Former-commit-id: 0c869f599e
2012-06-11 17:33:48 -05:00
Steve Harris
a945ed8e6d 12.6.1-5 baseline
Former-commit-id: c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: 8947efbc7f
2012-06-11 16:23:47 -05:00
Steve Harris
1fdc0aa237 12.6.1-3 baseline
Former-commit-id: 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]
Former-commit-id: d57eb02b9e
2012-06-11 16:23:47 -05:00
Steve Harris
7da9afe36a 12.5.1-15 baseline
Former-commit-id: d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]
Former-commit-id: cee20d8656
2012-06-11 16:02:30 -05:00
Matt Nash
03ee9d8a90 issue #693 always allow to invite users after opening create session dialog
Former-commit-id: 9f2d97fa68 [formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]
Former-commit-id: b78d86bf04
2012-06-11 15:34:49 -05:00
Steve Harris
cf3c768213 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: 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]
Former-commit-id: d325d496f5
2012-06-11 15:24:03 -05:00
Matt Nash
d5e3c97d98 Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: 73da2b1fe8 [formerly b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321]
Former-commit-id: 022e982aae
2012-06-11 10:24:35 -05:00
Matt Nash
4453a06f31 Issue #703 can change font size in sessions
Former-commit-id: 9d187cc362 [formerly 0e7af586cd96a21540263474f321bd224c45ad54]
Former-commit-id: 4b72bb3d8e
2012-06-11 10:23:45 -05:00
Matt Nash
ae53309d60 Issue #659 make fixes to float/dock
Former-commit-id: cc5c172a77 [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]
Former-commit-id: 1f54c2d09d
2012-06-11 10:21:40 -05:00
Nate Jensen
680325f03c Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8

Former-commit-id: db3027c0d6 [formerly 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a]
Former-commit-id: 14c2b1271e
2012-06-08 16:10:57 -05:00
Nate Jensen
0271c9762d Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74

Former-commit-id: 05389dac56 [formerly 2306edfd4e11b512a68320ae7dc4edbcfa474934]
Former-commit-id: 28f779e7b9
2012-06-08 15:15:03 -05:00
Steve Harris
676ea3192f 12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: 3904c4ccf5
2012-06-08 13:39:48 -05:00
Max Schenkelberg
8a19179310 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: 49fa818762 [formerly 20e6ddde20749721784a80a4bb78736de1140a40]
Former-commit-id: ef669a0297
2012-06-07 18:22:01 -05:00
Max Schenkelberg
7df41dbc88 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: e10ece6081 [formerly 08d8389ea3b23e7fe209d12ff45275f86d3c5883]
Former-commit-id: 048484f689
2012-06-07 10:25:03 -05:00
Max Schenkelberg
70461db99f Issue #697 Fixed session closing issues and null pointer in gfe
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10

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

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

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

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

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

Former-commit-id: 7f6bc2df93 [formerly 49d468829654697d266a551452edf6a2de66edce]
Former-commit-id: 240dac19ba
2012-06-05 10:50:08 -05:00
Matt Nash
7915f5edf2 Issue #642 fixing merge mistake
Former-commit-id: 77d150bf6c [formerly 2e699d0cd90d2f61ff211b601300ab17cf9c5a40]
Former-commit-id: 4cc721ebf5
2012-06-04 09:25:13 -05:00
Matt Nash
2a476c6ce8 Issue #642 removing update code
Former-commit-id: acc5d69e59 [formerly 510ca9d1234dba1b4e76f05536fb24c7fd693a76]
Former-commit-id: 2935d69e4f
2012-06-04 09:13:23 -05:00
Matt Nash
b3a948cca6 Issue #642 alert words now filter what directory is shown
Former-commit-id: 82cad97932 [formerly df7971ed32994f6ac52ac10fcb03945d57eb5872]
Former-commit-id: c5509344e9
2012-06-04 07:33:30 -05:00