xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1676 commits 31 branches 40 tags 3.8 GiB
Commit graph

127 commits

Author SHA1 Message Date
Bryan Kowal
147cf7902b Issue #1469 - updated for compatibility with recent changes to Pypies. 
Former-commit-id: d710e987e4 [formerly 02c16b6f3d [formerly 417ecdcc5b9907b95856571d5d03fa12099eb3f6]]
Former-commit-id: 02c16b6f3d
Former-commit-id: 90b9cf9804
 2013-01-15 16:09:42 -06:00
Bryan Kowal
1414f0415b Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict. 
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: 4db9c6c321 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]
Former-commit-id: e2a12845d3
Former-commit-id: fba28ea69b
 2013-01-15 14:56:01 -06:00
Richard Peter
4e1f66abb3 Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: 1318f53902
Former-commit-id: ae3ea75cbf
 2013-01-14 17:38:38 -06:00
Steve Harris
5aaacf4eec 13.1.2-8 baseline 
Former-commit-id: 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: e6217a17de
Former-commit-id: b864fdc303
 2013-01-11 16:19:07 -05:00
Steve Harris
0b15dff12b 13.1.2-7 baseline 
Former-commit-id: 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 4f86b07eb0
Former-commit-id: a8d90da9c0
 2013-01-11 16:12:09 -05:00
Ben Steffensmeier
b6e5e160ea Issue #1362 add null chack in nsharp mouse handler. 
Former-commit-id: a836aee481 [formerly 1186724fa8 [formerly 4ae38765c9a6815050d30b307b4a364b617c49aa]]
Former-commit-id: 1186724fa8
Former-commit-id: b05bf7b6e2
 2013-01-08 18:17:24 -06:00
Steve Harris
1d4d25b49b 13.1.2-6 baseline 
Former-commit-id: 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
 2013-01-06 14:55:11 -06:00
Steve Harris
e8f4a2f031 13.1.2-2 baseline 
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
 2013-01-06 14:32:24 -06:00
Max Schenkelberg
656a4500eb Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor. 
Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde

