Commit graph

544 commits

Author SHA1 Message Date
Steve Harris
37f2b6e138 12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
2012-07-10 07:53:49 -05:00
Bryan Kowal
e8734b639e Issue #862 - fix java error.
Former-commit-id: adcd49b090 [formerly 2ec61df191] [formerly adcd49b090 [formerly 2ec61df191] [formerly 748c121036 [formerly 9e5b18d03a18d7af849efb9b1cf3f1c25a9252a8]]]
Former-commit-id: 748c121036
Former-commit-id: 99593642d4 [formerly 8c8dcd0b81]
Former-commit-id: cb8124a894
2012-07-09 09:40:40 -05:00
Max Schenkelberg
3325ed5deb 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: 7d13c7d339 [formerly 9bbb68a547] [formerly 7d13c7d339 [formerly 9bbb68a547] [formerly 98c2ec7dc5 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: c6d324aaeb [formerly 7286b4e962]
Former-commit-id: d876190d68
2012-07-06 16:01:47 -05:00
Ron Anderson
971c1d8731 Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures.
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97

Former-commit-id: d68ece4d55 [formerly d3e0cd5af8] [formerly d68ece4d55 [formerly d3e0cd5af8] [formerly e71059c2b9 [formerly ff032c53a059f25558aabdc5b483c4cc59ad3f6e]]]
Former-commit-id: e71059c2b9
Former-commit-id: 60de5ca0f4 [formerly 473e6e9eb2]
Former-commit-id: 34452f236e
2012-07-05 16:32:44 -05:00
Ron Anderson
147b2737f8 Issue #851 Cleaned up dead code and unused dependencies in GFE.
Amend: Issue #851 resubmitting after accepting ticket

Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e

Former-commit-id: 936b2cabca [formerly ff5c7b7498] [formerly 936b2cabca [formerly ff5c7b7498] [formerly 59a3ebe8ba [formerly af1332170e28aed53ff91997ce089b20423203d5]]]
Former-commit-id: 59a3ebe8ba
Former-commit-id: 5186dcf321 [formerly 0c5199ba03]
Former-commit-id: b109c320ae
2012-07-05 15:39:05 -05:00
Nate Jensen
065bd9facf Issue #716 remove dead plugin from features
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f

Former-commit-id: e58404bcb5 [formerly bcedcc51fa] [formerly e58404bcb5 [formerly bcedcc51fa] [formerly 7046ba996a [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]]
Former-commit-id: 7046ba996a
Former-commit-id: 95bbc6a2d4 [formerly 63c5c4dc33]
Former-commit-id: c558b07925
2012-06-29 13:19:47 -05:00
Nate Jensen
c39f1c2a1d Issue #716 fix feature location of smack and remove dead dir
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702

Former-commit-id: eb2c21c15d [formerly 315594cab4] [formerly eb2c21c15d [formerly 315594cab4] [formerly 24b40c3392 [formerly eabc44141aa681503d6076ebf779536ff27e62f2]]]
Former-commit-id: 24b40c3392
Former-commit-id: 11f01325e5 [formerly d125185d28]
Former-commit-id: bd58025a99
2012-06-28 17:57:17 -05:00
Max Schenkelberg
e1d946912c Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline
Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47

Former-commit-id: e1d23a56a9 [formerly 62bd4a667a] [formerly e1d23a56a9 [formerly 62bd4a667a] [formerly a3014f6ec3 [formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]]
Former-commit-id: a3014f6ec3
Former-commit-id: 544ffdc4ca [formerly 9328717a1a]
Former-commit-id: 57cc1a4830
2012-06-28 15:29:05 -05:00
Nate Jensen
c946b42d40 Merge "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." into development
Former-commit-id: 6dcea3d733 [formerly ed08428483] [formerly 6dcea3d733 [formerly ed08428483] [formerly 24a4ef99a7 [formerly 41f21e357b6aacc42ff01a93a85f50c68c2c890b]]]
Former-commit-id: 24a4ef99a7
Former-commit-id: b56d23d072 [formerly afd37ef8b8]
Former-commit-id: 0b604f9b5d
2012-06-28 14:16:28 -05:00
Ben Steffensmeier
fbc750bd7e Issue #704 remove obsolete edex kml and add kml to develoepr feature
Former-commit-id: b7326d0979 [formerly 79ba6c2cd5] [formerly b7326d0979 [formerly 79ba6c2cd5] [formerly 6f2e2b2cea [formerly 067bfaab551c3c061ecfa8defba7d90c3e34b81a]]]
Former-commit-id: 6f2e2b2cea
Former-commit-id: 7238645490 [formerly 1513500d7b]
Former-commit-id: 571fdce958
2012-06-28 14:07:48 -05:00
Ben Steffensmeier
44d3823a51 Issue #704 introduce canvas based rendering for making KML screen overlays
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def

Former-commit-id: e3c0387f6e [formerly 02e2c7b579] [formerly e3c0387f6e [formerly 02e2c7b579] [formerly 881896c21b [formerly bb83a95f5f00cce75b47e7fab084cf3258f65aba]]]
Former-commit-id: 881896c21b
Former-commit-id: 8a86a66376 [formerly b0f5013c7c]
Former-commit-id: bce842f480
2012-06-28 13:58:29 -05:00
Max Schenkelberg
b378e3cdb4 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: 53fd2ec047 [formerly 84ae717563] [formerly 53fd2ec047 [formerly 84ae717563] [formerly 668838364d [formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]]
Former-commit-id: 668838364d
Former-commit-id: f1eb4b4713 [formerly e3524fd4df]
Former-commit-id: d12df1af56
2012-06-28 11:53:21 -05:00
Bryan Kowal
8da12f2c0d Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 873ee341f5 [formerly 4acb1d8693] [formerly 873ee341f5 [formerly 4acb1d8693] [formerly 5fe8bd69f8 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]]
Former-commit-id: 5fe8bd69f8
Former-commit-id: 3010c15a2a [formerly 7d807fad71]
Former-commit-id: f3409d507f
2012-06-27 18:38:19 -05:00
Bryan Kowal
2e5a850d28 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: b1b294c401 [formerly a33740e915] [formerly b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: b4917e6708 [formerly 9a7d0492fe]
Former-commit-id: 611925412d
2012-06-27 17:21:48 -05:00
Bryan Kowal
4fb7e68f4b Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55

Former-commit-id: 1e06e23eca [formerly f7d19019a9] [formerly 1e06e23eca [formerly f7d19019a9] [formerly 98fdfa6f37 [formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]]]
Former-commit-id: 98fdfa6f37
Former-commit-id: fca7bf5b45 [formerly 5874255a05]
Former-commit-id: 2ea8bed91e
2012-06-27 16:22:53 -05:00
Bryan Kowal
ee40decf54 12.6.1-10 baseline
Conflicts:
	cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/IImagingExtension.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableCellData.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.npp.feature/com.raytheon.uf.viz.npp.feature.ecl
	cave/com.raytheon.uf.viz.npp.viirs/.classpath
	cave/com.raytheon.uf.viz.npp.viirs/.project
	cave/com.raytheon.uf.viz.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.npp.viirs/com.raytheon.uf.viz.npp.viirs.ecl
	cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/widgets/ScaleWidget.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/AbstractRadarResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	cots/org.jboss.cache/.project
	deltaScripts/12.5.1/drop_gfe_tables.sh
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendQueue.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/SendIscTransactions.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/ClimoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/HLSTopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/TopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/com.raytheon.uf.common.dataplugin.npp.viirs.ecl
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.common.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSSpatialMessageData.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/gov.noaa.nws.ost.edex.plugin.regionalsat.ecl
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/cave_static/site/AFC/menus/satellite/regionalsat/baseRegionalComposite.xml
	ncep/gov.noaa.nws.ncep.common.staticdata/.classpath
	ncep/gov.noaa.nws.ncep.common.staticdata/.project
	ncep/gov.noaa.nws.ncep.common.staticdata/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.common.staticdata/build.properties
	ncep/gov.noaa.nws.ncep.common.staticdata/gov.noaa.nws.ncep.common.staticdata.ecl
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.project
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/build.properties
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/gov.noaa.nws.ncep.gempak.parameters.core.ecl
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metParameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/ClimDayTemp.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/DayTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/HeightAboveSeaLevel.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/NightTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/POP12HrsAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms12hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms24hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms6hr.java
	ncep/gov.noaa.nws.ncep.staticdataprovider/.classpath
	ncep/gov.noaa.nws.ncep.staticdataprovider/.project
	ncep/gov.noaa.nws.ncep.staticdataprovider/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.staticdataprovider/gov.noaa.nws.ncep.staticdataprovider.ecl
	ncep/gov.noaa.nws.ncep.viz.customProjection/.classpath
	ncep/gov.noaa.nws.ncep.viz.customProjection/.project
	ncep/gov.noaa.nws.ncep.viz.customProjection/gov.noaa.nws.ncep.viz.customProjection.ecl
	rpms/awips2.core/Installer.ldm/component.spec

Change-Id: Ib8015bb11aef0561ff3b3bc426b51b5c8ee8ef4a

Former-commit-id: 072c88b382 [formerly 4a17650914] [formerly 072c88b382 [formerly 4a17650914] [formerly 53e5b7c491 [formerly 9597fdac96022c94dad425367de23eafedad06bc]]]
Former-commit-id: 53e5b7c491
Former-commit-id: 6d2ca51c52 [formerly 62c7de6d3b]
Former-commit-id: 718062f386
2012-06-27 15:04:34 -05:00
David Gillingham
201e83898a Issue #766: Merge VCModule refactor and Python globals memory leak fix to common baseline.
Former-commit-id: 768afb8423 [formerly 2a0ffc5311] [formerly 768afb8423 [formerly 2a0ffc5311] [formerly 672d7a2c31 [formerly 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d]]]
Former-commit-id: 672d7a2c31
Former-commit-id: ca54365f87 [formerly 235cf57de8]
Former-commit-id: b2629a6f41
2012-06-26 17:49:06 -05:00
Nate Jensen
06bb6ef640 Merge "Issue #628 added PgenResourceGhost to track the gl ghost draw objects." into development
Former-commit-id: 4a389da950 [formerly cfc56f670a] [formerly 4a389da950 [formerly cfc56f670a] [formerly ab86141e2f [formerly 00dfc8449b6d12b0a3ed52c3f60cc016eaa13af3]]]
Former-commit-id: ab86141e2f
Former-commit-id: f90897dc5d [formerly 5ada671511]
Former-commit-id: 3c7a10a698
2012-06-26 13:21:49 -05:00
Ben Steffensmeier
153a1d7c5e Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
Former-commit-id: 0855e117cb [formerly 682edec2cf] [formerly 0855e117cb [formerly 682edec2cf] [formerly 603d48a017 [formerly 308f0e8c03ab4237830a91c96c500b6860c6fd36]]]
Former-commit-id: 603d48a017
Former-commit-id: 745b2cd722 [formerly 7ea36122f2]
Former-commit-id: b2ce12e3a7
2012-06-25 15:22:35 -05:00
Ben Steffensmeier
2c6b6269fd Issue #704 fixes to plots/MPE to work better in KML
Former-commit-id: 2b6e1fa5b6 [formerly 32627cf132] [formerly 2b6e1fa5b6 [formerly 32627cf132] [formerly b01be5085f [formerly f1d440729b4e436e879219abaaaf7fa0e04d4ef6]]]
Former-commit-id: b01be5085f
Former-commit-id: 8517eafdf4 [formerly 67ba3ee6f6]
Former-commit-id: 6a9c9a47e2
2012-06-22 17:54:31 -05:00
Brad Gonzales
faa1ca2995 Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: b0c29466de [formerly 3799026523] [formerly b0c29466de [formerly 3799026523] [formerly bef2bfa7cc [formerly 237309aab32cdb36703dbe62d2cfe102b3197863]]]
Former-commit-id: bef2bfa7cc
Former-commit-id: be195ab805 [formerly 23ede5fa7b]
Former-commit-id: 7f0f751018
2012-06-22 15:08:40 -05:00
Max Schenkelberg
5ea6c7da61 Issue #778 changed SPIResource to not dispose font when magnification changes but instead call setMagnification()
Change-Id: Ibc8aa9b69643d67a1203a560f3adbc3d870db2bf

Former-commit-id: 86e285c8e7 [formerly a8c958fcc8] [formerly 86e285c8e7 [formerly a8c958fcc8] [formerly fce005b109 [formerly 6ce5d188d0b27bf4cf07a8cd9b15fa9ad0bb16c2]]]
Former-commit-id: fce005b109
Former-commit-id: 896f128f19 [formerly b4d28b22cd]
Former-commit-id: 911392f917
2012-06-21 16:07:23 -05:00
Max Schenkelberg
ecc5316b44 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: a691f425ea [formerly d0b06374e9] [formerly a691f425ea [formerly d0b06374e9] [formerly 130692aefd [formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]]
Former-commit-id: 130692aefd
Former-commit-id: e8e159bed0 [formerly 859e041e10]
Former-commit-id: 34cb1fc585
2012-06-21 16:07:20 -05:00
Nate Jensen
15690cd50d Merge "Issue #704 fixes to random resources and optimization of radar projection transforms" into development
Former-commit-id: 98fee4da65 [formerly 96c4d9301f] [formerly 98fee4da65 [formerly 96c4d9301f] [formerly 22d4de96fd [formerly 995d7e08ade1a3e10ac8ab51aa24f900091054de]]]
Former-commit-id: 22d4de96fd
Former-commit-id: 00e6701ce9 [formerly 71a1826611]
Former-commit-id: e5b4a007e5
2012-06-21 10:04:51 -05:00
Steve Harris
56f8cf00a8 12.6.1-10 baseline
Former-commit-id: edac4d827c [formerly 8dc4a774e2] [formerly edac4d827c [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]
Former-commit-id: 3cd0902b49
Former-commit-id: efe25edfad [formerly eacd5aeb7f]
Former-commit-id: df59dc7c44
2012-06-21 08:58:00 -05:00
Steve Harris
e77a15c047 Revert "12.6.1-10 baseline"
This reverts commit 95e7f4fc0c [formerly aecc6a8474] [formerly f8497470fc [formerly b33c5bdfcf]] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].


Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 333fd9c64e [formerly 8367fb50f5]
Former-commit-id: 75f77df418
2012-06-21 08:51:08 -05:00
Steve Harris
95e7f4fc0c 12.6.1-10 baseline
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: f8497470fc [formerly b33c5bdfcf]
Former-commit-id: aecc6a8474
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
e60add5122 Issue #704 fixes to random resources and optimization of radar projection transforms
Former-commit-id: fd6a3d3b23 [formerly 601d46661c] [formerly fd6a3d3b23 [formerly 601d46661c] [formerly 16e4fe8ce2 [formerly 7619165ce45efe9dbad045adfaaf978acee782be]]]
Former-commit-id: 16e4fe8ce2
Former-commit-id: 8111785587 [formerly cf35d99036]
Former-commit-id: 7e9eb91232
2012-06-20 18:07:17 -05:00
Nate Jensen
9e69498620 Merge "Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later" into development
Former-commit-id: c7de1d7896 [formerly 121d68b8c4] [formerly c7de1d7896 [formerly 121d68b8c4] [formerly 133cd9994e [formerly 5e8d1cbc132dbd69b86342234631f3d11e3bdb3d]]]
Former-commit-id: 133cd9994e
Former-commit-id: 8c38ed612e [formerly f4db55cd46]
Former-commit-id: 082fbf8f1a
2012-06-20 17:56:50 -05:00
Max Schenkelberg
379ca48057 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: 81b6158c40 [formerly ab871d218b] [formerly 81b6158c40 [formerly ab871d218b] [formerly 61e0ea0516 [formerly c0d7f68bed2b141240d2e2a695c8439f7a4ffa67]]]
Former-commit-id: 61e0ea0516
Former-commit-id: 460a1179af [formerly 66a60a7b7b]
Former-commit-id: 77aef2db41
2012-06-20 15:32:27 -05:00
Ben Steffensmeier
19ce6f7e77 Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: c2191c83dc [formerly d317777ee6] [formerly c2191c83dc [formerly d317777ee6] [formerly 0c69731e18 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]]
Former-commit-id: 0c69731e18
Former-commit-id: 8b107023d1 [formerly b55a4f026c]
Former-commit-id: 63b55f454f
2012-06-20 14:13:37 -05:00
Bryan Kowal
b69b1e9509 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: fa84e5df3e [formerly 207bbd3087] [formerly fa84e5df3e [formerly 207bbd3087] [formerly 25addabe64 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]
Former-commit-id: 25addabe64
Former-commit-id: 21a02e1510 [formerly 94e4af6d47]
Former-commit-id: 85507d67dd
2012-06-19 15:03:57 -05:00
Bryan Kowal
89ab662ecf Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: ec395ae134 [formerly 96f987631c] [formerly ec395ae134 [formerly 96f987631c] [formerly 966c50ed06 [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]]]
Former-commit-id: 966c50ed06
Former-commit-id: 07b8c70b1b [formerly ff0c86f857]
Former-commit-id: 6d4946e753
2012-06-18 11:51:47 -05:00
Bryan Kowal
a6d1f97dec 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: 9361f3eb94 [formerly f528e10391] [formerly 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]
Former-commit-id: f0e3b957e3
Former-commit-id: 21e8618852 [formerly 1ee59eac71]
Former-commit-id: cbc8964e5b
2012-06-18 11:16:28 -05:00
Ben Steffensmeier
1a3e1ba291 Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97

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

Former-commit-id: 2c27ec20b5 [formerly d187436589] [formerly 2c27ec20b5 [formerly d187436589] [formerly 58356c49cb [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]]
Former-commit-id: 58356c49cb
Former-commit-id: 352648586a [formerly e604271c54]
Former-commit-id: 3e4b09847b
2012-06-14 16:41:05 -05:00
Max Schenkelberg
d915360713 Issue #697 fixed join issues with GFE
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012

Former-commit-id: 6b9d13211d [formerly dac8374f52] [formerly 6b9d13211d [formerly dac8374f52] [formerly 576dbcf340 [formerly e648206c2e8129b2d63b9309f67e1ce46a1edbf0]]]
Former-commit-id: 576dbcf340
Former-commit-id: 86f4c94dc3 [formerly 475623fe22]
Former-commit-id: 8a0626ec3f
2012-06-14 14:18:02 -05:00
Bryan Kowal
eca1d3d525 Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: 5e80c45a03 [formerly dcc5675564] [formerly 5e80c45a03 [formerly dcc5675564] [formerly c0aaac4a07 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]]
Former-commit-id: c0aaac4a07
Former-commit-id: a9c2cf4fae [formerly c608fc959c]
Former-commit-id: 720a152a45
2012-06-14 11:35:15 -05:00
Nate Jensen
e3596980f5 Issue #716 better tooltip
Change-Id: I9db709540cb6ac25893756139b3269adf9d4551b

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

Former-commit-id: 4f391588ab [formerly e92eb6366e] [formerly 4f391588ab [formerly e92eb6366e] [formerly 4c8b468854 [formerly c00c45f5ba1ae3bb0a0a246d1435bd10b3a8aa51]]]
Former-commit-id: 4c8b468854
Former-commit-id: 01a075077f [formerly c2d278d75b]
Former-commit-id: 35e332f89a
2012-06-14 11:16:11 -05:00
Max Schenkelberg
7bac48f643 Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: 51c2a41e68 [formerly dd99479eeb] [formerly 51c2a41e68 [formerly dd99479eeb] [formerly fceef3c5a1 [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]
Former-commit-id: fceef3c5a1
Former-commit-id: f0d2893e97 [formerly e5e1a4de6a]
Former-commit-id: f2e34fe03c
2012-06-13 17:52:11 -05:00
Matt Nash
4e1074e262 Issue #711 add roles and site capability
Former-commit-id: 48bf29974c [formerly a9d225066a] [formerly 48bf29974c [formerly a9d225066a] [formerly 032827aa1b [formerly a49eee36dac39f172d7c4fa723a297d7cf94d5db]]]
Former-commit-id: 032827aa1b
Former-commit-id: 4cd558c1ca [formerly 13a1fa879e]
Former-commit-id: 34f57345ac
2012-06-13 12:58:11 -05:00
Matt Nash
576e5c5310 Issue #659 fix floating view issue when minimize happened
Former-commit-id: 3689ed489e [formerly 96bf8b356a] [formerly 3689ed489e [formerly 96bf8b356a] [formerly b65a0f124e [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]]
Former-commit-id: b65a0f124e
Former-commit-id: 9e81392638 [formerly 3bd1a43af2]
Former-commit-id: 8eac89d337
2012-06-13 10:04:12 -05:00
Nate Jensen
da2ab4d95b Issue #716 fix lots of minor issues, fix merge problem
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575

Former-commit-id: eedc68c32c [formerly 619d3062c2] [formerly eedc68c32c [formerly 619d3062c2] [formerly 47e8561dd0 [formerly ae131c0d05148e58ba445e5f144aa21c8c5c12c3]]]
Former-commit-id: 47e8561dd0
Former-commit-id: 3b8b89fc84 [formerly 2cf220ff0c]
Former-commit-id: 1a8935e86d
2012-06-13 09:39:19 -05:00
Steve Harris
b3c2646e5e Removed duplicate method created by merge
Former-commit-id: 282682ccc1 [formerly 5f66b0995a] [formerly 282682ccc1 [formerly 5f66b0995a] [formerly 308737bff8 [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]]]
Former-commit-id: 308737bff8
Former-commit-id: 383f9d2d56 [formerly 55b4d7c5da]
Former-commit-id: 0de9e03c5a
2012-06-13 08:41:24 -05:00
Steve Harris
70a928d039 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: af6c0529ad [formerly 2f20a86a30] [formerly af6c0529ad [formerly 2f20a86a30] [formerly 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: d7a4853091 [formerly 27b50c57bd]
Former-commit-id: 2838ca117f
2012-06-12 14:37:12 -05:00
Nate Jensen
ed987231b5 Issue #716 removing unnecessary file
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba

Former-commit-id: 4b54691479 [formerly 07d44ae528] [formerly 4b54691479 [formerly 07d44ae528] [formerly cd14177a84 [formerly 5ade0f2437308ab21429432746cf4e71afc33c93]]]
Former-commit-id: cd14177a84
Former-commit-id: 37342dd500 [formerly 090bb2918b]
Former-commit-id: 38fcee07e8
2012-06-11 17:34:21 -05:00
Nate Jensen
ab30be436b Issue #716 fix disabled toolbar
Change-Id: I464d0560cf7462b37d324db368411f3867e53602

Former-commit-id: c3c4a8519a [formerly d2bb1b6e0c] [formerly c3c4a8519a [formerly d2bb1b6e0c] [formerly 0c869f599e [formerly d32771cbbe72a32965c50aacd7ede3383a5fff23]]]
Former-commit-id: 0c869f599e
Former-commit-id: 38a3e93585 [formerly ea33fc82fe]
Former-commit-id: 91b7225c2f
2012-06-11 17:33:48 -05:00
Steve Harris
3b468d9f50 12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: b69fa75919 [formerly a945ed8e6d]
Former-commit-id: 91e65230ad
2012-06-11 16:23:47 -05:00
Steve Harris
518fa79f7f 12.6.1-3 baseline
Former-commit-id: 7c5306b795 [formerly 42f3513175] [formerly 7c5306b795 [formerly 42f3513175] [formerly d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 32c0464d79 [formerly 1fdc0aa237]
Former-commit-id: ca8baf18a3
2012-06-11 16:23:47 -05:00