Steve Harris
f2ab9cfe1a
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 302aa05586
[formerly de9034c96c
] [formerly 4688ac304f
[formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]
Former-commit-id: 4688ac304f
Former-commit-id: b82d6772c3
2012-07-27 14:50:45 -05:00
Steve Harris
9e4df42326
Merge branch 'master' (OB12.7.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.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.points/.classpath
cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.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
deltaScripts/.pydevproject
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
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.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.climo/.classpath
edexOsgi/com.raytheon.uf.common.climo/.project
edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
edexOsgi/com.raytheon.uf.common.hlstopo/.project
edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.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/com.raytheon.uf.edex.tafqueue.ecl
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/component-deploy.xml
nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
rpms/awips2-rpm.db
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
rpms/awips2.core/Installer.rcm/scripts/conf/start-config
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/release/buildCoreRPMs.sh
rpms/common/yum/arch.x86/comps.xml
tools/devAutoDeploy/devAutoDeploy.ecl
Former-commit-id: 07c40a9c0c
[formerly 56249c2611
] [formerly 587bb6a274
[formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]
Former-commit-id: 587bb6a274
Former-commit-id: 2aa4114e4d
2012-07-27 14:44:44 -05:00
Nate Jensen
4e0a0f10dc
Issue #882 fix auto updates, more efficiently set simulated time
...
Change-Id: I29f497df91920618e5271bf0ff436547d6225413
Former-commit-id: ac8d12ce13
[formerly 3d07fc8ebf
] [formerly dbe185f3a0
[formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]
Former-commit-id: dbe185f3a0
Former-commit-id: 67edb6917d
2012-07-26 17:43:29 -05:00
Ben Steffensmeier
bcea00c92b
Issue #924 fix some concurrency issues for GridResource
...
Former-commit-id: 78491d6318
[formerly e18782687c
] [formerly de742a4b8c
[formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]]
Former-commit-id: de742a4b8c
Former-commit-id: 3e9abe8682
2012-07-25 17:33:24 -05:00
Ben Steffensmeier
97776790cb
Issue #921 register GFEColorbarResource as a listener when recycling.
...
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0
Former-commit-id: 7514bfd6cd
[formerly e3cfa52237
] [formerly 044836cd2c
[formerly 90ce1b3643af750a19bc29156137f18848e7dc77]]
Former-commit-id: 044836cd2c
Former-commit-id: 6f9ec1af50
2012-07-24 11:29:51 -05:00
Ron Anderson
e184dceb91
Issue #851 Fixed issues with DatabaseID.dateFormat
...
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72
Former-commit-id: 21431b2693
[formerly 1f2e581534
] [formerly b52f1400ef
[formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]]
Former-commit-id: b52f1400ef
Former-commit-id: bc034e1863
2012-07-23 16:49:21 -05:00
Ben Steffensmeier
af3102991e
Issue #924 fix concurrency issues for Grid products
...
Former-commit-id: 286274aed0
[formerly 0b951d425d
] [formerly 9abd645758
[formerly 767173dc95dc811bc94081415a214803403985f5]]
Former-commit-id: 9abd645758
Former-commit-id: cb08c202ef
2012-07-19 17:37:15 -05:00
Ben Steffensmeier
b281516e71
Issue #910 fix Memory Leak in GLDelegate Images, add Graphics memory logging.
...
Change-Id: I07635279472c5f4a605f00cbdde81e961eb9e757
Former-commit-id: 41860a891e
[formerly 5df07dac9f
] [formerly 98218ec3cd
[formerly e4d9419134f7fcfd47dfe84e55764309d3d65257]]
Former-commit-id: 98218ec3cd
Former-commit-id: 10706db0b1
2012-07-19 17:12:31 -05:00
Steve Harris
f2102bfb24
12.7.1-8 baseline
...
Former-commit-id: 11f96dbedd
[formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
2012-07-19 16:20:40 -05:00
Nate Jensen
abc8a39763
Merge "Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged" into development
...
Former-commit-id: 127feeb545
[formerly bad816a50e
] [formerly 0fd6c7d56c
[formerly 3786f2c0a7add2d36b27b92e2a8efd235b65e147]]
Former-commit-id: 0fd6c7d56c
Former-commit-id: 33611406a4
2012-07-19 15:31:55 -05:00
Max Schenkelberg
5d8515fb58
Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged
...
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4
Former-commit-id: 0cfd8834c2
[formerly c8909c0fbc
] [formerly d8971a72fd
[formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]]
Former-commit-id: d8971a72fd
Former-commit-id: bc0ec0455d
2012-07-19 11:45:01 -05:00
Ben Steffensmeier
6c96f56744
Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing.
...
Former-commit-id: 53f915c3e4
[formerly 144dd7bab9
] [formerly eab4b1cd78
[formerly 84055039ccd601f4be4546f97cde99faf33b7818]]
Former-commit-id: eab4b1cd78
Former-commit-id: 1393fa1d14
2012-07-18 17:53:51 -05:00
Roger Ferrel
8fd8405482
Issue #875 Modfications to prevent null pointer exeception when no map displayed.
...
Change-Id: Ia20c00021c3c2741b30679c72c01b245cdb4c504
Former-commit-id: 44a3176dd6
[formerly c908de0d82
] [formerly 3cfd8547b4
[formerly 7eaa2860847149879bb62a637e6677675dd5c7ec]]
Former-commit-id: 3cfd8547b4
Former-commit-id: aa7b01b330
2012-07-16 11:10:23 -05:00
Nate Jensen
ca0c314851
Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
...
Former-commit-id: da1e9ae3c3
[formerly c0dad4432c
] [formerly 1b3d6560e4
[formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]]
Former-commit-id: 1b3d6560e4
Former-commit-id: 565100d787
2012-07-12 17:17:57 -05:00
Ben Steffensmeier
32d4848ef2
Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
...
Former-commit-id: 45a1cc1997
[formerly ea0c7046af
] [formerly 8984b35ff8
[formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]]
Former-commit-id: 8984b35ff8
Former-commit-id: 1c68f4e01e
2012-07-12 13:35:52 -05:00
Roger Ferrel
c317c5d0a3
Issue #875 - Create com.raytheon.uf.viz.points
...
Amend: fixing code per review comments
Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627
Former-commit-id: bfcefac909
[formerly 0cf7d64cf4
] [formerly 9071334fe9
[formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]
Former-commit-id: 9071334fe9
Former-commit-id: b3df932794
2012-07-12 11:32:03 -05:00
Bryan Kowal
541b59d060
Merge branch 'merge_development' into development
...
Former-commit-id: 226818bda5
[formerly 051a51b79c
] [formerly b27994c9b1
[formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]]
Former-commit-id: b27994c9b1
Former-commit-id: fa5eb7a16a
2012-07-10 17:03:21 -05:00
Bryan Kowal
8d64fdba2c
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: c629f18f24
[formerly 99d22f395a
] [formerly f92eb59a73
[formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]
Former-commit-id: f92eb59a73
Former-commit-id: 580172b47c
2012-07-10 16:57:16 -05:00
Nate Jensen
989ddf7808
Merge "Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API. Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998" into development
...
Former-commit-id: 85350ace5e
[formerly 2af538f200
] [formerly ee43626e2e
[formerly 95d4cacc92bbf5531ca54c3a4dda811ea402ac84]]
Former-commit-id: ee43626e2e
Former-commit-id: 3fbdc016c5
2012-07-10 16:06:28 -05:00
Ben Steffensmeier
612e586a6c
Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
...
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998
Former-commit-id: 5bf019e1bb
[formerly 74a69d1fb9
] [formerly 79ab850efa
[formerly 009e769a180898cb62e9df4a604b40e139cf2886]]
Former-commit-id: 79ab850efa
Former-commit-id: 4182352f8c
2012-07-10 16:04:56 -05:00
Steve Harris
45ac1d4d51
Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
...
These files have existing camel-cased equivalents and may not be needed.
Former-commit-id: 8fff0d7e53
[formerly 479ccdbed2
] [formerly 9454393d13
[formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]
Former-commit-id: 9454393d13
Former-commit-id: 330b9c3174
2012-07-10 09:29:33 -05:00
Steve Harris
dc50bc8443
12.6.1-9 baseline
...
Former-commit-id: 7c064b6868
[formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
2012-07-10 07:53:49 -05:00
Bryan Kowal
99593642d4
Issue #862 - fix java error.
...
Former-commit-id: adcd49b090
[formerly 2ec61df191
] [formerly 748c121036
[formerly 9e5b18d03a18d7af849efb9b1cf3f1c25a9252a8]]
Former-commit-id: 748c121036
Former-commit-id: 8c8dcd0b81
2012-07-09 09:40:40 -05:00
Max Schenkelberg
c6d324aaeb
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 98c2ec7dc5
[formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 7286b4e962
2012-07-06 16:01:47 -05:00
Ron Anderson
60de5ca0f4
Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures.
...
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97
Former-commit-id: d68ece4d55
[formerly d3e0cd5af8
] [formerly e71059c2b9
[formerly ff032c53a059f25558aabdc5b483c4cc59ad3f6e]]
Former-commit-id: e71059c2b9
Former-commit-id: 473e6e9eb2
2012-07-05 16:32:44 -05:00
Ron Anderson
5186dcf321
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 59a3ebe8ba
[formerly af1332170e28aed53ff91997ce089b20423203d5]]
Former-commit-id: 59a3ebe8ba
Former-commit-id: 0c5199ba03
2012-07-05 15:39:05 -05:00
Nate Jensen
95bbc6a2d4
Issue #716 remove dead plugin from features
...
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f
Former-commit-id: e58404bcb5
[formerly bcedcc51fa
] [formerly 7046ba996a
[formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]
Former-commit-id: 7046ba996a
Former-commit-id: 63c5c4dc33
2012-06-29 13:19:47 -05:00
Nate Jensen
11f01325e5
Issue #716 fix feature location of smack and remove dead dir
...
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702
Former-commit-id: eb2c21c15d
[formerly 315594cab4
] [formerly 24b40c3392
[formerly eabc44141aa681503d6076ebf779536ff27e62f2]]
Former-commit-id: 24b40c3392
Former-commit-id: d125185d28
2012-06-28 17:57:17 -05:00
Max Schenkelberg
544ffdc4ca
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 a3014f6ec3
[formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]
Former-commit-id: a3014f6ec3
Former-commit-id: 9328717a1a
2012-06-28 15:29:05 -05:00
Nate Jensen
b56d23d072
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 24a4ef99a7
[formerly 41f21e357b6aacc42ff01a93a85f50c68c2c890b]]
Former-commit-id: 24a4ef99a7
Former-commit-id: afd37ef8b8
2012-06-28 14:16:28 -05:00
Ben Steffensmeier
7238645490
Issue #704 remove obsolete edex kml and add kml to develoepr feature
...
Former-commit-id: b7326d0979
[formerly 79ba6c2cd5
] [formerly 6f2e2b2cea
[formerly 067bfaab551c3c061ecfa8defba7d90c3e34b81a]]
Former-commit-id: 6f2e2b2cea
Former-commit-id: 1513500d7b
2012-06-28 14:07:48 -05:00
Ben Steffensmeier
8a86a66376
Issue #704 introduce canvas based rendering for making KML screen overlays
...
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def
Former-commit-id: e3c0387f6e
[formerly 02e2c7b579
] [formerly 881896c21b
[formerly bb83a95f5f00cce75b47e7fab084cf3258f65aba]]
Former-commit-id: 881896c21b
Former-commit-id: b0f5013c7c
2012-06-28 13:58:29 -05:00
Max Schenkelberg
f1eb4b4713
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 668838364d
[formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]
Former-commit-id: 668838364d
Former-commit-id: e3524fd4df
2012-06-28 11:53:21 -05:00
Bryan Kowal
3010c15a2a
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 5fe8bd69f8
[formerly 403599d216e643dba2fcae0883f32987c7bade3f]]
Former-commit-id: 5fe8bd69f8
Former-commit-id: 7d807fad71
2012-06-27 18:38:19 -05:00
Bryan Kowal
b4917e6708
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 b87b66abc5
[formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: b87b66abc5
Former-commit-id: 9a7d0492fe
2012-06-27 17:21:48 -05:00
Bryan Kowal
fca7bf5b45
Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
...
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55
Former-commit-id: 1e06e23eca
[formerly f7d19019a9
] [formerly 98fdfa6f37
[formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]]
Former-commit-id: 98fdfa6f37
Former-commit-id: 5874255a05
2012-06-27 16:22:53 -05:00
Bryan Kowal
6d2ca51c52
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 53e5b7c491
[formerly 9597fdac96022c94dad425367de23eafedad06bc]]
Former-commit-id: 53e5b7c491
Former-commit-id: 62c7de6d3b
2012-06-27 15:04:34 -05:00
David Gillingham
ca54365f87
Issue #766 : Merge VCModule refactor and Python globals memory leak fix to common baseline.
...
Former-commit-id: 768afb8423
[formerly 2a0ffc5311
] [formerly 672d7a2c31
[formerly 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d]]
Former-commit-id: 672d7a2c31
Former-commit-id: 235cf57de8
2012-06-26 17:49:06 -05:00
Nate Jensen
f90897dc5d
Merge "Issue #628 added PgenResourceGhost to track the gl ghost draw objects." into development
...
Former-commit-id: 4a389da950
[formerly cfc56f670a
] [formerly ab86141e2f
[formerly 00dfc8449b6d12b0a3ed52c3f60cc016eaa13af3]]
Former-commit-id: ab86141e2f
Former-commit-id: 5ada671511
2012-06-26 13:21:49 -05:00
Ben Steffensmeier
745b2cd722
Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
...
Former-commit-id: 0855e117cb
[formerly 682edec2cf
] [formerly 603d48a017
[formerly 308f0e8c03ab4237830a91c96c500b6860c6fd36]]
Former-commit-id: 603d48a017
Former-commit-id: 7ea36122f2
2012-06-25 15:22:35 -05:00
Ben Steffensmeier
8517eafdf4
Issue #704 fixes to plots/MPE to work better in KML
...
Former-commit-id: 2b6e1fa5b6
[formerly 32627cf132
] [formerly b01be5085f
[formerly f1d440729b4e436e879219abaaaf7fa0e04d4ef6]]
Former-commit-id: b01be5085f
Former-commit-id: 67ba3ee6f6
2012-06-22 17:54:31 -05:00
Brad Gonzales
be195ab805
Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
...
Former-commit-id: b0c29466de
[formerly 3799026523
] [formerly bef2bfa7cc
[formerly 237309aab32cdb36703dbe62d2cfe102b3197863]]
Former-commit-id: bef2bfa7cc
Former-commit-id: 23ede5fa7b
2012-06-22 15:08:40 -05:00
Max Schenkelberg
896f128f19
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 fce005b109
[formerly 6ce5d188d0b27bf4cf07a8cd9b15fa9ad0bb16c2]]
Former-commit-id: fce005b109
Former-commit-id: b4d28b22cd
2012-06-21 16:07:23 -05:00
Max Schenkelberg
e8e159bed0
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 130692aefd
[formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]
Former-commit-id: 130692aefd
Former-commit-id: 859e041e10
2012-06-21 16:07:20 -05:00
Nate Jensen
00e6701ce9
Merge "Issue #704 fixes to random resources and optimization of radar projection transforms" into development
...
Former-commit-id: 98fee4da65
[formerly 96c4d9301f
] [formerly 22d4de96fd
[formerly 995d7e08ade1a3e10ac8ab51aa24f900091054de]]
Former-commit-id: 22d4de96fd
Former-commit-id: 71a1826611
2012-06-21 10:04:51 -05:00
Steve Harris
efe25edfad
12.6.1-10 baseline
...
Former-commit-id: edac4d827c
[formerly 8dc4a774e2
] [formerly 3cd0902b49
[formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]
Former-commit-id: 3cd0902b49
Former-commit-id: eacd5aeb7f
2012-06-21 08:58:00 -05:00
Steve Harris
333fd9c64e
Revert "12.6.1-10 baseline"
...
This reverts commit f8497470fc
[formerly b33c5bdfcf
] [formerly a2c0893d1a
] [formerly 06f1c7b73c
[formerly ddde63eee0
] [formerly a2c0893d1a
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].
Former-commit-id: 62cf6a9f92
[formerly b4b1f6975f
] [formerly 25198a5cd6
[formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
2012-06-21 08:51:08 -05:00
Steve Harris
f8497470fc
12.6.1-10 baseline
...
Former-commit-id: 06f1c7b73c
[formerly ddde63eee0
] [formerly a2c0893d1a
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
8111785587
Issue #704 fixes to random resources and optimization of radar projection transforms
...
Former-commit-id: fd6a3d3b23
[formerly 601d46661c
] [formerly 16e4fe8ce2
[formerly 7619165ce45efe9dbad045adfaaf978acee782be]]
Former-commit-id: 16e4fe8ce2
Former-commit-id: cf35d99036
2012-06-20 18:07:17 -05:00
Nate Jensen
8c38ed612e
Merge "Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later" into development
...
Former-commit-id: c7de1d7896
[formerly 121d68b8c4
] [formerly 133cd9994e
[formerly 5e8d1cbc132dbd69b86342234631f3d11e3bdb3d]]
Former-commit-id: 133cd9994e
Former-commit-id: f4db55cd46
2012-06-20 17:56:50 -05:00