162 commits

Author	SHA1	Message	Date
Steven Harris	db663faca9	12.11.1-1 baseline ... Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]] Former-commit-id: feec28f274 Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]] Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83] Former-commit-id: 2f855322f6	2012-09-27 15:57:45 -05:00
Roger Ferrel	9f63e0ac2d	Issue #1196 Changes for Valid Period Dialog. ... Changes from review. Change-Id: I6adeb9741c0b8a6bb02525021b5c5b0b75ea43ee Former-commit-id: 3621f8bc9d [formerly b629d03f38] [formerly 031fabe87a] [formerly 3621f8bc9d [formerly b629d03f38] [formerly 031fabe87a] [formerly b3cd481696 [formerly 031fabe87a [formerly 2d73c05dcff07658fc1bcd9ab878a9bca73b4aa3]]]] Former-commit-id: b3cd481696 Former-commit-id: e16105d078 [formerly ac45c8984f] [formerly 954a626185d9d9572174c931508c3eb684e8c0a5 [formerly 1ef155a4f0]] Former-commit-id: a4285e030b18057f1230be1a527e040afb7db17c [formerly 3dd5de22ac] Former-commit-id: d7d19ebc5c	2012-09-27 10:40:47 -05:00
Roger Ferrel	44f4a4d08c	Issue #1196 Changes for WmoIdSelectiondialog and modification to CaveJFACEDialog's setBlockOnOpen. ... Change-Id: I3b9cc2bdc32a8f82a2d9ca6927c7fcda02254e9a Former-commit-id: 9d3d2d5b99 [formerly 6fa8e82174] [formerly 6cd9792f46] [formerly 9d3d2d5b99 [formerly 6fa8e82174] [formerly 6cd9792f46] [formerly 471bab8172 [formerly 6cd9792f46 [formerly 54e670d97751f1f78d472d742c4f362c7deee625]]]] Former-commit-id: 471bab8172 Former-commit-id: c2b693b674 [formerly d28e0d8560] [formerly 1777c37d1931736bbd6dce1364547d3a74879687 [formerly 3bf89d2240]] Former-commit-id: ff003ef4064bac84e7f43fee093d444610749f85 [formerly f34bb941c0] Former-commit-id: 1478cc1d81	2012-09-20 12:14:42 -05:00
Lee Venable	16d5ce5ebd	Issue #1165 : initial update for the dialog refactor. ... Issue #1165 - added JFACE code update. Issue #1165 - changed method names. Change-Id: I4fab0a7c1384a4f3e5f66a9daf90027d39421110 Former-commit-id: 5788991c34 [formerly 6ac7e90550] [formerly 045297e677] [formerly 5788991c34 [formerly 6ac7e90550] [formerly 045297e677] [formerly 14eb99add7 [formerly 045297e677 [formerly 687a13eb43abd6ff17b3aa82f2a0265159f5e6cc]]]] Former-commit-id: 14eb99add7 Former-commit-id: 236e15e6bc [formerly 68d0ee976a] [formerly a27ddb6856f05c1bdee33dfc8b324aa6f0223172 [formerly 9267113411]] Former-commit-id: 1c499b4c7a6f60f40d973e283bd129133945fe27 [formerly 0a23610dee] Former-commit-id: 6875f14e23	2012-09-14 08:39:38 -05:00
Steve Harris	9d4e230e7a	12.10.1-3 baseline ... Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]] Former-commit-id: 969e7e6dfd Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]] Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529] Former-commit-id: 5030894212	2012-09-11 16:00:38 -05:00
Steve Harris	7f13d82b95	Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development ... Conflicts: cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java Former-commit-id: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]] Former-commit-id: a71dac6cad Former-commit-id: fd6e8d5b63 [formerly dbcb28ce77] [formerly 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]] Former-commit-id: 8e63ec5399842340c4f27680b2ed51ba425ae251 [formerly 0b647c0c9d] Former-commit-id: 3f44e46a6f	2012-08-27 09:53:55 -05:00
David Gillingham	8dbdf09690	Issue #1087: Enable DRT for CAVE operational mode. ... Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9 Former-commit-id: a03dfbea98 [formerly f3a33e3df4] [formerly f7182ae9c7] [formerly a03dfbea98 [formerly f3a33e3df4] [formerly f7182ae9c7] [formerly ec2d211800 [formerly f7182ae9c7 [formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]]] Former-commit-id: ec2d211800 Former-commit-id: b33e97efd3 [formerly 3b41cd02f4] [formerly 6b68db4233ced16f4cebc0b40b285c958108b1b8 [formerly cbd3bfacfa]] Former-commit-id: abf0993fd7cd743ab5654bfbf8161364ccd1677d [formerly 1856f2b941] Former-commit-id: d1801d7942	2012-08-23 11:21:23 -05:00
Steve Harris	98059f9ef1	12.9.1-5 baseline ... Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]] Former-commit-id: f2fac39428 Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]] Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed] Former-commit-id: 2d928d328e	2012-08-21 15:27:03 -05:00
Max Schenkelberg	950e2bff73	Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes. ... Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014 Former-commit-id: 79d98841a0 [formerly fc06265360] [formerly b69d2cad1c] [formerly 79d98841a0 [formerly fc06265360] [formerly b69d2cad1c] [formerly 1b406ecfca [formerly b69d2cad1c [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]] Former-commit-id: 1b406ecfca Former-commit-id: 56496dc03e [formerly 47cefd1513] [formerly 71e7ec51b8b8299ebc4b78fb5367003fc83ce4f5 [formerly aa9df46a1d]] Former-commit-id: 408d45a6b996130822ce865675f4446c9ea19f79 [formerly 362d34bee0] Former-commit-id: dcbab7d58f	2012-08-20 14:47:14 -05:00
root	73466bae44	Merge 12.9.1-4 into development_on_ss_builds ... Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]] Former-commit-id: 5a453ee984 Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]] Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8] Former-commit-id: 0eb9520e15	2012-08-15 22:15:20 +00:00
Ben Steffensmeier	16582906da	Issue #1065 fix contexts to deactivate when unrecognized views activate. ... Former-commit-id: e65418717f [formerly e8524301b5] [formerly 6d9d0a406f] [formerly e65418717f [formerly e8524301b5] [formerly 6d9d0a406f] [formerly 4203807a77 [formerly 6d9d0a406f [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]]] Former-commit-id: 4203807a77 Former-commit-id: a50be67e0e [formerly d7597d8cf7] [formerly 0f7510411fcfebd4307421621a6b66de713609a0 [formerly 8a170234b8]] Former-commit-id: 66a1a85df2f4afc8d3aba14a9291d086df04411b [formerly 62979089d3] Former-commit-id: 2256ec871d	2012-08-15 16:36:05 -05:00
Steve Harris	31353e2296	12.9.1-1 baseline ... Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]] Former-commit-id: 79ce6cfd97 Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]] Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121] Former-commit-id: 16d7d955fc	2012-08-15 13:59:00 -05:00
Ben Steffensmeier	7a076b4a0b	Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container ... Former-commit-id: 2c64112a4c [formerly 474fe44037] [formerly a4c46c7f55] [formerly 2c64112a4c [formerly 474fe44037] [formerly a4c46c7f55] [formerly 0857d971b5 [formerly a4c46c7f55 [formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]]] Former-commit-id: 0857d971b5 Former-commit-id: 47059f915b [formerly 08021bcfc2] [formerly 65c0e971652eab1efeba6ce2a63fccbf32b0da33 [formerly a02bb2c092]] Former-commit-id: bc354bf6e6f8705f771409a71703c7dbefc1f8f2 [formerly a17bae6f40] Former-commit-id: d6c42b28bf	2012-08-14 10:25:38 -05:00
Nate Jensen	eef3f2552a	Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development ... Former-commit-id: 39d65bbdbd [formerly da1e9ae3c3] [formerly c0dad4432c] [formerly 39d65bbdbd [formerly da1e9ae3c3] [formerly c0dad4432c] [formerly 1b3d6560e4 [formerly c0dad4432c [formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]]]] Former-commit-id: 1b3d6560e4 Former-commit-id: cdccfa21de [formerly ca0c314851] [formerly e6c20d7103adfd2547af480b29383bc04aee6aed [formerly 565100d787]] Former-commit-id: bc5474661d08e56e79ac35ad69c551124cc0c311 [formerly cc4d1777e6] Former-commit-id: f3d7771e92	2012-07-12 17:17:57 -05:00
Ben Steffensmeier	a76c6f7bb9	Issue #808 create API for managing floating views and made CaveDetachedWindow more robust. ... Former-commit-id: e565237b63 [formerly 45a1cc1997] [formerly ea0c7046af] [formerly e565237b63 [formerly 45a1cc1997] [formerly ea0c7046af] [formerly 8984b35ff8 [formerly ea0c7046af [formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]]]] Former-commit-id: 8984b35ff8 Former-commit-id: 7943034530 [formerly 32d4848ef2] [formerly 237718f6c294129e4e532f14b6baf4909a02e31f [formerly 1c68f4e01e]] Former-commit-id: 360a33ee647c34b817736eac5dec88d6ab0b2a78 [formerly 4fbdefff68] Former-commit-id: 0559de8925	2012-07-12 13:35:52 -05:00
Roger Ferrel	1b97f2ad09	Issue #875 - Create com.raytheon.uf.viz.points ... Amend: fixing code per review comments Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627 Former-commit-id: cc1aecde2f [formerly bfcefac909] [formerly 0cf7d64cf4] [formerly cc1aecde2f [formerly bfcefac909] [formerly 0cf7d64cf4] [formerly 9071334fe9 [formerly 0cf7d64cf4 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]]] Former-commit-id: 9071334fe9 Former-commit-id: 9116d93f52 [formerly c317c5d0a3] [formerly 02403b301463b98f598c97b53f769f6aa9cdf6a2 [formerly b3df932794]] Former-commit-id: 1d76b537c3a1bcb9fb3c9d0a26d64d72d4c7a715 [formerly d6d4222e24] Former-commit-id: b75d001a2a	2012-07-12 11:32:03 -05:00
Steve Harris	c74431ba29	12.6.1-9 baseline ... Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]] Former-commit-id: 27afa60345 Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]] Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b] Former-commit-id: 37f2b6e138	2012-07-10 07:53:49 -05:00
Max Schenkelberg	aa709bc1ce	Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function ... Amend: Fixed Richard's comments Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3 Former-commit-id: 3bff06cf92 [formerly 7d13c7d339] [formerly 9bbb68a547] [formerly 3bff06cf92 [formerly 7d13c7d339] [formerly 9bbb68a547] [formerly 98c2ec7dc5 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]] Former-commit-id: 98c2ec7dc5 Former-commit-id: 58abd127b7 [formerly c6d324aaeb] [formerly 16ed73fb714995ccf7fe67f7b63b429bcc378657 [formerly 7286b4e962]] Former-commit-id: 6353460f49cb2fb59cc8a8385f88fe8159290a8a [formerly d876190d68] Former-commit-id: 3325ed5deb	2012-07-06 16:01:47 -05:00
Max Schenkelberg	edb5900530	Issue #821 Fixed editor menu so plugin.xml action contribution items ... are created every time the menu is shown to make sure any submenus are recreated in the action. Change-Id: I9f2103b1e8fcddc5bc790d74753733a42f9e6382 Former-commit-id: 4b91c8e169 [formerly 53fd2ec047] [formerly 84ae717563] [formerly 4b91c8e169 [formerly 53fd2ec047] [formerly 84ae717563] [formerly 668838364d [formerly 84ae717563 [formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]]] Former-commit-id: 668838364d Former-commit-id: e0ab853ca7 [formerly f1eb4b4713] [formerly 42947fd159b2be8315aff7a6c8c72bf8a602e2ec [formerly e3524fd4df]] Former-commit-id: fcd25cfb7ac43c46ba0ad4ba8b317fb3298eacff [formerly d12df1af56] Former-commit-id: b378e3cdb4	2012-06-28 11:53:21 -05:00
Bryan Kowal	e05b247e3b	Merge branch 'ss_sync' (OB12.6.1-10) into development ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java cave/com.raytheon.viz.feature.awips.developer/feature.xml cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java edexOsgi/build.edex/deploy-install.xml edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF edexOsgi/com.raytheon.edex.feature.uframe/feature.xml edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java edexOsgi/com.raytheon.uf.common.hlstopo/build.properties edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java rpms/awips2-rpm.db rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]] Former-commit-id: b87b66abc5 Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]] Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d] Former-commit-id: 2e5a850d28	2012-06-27 17:21:48 -05:00
Max Schenkelberg	ac8314da2c	Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it. ... Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5 Former-commit-id: c1b95ef2c9 [formerly a691f425ea] [formerly d0b06374e9] [formerly c1b95ef2c9 [formerly a691f425ea] [formerly d0b06374e9] [formerly 130692aefd [formerly d0b06374e9 [formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]]] Former-commit-id: 130692aefd Former-commit-id: 3caff8171f [formerly e8e159bed0] [formerly a277ad161643ccdccd8ce94496000eaa48028c29 [formerly 859e041e10]] Former-commit-id: 45d916b2a8cce170d0a492d44295737178bab844 [formerly 34cb1fc585] Former-commit-id: ecc5316b44	2012-06-21 16:07:20 -05:00
Steve Harris	c7356570ae	Revert "12.6.1-10 baseline" ... This reverts commit 8d09188a88 [formerly 95e7f4fc0c] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]] [formerly 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]] [formerly a2c0893d1a] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]]. Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]] Former-commit-id: 25198a5cd6 Former-commit-id: 944e3148d4 [formerly 333fd9c64e] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5]] Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418] Former-commit-id: e77a15c047	2012-06-21 08:51:08 -05:00
Steve Harris	8d09188a88	12.6.1-10 baseline ... Former-commit-id: 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]] Former-commit-id: a2c0893d1a Former-commit-id: 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]] Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474] Former-commit-id: 95e7f4fc0c	2012-06-21 08:38:48 -05:00
Max Schenkelberg	e773643f7a	Issue #697 added support for multiple editors ... Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82 Former-commit-id: 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly fceef3c5a1 [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]] Former-commit-id: fceef3c5a1 Former-commit-id: ea948bbb82 [formerly f0d2893e97] [formerly f94add25d0e7e6bf562b43f3ede6e45e7d953f95 [formerly e5e1a4de6a]] Former-commit-id: 0763957c65637dd50362099f2ea1a0663adf6a1a [formerly f2e34fe03c] Former-commit-id: 7bac48f643	2012-06-13 17:52:11 -05:00
Matt Nash	3309b5109e	Issue #659 fix floating view issue when minimize happened ... Former-commit-id: 7dc3044f26 [formerly 3689ed489e] [formerly 96bf8b356a] [formerly 7dc3044f26 [formerly 3689ed489e] [formerly 96bf8b356a] [formerly b65a0f124e [formerly 96bf8b356a [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]]] Former-commit-id: b65a0f124e Former-commit-id: 455ac1faf9 [formerly 9e81392638] [formerly d25734d06b93a1a330c627b9c997a28dbfb4665a [formerly 3bd1a43af2]] Former-commit-id: 87796f659980b8c75e5089847bd5b3ce9c36af1d [formerly 8eac89d337] Former-commit-id: 576e5c5310	2012-06-13 10:04:12 -05:00
Steve Harris	ec9204fa94	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: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]] Former-commit-id: 48860df690 Former-commit-id: 6c0d8be39e [formerly d7a4853091] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]] Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f] Former-commit-id: 70a928d039	2012-06-12 14:37:12 -05:00
Steve Harris	883d66bc46	12.6.1-5 baseline ... Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]] Former-commit-id: 8947efbc7f Former-commit-id: d5c94ccef2 [formerly b69fa75919] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]] Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad] Former-commit-id: 3b468d9f50	2012-06-11 16:23:47 -05:00
Matt Nash	52aafd94d3	Issue #659 make fixes to float/dock ... Former-commit-id: 8acb6d3be2 [formerly 5accda84c9] [formerly cc5c172a77] [formerly 8acb6d3be2 [formerly 5accda84c9] [formerly cc5c172a77] [formerly 1f54c2d09d [formerly cc5c172a77 [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]]]] Former-commit-id: 1f54c2d09d Former-commit-id: a45f167db2 [formerly b55c763a34] [formerly 89258ee3faab44a96efb6b9c4e30d16189f39336 [formerly ae53309d60]] Former-commit-id: 1edc92caef4989e72b40b976f60a2350c9887a80 [formerly 94bc675780] Former-commit-id: e1d1dbe568	2012-06-11 10:21:40 -05:00
Steve Harris	46068c6716	12.5.1-15 baseline ... Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]] Former-commit-id: 3904c4ccf5 Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]] Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c] Former-commit-id: 39ff9954f8	2012-06-08 13:39:48 -05:00
Matt Nash	5e7f692599	Issue #659 toolbar is in session view now ... Former-commit-id: ca96492c0e [formerly 373db85359] [formerly 00f55c1d80] [formerly ca96492c0e [formerly 373db85359] [formerly 00f55c1d80] [formerly e43fee4483 [formerly 00f55c1d80 [formerly a516cc2073fa33c88f13678a55dda4bdbe3ed120]]]] Former-commit-id: e43fee4483 Former-commit-id: 75ed94c837 [formerly f2d8da6b3d] [formerly da5e2155fd0c122d5fa28bd9148319c145e52549 [formerly 304970e9a9]] Former-commit-id: 5815b03d7aeb9b323b021b49931945dec8afc46f [formerly 637cbca41c] Former-commit-id: d47328be4a	2012-06-05 13:25:36 -05:00
Matt Nash	18d851a519	Issue #659 float button for cool detachable functionality ... Former-commit-id: bfcfcba572 [formerly 2b1ce9e674] [formerly 855193aa77] [formerly bfcfcba572 [formerly 2b1ce9e674] [formerly 855193aa77] [formerly cab515cbfd [formerly 855193aa77 [formerly 9b1c62c4851f95ad270b58ceacf756a616f7c136]]]] Former-commit-id: cab515cbfd Former-commit-id: 0a225b2540 [formerly 945095e345] [formerly 8443892ca2884191c2aab260370223421cc04482 [formerly 633fd997e5]] Former-commit-id: 66ad3ad98cf5e3de70cd7c9fd86b9687c9ce52e4 [formerly 22eb377b74] Former-commit-id: 927b2967d7	2012-05-30 16:13:21 -05:00
Steve Harris	e460104ec9	12.5.1-6 baseline ... Former-commit-id: ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]] Former-commit-id: fa87dc6cf1 Former-commit-id: bc695ee025 [formerly 4792884ab2] [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633]] Former-commit-id: 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa [formerly 2738af2019] Former-commit-id: 26ed02c3dc	2012-05-16 16:41:22 -05:00
Nate Jensen	6189b6cd8c	Issue #590 fix issue when exiting GFE ... Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157 Former-commit-id: b6ab7baf51 [formerly 7abedf8904] [formerly 75754040cb] [formerly b6ab7baf51 [formerly 7abedf8904] [formerly 75754040cb] [formerly c92f9ee705 [formerly 75754040cb [formerly 258fead57d05a908b32b0b74a2e34ab19be0947f]]]] Former-commit-id: c92f9ee705 Former-commit-id: a017a4cb07 [formerly 4be7493c21] [formerly 79efdc4893b23722a798dfe52e27083bec43a468 [formerly c55862a1ab]] Former-commit-id: 3bdf73a02f7dd393b70c537e8d4c796dd00dde8b [formerly 94661e501c] Former-commit-id: 99130351c6	2012-05-11 13:58:46 -05:00
Max Schenkelberg	2d167af343	Issue #588 Added serialization adapter registration to better support serializing DrawableString objects ... Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056 Former-commit-id: 82298cb03b [formerly 06ee0bbf6f] [formerly 78e1bd2c62] [formerly 82298cb03b [formerly 06ee0bbf6f] [formerly 78e1bd2c62] [formerly 1f5abc6e20 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]] Former-commit-id: 1f5abc6e20 Former-commit-id: 985ee5a034 [formerly 2db836b296] [formerly 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01]] Former-commit-id: ae5df9ba1774095dd47fab5b8b61888b552632fc [formerly 6cd18a09dc] Former-commit-id: 5729c0acc5	2012-05-09 15:02:30 -05:00
Steve Harris	c76fddc7e4	Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration ... Conflicts: cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]] Former-commit-id: 58037cb5d1 Former-commit-id: 43f936900c [formerly 9c9e01dbda] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]] Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640] Former-commit-id: 1d2ad9224a	2012-05-09 13:14:00 -05:00
Steve Harris	6715112613	12.5.1-2 baseline ... Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]] Former-commit-id: b36c69cc67 Former-commit-id: 8025cc609e [formerly f6300cd995] [formerly 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]] Former-commit-id: db29a95fc27cec97c5d6fcf7b21e22c5e97b5236 [formerly 377ae76413] Former-commit-id: ef49f63d8d	2012-05-03 19:17:13 -05:00
Steve Harris	3419f72215	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) ... used git cherry-pick -m 1 879a2e0 Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline Conflicts: cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java* cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java* cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java Conflicts: ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java Former-commit-id: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]] Former-commit-id: 7b75b781ad Former-commit-id: 3992b18e28 [formerly 7c7fc97131] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]] Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35] Former-commit-id: 491aa53a0c	2012-05-01 18:31:09 -05:00
Steve Harris	7f90924706	12.4.1-10 baseline ... Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]] Former-commit-id: 8485b90ff8 Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]] Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86] Former-commit-id: 0c25458510	2012-05-01 18:06:13 -05:00
Steve Harris	ad3bb08978	12.4.1-10 baseline ... Former-commit-id: 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]] Former-commit-id: 01457fbbde Former-commit-id: caab7c1fbb [formerly 97caaa0327] [formerly bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac]] Former-commit-id: 8277df75752720d65ab600e9a692b7a94f2111c5 [formerly 3ed3a665cb] Former-commit-id: f1eb6efb23	2012-04-24 15:38:29 -05:00
Steve Harris	0cf19dc505	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) ... Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline Conflicts: cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java* cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java* cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java Former-commit-id: 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]] Former-commit-id: 625cd4262c Former-commit-id: 6aa0898aae [formerly e86dc647be] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]] Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d] Former-commit-id: 9b8c6e395d	2012-04-19 11:11:02 -05:00
Steve Harris	5b35d8a6e0	12.4.1-4 baseline ... Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]] Former-commit-id: 2a216f333c Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]] Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c] Former-commit-id: 74b66d9683	2012-04-18 15:18:16 -05:00
Max Schenkelberg	1ade3f1684	Issue #239 Fixed D2D context activation so as not to override important ... keys when a unrelated view is active such as Product Browser or Collaboration views. Former-commit-id: 65e7184cc4 [formerly a5fa19c914] [formerly cbe92bdf32] [formerly 65e7184cc4 [formerly a5fa19c914] [formerly cbe92bdf32] [formerly 6812c1ba2b [formerly cbe92bdf32 [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]]] Former-commit-id: 6812c1ba2b Former-commit-id: c19de5dcc3 [formerly 532f2d691b] [formerly a24149c0db6c44d2a20bc8fb7a45708e704473a7 [formerly 824b24dfcb]] Former-commit-id: 7994a40c93b0f5a9b6f2414d1ff1061656c15e12 [formerly a6c9c88b4f] Former-commit-id: 54d8c44956	2012-04-06 10:23:24 -05:00
Max Schenkelberg	e191d8372f	Issue #239 Added remote capability injection code through factory ... method. Cleaned up old/unmaintained 3D references Former-commit-id: e525c9c35d [formerly 48ca9ca105] [formerly 54aaf05209] [formerly e525c9c35d [formerly 48ca9ca105] [formerly 54aaf05209] [formerly 16056d53c5 [formerly 54aaf05209 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]]] Former-commit-id: 16056d53c5 Former-commit-id: 4fbb7ea290 [formerly 20ad9fe872] [formerly 265f2d1efade092dd1793dfa515ef1708447df02 [formerly b4b754c7cc]] Former-commit-id: 64590c6aeb3aeb7336aeaaa39d73b4ea63738378 [formerly 9bcd4b911a] Former-commit-id: 01bf183cf3	2012-04-05 13:52:20 -05:00
Max Schenkelberg	fb2aac38df	Merge branch 'ss_sync (12.3.1)' into 11-Collaboration ... Former-commit-id: 0b1caa67df [formerly c56707c6bc] [formerly 23d65caf2e] [formerly 0b1caa67df [formerly c56707c6bc] [formerly 23d65caf2e] [formerly 753de872e0 [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]] Former-commit-id: 753de872e0 Former-commit-id: f3ff93f96f [formerly c7165384f1] [formerly adc59a45b53d18b81a0ef2d2163602690fcd76f2 [formerly e3477c90ae]] Former-commit-id: fd2fce7269f96cccd09b7c752b9ea972105488bb [formerly 5ebb709ef6] Former-commit-id: 8e521d2c29	2012-04-02 16:15:21 -05:00
Steve Harris	095b190063	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) ... Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline Conflicts: cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java* cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java* cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java Former-commit-id: b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]] Former-commit-id: 5cdda77afb Former-commit-id: c6071e24c5 [formerly 9845ef53f9] [formerly a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6]] Former-commit-id: 863dd9f649ac647186ce86d3db6a31c7237682d4 [formerly 9fee09c9e4] Former-commit-id: 1556e72eeb	2012-03-30 09:50:48 -05:00
Nate Jensen	0fa5ab5052	Issue #427 Right click on editor tab support ... Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987 Former-commit-id: a4965d6bf9 [formerly 202bd0adf8] [formerly d2d3a245b3] [formerly a4965d6bf9 [formerly 202bd0adf8] [formerly d2d3a245b3] [formerly aa000b4b06 [formerly d2d3a245b3 [formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]]] Former-commit-id: aa000b4b06 Former-commit-id: 274e2df586 [formerly 9792be406a] [formerly a6d73562ce75aff32ab9bfe5f1b0ddce7553fd0c [formerly 6aae45687a]] Former-commit-id: ba593db28636bbaf2f46e5a77d5b70b957e81f82 [formerly ac8087a21a] Former-commit-id: a0c6c92587	2012-03-29 10:44:08 -05:00
Max Schenkelberg	42696fd296	Issue #358 Cleaned up mesh extension and API to use geotools for ... defining a mesh. This is better practice than using arbitrary MathTransform objects as it is well defined and allows for serialization of the mesh to occur. Former-commit-id: 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]] Former-commit-id: 50765e8a34 Former-commit-id: 458f5970aa [formerly 8f08fab0a7] [formerly 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884]] Former-commit-id: 732d389245ce92a580088b9302b87702dca2b03d [formerly 6378e8c4ee] Former-commit-id: 9366a5f308	2012-03-14 09:49:32 -05:00
Max Schenkelberg	714bb7dfec	Issue #358 Merging core drawing API improvements from Collaboration ... Former-commit-id: 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]] Former-commit-id: 89f603f448 Former-commit-id: 8b6aa63464 [formerly f78b932abb] [formerly 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060]] Former-commit-id: 633ae123a39ad609c62c4173a428f3bfbc1fedbd [formerly 1303289d12] Former-commit-id: 0f005d3521	2012-03-09 12:31:50 -06:00
Max Schenkelberg	67b1edb767	Issue #358 Committing NPP core rendering improvements merged with Thin ... Client core improvements Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]] Former-commit-id: 48b6d45f00 Former-commit-id: 52c7dec2e8 [formerly 0554abdde0] [formerly 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]] Former-commit-id: de90ce0a3f7817cfc15c75089e7f6a081fef0acc [formerly 585e979c76] Former-commit-id: ae389f0b57	2012-03-01 16:59:40 -06:00
Steve Harris	f0c1c03fff	Merge branch '10-Tech_Blocked' into 104-integration ... Conflicts: edexOsgi/build.edex/deploy-install.xml rpms/awips2.edex/Installer.edex-cots/component.spec Former-commit-id: eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]] Former-commit-id: 5e9d2dd367 Former-commit-id: 2e0f1d3ecc [formerly b12f5e5d75] [formerly a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]] Former-commit-id: f7595a0be89f8ab41c20c0d16d038e5e650e4712 [formerly acd7845ebd] Former-commit-id: bcccffbaa4	2012-02-20 13:03:39 -06:00