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

62 commits

Author SHA1 Message Date
Roger Ferrel
bb21c0b2f7 Issue #1298 Plugin changes to get localization import of files to work for test procedures. 
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d

Former-commit-id: ac09c59d38 [formerly 2a1024ff50] [formerly ac09c59d38 [formerly 2a1024ff50] [formerly 230e24addc [formerly 67b55ee03d17a878375be75bc36bcb5500ca98fd]]]
Former-commit-id: 230e24addc
Former-commit-id: 0011eb0ff4 [formerly ea3b2aebc6]
Former-commit-id: 2cc1b72f9e
 2012-11-27 10:37:06 -06:00
Ben Steffensmeier
ce495bd549 Issue #1316 pass original constraints through when doing time queries in derived parameters. 
Former-commit-id: a1fc232a19 [formerly 7061c6db78] [formerly a1fc232a19 [formerly 7061c6db78] [formerly f6a502fb78 [formerly 5f67639bdd24711dc6f77b41163f49bf8626b7d3]]]
Former-commit-id: f6a502fb78
Former-commit-id: 27b77f735d [formerly 59a00a75f9]
Former-commit-id: d08d71d471
 2012-11-21 14:21:01 -06:00
Max Schenkelberg
eec401909b 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: fe11e31bfb [formerly dcde9e8951] [formerly fe11e31bfb [formerly dcde9e8951] [formerly 28e61c8285 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]
Former-commit-id: 28e61c8285
Former-commit-id: 5aa26e4f13 [formerly 2e20c3e799]
Former-commit-id: 429ddc7312
 2012-11-14 16:19:37 -06:00
Ben Steffensmeier
1931b503a2 merge branch Unifeid_Grid into developement 
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 1d94435220 [formerly 92fd247ccc]
Former-commit-id: 38b0dafe0b
 2012-10-30 12:24:54 -05:00
Steve Harris
35c2a8e26f 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: 3eff876edd [formerly a7337d9160] [formerly 3eff876edd [formerly a7337d9160] [formerly 1807100932 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: 8486da2fd3 [formerly 892e4df811]
Former-commit-id: 8a17564ba3
 2012-10-18 16:01:05 -05:00
Steve Harris
9c597c7060 12.11.1-6 baseline 
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 8beb6fc0b8 [formerly 08fc9f6b14]
Former-commit-id: 4f27cbb406
 2012-10-18 15:53:01 -05:00
Steve Harris
0ad4e4f39a 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: 8b7665418a [formerly 0a42cb87a4] [formerly 8b7665418a [formerly 0a42cb87a4] [formerly 63ffdac2b7 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]]
Former-commit-id: 63ffdac2b7
Former-commit-id: f0121b6fa8 [formerly 63da835aef]
Former-commit-id: 99147526f9
 2012-10-16 09:20:37 -05:00
Steve Harris
c25ebcdc41 12.11.1-3 baseline 
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 725b2f8ba5 [formerly 5723fb0031]
Former-commit-id: bf1f88482b
 2012-10-15 16:30:31 -05:00
Ben Steffensmeier
29777154bb 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: de3769129c [formerly 8b7256b1ae] [formerly de3769129c [formerly 8b7256b1ae] [formerly 266a2f317f [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]
Former-commit-id: 266a2f317f
Former-commit-id: fde1e73d58 [formerly fed5a35af3]
Former-commit-id: b2fdd9283d
 2012-10-12 12:45:50 -05:00
Ben Steffensmeier
069958385b Issue #189 minor fixes to grid for issues discovered during dev tests 
Former-commit-id: fa380d06c1 [formerly 23da6e6494] [formerly fa380d06c1 [formerly 23da6e6494] [formerly 509c09ebb0 [formerly 4ae112f6fcc9c2d0bb8715033a80d265dbdfe8b4]]]
Former-commit-id: 509c09ebb0
Former-commit-id: 4cacd4a7b1 [formerly 59754c0f6a]
Former-commit-id: b3a945b203
 2012-10-10 16:32:36 -05:00
Ben Steffensmeier
bee77d6299 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: b4d7183cdd [formerly 42ae490a50] [formerly b4d7183cdd [formerly 42ae490a50] [formerly b6e124f830 [formerly 4f648f3ea23cd2d300bb92228e20d7f2678718fd]]]
Former-commit-id: b6e124f830
Former-commit-id: fdddbebddc [formerly 2cdb3553e9]
Former-commit-id: 542aca681b
 2012-10-05 14:28:35 -05:00
Ben Steffensmeier
0b0db88d15 Issue #189 Make Derived parameters spatially aware 
Former-commit-id: 02ee622165 [formerly 317696c66f] [formerly 02ee622165 [formerly 317696c66f] [formerly 8682b30383 [formerly f7919f7bfc3f631cc76e19710ea18feb6faf35f9]]]
Former-commit-id: 8682b30383
Former-commit-id: f01d6242ce [formerly 2f6b9f6188]
Former-commit-id: c866f23a03
 2012-09-27 17:01:32 -05:00
Steven Harris
2f855322f6 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
 2012-09-27 15:57:45 -05:00
James Korman
97e31b6639 Issue #1172 - Corrected update problem 
Change-Id: Id600728f8f9352b9c44c261c24bf1af8ae6c8e32

Former-commit-id: 26ed32cb19 [formerly c228b73624] [formerly 26ed32cb19 [formerly c228b73624] [formerly f0eafc3839 [formerly d436841050e4d96dbe3b3cb1e54a9d62525c5d08]]]
Former-commit-id: f0eafc3839
Former-commit-id: f90f5fadb1 [formerly 5c79be21d8]
Former-commit-id: 8bd924f6a5
 2012-09-14 09:46:08 -05:00
Steve Harris
f8e7459dfb Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: 0e046d847a [formerly bba4eb12d0] [formerly 0e046d847a [formerly bba4eb12d0] [formerly af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: f224e3e8ad [formerly 53e29f59e4]
Former-commit-id: e9582cb789
 2012-09-04 12:11:03 -05:00
Steve Harris
a924a8347a 12.10.1-1 baseline 
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
 2012-09-04 12:07:27 -05:00
Steve Harris
3f44e46a6f 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: 51eb89eb2a [formerly 91e39617cb] [formerly 51eb89eb2a [formerly 91e39617cb] [formerly a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: dbcb28ce77 [formerly 87a602dfee]
Former-commit-id: 0b647c0c9d
 2012-08-27 09:53:55 -05:00
Steve Harris
2d928d328e 12.9.1-5 baseline 
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
 2012-08-21 15:27:03 -05:00
root
0eb9520e15 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
 2012-08-15 22:15:20 +00:00
Steve Harris
7e1d1f6e08 12.9.1-4 baseline 
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
 2012-08-15 15:19:10 -05:00
Ben Steffensmeier
f87969cbee Issue #1004 change plots to synchronize with dispose instead of joining since join allows paint to happen 
Change-Id: I6011a5fedc155ab8d515d3c6eb5d368f582c59bd

Former-commit-id: 6f178a9150 [formerly 603a9c90e4] [formerly 6f178a9150 [formerly 603a9c90e4] [formerly 559efb19fb [formerly aece671b35405e1f278439c9a1a8230dad5cf4c2]]]
Former-commit-id: 559efb19fb
Former-commit-id: d52dd42ab2 [formerly 3f258a2bf8]
Former-commit-id: fa8ea385d9
 2012-08-13 09:54:22 -05:00
Ben Steffensmeier
32287c896b Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings. 
Former-commit-id: 573cc270e8 [formerly c6a121962f] [formerly 573cc270e8 [formerly c6a121962f] [formerly 1e527f83f0 [formerly 06c2c85159598ca803c663de97caed4b6841c135]]]
Former-commit-id: 1e527f83f0
Former-commit-id: 0af9fd4fe2 [formerly c9ff69014b]
Former-commit-id: dc8d05c1be
 2012-08-09 17:53:19 -05:00
Ben Steffensmeier
62aafd3542 Issue #947 fix parsing of DataTime. 
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 8d118c392a [formerly 525c0b21a9] [formerly 8d118c392a [formerly 525c0b21a9] [formerly b53fe917bc [formerly 045952304218c867d8fe89df9828f70632df2d00]]]
Former-commit-id: b53fe917bc
Former-commit-id: 54b3078ad1 [formerly 4ed3d04e64]
Former-commit-id: fafea907c7
 2012-08-09 17:50:23 -05:00
Ben Steffensmeier
de38003e6c Issue #1004 make dispose/shutdown of plot jobs more permenant by joining. 
Former-commit-id: 3f92e385a6 [formerly 3abfef55cc] [formerly 3f92e385a6 [formerly 3abfef55cc] [formerly c1bacb33b1 [formerly 6cb8e45b4f3a78abcfeee982306684eef025fd3d]]]
Former-commit-id: c1bacb33b1
Former-commit-id: 0e48e6e4fd [formerly f711cfdae2]
Former-commit-id: 30702ea3c6
 2012-08-09 17:45:19 -05:00
Ben Steffensmeier
aa740ef6a8 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings. 
Former-commit-id: 64caa963b1 [formerly 066a5af2a6] [formerly 64caa963b1 [formerly 066a5af2a6] [formerly ad1415948f [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]]
Former-commit-id: ad1415948f
Former-commit-id: e03eb5f5c9 [formerly 65c33256d9]
Former-commit-id: 70f8f93f81
 2012-08-09 17:16:38 -05:00
Ben Steffensmeier
873a7d64b6 Issue #947 fix parsing of DataTime. 
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: cac790ac5a [formerly 97ba96759c] [formerly cac790ac5a [formerly 97ba96759c] [formerly 5da238c8b9 [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]]
Former-commit-id: 5da238c8b9
Former-commit-id: 8cdf1f8d1c [formerly b6cc71bf75]
Former-commit-id: 726e934763
 2012-08-08 14:41:33 -05:00
Ben Steffensmeier
1dc30083ca Issue #1004 make dispose/shutdown of plot jobs more permenant by joining. 
Former-commit-id: 0a974b26c2 [formerly c9774a4f03] [formerly 0a974b26c2 [formerly c9774a4f03] [formerly 83d6cde368 [formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]]]
Former-commit-id: 83d6cde368
Former-commit-id: f47d533ac3 [formerly ea70488664]
Former-commit-id: d645fc787e
 2012-08-07 12:03:13 -05:00
Steve Harris
078b4fff3c 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: fb47934159 [formerly 6d77b94217] [formerly fb47934159 [formerly 6d77b94217] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: d2291ba23f [formerly 3476fe755b]
Former-commit-id: e892eb4628
 2012-08-01 12:43:12 -05:00
Steve Harris
d3be09bd74 12.8.1-5 baseline 
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
 2012-08-01 10:45:37 -05:00
Nate Jensen
e1321b8bc9 Issue #882 improved use of SimulatedTime 
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: 6f90bfa61c [formerly a65e9608fd] [formerly 6f90bfa61c [formerly a65e9608fd] [formerly 4a2841b287 [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]
Former-commit-id: 4a2841b287
Former-commit-id: 7d478ac74c [formerly 8fa0eb70db]
Former-commit-id: 04a7e5a8c0
 2012-07-31 08:57:54 -05:00
Steve Harris
05082b1d3a Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: 302aa05586 [formerly de9034c96c] [formerly 302aa05586 [formerly de9034c96c] [formerly 4688ac304f [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]]
Former-commit-id: 4688ac304f
Former-commit-id: f2ab9cfe1a [formerly b82d6772c3]
Former-commit-id: acfc6eff55
 2012-07-27 14:50:45 -05:00
Steve Harris
84d0f1fbb6 Merge branch 'master' (OB12.7.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 07c40a9c0c [formerly 56249c2611] [formerly 07c40a9c0c [formerly 56249c2611] [formerly 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: 9e4df42326 [formerly 2aa4114e4d]
Former-commit-id: d7540c958f
 2012-07-27 14:44:44 -05:00
Nate Jensen
c2558bdb79 Issue #882 fix auto updates, more efficiently set simulated time 
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: ac8d12ce13 [formerly 3d07fc8ebf] [formerly ac8d12ce13 [formerly 3d07fc8ebf] [formerly dbe185f3a0 [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]]
Former-commit-id: dbe185f3a0
Former-commit-id: 4e0a0f10dc [formerly 67edb6917d]
Former-commit-id: 70d269fc34
 2012-07-26 17:43:29 -05:00
Steve Harris
36e2ad3023 12.7.1-8 baseline 
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
 2012-07-19 16:20:40 -05:00
Steve Harris
37f2b6e138 12.6.1-9 baseline 
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
 2012-07-10 07:53:49 -05:00
Bryan Kowal
2e5a850d28 Merge branch 'ss_sync' (OB12.6.1-10) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: b1b294c401 [formerly a33740e915] [formerly b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: b4917e6708 [formerly 9a7d0492fe]
Former-commit-id: 611925412d
 2012-06-27 17:21:48 -05:00
Ben Steffensmeier
2c6b6269fd Issue #704 fixes to plots/MPE to work better in KML 
Former-commit-id: 2b6e1fa5b6 [formerly 32627cf132] [formerly 2b6e1fa5b6 [formerly 32627cf132] [formerly b01be5085f [formerly f1d440729b4e436e879219abaaaf7fa0e04d4ef6]]]
Former-commit-id: b01be5085f
Former-commit-id: 8517eafdf4 [formerly 67ba3ee6f6]
Former-commit-id: 6a9c9a47e2
 2012-06-22 17:54:31 -05:00
Steve Harris
e77a15c047 Revert "12.6.1-10 baseline" 
This reverts commit 95e7f4fc0c [formerly aecc6a8474] [formerly f8497470fc [formerly b33c5bdfcf]] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].


Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 333fd9c64e [formerly 8367fb50f5]
Former-commit-id: 75f77df418
 2012-06-21 08:51:08 -05:00
Steve Harris
95e7f4fc0c 12.6.1-10 baseline 
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: f8497470fc [formerly b33c5bdfcf]
Former-commit-id: aecc6a8474
 2012-06-21 08:38:48 -05:00
Ben Steffensmeier
19ce6f7e77 Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later 
Former-commit-id: c2191c83dc [formerly d317777ee6] [formerly c2191c83dc [formerly d317777ee6] [formerly 0c69731e18 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]]
Former-commit-id: 0c69731e18
Former-commit-id: 8b107023d1 [formerly b55a4f026c]
Former-commit-id: 63b55f454f
 2012-06-20 14:13:37 -05:00
Bryan Kowal
a6d1f97dec 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: 9361f3eb94 [formerly f528e10391] [formerly 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]
Former-commit-id: f0e3b957e3
Former-commit-id: 21e8618852 [formerly 1ee59eac71]
Former-commit-id: cbc8964e5b
 2012-06-18 11:16:28 -05:00
Steve Harris
70a928d039 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: af6c0529ad [formerly 2f20a86a30] [formerly af6c0529ad [formerly 2f20a86a30] [formerly 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: d7a4853091 [formerly 27b50c57bd]
Former-commit-id: 2838ca117f
 2012-06-12 14:37:12 -05:00
Steve Harris
518fa79f7f 12.6.1-3 baseline 
Former-commit-id: 7c5306b795 [formerly 42f3513175] [formerly 7c5306b795 [formerly 42f3513175] [formerly d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 32c0464d79 [formerly 1fdc0aa237]
Former-commit-id: ca8baf18a3
 2012-06-11 16:23:47 -05:00
Steve Harris
c01b096242 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: c7024992a3 [formerly 37793c86b1] [formerly c7024992a3 [formerly 37793c86b1] [formerly d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 23c34c469a [formerly cf3c768213]
Former-commit-id: 3dd5b84aa2
 2012-06-11 15:24:03 -05:00
Steve Harris
39ff9954f8 12.5.1-15 baseline 
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
 2012-06-08 13:39:48 -05:00
Steve Harris
26ed02c3dc 12.5.1-6 baseline 
Former-commit-id: df80148db6 [formerly 24474489f9] [formerly df80148db6 [formerly 24474489f9] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 4792884ab2 [formerly c452cce633]
Former-commit-id: 2738af2019
 2012-05-16 16:41:22 -05:00
Steve Harris
d040b14742 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: d7f7c26582 [formerly 092efd6072] [formerly d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 53d2822329 [formerly 98447412f8]
Former-commit-id: 7ee04eb560
 2012-05-09 13:19:47 -05:00
Steve Harris
1d2ad9224a 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: 572e1bb476 [formerly 27bc369818] [formerly 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda [formerly 63ea8599d7]
Former-commit-id: 7978d3b640
 2012-05-09 13:14:00 -05:00
Steve Harris
ef49f63d8d 12.5.1-2 baseline 
Former-commit-id: ac708c050d [formerly 84d191e7b6] [formerly ac708c050d [formerly 84d191e7b6] [formerly b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: f6300cd995 [formerly a821111fbf]
Former-commit-id: 377ae76413
 2012-05-03 19:17:13 -05:00
Steve Harris
491aa53a0c Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
used git cherry-pick -m 1 879a2e0

Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Conflicts:

	ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java


Former-commit-id: 4ec294b525 [formerly 2ed7249613] [formerly 4ec294b525 [formerly 2ed7249613] [formerly 7b75b781ad [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 7c7fc97131 [formerly 6dd3ee8809]
Former-commit-id: fd9e226b35
 2012-05-01 18:31:09 -05:00