Commit graph

85 commits

Author SHA1 Message Date
Brad Gonzales
844ee8cd77 Issue #1456 Changed ArrayList parameter to List.
Change-Id: I47e7a054b774f5f2707f53b1c3692c3ec07ac157

Former-commit-id: 1c6cfee5cc [formerly 1c6cfee5cc [formerly 6ba091caf7aa4de243fbea57ed19ae99ddb39585]]
Former-commit-id: 71230cc246
Former-commit-id: 9bcf7cbd07
2013-01-07 16:55:04 -06:00
Brad Gonzales
a0a9a3027e Issue #1456 Added DualList.setSelectedList(ArrayList<String>).
Change-Id: I86765b965f90bf714ede8707c516287a91c64de7

Former-commit-id: cf3a7e1455 [formerly cf3a7e1455 [formerly 334782a0f7df272200196a3905d656d2fa3603d7]]
Former-commit-id: e457297ceb
Former-commit-id: 7b0dc0478d
2013-01-07 16:08:18 -06:00
Mike Duff
d72d3db542 Issue #1431 - Fix Dual List filter problem.
Former-commit-id: ace6214c3f [formerly ace6214c3f [formerly 0fc212dac04a4693060ee0e321c532a3f5076e01]]
Former-commit-id: 7eb980fd83
Former-commit-id: 4757feb616
2013-01-07 09:19:01 -06:00
Ron Anderson
5c59df1ae1 Merge "Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item." into development
Former-commit-id: 6f79ba14e6 [formerly 6f79ba14e6 [formerly 6e0bfe56d437622b9c5f6e3d4d8d9c0192fc5a46]]
Former-commit-id: c17e0a19c9
Former-commit-id: cb4721ae15
2012-12-13 15:47:04 -06:00
Ron Anderson
676819adfa Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1

Former-commit-id: 753fa0487b [formerly 753fa0487b [formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]]
Former-commit-id: 639b5abbd9
Former-commit-id: 995f28220a
2012-12-13 15:25:24 -06:00
Max Schenkelberg
206116ab66 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: 3e128b266a [formerly 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]
Former-commit-id: 5db71ca943
Former-commit-id: b74d788909
2012-12-12 11:39:32 -06:00
Ron Anderson
bd7162eca5 Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: bc5f445ecf [formerly bc5f445ecf [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]]
Former-commit-id: 43881be47a
Former-commit-id: 641d268bd8
2012-12-11 13:31:05 -06:00
Ron Anderson
111c0495a4 Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06

