Ben Steffensmeier
d841924588
Issue #978 GChange GridResource to use its own times rather than descriptor times.
...
Former-commit-id: 090b9f5ccb
[formerly 8346805ed2
[formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]
Former-commit-id: 8346805ed2
Former-commit-id: c5c9e8b05c
2012-08-03 15:52:47 -05:00
Richard Peter
1d953096d4
Merge "Issue #798 - Force interpolationLevels in derived satellite" into development
...
Former-commit-id: 131ba842e9
[formerly fd051c19d4
[formerly 622e8119ab53ed34e5249c67186343203a56b821]]
Former-commit-id: fd051c19d4
Former-commit-id: 2154c4e286
2012-08-03 14:32:35 -05:00
James Korman
2ebcf052dc
Issue #798 - Force interpolationLevels in derived satellite
...
Former-commit-id: 317acc38fe
[formerly 1bc1784478
[formerly ffcc7cfa6e7c2ce0f406becff390781ceee7faa3]]
Former-commit-id: 1bc1784478
Former-commit-id: dfd18c7a85
2012-08-03 14:14:53 -05:00
Ben Steffensmeier
c57d546746
Issue #1001 synchronize paint with add.
...
Former-commit-id: 798d26e954
[formerly 2c9737ca5c
[formerly 825c08e6ce89b0c4b042c9e85f7abbc7b9a675ef]]
Former-commit-id: 2c9737ca5c
Former-commit-id: 3e601b2baf
2012-08-03 14:10:04 -05:00
Steve Harris
0557c9a0c6
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: 51e38ca887
[formerly 6d77b94217
[formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 6d77b94217
Former-commit-id: fb47934159
2012-08-01 12:43:12 -05:00
Max Schenkelberg
01b0313c03
Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
...
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac
Former-commit-id: cc0a1fbca3
[formerly f635e9c332
[formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]
Former-commit-id: f635e9c332
Former-commit-id: 079a11565a
2012-08-01 10:51:32 -05:00
Steve Harris
2e804fc8c4
12.8.1-5 baseline
...
Former-commit-id: cd49ef3eda
[formerly fd2abfb6f1
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: fd2abfb6f1
Former-commit-id: 2653ddc2e3
2012-08-01 10:45:37 -05:00
James Korman
226ff6ea65
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 4cbbc59278
[formerly 38a2e426d9
[formerly cb05a9f95384806537106dc804833331d6c7db48]]
Former-commit-id: 38a2e426d9
Former-commit-id: 1166a7cbb1
2012-07-31 13:38:23 -05:00
Richard Peter
0ee07efae3
Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
...
Former-commit-id: 8631b64e75
[formerly 97a1d083cd
[formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]]
Former-commit-id: 97a1d083cd
Former-commit-id: 4f64038c78
2012-07-31 09:16:23 -05:00
Nate Jensen
baff86f951
Issue #882 improved use of SimulatedTime
...
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: 4a2841b287
[formerly a65e9608fd
[formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]
Former-commit-id: a65e9608fd
Former-commit-id: 6f90bfa61c
2012-07-31 08:57:54 -05:00
Ron Anderson
c2937d7303
Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
...
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62
Former-commit-id: b1650b6143
[formerly 7c6686f2f4
[formerly 181fba1a75357aa39a54267c6df907075f4601dc]]
Former-commit-id: 7c6686f2f4
Former-commit-id: e9f24e8660
2012-07-31 08:36:27 -05:00
Ron Anderson
b1a633e121
Issue #851 removed obsolete GFE code.
...
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02
Former-commit-id: d87c0b6c4b
[formerly 35d140f0fb
[formerly c91b6fc2c506096f37f175e8196f9aaeb356141d]]
Former-commit-id: 35d140f0fb
Former-commit-id: 74478728de
2012-07-30 15:34:16 -05:00
Steve Harris
e6f4b3f257
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 4688ac304f
[formerly de9034c96c
[formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]
Former-commit-id: de9034c96c
Former-commit-id: 302aa05586
2012-07-27 14:50:45 -05:00
Steve Harris
7efcfa7d8d
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: 587bb6a274
[formerly 56249c2611
[formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]
Former-commit-id: 56249c2611
Former-commit-id: 07c40a9c0c
2012-07-27 14:44:44 -05:00
Nate Jensen
903803754a
Issue #882 fix auto updates, more efficiently set simulated time
...
Change-Id: I29f497df91920618e5271bf0ff436547d6225413
Former-commit-id: dbe185f3a0
[formerly 3d07fc8ebf
[formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]
Former-commit-id: 3d07fc8ebf
Former-commit-id: ac8d12ce13
2012-07-26 17:43:29 -05:00
Ben Steffensmeier
bbc96afc4b
Issue #924 fix some concurrency issues for GridResource
...
Former-commit-id: de742a4b8c
[formerly e18782687c
[formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]]
Former-commit-id: e18782687c
Former-commit-id: 78491d6318
2012-07-25 17:33:24 -05:00
Ben Steffensmeier
23fa86c332
Issue #921 register GFEColorbarResource as a listener when recycling.
...
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0
Former-commit-id: 044836cd2c
[formerly e3cfa52237
[formerly 90ce1b3643af750a19bc29156137f18848e7dc77]]
Former-commit-id: e3cfa52237
Former-commit-id: 7514bfd6cd
2012-07-24 11:29:51 -05:00
Ron Anderson
8b897c2bb0
Issue #851 Fixed issues with DatabaseID.dateFormat
...
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72
Former-commit-id: b52f1400ef
[formerly 1f2e581534
[formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]]
Former-commit-id: 1f2e581534
Former-commit-id: 21431b2693
2012-07-23 16:49:21 -05:00
Ben Steffensmeier
7a1573aab5
Issue #924 fix concurrency issues for Grid products
...
Former-commit-id: 9abd645758
[formerly 0b951d425d
[formerly 767173dc95dc811bc94081415a214803403985f5]]
Former-commit-id: 0b951d425d
Former-commit-id: 286274aed0
2012-07-19 17:37:15 -05:00
Ben Steffensmeier
e2931482a8
Issue #910 fix Memory Leak in GLDelegate Images, add Graphics memory logging.
...
Change-Id: I07635279472c5f4a605f00cbdde81e961eb9e757
Former-commit-id: 98218ec3cd
[formerly 5df07dac9f
[formerly e4d9419134f7fcfd47dfe84e55764309d3d65257]]
Former-commit-id: 5df07dac9f
Former-commit-id: 41860a891e
2012-07-19 17:12:31 -05:00
Steve Harris
b242dd98d6
12.7.1-8 baseline
...
Former-commit-id: c42ae0fa39
[formerly 16bf591a33
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: 16bf591a33
Former-commit-id: 11f96dbedd
2012-07-19 16:20:40 -05:00
Nate Jensen
8bde735797
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: 0fd6c7d56c
[formerly bad816a50e
[formerly 3786f2c0a7add2d36b27b92e2a8efd235b65e147]]
Former-commit-id: bad816a50e
Former-commit-id: 127feeb545
2012-07-19 15:31:55 -05:00
Max Schenkelberg
9ac745e1f4
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: d8971a72fd
[formerly c8909c0fbc
[formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]]
Former-commit-id: c8909c0fbc
Former-commit-id: 0cfd8834c2
2012-07-19 11:45:01 -05:00
Ben Steffensmeier
2daf72edf2
Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing.
...
Former-commit-id: eab4b1cd78
[formerly 144dd7bab9
[formerly 84055039ccd601f4be4546f97cde99faf33b7818]]
Former-commit-id: 144dd7bab9
Former-commit-id: 53f915c3e4
2012-07-18 17:53:51 -05:00
Roger Ferrel
45a8ef3971
Issue #875 Modfications to prevent null pointer exeception when no map displayed.
...
Change-Id: Ia20c00021c3c2741b30679c72c01b245cdb4c504
Former-commit-id: 3cfd8547b4
[formerly c908de0d82
[formerly 7eaa2860847149879bb62a637e6677675dd5c7ec]]
Former-commit-id: c908de0d82
Former-commit-id: 44a3176dd6
2012-07-16 11:10:23 -05:00
Nate Jensen
39d65bbdbd
Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
...
Former-commit-id: 1b3d6560e4
[formerly c0dad4432c
[formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]]
Former-commit-id: c0dad4432c
Former-commit-id: da1e9ae3c3
2012-07-12 17:17:57 -05:00
Ben Steffensmeier
e565237b63
Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
...
Former-commit-id: 8984b35ff8
[formerly ea0c7046af
[formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]]
Former-commit-id: ea0c7046af
Former-commit-id: 45a1cc1997
2012-07-12 13:35:52 -05:00
Roger Ferrel
cc1aecde2f
Issue #875 - Create com.raytheon.uf.viz.points
...
Amend: fixing code per review comments
Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627
Former-commit-id: 9071334fe9
[formerly 0cf7d64cf4
[formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]
Former-commit-id: 0cf7d64cf4
Former-commit-id: bfcefac909
2012-07-12 11:32:03 -05:00
Bryan Kowal
291a674e41
Merge branch 'merge_development' into development
...
Former-commit-id: b27994c9b1
[formerly 051a51b79c
[formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]]
Former-commit-id: 051a51b79c
Former-commit-id: 226818bda5
2012-07-10 17:03:21 -05:00
Bryan Kowal
2acacb211a
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: f92eb59a73
[formerly 99d22f395a
[formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]
Former-commit-id: 99d22f395a
Former-commit-id: c629f18f24
2012-07-10 16:57:16 -05:00
Nate Jensen
596d51ad4b
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: ee43626e2e
[formerly 2af538f200
[formerly 95d4cacc92bbf5531ca54c3a4dda811ea402ac84]]
Former-commit-id: 2af538f200
Former-commit-id: 85350ace5e
2012-07-10 16:06:28 -05:00
Ben Steffensmeier
0a7be21041
Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
...
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998
Former-commit-id: 79ab850efa
[formerly 74a69d1fb9
[formerly 009e769a180898cb62e9df4a604b40e139cf2886]]
Former-commit-id: 74a69d1fb9
Former-commit-id: 5bf019e1bb
2012-07-10 16:04:56 -05:00
Steve Harris
a456af38fa
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: 9454393d13
[formerly 479ccdbed2
[formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]
Former-commit-id: 479ccdbed2
Former-commit-id: 8fff0d7e53
2012-07-10 09:29:33 -05:00
Steve Harris
32fdf6ed3b
12.6.1-9 baseline
...
Former-commit-id: 27afa60345
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
2012-07-10 07:53:49 -05:00
Bryan Kowal
708a753282
Issue #862 - fix java error.
...
Former-commit-id: 748c121036
[formerly 2ec61df191
[formerly 9e5b18d03a18d7af849efb9b1cf3f1c25a9252a8]]
Former-commit-id: 2ec61df191
Former-commit-id: adcd49b090
2012-07-09 09:40:40 -05:00
Max Schenkelberg
3bff06cf92
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: 98c2ec7dc5
[formerly 9bbb68a547
[formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]
Former-commit-id: 9bbb68a547
Former-commit-id: 7d13c7d339
2012-07-06 16:01:47 -05:00
Ron Anderson
9667367c3c
Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures.
...
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97
Former-commit-id: e71059c2b9
[formerly d3e0cd5af8
[formerly ff032c53a059f25558aabdc5b483c4cc59ad3f6e]]
Former-commit-id: d3e0cd5af8
Former-commit-id: d68ece4d55
2012-07-05 16:32:44 -05:00
Ron Anderson
b4c02fd246
Issue #851 Cleaned up dead code and unused dependencies in GFE.
...
Amend: Issue #851 resubmitting after accepting ticket
Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e
Former-commit-id: 59a3ebe8ba
[formerly ff5c7b7498
[formerly af1332170e28aed53ff91997ce089b20423203d5]]
Former-commit-id: ff5c7b7498
Former-commit-id: 936b2cabca
2012-07-05 15:39:05 -05:00
Nate Jensen
7e34a3e6ab
Issue #716 remove dead plugin from features
...
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f
Former-commit-id: 7046ba996a
[formerly bcedcc51fa
[formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]
Former-commit-id: bcedcc51fa
Former-commit-id: e58404bcb5
2012-06-29 13:19:47 -05:00
Nate Jensen
314910c88f
Issue #716 fix feature location of smack and remove dead dir
...
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702
Former-commit-id: 24b40c3392
[formerly 315594cab4
[formerly eabc44141aa681503d6076ebf779536ff27e62f2]]
Former-commit-id: 315594cab4
Former-commit-id: eb2c21c15d
2012-06-28 17:57:17 -05:00
Max Schenkelberg
f0f4ad8039
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: a3014f6ec3
[formerly 62bd4a667a
[formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]
Former-commit-id: 62bd4a667a
Former-commit-id: e1d23a56a9
2012-06-28 15:29:05 -05:00
Nate Jensen
d45000e600
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: 24a4ef99a7
[formerly ed08428483
[formerly 41f21e357b6aacc42ff01a93a85f50c68c2c890b]]
Former-commit-id: ed08428483
Former-commit-id: 6dcea3d733
2012-06-28 14:16:28 -05:00
Ben Steffensmeier
a93f42b3ec
Issue #704 remove obsolete edex kml and add kml to develoepr feature
...
Former-commit-id: 6f2e2b2cea
[formerly 79ba6c2cd5
[formerly 067bfaab551c3c061ecfa8defba7d90c3e34b81a]]
Former-commit-id: 79ba6c2cd5
Former-commit-id: b7326d0979
2012-06-28 14:07:48 -05:00
Ben Steffensmeier
f9e9d6d938
Issue #704 introduce canvas based rendering for making KML screen overlays
...
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def
Former-commit-id: 881896c21b
[formerly 02e2c7b579
[formerly bb83a95f5f00cce75b47e7fab084cf3258f65aba]]
Former-commit-id: 02e2c7b579
Former-commit-id: e3c0387f6e
2012-06-28 13:58:29 -05:00
Max Schenkelberg
4b91c8e169
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: 668838364d
[formerly 84ae717563
[formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]
Former-commit-id: 84ae717563
Former-commit-id: 53fd2ec047
2012-06-28 11:53:21 -05:00
Bryan Kowal
4ce58fa303
Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
...
Former-commit-id: 5fe8bd69f8
[formerly 4acb1d8693
[formerly 403599d216e643dba2fcae0883f32987c7bade3f]]
Former-commit-id: 4acb1d8693
Former-commit-id: 873ee341f5
2012-06-27 18:38:19 -05:00
Bryan Kowal
455d7b90a9
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: b87b66abc5
[formerly a33740e915
[formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: a33740e915
Former-commit-id: b1b294c401
2012-06-27 17:21:48 -05:00
Bryan Kowal
466046f605
Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
...
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55
Former-commit-id: 98fdfa6f37
[formerly f7d19019a9
[formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]]
Former-commit-id: f7d19019a9
Former-commit-id: 1e06e23eca
2012-06-27 16:22:53 -05:00
Bryan Kowal
687c8e9968
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: 53e5b7c491
[formerly 4a17650914
[formerly 9597fdac96022c94dad425367de23eafedad06bc]]
Former-commit-id: 4a17650914
Former-commit-id: 072c88b382
2012-06-27 15:04:34 -05:00
David Gillingham
4a32c3b1f1
Issue #766 : Merge VCModule refactor and Python globals memory leak fix to common baseline.
...
Former-commit-id: 672d7a2c31
[formerly 2a0ffc5311
[formerly 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d]]
Former-commit-id: 2a0ffc5311
Former-commit-id: 768afb8423
2012-06-26 17:49:06 -05:00