Steve Harris
b2432e096f
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
...
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: f0b7d5e4c585f82b18b3
2012-08-06 09:38:26 -05:00
Steve Harris
d5563fc340
12.8.1-10 baseline
...
Former-commit-id: b5e8fee24dca25d508ec
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
f26cce33a9
Issue #1006 Implemented urban areas.
...
Former-commit-id: dbd30e3b6762db15b6f4
2012-08-06 08:41:52 -05:00
Steve Harris
8f4ddad22c
Merge branch 'development' into development_on_ss_builds
...
Former-commit-id: 24799cd93da1071e3204
2012-08-06 08:23:04 -05:00
Ben Steffensmeier
6ccc09e0b4
Issue #988 set statem bits on underlieing image for GLDelegate Image
...
Former-commit-id: 0f7dd0f4cd5fe65c6538
2012-08-03 16:39:33 -05:00
Ben Steffensmeier
942b0e5315
Issue #978 GChange GridResource to use its own times rather than descriptor times.
...
Former-commit-id: 8346805ed2090b9f5ccb
2012-08-03 15:52:47 -05:00
Richard Peter
c61f4f8245
Merge "Issue #798 - Force interpolationLevels in derived satellite" into development
...
Former-commit-id: fd051c19d4131ba842e9
2012-08-03 14:32:35 -05:00
James Korman
b27f4fb5e5
Issue #798 - Force interpolationLevels in derived satellite
...
Former-commit-id: 1bc1784478317acc38fe
2012-08-03 14:14:53 -05:00
Ben Steffensmeier
e9cde98072
Issue #1001 synchronize paint with add.
...
Former-commit-id: 2c9737ca5c798d26e954
2012-08-03 14:10:04 -05:00
Steve Harris
3476fe755b
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: 6d77b9421751e38ca887
2012-08-01 12:43:12 -05:00
Max Schenkelberg
74f0179b92
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: f635e9c332cc0a1fbca3
2012-08-01 10:51:32 -05:00
Steve Harris
e0c3722fd1
12.8.1-5 baseline
...
Former-commit-id: fd2abfb6f1cd49ef3eda
2012-08-01 10:45:37 -05:00
James Korman
5df52e38f9
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 38a2e426d94cbbc59278
2012-07-31 13:38:23 -05:00
Richard Peter
c379c2f884
Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
...
Former-commit-id: 97a1d083cd8631b64e75
2012-07-31 09:16:23 -05:00
Nate Jensen
8fa0eb70db
Issue #882 improved use of SimulatedTime
...
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: a65e9608fd4a2841b287
2012-07-31 08:57:54 -05:00
Ron Anderson
6a3e6f599f
Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
...
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62
Former-commit-id: 7c6686f2f4b1650b6143
2012-07-31 08:36:27 -05:00
Ron Anderson
6b7f1b3611
Issue #851 removed obsolete GFE code.
...
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02
Former-commit-id: 35d140f0fbd87c0b6c4b
2012-07-30 15:34:16 -05:00
Steve Harris
b82d6772c3
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: de9034c96c4688ac304f
2012-07-27 14:50:45 -05:00
Steve Harris
2aa4114e4d
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: 56249c2611587bb6a274
2012-07-27 14:44:44 -05:00
Nate Jensen
67edb6917d
Issue #882 fix auto updates, more efficiently set simulated time
...
Change-Id: I29f497df91920618e5271bf0ff436547d6225413
Former-commit-id: 3d07fc8ebfdbe185f3a0
2012-07-26 17:43:29 -05:00
Ben Steffensmeier
3e9abe8682
Issue #924 fix some concurrency issues for GridResource
...
Former-commit-id: e18782687cde742a4b8c
2012-07-25 17:33:24 -05:00
Ben Steffensmeier
6f9ec1af50
Issue #921 register GFEColorbarResource as a listener when recycling.
...
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0
Former-commit-id: e3cfa52237044836cd2c
2012-07-24 11:29:51 -05:00
Ron Anderson
bc034e1863
Issue #851 Fixed issues with DatabaseID.dateFormat
...
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72
Former-commit-id: 1f2e581534b52f1400ef
2012-07-23 16:49:21 -05:00
Ben Steffensmeier
cb08c202ef
Issue #924 fix concurrency issues for Grid products
...
Former-commit-id: 0b951d425d9abd645758
2012-07-19 17:37:15 -05:00
Ben Steffensmeier
10706db0b1
Issue #910 fix Memory Leak in GLDelegate Images, add Graphics memory logging.
...
Change-Id: I07635279472c5f4a605f00cbdde81e961eb9e757
Former-commit-id: 5df07dac9f98218ec3cd
2012-07-19 17:12:31 -05:00
Steve Harris
9f97182964
12.7.1-8 baseline
...
Former-commit-id: 16bf591a33c42ae0fa39
2012-07-19 16:20:40 -05:00
Nate Jensen
33611406a4
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: bad816a50e0fd6c7d56c
2012-07-19 15:31:55 -05:00
Max Schenkelberg
bc0ec0455d
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: c8909c0fbcd8971a72fd
2012-07-19 11:45:01 -05:00
Ben Steffensmeier
1393fa1d14
Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing.
...
Former-commit-id: 144dd7bab9eab4b1cd78
2012-07-18 17:53:51 -05:00
Roger Ferrel
aa7b01b330
Issue #875 Modfications to prevent null pointer exeception when no map displayed.
...
Change-Id: Ia20c00021c3c2741b30679c72c01b245cdb4c504
Former-commit-id: c908de0d823cfd8547b4
2012-07-16 11:10:23 -05:00
Nate Jensen
565100d787
Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
...
Former-commit-id: c0dad4432c1b3d6560e4
2012-07-12 17:17:57 -05:00
Ben Steffensmeier
1c68f4e01e
Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
...
Former-commit-id: ea0c7046af8984b35ff8
2012-07-12 13:35:52 -05:00
Roger Ferrel
b3df932794
Issue #875 - Create com.raytheon.uf.viz.points
...
Amend: fixing code per review comments
Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627
Former-commit-id: 0cf7d64cf49071334fe9
2012-07-12 11:32:03 -05:00
Bryan Kowal
fa5eb7a16a
Merge branch 'merge_development' into development
...
Former-commit-id: 051a51b79cb27994c9b1
2012-07-10 17:03:21 -05:00
Bryan Kowal
580172b47c
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: 99d22f395af92eb59a73
2012-07-10 16:57:16 -05:00
Nate Jensen
3fbdc016c5
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: 2af538f200ee43626e2e
2012-07-10 16:06:28 -05:00
Ben Steffensmeier
4182352f8c
Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
...
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998
Former-commit-id: 74a69d1fb979ab850efa
2012-07-10 16:04:56 -05:00
Steve Harris
330b9c3174
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: 479ccdbed29454393d13
2012-07-10 09:29:33 -05:00
Steve Harris
4f7bb90bb0
12.6.1-9 baseline
...
Former-commit-id: 2c0ff851ca27afa60345
2012-07-10 07:53:49 -05:00
Bryan Kowal
8c8dcd0b81
Issue #862 - fix java error.
...
Former-commit-id: 2ec61df191748c121036
2012-07-09 09:40:40 -05:00
Max Schenkelberg
7286b4e962
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: 9bbb68a54798c2ec7dc5
2012-07-06 16:01:47 -05:00
Ron Anderson
473e6e9eb2
Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures.
...
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97
Former-commit-id: d3e0cd5af8e71059c2b9
2012-07-05 16:32:44 -05:00
Ron Anderson
0c5199ba03
Issue #851 Cleaned up dead code and unused dependencies in GFE.
...
Amend: Issue #851 resubmitting after accepting ticket
Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e
Former-commit-id: ff5c7b749859a3ebe8ba
2012-07-05 15:39:05 -05:00
Nate Jensen
63c5c4dc33
Issue #716 remove dead plugin from features
...
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f
Former-commit-id: bcedcc51fa7046ba996a
2012-06-29 13:19:47 -05:00
Nate Jensen
d125185d28
Issue #716 fix feature location of smack and remove dead dir
...
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702
Former-commit-id: 315594cab424b40c3392
2012-06-28 17:57:17 -05:00
Max Schenkelberg
9328717a1a
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: 62bd4a667aa3014f6ec3
2012-06-28 15:29:05 -05:00
Nate Jensen
afd37ef8b8
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: ed0842848324a4ef99a7
2012-06-28 14:16:28 -05:00
Ben Steffensmeier
1513500d7b
Issue #704 remove obsolete edex kml and add kml to develoepr feature
...
Former-commit-id: 79ba6c2cd56f2e2b2cea
2012-06-28 14:07:48 -05:00
Ben Steffensmeier
b0f5013c7c
Issue #704 introduce canvas based rendering for making KML screen overlays
...
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def
Former-commit-id: 02e2c7b579881896c21b
2012-06-28 13:58:29 -05:00
Max Schenkelberg
e3524fd4df
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: 84ae717563668838364d
2012-06-28 11:53:21 -05:00