Former-commit-id: 7e3273db95 [formerly fabb9bbcff [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]
Former-commit-id: fabb9bbcff
Former-commit-id: 08160fff31
 2012-12-20 17:14:34 -06:00
Steve Harris
d27c5237c3 Merge branch 'ss_builds' (12.12.1-12) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: 43ddfe98c4
Former-commit-id: 4d4771ee3a
 2012-12-11 08:45:53 -06:00
Steve Harris
8790caf84e 12.12.1-8 baseline 
Former-commit-id: 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 19962f41ba
Former-commit-id: 2d338b4cec
 2012-12-06 09:02:51 -06:00
Max Schenkelberg
a113ecd2ea Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins 
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: ed77d56a84 [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]
Former-commit-id: b648c5828e
Former-commit-id: 56ae27e172
 2012-11-29 10:29:36 -06:00
Nate Jensen
c4cc7b638c Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development 
Former-commit-id: 31637efbbc [formerly 49c2079963 [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]
Former-commit-id: 49c2079963
Former-commit-id: 0398aeaa5b
 2012-11-14 16:09:00 -06:00
Dustin Johnson
069c8d4788 Merge branch 'ss_builds' (12.12.1-4) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: bff32bbe58
Former-commit-id: d27bce13c2
 2012-11-14 14:41:57 -06:00
Steve Harris
b968ab5135 12.12.1-4 baseline 
Former-commit-id: 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 85130eb611
Former-commit-id: b91b7f0fae
 2012-11-14 14:19:20 -06:00
Ben Steffensmeier
233398088a Issue #189 changes to mappings and ncep merge from code review 
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 2d864c3b09 [formerly 2c8f3f09ac [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]
Former-commit-id: 2c8f3f09ac
Former-commit-id: 3d126b41e1
 2012-11-14 12:22:53 -06:00
Ben Steffensmeier
c17b92afc5 Issue #189 merge ncep changes to unified grid. 
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: fbed67a208 [formerly e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]
Former-commit-id: e6b0751f5c
Former-commit-id: f62cf2713d
 2012-11-08 14:34:55 -06:00
Dustin Johnson
acd4cf94d8 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
 2012-11-08 09:57:16 -06:00
Steve Harris
8278cac143 12.12.1-1 baseline 
Former-commit-id: e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
 2012-11-07 12:41:20 -06:00
Dustin Johnson
7d0e4a6e75 Issue #1302 Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
 2012-11-01 13:36:06 -05:00
Richard Peter
b2989eb90f Issue #1257: Update PurgeRules to not be hard linked to path keys 
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 886375172b [formerly 275398778f [formerly 73bca27407552c864765d5924e8609a253493f4c]]
Former-commit-id: 275398778f
Former-commit-id: 5787d6278d
 2012-10-31 18:19:44 -05:00
Ben Steffensmeier
c789e1fd94 merge branch Unifeid_Grid into developement 
Former-commit-id: b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: d0a2ed32b5
Former-commit-id: 272e057bf1
 2012-10-30 12:24:54 -05:00
Ben Steffensmeier
1a215cb42a merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: 6a9ff88b33
Former-commit-id: 4f503d3a1e
 2012-10-25 12:22:11 -05:00
Ben Steffensmeier
ed69bb3056 Issue #189 modify nsharp to use grid data. 
Former-commit-id: db1efee514 [formerly 52c37c114a [formerly 4c364f429bbcaddfa1f23ae31a95ca25cb6baef9]]
Former-commit-id: 52c37c114a
Former-commit-id: 190e27205c
 2012-10-24 13:07:41 -05:00
Steve Harris
bb8fe6e556 12.11.1-5 baseline 
Former-commit-id: a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: 03f3f3c36a
Former-commit-id: 362d6ffaca
 2012-10-18 15:46:42 -05:00
Steve Harris
6e44abdba1 12.11.1-4 baseline 
Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
 2012-10-16 13:27:07 -05:00
Richard Peter
c3961853ba Issue #1257: Fix NSharp point retrieval 
Change-Id: I50e27a10c987dfb373c8431bff7a18f50563f4b4

Former-commit-id: 3fa2a8b894 [formerly 25fe0aef5b [formerly 3a6ee9b778035d62285be6d1e5ff08f240ba8c51]]
Former-commit-id: 25fe0aef5b
Former-commit-id: ca878b536f
 2012-10-15 19:40:20 -05:00
Richard Peter
202c7b885e Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path. 
Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f

Former-commit-id: bcb0560291 [formerly ca0c9b7502 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]
Former-commit-id: ca0c9b7502
Former-commit-id: 12bcfbda80
 2012-10-15 09:52:14 -05:00
Ben Steffensmeier
a67ce9586c Merge branch 'ss_builds' into Unified_Grid 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]
Former-commit-id: 8b7256b1ae
Former-commit-id: de3769129c
 2012-10-12 12:45:50 -05:00
Ben Steffensmeier
ca08938dbb Issue #1217 commit code from Ncep to fix the problem 
Former-commit-id: bb7b9d18e0 [formerly d566733aae [formerly 608994193c845cfc60431b3c416c61736189a160]]
Former-commit-id: d566733aae
Former-commit-id: 71704d7298
 2012-10-09 16:20:39 -05:00
Ben Steffensmeier
53024843e6 Issue #1131 merge latest changes to nsharp from ncep 
Change-Id: I784a0f60d63b6598457f9c53e466888506b7f320

Former-commit-id: 01a13dee33 [formerly b266c68be3 [formerly 3c62033bdd4129c718c30af78576a8f850398f01]]
Former-commit-id: b266c68be3
Former-commit-id: 95f23ebe70
 2012-09-28 15:35:11 -05:00
Steven Harris
ffe3641057 12.11.1-1 baseline 
Former-commit-id: feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: 618aa3f316
Former-commit-id: 0e86bfd1d3
 2012-09-27 15:57:45 -05:00
Ben Steffensmeier
6594ab0fbf Issue #1213 update nsharp resources to clear target on dispose. 
Former-commit-id: 752a0078d4 [formerly 60ca8a3011 [formerly b1df98f68b5927d71230efa6f1f49ba3023a9a6f]]
Former-commit-id: 60ca8a3011
Former-commit-id: cfc9e5e78c
 2012-09-25 10:54:57 -05:00
Ben Steffensmeier
f68919cd08 Issue #1131 merge multipane nsharp into D2D. 
Former-commit-id: 2606f968cb [formerly c04649842a [formerly 14310917dffa9bb2a805f3ff8fc98ccfdd1c9d92]]
Former-commit-id: c04649842a
Former-commit-id: cb6b9dda23
 2012-09-20 17:28:54 -05:00
Ben Steffensmeier
9eecab65c0 Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin 
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]
Former-commit-id: bd8eb7fc15
Former-commit-id: 4fe2127bfb
 2012-09-18 15:19:05 -05:00
Max Schenkelberg
5e94274b98 Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed. 
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d

Former-commit-id: 2f8f1ce9b2 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]
Former-commit-id: 7294025e26
Former-commit-id: a6cc869ada
 2012-09-11 16:27:41 -05:00
Steve Harris
0403e7d0a9 12.10.1-3 baseline 
Former-commit-id: 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 21f430062b
Former-commit-id: de1639aea2
 2012-09-11 16:00:38 -05:00
Steve Harris
319927240c Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]
Former-commit-id: bba4eb12d0
Former-commit-id: 0e046d847a
 2012-09-04 12:11:03 -05:00
Steve Harris
7248f8b762 12.10.1-1 baseline 
Former-commit-id: d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: 195158c004
Former-commit-id: 0abf64b77c
 2012-09-04 12:07:27 -05:00
Steve Harris
772c4359da Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development 
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: 91e39617cb
Former-commit-id: 51eb89eb2a
 2012-08-27 09:53:55 -05:00
Steve Harris
77cbd6c1e5 12.9.1-5 baseline 
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
 2012-08-21 15:27:03 -05:00
Ben Steffensmeier
977d5587cb Issue #666 fix collaboration message compose problems with ncp keybindings 
Former-commit-id: 8e971abbd8 [formerly 3f0b2e474c [formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]
Former-commit-id: 3f0b2e474c
Former-commit-id: 25b00010e1
 2012-08-17 16:16:20 -05:00
Steve Harris
b9fb1c89d4 12.9.1-1 baseline 
Former-commit-id: 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
 2012-08-15 13:59:00 -05:00
Steve Harris
7e89b04a10 Merge branch 'development' into development_on_ss_builds 
Former-commit-id: a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]
Former-commit-id: 24799cd93d
Former-commit-id: 54c505dd8e
 2012-08-06 08:23: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
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
Nate Jensen
3db2a3fe6a Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu 
Change-Id: I103017fef97b6f7992f753eb17737201bf0a4f64

Former-commit-id: 69f51e6e87 [formerly ae7c427b4b [formerly e3b8f1e0c5d1e5d9fa7446124bc7c3c0b98a967c]]
Former-commit-id: ae7c427b4b
Former-commit-id: 8539a075bb
 2012-07-31 10:02:39 -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
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
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