Former-commit-id: bb163074fa [formerly bb163074fa [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]
Former-commit-id: b6fcd999f4
Former-commit-id: 70cca3900b
2012-12-06 17:02:56 -06:00
Ron Anderson
ddd26d1fbd Issue #1395 Modified LineStyle to contain a definition of the style so that GL and SWT can render them the same way
Change-Id: I9e9875c3d56870309d4c5420a541674fb8733a09

Former-commit-id: 5143e82d4a [formerly 5143e82d4a [formerly 6c2704dffcbadab19611464df580f781bb5ebefd]]
Former-commit-id: 9398573f2f
Former-commit-id: 10479a1909
2012-12-06 15:38:04 -06:00
Max Schenkelberg
b8b98a78c3 Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: b648c5828e [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]
Former-commit-id: ed77d56a84
Former-commit-id: b24440cc37
2012-11-29 10:29:36 -06:00
Mike Duff
514c93b9b8 Issue #728 - Implementation of Statistics graphs
peer review comments
Changing to use average value rather than sum.

Change-Id: I7f97e27c4f463fe60bec2cbc52f3eac66d8fa77f

Former-commit-id: c49759d28e [formerly c49759d28e [formerly f15ba1ee009abf4a562bb37450d65f97c7ffa217]]
Former-commit-id: f000c1a9cf
Former-commit-id: 56cd5da64d
2012-11-26 17:31:29 -06:00
Dustin Johnson
5ca7396d38 Issue #1322 Add IDisplay
Change-Id: I0f20b5e2e4544c2a984c317a812855f92e935b92

Former-commit-id: 4425d25c71 [formerly 4425d25c71 [formerly 039c475445ca8f049c46547dba63d413f3019817]]
Former-commit-id: d68c1f84f2
Former-commit-id: fe187f62f7
2012-11-20 15:22:52 -06:00
Roger Ferrel
1b582e49a6 Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081

Former-commit-id: 22f8bc10f0 [formerly 22f8bc10f0 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]
Former-commit-id: 4c3af2a258
Former-commit-id: 8e85e1c8df
2012-11-13 12:55:33 -06:00
Dustin Johnson
6613c51d3b Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 064ef82d1e [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
2012-11-08 09:57:16 -06:00
Dustin Johnson
4d9c945388 Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 98d7beae50 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
Roger Ferrel
729a2b227c Issue #1229 Changes for non-blocking CaveSWTWizardDlg.
Change-Id: I2ce93910b6605e5527c321f594bd0a03b13f321d

Former-commit-id: ae3fb5eef5 [formerly ae3fb5eef5 [formerly 30b387dc4c5392263ba3e82bca1db64099684ecf]]
Former-commit-id: 314af882c6
Former-commit-id: 39b1fcbb01
2012-10-22 14:07:18 -05:00
Roger Ferrel
7f7a51a20f Issue #1229 Changes for non-blocking ViewMessagesDialog.
Change-Id: Id1bd1e36a2d16feec60c82997891577c98296fe7

Former-commit-id: 763c6ea58c [formerly 763c6ea58c [formerly 02e781832ab07685baf2b353df39e156a3190c2c]]
Former-commit-id: e157187c72
Former-commit-id: 7c63cb3495
2012-10-22 10:25:05 -05:00
Roger Ferrel
71c69e504e Issue #1229 Changes for non-blocking SWTMessageBox.
Change-Id: Id9954878c2764f4527e85b958a0fec7a05548db9

Former-commit-id: 610444ee88 [formerly 610444ee88 [formerly b073d27b36543630e3fd04623e22cd5242e5ed1f]]
Former-commit-id: 38ae2b122e
Former-commit-id: db1a29205a
2012-10-18 14:06:02 -05:00
Roger Ferrel
05c83289b6 Issue #1229 Changes for non-blocking SetTimeDialog.
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3

Former-commit-id: 40fb3f9729 [formerly 40fb3f9729 [formerly 5e4edda802714c236334500a12c2020386770dd2]]
Former-commit-id: 4cd2f1c851
Former-commit-id: 7a095d2d99
2012-10-18 07:36:31 -05:00
Roger Ferrel
fae6e2ec44 Issue #1229 Changes for non-blocking LabelOffsetDialog.
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e

Former-commit-id: 66379c3210 [formerly 66379c3210 [formerly f1131f2d9d1d5e0194a65e787e2628e733563683]]
Former-commit-id: d319101ed9
Former-commit-id: 928e9f6a1d
2012-10-17 15:12:55 -05:00
Roger Ferrel
b164d67e54 Issue #1229 Changes for non-blocking ImagingDialog.
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468

Former-commit-id: c73acb0c30 [formerly c73acb0c30 [formerly 185024d06da214041273674716a7efce4b2a98f1]]
Former-commit-id: 460acb4337
Former-commit-id: b42cae4034
2012-10-17 13:53:29 -05:00
Roger Ferrel
a53f94e93d Issues #1229 Changes for non-blocking ColormapDialog.
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: 8e86f32714 [formerly 8e86f32714 [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]
Former-commit-id: 6833c7e04c
Former-commit-id: d5acf40cc2
2012-10-17 10:20:18 -05:00
Roger Ferrel
d9cfa1f2f6 Issue #1229 Changes for non-blocking SaveColorMapDialog.
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc

Former-commit-id: 5e79024db3 [formerly 5e79024db3 [formerly b902eadfca48628bf8944d97019263e94618667a]]
Former-commit-id: 7f3ab5434c
Former-commit-id: f77e146c65
2012-10-17 08:15:21 -05:00
Roger Ferrel
a6e13f80d4 Issue #1229 Changes for non-blocking BackgroundColorDialog.
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9

Former-commit-id: 59a2dd6a3a [formerly 59a2dd6a3a [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]
Former-commit-id: d60b4ca396
Former-commit-id: 757affcc66
2012-10-16 17:00:11 -05:00
James Korman
d53badbe68 Issue #1229 - Issue #1229 - Change to use non-blocking.
Change-Id: I2da0ebd176f7f50d63d70aed28bfe3385ac39a48

Former-commit-id: 7769d4cc14 [formerly 7769d4cc14 [formerly ae8a0dcce3055931c901093e148639f959c70a97]]
Former-commit-id: 860bd4af04
Former-commit-id: 3be1610080
2012-10-11 11:31:43 -05:00
Ron Anderson
51abd858bc Issue #1242 Fix wierd GFE behavior when Grid Manager is maximized.
Change-Id: I2e6d6929a8a8af8dab3320bdf8cda3466fe05fa8

Former-commit-id: b041ccf099 [formerly b041ccf099 [formerly 4fb21077aba1dd9cfafc7f046b02f24f750c6384]]
Former-commit-id: 8e8c713884
Former-commit-id: 60171b46a2
2012-10-04 12:15:01 -05:00
Max Schenkelberg
b093240644 Issue #1222 Fixed MapResourceGroup to manage keeping capabilties in sync with underlying resources by using listeners. Also fixed issue where you can set map resources to be time match basis to avoid errors. Fixed build when merging in 12.10
Change-Id: Iec0389be3a563df2d14f079cdd127a32ba552237

Former-commit-id: 8cd4f17cd4 [formerly 8cd4f17cd4 [formerly ac247423f66f1b29b2235595f08b8cee03962842]]
Former-commit-id: d63f741ab5
Former-commit-id: b35aefa9e0
2012-09-28 11:43:03 -05:00
Roger Ferrel
8dda0a658f Issue #1196 Added isDisposed to CaveJFACEDialog.
Change-Id: I6ad1c3e1ba9015d87d04603a30ac8d02bb36abe5

Former-commit-id: d1e52778db [formerly d1e52778db [formerly 0eee43ff9fc99f027a295abebf64a98bbfeabe26]]
Former-commit-id: bfd519cefe
Former-commit-id: 59b174d6bd
2012-09-27 16:31:11 -05:00
Roger Ferrel
3dd5de22ac Issue #1196 Changes for Valid Period Dialog.
Changes from review.

Change-Id: I6adeb9741c0b8a6bb02525021b5c5b0b75ea43ee

Former-commit-id: 031fabe87a [formerly 031fabe87a [formerly 2d73c05dcff07658fc1bcd9ab878a9bca73b4aa3]]
Former-commit-id: b3cd481696
Former-commit-id: 1ef155a4f0
2012-09-27 10:40:47 -05:00
Roger Ferrel
f34bb941c0 Issue #1196 Changes for WmoIdSelectiondialog and modification to CaveJFACEDialog's setBlockOnOpen.
Change-Id: I3b9cc2bdc32a8f82a2d9ca6927c7fcda02254e9a

Former-commit-id: 6cd9792f46 [formerly 6cd9792f46 [formerly 54e670d97751f1f78d472d742c4f362c7deee625]]
Former-commit-id: 471bab8172
Former-commit-id: 3bf89d2240
2012-09-20 12:14:42 -05:00
Lee Venable
0a23610dee 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: 045297e677 [formerly 045297e677 [formerly 687a13eb43abd6ff17b3aa82f2a0265159f5e6cc]]
Former-commit-id: 14eb99add7
Former-commit-id: 9267113411
2012-09-14 08:39:38 -05:00
Steve Harris
0b647c0c9d 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: 91e39617cb [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: a71dac6cad
Former-commit-id: 87a602dfee
2012-08-27 09:53:55 -05:00
David Gillingham
1856f2b941 Issue #1087: Enable DRT for CAVE operational mode.
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9

Former-commit-id: f7182ae9c7 [formerly f7182ae9c7 [formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]
Former-commit-id: ec2d211800
Former-commit-id: cbd3bfacfa
2012-08-23 11:21:23 -05:00
Max Schenkelberg
362d34bee0 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: b69d2cad1c [formerly b69d2cad1c [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]
Former-commit-id: 1b406ecfca
Former-commit-id: aa9df46a1d
2012-08-20 14:47:14 -05:00
root
1792158ef8 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: cb46f57879 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
62979089d3 Issue #1065 fix contexts to deactivate when unrecognized views activate.
Former-commit-id: 6d9d0a406f [formerly 6d9d0a406f [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]
Former-commit-id: 4203807a77
Former-commit-id: 8a170234b8
2012-08-15 16:36:05 -05:00
Ben Steffensmeier
a17bae6f40 Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
Former-commit-id: a4c46c7f55 [formerly a4c46c7f55 [formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]
Former-commit-id: 0857d971b5
Former-commit-id: a02bb2c092
2012-08-14 10:25:38 -05:00
Nate Jensen
cc4d1777e6 Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
Former-commit-id: c0dad4432c [formerly c0dad4432c [formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]]
Former-commit-id: 1b3d6560e4
Former-commit-id: 565100d787
2012-07-12 17:17:57 -05:00
Ben Steffensmeier
4fbdefff68 Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
Former-commit-id: ea0c7046af [formerly ea0c7046af [formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]]
Former-commit-id: 8984b35ff8
Former-commit-id: 1c68f4e01e
2012-07-12 13:35:52 -05:00
Roger Ferrel
d6d4222e24 Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: 0cf7d64cf4 [formerly 0cf7d64cf4 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]
Former-commit-id: 9071334fe9
Former-commit-id: b3df932794
2012-07-12 11:32:03 -05:00
Max Schenkelberg
d876190d68 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: 9bbb68a547 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 7286b4e962
2012-07-06 16:01:47 -05:00
Max Schenkelberg
d12df1af56 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: 84ae717563 [formerly 84ae717563 [formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]
Former-commit-id: 668838364d
Former-commit-id: e3524fd4df
2012-06-28 11:53:21 -05:00
Bryan Kowal
611925412d 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: a33740e915 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: b87b66abc5
Former-commit-id: 9a7d0492fe
2012-06-27 17:21:48 -05:00
Max Schenkelberg
34cb1fc585 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: d0b06374e9 [formerly d0b06374e9 [formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]
Former-commit-id: 130692aefd
Former-commit-id: 859e041e10
2012-06-21 16:07:20 -05:00
Steve Harris
75f77df418 Revert "12.6.1-10 baseline"
This reverts commit aecc6a8474 [formerly b33c5bdfcf] [formerly a2c0893d1a] [formerly ddde63eee0 [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].


Former-commit-id: b4b1f6975f [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
2012-06-21 08:51:08 -05:00
Steve Harris
aecc6a8474 12.6.1-10 baseline
Former-commit-id: ddde63eee0 [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
2012-06-21 08:38:48 -05:00
Max Schenkelberg
f2e34fe03c Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: dd99479eeb [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]
Former-commit-id: fceef3c5a1
Former-commit-id: e5e1a4de6a
2012-06-13 17:52:11 -05:00
Matt Nash
8eac89d337 Issue #659 fix floating view issue when minimize happened
Former-commit-id: 96bf8b356a [formerly 96bf8b356a [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]
Former-commit-id: b65a0f124e
Former-commit-id: 3bd1a43af2
2012-06-13 10:04:12 -05:00
Steve Harris
2838ca117f 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 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]
Former-commit-id: 48860df690
Former-commit-id: 27b50c57bd
2012-06-12 14:37:12 -05:00
Steve Harris
91e65230ad 12.6.1-5 baseline
Former-commit-id: c99afab05f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
2012-06-11 16:23:47 -05:00