Commit graph

81 commits

Author SHA1 Message Date
Matt Nash
e5379c7c15 Issue #1471 fix product browser issues
Change-Id: Ic37ef8f288a4949d13db75b27e7aebb03c8e3062

Former-commit-id: 0a8448cfed [formerly 90fa08596e] [formerly 0a8448cfed [formerly 90fa08596e] [formerly 6bfbf6b0e3 [formerly 87ca33679bc3b6ff5fbfffd1f95398b255de9137]]]
Former-commit-id: 6bfbf6b0e3
Former-commit-id: 1ab332b654 [formerly addac12b84]
Former-commit-id: e85d6610e4
2013-01-11 10:48:06 -06:00
Ben Steffensmeier
8d6310adfb Issue #1465 fix import derived parameter.
Former-commit-id: c0ea76eb90 [formerly 6a2b73b816] [formerly c0ea76eb90 [formerly 6a2b73b816] [formerly a9ece85f9b [formerly fb133aac1ba6013e826ff38a29f5f1720127aa53]]]
Former-commit-id: a9ece85f9b
Former-commit-id: 0df360a83a [formerly d7c2668b88]
Former-commit-id: 7a693e3f66
2013-01-09 12:04:00 -06:00
Ben Steffensmeier
5ac9e8b73c Issue #1401 add the word Grid in front of load properties because that always makes things better.
Former-commit-id: 8b3667d646 [formerly 1848f614fd] [formerly 8b3667d646 [formerly 1848f614fd] [formerly d43336bcbd [formerly 345673524a287d87efbdfcb60ef838dd78c33ae3]]]
Former-commit-id: d43336bcbd
Former-commit-id: 8c66a66834 [formerly ff5a5cac4c]
Former-commit-id: cf30a422fc
2012-12-12 14:33:48 -06:00
Max Schenkelberg
2030832669 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: be99f6c7ca [formerly 3e128b266a] [formerly be99f6c7ca [formerly 3e128b266a] [formerly 5db71ca943 [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]
Former-commit-id: 5db71ca943
Former-commit-id: d43e0c1c25 [formerly b74d788909]
Former-commit-id: 206116ab66
2012-12-12 11:39:32 -06:00
Richard Peter
849eedffb2 Merge "Issue #1384 allow the derived parameters to function even if the database has multiple identical coverages, add cluster locking to grid coverage creation." into development
Former-commit-id: ea5314b983 [formerly 970f1fc201] [formerly ea5314b983 [formerly 970f1fc201] [formerly f279d478f8 [formerly 251535242b781031c5324708db7be1127844c6d0]]]
Former-commit-id: f279d478f8
Former-commit-id: 5597c522e0 [formerly 35e382251d]
Former-commit-id: e79fa94195
2012-12-04 16:15:16 -06:00
Ben Steffensmeier
805b9ff1ff Issue #1387 updated style rules for RFC-FFG products, fixed never ending Requesting Gridded Data when RFC-FFG is loaded
Former-commit-id: 45220299f9 [formerly 95dc87b6cf] [formerly 45220299f9 [formerly 95dc87b6cf] [formerly e44db81177 [formerly 26abcb77b1b1157ce6e8bc5bda28202430f2d4f7]]]
Former-commit-id: e44db81177
Former-commit-id: d3456e3ee3 [formerly e1b134aa35]
Former-commit-id: d5d586c967
2012-12-04 14:09:28 -06:00
Ben Steffensmeier
5f588f1b55 Issue #1384 allow the derived parameters to function even if the database has multiple identical coverages, add cluster locking to grid coverage creation.
Former-commit-id: f4c534a556 [formerly 038e87f4b0] [formerly f4c534a556 [formerly 038e87f4b0] [formerly d0e8e3b1c3 [formerly e804d35462beea4483d6c0b01f3f61a2576b8098]]]
Former-commit-id: d0e8e3b1c3
Former-commit-id: e23992352e [formerly 7f18e0bbee]
Former-commit-id: 6d6d3bbb35
2012-12-04 12:49:50 -06:00
Matt Nash
d72df0dc66 Issue #1273 product browser re-orders for all applicable data types
Change-Id: I8612578d239119e9df22724ebb0bc100cf7826af

Former-commit-id: 5fa5302739 [formerly 3f2c497286] [formerly 5fa5302739 [formerly 3f2c497286] [formerly 73a0b0da75 [formerly c4e2ff5e1b4f22b1bf712f26dea71ab8d15a75f1]]]
Former-commit-id: 73a0b0da75
Former-commit-id: 7687db01f4 [formerly 1b2d3d642d]
Former-commit-id: 2c4164decc
2012-11-29 09:54:50 -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
Ben Steffensmeier
2223e6ff64 Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 7c93db759c [formerly 884c82c4fe]
Former-commit-id: 74d1381180
2012-11-08 14:45:36 -06:00
Dustin Johnson
b4a13190ad 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: efd3d3735a [formerly 064ef82d1e] [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3 [formerly 4222b24d09]
Former-commit-id: 6613c51d3b
2012-11-08 09:57:16 -06:00
Nate Jensen
04c843cb1b Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
Former-commit-id: 20a63254e2 [formerly b32a9e839e] [formerly 20a63254e2 [formerly b32a9e839e] [formerly 6b205399d4 [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]]
Former-commit-id: 6b205399d4
Former-commit-id: 2fe69a5871 [formerly e3208d48a0]
Former-commit-id: 01e11761d8
2012-11-07 18:18:06 -06:00
Max Schenkelberg
2345861756 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: f069f34a96 [formerly 2f90120248] [formerly f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 5a5bd522a1 [formerly 747ab974e9]
Former-commit-id: 50625b0453
2012-11-07 10:44:42 -06:00
Matt Nash
79d997ef52 Issue #1273 product browser can now change order for grid
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2

Former-commit-id: 76cdfc09bb [formerly 9c9db6643a] [formerly 76cdfc09bb [formerly 9c9db6643a] [formerly 284aecc6f9 [formerly 9c7477357508794a00267991b825d169df5ae71a]]]
Former-commit-id: 284aecc6f9
Former-commit-id: e87cb88d60 [formerly 46f695b72d]
Former-commit-id: fc838f3de2
2012-11-06 14:06:49 -06:00
Ben Steffensmeier
518644cc2f Issue #189 a few fixes to grid resources for FFG Mosaic
Former-commit-id: dc0e75eb29 [formerly 64d4a1add7] [formerly dc0e75eb29 [formerly 64d4a1add7] [formerly 4b121fd7b3 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]]]
Former-commit-id: 4b121fd7b3
Former-commit-id: ec68d0445e [formerly bde106e70d]
Former-commit-id: b830e7c9c2
2012-10-31 11:39:32 -05: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
Ben Steffensmeier
94f0378fab Issue #189 changes from code review
Former-commit-id: 3c222ab437 [formerly 984d128d33] [formerly 3c222ab437 [formerly 984d128d33] [formerly 7139c80557 [formerly 449762acbbe74173121e19f5c325104221c083a2]]]
Former-commit-id: 7139c80557
Former-commit-id: fcc23a917e [formerly b0bf62ce6f]
Former-commit-id: c1e4873727
2012-10-25 16:33:59 -05:00
Ben Steffensmeier
86562637f0 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 9b8f2bcdbd [formerly a77d2097f8]
Former-commit-id: dd5ab10b61
2012-10-25 12:22:11 -05:00
Ben Steffensmeier
a68dd3b05e Issue #189 move stereographic grid coverage to common so ti can be stored in the db and parsed from a URI using the standard mechanisms.
Former-commit-id: 321988209e [formerly d349cb2dbf] [formerly 321988209e [formerly d349cb2dbf] [formerly 1377341720 [formerly 721d3ad5bb7a6007dafba91283814e83590c972a]]]
Former-commit-id: 1377341720
Former-commit-id: 5c51ac0204 [formerly 8fd7254b23]
Former-commit-id: de1dcdbf54
2012-10-24 11:45:49 -05:00
Ben Steffensmeier
3ccf7b0736 Issue #189 fix several errors with grid resources when there is no valid data.
Former-commit-id: 601dcf7b31 [formerly 392e64f33e] [formerly 601dcf7b31 [formerly 392e64f33e] [formerly efb19ceb6f [formerly 98d52a1d86b5b5325c678a3aedbc4d20c009413d]]]
Former-commit-id: efb19ceb6f
Former-commit-id: 1fe73f9c8f [formerly a9c7c3297c]
Former-commit-id: c140338859
2012-10-23 18:32:55 -05:00
Ben Steffensmeier
a93b25c05d Issue #189 fix reprojection problems wiht grid resources.
Former-commit-id: 88aefa3fb9 [formerly 9500d6c2fb] [formerly 88aefa3fb9 [formerly 9500d6c2fb] [formerly a00a6ac663 [formerly 12f994bb426f23348f5d448786e946db3b65612e]]]
Former-commit-id: a00a6ac663
Former-commit-id: 48fb7f642d [formerly 6e69d766b6]
Former-commit-id: 27d3146ec0
2012-10-23 10:27:16 -05:00
Ben Steffensmeier
4f2a5853b6 Issue #189 throw a more useful, less fatal error when grib data is loaded into a grid resource.
Former-commit-id: 13932f9c1f [formerly 2fcaf9ff60] [formerly 13932f9c1f [formerly 2fcaf9ff60] [formerly 96ca3108a4 [formerly 74e1f6e724627f452c808173be2968053f7dd6f9]]]
Former-commit-id: 96ca3108a4
Former-commit-id: b234c6fcbf [formerly d217ea2e21]
Former-commit-id: 9f9124fe65
2012-10-19 11:53:22 -05:00
Steve Harris
35e34308c5 12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -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
2ab0828bae Issue #189 update grid resource reprojection to match ss_builds
Former-commit-id: 326acb6c15 [formerly c503a9b94c] [formerly 326acb6c15 [formerly c503a9b94c] [formerly a6168a2e88 [formerly 4a2a57ae5e7b380141910106aa016c6c4ef46d82]]]
Former-commit-id: a6168a2e88
Former-commit-id: 2c82f142ca [formerly 8c21bc8510]
Former-commit-id: ab90613e0b
2012-10-10 16:32:33 -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
Ben Steffensmeier
231ab11d9a Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 8e5b20236d [formerly 9632663c0a] [formerly 8e5b20236d [formerly 9632663c0a] [formerly f918b6636f [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]
Former-commit-id: f918b6636f
Former-commit-id: 9512238d6e [formerly 6c38e6abb2]
Former-commit-id: 769e28c28d
2012-09-24 14:05:22 -05:00
Ben Steffensmeier
3b6a1ac6a9 Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 5f787b6a6b [formerly 4be2aa88c7] [formerly 5f787b6a6b [formerly 4be2aa88c7] [formerly 0132d35871 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]]
Former-commit-id: 0132d35871
Former-commit-id: d1c3a0c1eb [formerly 174d8ad029]
Former-commit-id: 90dc005f25
2012-09-20 12:24:35 -05:00
Mike Duff
c73de757df Issue #1162 - Fix the NCEP/Hydro RFC FFG Mosaic displays.
Fixed the grid resource and created FFGVizGroupResource.

Change-Id: I4e90fb77c9a27da049e6c06d091076961e7f304c

Former-commit-id: ec28f8f28f [formerly 643eaea29d] [formerly ec28f8f28f [formerly 643eaea29d] [formerly 9fe028c438 [formerly d99d895daeaa049c6b4e683b7fbd37186f5ef1dc]]]
Former-commit-id: 9fe028c438
Former-commit-id: 2e0b64277c [formerly ff2bb36d39]
Former-commit-id: 6163f14f6b
2012-09-20 10:19:46 -05:00
Ben Steffensmeier
9509d72ef9 Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 4fe2127bfb [formerly bd8eb7fc15] [formerly 4fe2127bfb [formerly bd8eb7fc15] [formerly 05849f634d [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]
Former-commit-id: 05849f634d
Former-commit-id: 6b058ace34 [formerly b547d9dd8f]
Former-commit-id: a28984c40c
2012-09-18 15:19:05 -05:00
Steve Harris
288d4afff5 12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]
Former-commit-id: 4fd8893e55
Former-commit-id: a903893a09 [formerly deed84c1a2]
Former-commit-id: 430a11f72b
2012-09-17 15:42:31 -05:00
Mike Duff
195e71243f Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
Former-commit-id: 269d2831d9 [formerly bcafd807c5] [formerly 269d2831d9 [formerly bcafd807c5] [formerly 7825863940 [formerly 5504abfd272649dad36357ae7fdce83c75b3e3fa]]]
Former-commit-id: 7825863940
Former-commit-id: e443d5b5da [formerly db6ac1594e]
Former-commit-id: 45e84531a6
2012-09-11 08:50: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
16d7d955fc 12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416]
Former-commit-id: 63bcadf121
2012-08-15 13:59:00 -05:00
Ben Steffensmeier
dfd6d73cc2 Issue #1058 fix reprojection of wind vectors
Former-commit-id: 283781ba03 [formerly c25c08c8e7] [formerly 283781ba03 [formerly c25c08c8e7] [formerly 09c412d754 [formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]]
Former-commit-id: 09c412d754
Former-commit-id: 6207cd7310 [formerly ea551d3866]
Former-commit-id: e0561a1a35
2012-08-14 13:44:21 -05:00
Steve Harris
b62ac9c78e Merge branch 'development' into development_on_ss_builds
Former-commit-id: 54c505dd8e [formerly 24799cd93d] [formerly 54c505dd8e [formerly 24799cd93d] [formerly a1071e3204 [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]
Former-commit-id: a1071e3204
Former-commit-id: dbe07ca70c [formerly 8f4ddad22c]
Former-commit-id: d507458b9b
2012-08-06 08:23:04 -05:00
Ben Steffensmeier
a1c0547c50 Issue #978 GChange GridResource to use its own times rather than descriptor times.
Former-commit-id: c5c9e8b05c [formerly 8346805ed2] [formerly c5c9e8b05c [formerly 8346805ed2] [formerly 090b9f5ccb [formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]]
Former-commit-id: 090b9f5ccb
Former-commit-id: 5954717c26 [formerly 942b0e5315]
Former-commit-id: 42e01d8b1b
2012-08-03 15:52:47 -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
Ben Steffensmeier
e3e5e9f3fe Issue #924 fix some concurrency issues for GridResource
Former-commit-id: 78491d6318 [formerly e18782687c] [formerly 78491d6318 [formerly e18782687c] [formerly de742a4b8c [formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]]]
Former-commit-id: de742a4b8c
Former-commit-id: bcea00c92b [formerly 3e9abe8682]
Former-commit-id: 9713295486
2012-07-25 17:33:24 -05:00
Ben Steffensmeier
45411d9824 Issue #924 fix concurrency issues for Grid products
Former-commit-id: 286274aed0 [formerly 0b951d425d] [formerly 286274aed0 [formerly 0b951d425d] [formerly 9abd645758 [formerly 767173dc95dc811bc94081415a214803403985f5]]]
Former-commit-id: 9abd645758
Former-commit-id: af3102991e [formerly cb08c202ef]
Former-commit-id: bd6bb5fd43
2012-07-19 17:37:15 -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
Roger Ferrel
b75d001a2a Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: bfcefac909 [formerly 0cf7d64cf4] [formerly bfcefac909 [formerly 0cf7d64cf4] [formerly 9071334fe9 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]]
Former-commit-id: 9071334fe9
Former-commit-id: c317c5d0a3 [formerly b3df932794]
Former-commit-id: d6d4222e24
2012-07-12 11:32:03 -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