Matt Nash
d2fe46ce1a
Issue #1273 product browser re-orders for all applicable data types
...
Change-Id: I8612578d239119e9df22724ebb0bc100cf7826af
Former-commit-id: 3ec3104feb5fa53027393f2c49728673a0b0da753f2c49728673a0b0da751b2d3d642d7687db01f4
2012-11-29 09:54:50 -06:00
Roger Ferrel
588a4f7da3
Issue #1298 Plugin changes to get localization import of files to work for test procedures.
...
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d
Former-commit-id: 3e7d2cc03cac09c59d382a1024ff50230e24addc2a1024ff50230e24addcea3b2aebc60011eb0ff4
2012-11-27 10:37:06 -06:00
Ben Steffensmeier
5e691cd77e
Issue #1316 pass original constraints through when doing time queries in derived parameters.
...
Former-commit-id: a1d2334cc2a1fc232a197061c6db78f6a502fb787061c6db78f6a502fb7859a00a75f927b77f735d
2012-11-21 14:21:01 -06:00
Max Schenkelberg
91607fb03e
Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
...
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.
Amend: Rebased
Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567
Former-commit-id: 61f0c0501bfe11e31bfbdcde9e895128e61c8285dcde9e895128e61c82852e20c3e7995aa26e4f13
2012-11-14 16:19:37 -06:00
Ben Steffensmeier
0ee5726a56
merge branch Unifeid_Grid into developement
...
Former-commit-id: c789e1fd94272e057bf1d0a2ed32b5b6a1563bb2d0a2ed32b5b6a1563bb292fd247ccc1d94435220
2012-10-30 12:24:54 -05:00
Steve Harris
81db247276
Merge branch 'ss_builds' (12.11.1-6) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 95727755c73eff876edda7337d91601807100932a7337d91601807100932892e4df8118486da2fd3
2012-10-18 16:01:05 -05:00
Steve Harris
ae73939b02
12.11.1-6 baseline
...
Former-commit-id: 58cd1e90f830c786a885fba4a443a05c1f3cdc46fba4a443a05c1f3cdc4608fc9f6b148beb6fc0b8
2012-10-18 15:53:01 -05:00
Steve Harris
1b5f2c2f54
Merge branch 'ss_builds' (12.11.1-3) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.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/WarngenDialog.java
Former-commit-id: 6659a96ac68b7665418a0a42cb87a463ffdac2b70a42cb87a463ffdac2b763da835aeff0121b6fa8
2012-10-16 09:20:37 -05:00
Steve Harris
7fcbb49a3e
12.11.1-3 baseline
...
Former-commit-id: a65c057df5196afa0e5f2d0c4247135d796f775c2d0c4247135d796f775c5723fb0031725b2f8ba5
2012-10-15 16:30:31 -05:00
Ben Steffensmeier
97c23508d7
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: a67ce9586cde3769129c8b7256b1ae266a2f317f8b7256b1ae266a2f317ffed5a35af3fde1e73d58
2012-10-12 12:45:50 -05:00
Ben Steffensmeier
21ce531c20
Issue #189 minor fixes to grid for issues discovered during dev tests
...
Former-commit-id: 735099e934fa380d06c123da6e6494509c09ebb023da6e6494509c09ebb059754c0f6a4cacd4a7b1
2012-10-10 16:32:36 -05:00
Ben Steffensmeier
32ebb2c4c7
Issue #1151 move alert parsing into the resource data so that it can clear the time cache for derived alerts.
...
Change-Id: Iba5b641fbd6e8fa3657a7dd2311ae18cf63456f8
Former-commit-id: c3d732b9ddb4d7183cdd42ae490a50b6e124f83042ae490a50b6e124f8302cdb3553e9fdddbebddc
2012-10-05 14:28:35 -05:00
Ben Steffensmeier
3f98be967a
Issue #189 Make Derived parameters spatially aware
...
Former-commit-id: f57e004fc502ee622165317696c66f8682b30383317696c66f8682b303832f6b9f6188f01d6242ce
2012-09-27 17:01:32 -05:00
Steven Harris
9c67bbab77
12.11.1-1 baseline
...
Former-commit-id: ffe36410570e86bfd1d3618aa3f316feec28f274618aa3f316feec28f2748843ffd022f5e63d5f93
2012-09-27 15:57:45 -05:00
James Korman
0e296ab1ba
Issue #1172 - Corrected update problem
...
Change-Id: Id600728f8f9352b9c44c261c24bf1af8ae6c8e32
Former-commit-id: 60d3a9299526ed32cb19c228b73624f0eafc3839c228b73624f0eafc38395c79be21d8f90f5fadb1
2012-09-14 09:46:08 -05:00
Steve Harris
20e088a957
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: 319927240c0e046d847abba4eb12d0af106f1d29bba4eb12d0af106f1d2953e29f59e4f224e3e8ad
2012-09-04 12:11:03 -05:00
Steve Harris
9f4fa7bf83
12.10.1-1 baseline
...
Former-commit-id: 7248f8b7620abf64b77c195158c004d708932029195158c004d7089320297bd9c63dc7e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
fd6e8d5b63
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: 772c4359da51eb89eb2a91e39617cba71dac6cad91e39617cba71dac6cad87a602dfeedbcb28ce77
2012-08-27 09:53:55 -05:00
Steve Harris
d9faed979f
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac3942872824561cb7fb0b17bd5
2012-08-21 15:27:03 -05:00
root
791f3f5b85
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: bb7b5341dd0987fc6b3dcb46f578795a453ee984cb46f578795a453ee9848a66b2f209537dbadf64
2012-08-15 22:15:20 +00:00
Steve Harris
80655bf0a3
12.9.1-4 baseline
...
Former-commit-id: 71b024e3a136c108e960dcda3a229033b95fb96ddcda3a229033b95fb96d9990bf909bd7d60cc623
2012-08-15 15:19:10 -05:00
Ben Steffensmeier
3df0e4d6e8
Issue #1004 change plots to synchronize with dispose instead of joining since join allows paint to happen
...
Change-Id: I6011a5fedc155ab8d515d3c6eb5d368f582c59bd
Former-commit-id: 9aa0da6f766f178a9150603a9c90e4559efb19fb603a9c90e4559efb19fb3f258a2bf8d52dd42ab2
2012-08-13 09:54:22 -05:00
Ben Steffensmeier
400324692e
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
...
Former-commit-id: 4ac95d6f30573cc270e8c6a121962f1e527f83f0c6a121962f1e527f83f0c9ff69014b0af9fd4fe2
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
cf4e07b55c
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: 702f11b85d8d118c392a525c0b21a9b53fe917bc525c0b21a9b53fe917bc4ed3d04e6454b3078ad1
2012-08-09 17:50:23 -05:00
Ben Steffensmeier
445232b6d5
Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
...
Former-commit-id: c2732bff323f92e385a63abfef55ccc1bacb33b13abfef55ccc1bacb33b1f711cfdae20e48e6e4fd
2012-08-09 17:45:19 -05:00
Ben Steffensmeier
66f4ccc09b
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
...
Former-commit-id: 16187575d764caa963b1066a5af2a6ad1415948f066a5af2a6ad1415948f65c33256d9e03eb5f5c9
2012-08-09 17:16:38 -05:00
Ben Steffensmeier
a35bdcb526
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: ee8a4896bdcac790ac5a97ba96759c5da238c8b997ba96759c5da238c8b9b6cc71bf758cdf1f8d1c
2012-08-08 14:41:33 -05:00
Ben Steffensmeier
b7d35b54b4
Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
...
Former-commit-id: d84fd21e2a0a974b26c2c9774a4f0383d6cde368c9774a4f0383d6cde368ea70488664f47d533ac3
2012-08-07 12:03:13 -05:00
Steve Harris
330c7a877c
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: 0557c9a0c6fb479341596d77b9421751e38ca8876d77b9421751e38ca8873476fe755bd2291ba23f
2012-08-01 12:43:12 -05:00
Steve Harris
4f47148ced
12.8.1-5 baseline
...
Former-commit-id: 2e804fc8c42653ddc2e3fd2abfb6f1cd49ef3edafd2abfb6f1cd49ef3edae0c3722fd1dab00b12e6
2012-08-01 10:45:37 -05:00
Nate Jensen
6d8ac0455e
Issue #882 improved use of SimulatedTime
...
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: baff86f9516f90bfa61ca65e9608fd4a2841b287a65e9608fd4a2841b2878fa0eb70db7d478ac74c
2012-07-31 08:57:54 -05:00
Steve Harris
e9f4d5b474
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: e6f4b3f257302aa05586de9034c96c4688ac304fde9034c96c4688ac304fb82d6772c3f2ab9cfe1a
2012-07-27 14:50:45 -05:00
Steve Harris
c18e221e26
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: 7efcfa7d8d07c40a9c0c56249c2611587bb6a27456249c2611587bb6a2742aa4114e4d9e4df42326
2012-07-27 14:44:44 -05:00
Nate Jensen
f66f383270
Issue #882 fix auto updates, more efficiently set simulated time
...
Change-Id: I29f497df91920618e5271bf0ff436547d6225413
Former-commit-id: 903803754aac8d12ce133d07fc8ebfdbe185f3a03d07fc8ebfdbe185f3a067edb6917d4e0a0f10dc
2012-07-26 17:43:29 -05:00
Steve Harris
e1eb7f5972
12.7.1-8 baseline
...
Former-commit-id: b242dd98d611f96dbedd16bf591a33c42ae0fa3916bf591a33c42ae0fa399f97182964f2102bfb24
2012-07-19 16:20:40 -05:00
Steve Harris
e528bb0df2
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b7c064b68682c0ff851ca27afa603452c0ff851ca27afa603454f7bb90bb0dc50bc8443
2012-07-10 07:53:49 -05:00
Bryan Kowal
dfd75b4c72
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: 455d7b90a9b1b294c401a33740e915b87b66abc5a33740e915b87b66abc59a7d0492feb4917e6708
2012-06-27 17:21:48 -05:00
Ben Steffensmeier
91dce6f33f
Issue #704 fixes to plots/MPE to work better in KML
...
Former-commit-id: 81111548192b6e1fa5b632627cf132b01be5085f32627cf132b01be5085f67ba3ee6f68517eafdf4
2012-06-22 17:54:31 -05:00
Steve Harris
944e3148d4
Revert "12.6.1-10 baseline"
...
This reverts commit 530dfc0563f8497470fcb33c5bdfcfa2c0893d1a16fd236f2d06f1c7b73cddde63eee0a2c0893d1addde63eee0584f7eddf862cf6a9f92b4b1f6975f25198a5cd6b4b1f6975f25198a5cd68367fb50f5333fd9c64e
2012-06-21 08:51:08 -05:00
Steve Harris
530dfc0563
12.6.1-10 baseline
...
Former-commit-id: 16fd236f2d06f1c7b73cddde63eee0a2c0893d1addde63eee0a2c0893d1ab33c5bdfcff8497470fc
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
acbf7fd3b5
Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
...
Former-commit-id: 7bd0cce0a1c2191c83dcd317777ee60c69731e18d317777ee60c69731e18b55a4f026c8b107023d1
2012-06-20 14:13:37 -05:00
Bryan Kowal
ac72941bf0
Merge branch '11-Collaboration' into development
...
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9e7907ecd79361f3eb94f528e10391f0e3b957e3f528e10391f0e3b957e31ee59eac7121e8618852
2012-06-18 11:16:28 -05:00
Steve Harris
6c0d8be39e
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
...
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3af6c0529ad2f20a86a3048860df6902f20a86a3048860df69027b50c57bdd7a4853091
2012-06-12 14:37:12 -05:00
Steve Harris
471fa3ac04
12.6.1-3 baseline
...
Former-commit-id: bc96eba8207c5306b79542f3513175d57eb02b9e42f3513175d57eb02b9e1fdc0aa23732c0464d79
2012-06-11 16:23:47 -05:00
Steve Harris
5e0e2d2c48
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
...
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dcc7024992a337793c86b1d325d496f537793c86b1d325d496f5cf3c76821323c34c469a
2012-06-11 15:24:03 -05:00
Steve Harris
1f521a70b3
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e48552902906b13cbb7e003904c4ccf5b13cbb7e003904c4ccf5676ea3192f97c4db937e
2012-06-08 13:39:48 -05:00
Steve Harris
bc695ee025
12.5.1-6 baseline
...
Former-commit-id: ba6d779949df80148db624474489f9fa87dc6cf124474489f9fa87dc6cf1c452cce6334792884ab2
2012-05-16 16:41:22 -05:00
Steve Harris
fe7ac96625
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990d7f7c26582092efd607231b3e87ffa092efd607231b3e87ffa98447412f853d2822329
2012-05-09 13:19:47 -05:00
Steve Harris
43f936900c
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed572e1bb47627bc36981858037cb5d127bc36981858037cb5d163ea8599d79c9e01dbda
2012-05-09 13:14:00 -05:00
Steve Harris
8025cc609e
12.5.1-2 baseline
...
Former-commit-id: c1bc408f84ac708c050d84d191e7b6b36c69cc6784d191e7b6b36c69cc67a821111fbff6300cd995
2012-05-03 19:17:13 -05:00
