Commit graph

833 commits

Author SHA1 Message Date
Steve Harris
bb6fe85a47 Merge branch 'development' into Enhanced_points
Former-commit-id: ada1066831 [formerly 1dd1305a5d [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]
Former-commit-id: 1dd1305a5d
Former-commit-id: 892598dc66
2012-09-12 14:14:56 -05:00
Steve Harris
ea4731bde5 Merge branch 'ss_builds' (12.10.1-3 - better version) into development
Former-commit-id: ce5f09ec5c [formerly 3338cabcb2 [formerly 028c1bb9fe740017da11979d492eaec84d97a75f]]
Former-commit-id: 3338cabcb2
Former-commit-id: 1c37242c8b
2012-09-12 13:17:30 -05:00
Steve Harris
bbc20f4a68 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]
Former-commit-id: 077ced354e
Former-commit-id: 22dac5c82e
2012-09-12 13:10:36 -05:00
Nate Jensen
761795bbae Merge "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." into development
Former-commit-id: bb68c93607 [formerly 89fb0a5bee [formerly 9b20aae000c7d4ac25dada94390eb3e8d70a6cc9]]
Former-commit-id: 89fb0a5bee
Former-commit-id: 3c240d3269
2012-09-12 09:18:24 -05:00
Richard Peter
5baaa6593f Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
Former-commit-id: 60b21393fc [formerly 701960a246 [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]
Former-commit-id: 701960a246
Former-commit-id: c8443cf85c
2012-09-12 08:27:11 -05:00
Steve Harris
eff949899d Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: adf25aa707 [formerly 503cddcc5e [formerly 6d859accd185300997d14e7daf17f3c3257c348d]]
Former-commit-id: 503cddcc5e
Former-commit-id: d39a318583
2012-09-11 17:06:26 -05:00
Steve Harris
2f57e328fe Merge branch 'ss_builds' (12.10.1-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
	cave/com.raytheon.uf.viz.kml.export.feature/build.properties
	cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
	cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
	cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment

Former-commit-id: 012c526816 [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]
Former-commit-id: 64d4e2bded
Former-commit-id: f94db138cd
2012-09-11 16:57:03 -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
bb190a66a1 12.10.1-2 baseline
Former-commit-id: a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]
Former-commit-id: 250f0ccac9
Former-commit-id: dde1f4c54d
2012-09-11 15:50:57 -05:00
Max Schenkelberg
b5a198a27d Issue #1138 Added null check to base ProtectedFile object since will be null when called recursively first time when constructing the base object. Organized static functions together from member functions.
Change-Id: I5dbef82932c9dc8623061361fad64fd0e8706546

Former-commit-id: c4398c09a4 [formerly fffe220e05 [formerly edbff1f2b607d53e8247155a5526a7c21e40ac71]]
Former-commit-id: fffe220e05
Former-commit-id: ab120dfec6
2012-09-11 14:04:14 -05:00
Nate Jensen
a6252ceab2 Issue #1096 fixed sampling order
Change-Id: Ib5fa01c281a50f792abc6a813167455c51076bed

Former-commit-id: d58af3e377 [formerly c6b07f3672 [formerly 6274438941aef5d7e5ee284488ffe0300ee3a68e]]
Former-commit-id: c6b07f3672
Former-commit-id: cb9dd60490
2012-09-11 13:11:23 -05:00
Lee Venable
1a5f514d00 Merge "Issue #1161 changed comparator" into development
Former-commit-id: a691386102 [formerly 802b43036e [formerly 2d9bf3e785e72e8bc3b3a04d186d3c76ddc1eebb]]
Former-commit-id: 802b43036e
Former-commit-id: f731ae885c
2012-09-11 10:02:21 -05:00
Dave Hladky
70ccfe678a Issue #1161 changed comparator
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962

Former-commit-id: af27b562d7 [formerly c78fb26fbf [formerly 36748378cf53d2ab7c6ba1e49be195d90e2dc385]]
Former-commit-id: c78fb26fbf
Former-commit-id: afb00feb6d
2012-09-11 09:39:43 -05:00
Lee Venable
c1d6d8e77a Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
Former-commit-id: 83fc018f38 [formerly 056e74d3cf [formerly 19dc13a0d5ef2b0fc41300815dd6be34d7001afd]]
Former-commit-id: 056e74d3cf
Former-commit-id: 1f86d2c4ba
2012-09-11 09:15:47 -05:00
Nate Jensen
bdbaa71575 Merge "Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view." into development
Former-commit-id: 7c1bc79df7 [formerly e61076b316 [formerly 603632fbca6e67b9e1f3cd1f4a48026bca3f1f35]]
Former-commit-id: e61076b316
Former-commit-id: 4d91b0a15a
2012-09-11 09:06:26 -05:00
Dave Hladky
7ea2655805 Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
Change-Id: I23212f3281290d86621e72c88478b00d37336494

Former-commit-id: 6818408d40 [formerly 28912552fe [formerly 2088328c090d5a7d3f6218c42619fd3ab6d45dd9]]
Former-commit-id: 28912552fe
Former-commit-id: 33f222783d
2012-09-11 08:56:51 -05:00
Mike Duff
4180c20fbe Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
Former-commit-id: 7825863940 [formerly bcafd807c5 [formerly 5504abfd272649dad36357ae7fdce83c75b3e3fa]]
Former-commit-id: bcafd807c5
Former-commit-id: 269d2831d9
2012-09-11 08:50:55 -05:00
Jonathan Sanchez
6e1be0b967 Issue #1006 fix supdirs
Former-commit-id: 44d21bfe36 [formerly 09bdc765e5 [formerly 09109d26f68e527f843013883dc7f3082f01dd7a]]
Former-commit-id: 09bdc765e5
Former-commit-id: d2f4487543
2012-09-10 17:39:36 -05:00
Lee Venable
97a9c87490 Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
Former-commit-id: 903c220ecb [formerly b22bd12fad [formerly bacccfd683e71eab49c69d815aafbef2e395e863]]
Former-commit-id: b22bd12fad
Former-commit-id: 8f95f21e6a
2012-09-10 15:13:47 -05:00
Roger Ferrel
915ded00c4 Issue #1159 No longer wrap text pasted to empty text field.
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d

Former-commit-id: e55c9ca0bd [formerly ef9634dd96 [formerly 0b418dc248fd3c2107f2d6c045c8da51f13f1faa]]
Former-commit-id: ef9634dd96
Former-commit-id: fd1be035c3
2012-09-10 13:25:29 -05:00
Max Schenkelberg
f7abe9ee39 Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536

Former-commit-id: 84658dd03a [formerly 80439b309b [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]
Former-commit-id: 80439b309b
Former-commit-id: 6d78afd423
2012-09-10 10:45:37 -05:00
Brad Gonzales
87def306af Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
Former-commit-id: 1b028a6d54 [formerly f2b97d3170 [formerly ecbe261f768452fc30a6641d25f5303565d18cbb]]
Former-commit-id: f2b97d3170
Former-commit-id: 85961a3d6d
2012-09-10 09:24:28 -05:00
Roger Ferrel
2a34cf0ac2 Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377

Former-commit-id: caff5053cb [formerly ce5430a625 [formerly 8506d363eff80306d0413e942c52d90b977ea887]]
Former-commit-id: ce5430a625
Former-commit-id: 3de56714fb
2012-09-10 08:28:58 -05:00
David Gillingham
fc39f37437 Issue #1150: Fix regression caused by previous text product generation changes by ensuring all
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: 83681d1ff6 [formerly f192c8d115 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]
Former-commit-id: f192c8d115
Former-commit-id: cff73c9e1d
2012-09-07 12:29:36 -05:00
Bryan Kowal
f3a273027c Issue #1134 - edex will now use the same jep library that CAVE does
Former-commit-id: 04b574f56e [formerly ec89c440fe [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]
Former-commit-id: ec89c440fe
Former-commit-id: 3c63f21cfc
2012-09-07 10:28:51 -05:00
Lee Venable
ad24a257a5 Merge "Issue #1144 Fixed sizing of Local Effects Area dropdown." into development
Former-commit-id: 7e32db36fb [formerly 30e28997d2 [formerly 822993b3728f939e7e57ca9cd1c6fa7b0737ea25]]
Former-commit-id: 30e28997d2
Former-commit-id: 8615be95bf
2012-09-07 07:35:15 -05:00
Ron Anderson
88ba04e791 Issue #1144 Fixed sizing of Local Effects Area dropdown.
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5

Former-commit-id: 16260530e9 [formerly ee7985bd57 [formerly 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5]]
Former-commit-id: ee7985bd57
Former-commit-id: 8ca431ab8b
2012-09-06 17:44:00 -05:00
Greg Armendariz
572a83adb7 Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 58b74d05e5 [formerly 8201f5346f [formerly 9dc5230757d9a09f718fdf1f802e698ac6dd21d2]]
Former-commit-id: 8201f5346f
Former-commit-id: 3cc51587c6
2012-09-06 13:50:36 -05:00
Steve Harris
bff568429e Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: 259bb4dfed [formerly 7d7f20b388 [formerly d84394c2f8f62406fee0e039ba0aa283bbbd857e]]
Former-commit-id: 7d7f20b388
Former-commit-id: 262473a662
2012-09-06 11:09:24 -05:00
James Korman
5b2c527640 Issue #1090 - pattern corrections
Former-commit-id: eb17151f74 [formerly be350dd763 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]
Former-commit-id: be350dd763
Former-commit-id: 78c7ce88ac
2012-09-06 09:20:03 -05:00
Bryan Kowal
2f7fae43cc Issue #1141 - Merging KML into the Common Baseline
Former-commit-id: 7b45633097 [formerly 3180ae0c57 [formerly c3f584fdc5f53ecd62afe41c481aaa96cf532009]]
Former-commit-id: 3180ae0c57
Former-commit-id: 8d444b35d3
2012-09-05 18:39:08 -05:00
Bryan Kowal
8444e742df Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 3e1556a981 [formerly 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]
Former-commit-id: 137b27d3ff
Former-commit-id: 35aff16e89
2012-09-05 14:44:36 -05:00
Max Schenkelberg
e06d1dabef Issue #29 Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c

Former-commit-id: 28d6308444 [formerly c183a0e614 [formerly a4dd750d4bbdaae4a548c9a296436cc783d2d71a]]
Former-commit-id: c183a0e614
Former-commit-id: a14d5d4c86
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
513bd44ba0 Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8

Former-commit-id: c618ee9057 [formerly 4272f4c885 [formerly 5da7b54e1bff66ed46400bc624b9d881d0b967ce]]
Former-commit-id: 4272f4c885
Former-commit-id: dc6f5805ef
2012-09-04 13:41:10 -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
6784576fc9 12.9.1-12 baseline
Former-commit-id: 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]
Former-commit-id: 948766c387
Former-commit-id: 4bf4f0043a
2012-09-04 11:47:38 -05:00
Steve Harris
feccb1205d Merge branch 'development' into Enhanced_points
Former-commit-id: 32cf7fd764 [formerly 5feac55dbd [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]
Former-commit-id: 5feac55dbd
Former-commit-id: fa7c31206b
2012-08-30 15:43:06 -05:00
Steve Harris
9ff4f369a4 Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]
Former-commit-id: 3a9d4961e2
Former-commit-id: f52c8b374d
2012-08-30 14:40:34 -05:00
Steve Harris
a2bb1dabe0 12.9.1-11 baseline
Former-commit-id: fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]
Former-commit-id: 6eb6b0909b
Former-commit-id: d07c18918d
2012-08-30 14:36:12 -05:00
Steve Harris
264d870cbf 12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: 3adc50a783
Former-commit-id: bdb45cdfae
2012-08-30 14:28:27 -05:00
Max Schenkelberg
d0160a4aa9 Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4

Former-commit-id: 0de737ad64 [formerly 00de2922e1 [formerly b9568b79f531250c859b77296115da32b628318d]]
Former-commit-id: 00de2922e1
Former-commit-id: 81531873e0
2012-08-29 18:17:30 -05:00
Nate Jensen
a6afe463af Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
Former-commit-id: b47baedad4 [formerly 96393309eb [formerly c06f87cd60290f34b0c9b1ac955f0b72f9de5c5b]]
Former-commit-id: 96393309eb
Former-commit-id: 4c73903629
2012-08-29 16:09:50 -05:00
Max Schenkelberg
e03e761b28 Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9

Former-commit-id: 81f78fa819 [formerly f8aef2b067 [formerly 3ff192dfb09a0e4512287d45df864375e3900ca1]]
Former-commit-id: f8aef2b067
Former-commit-id: 04c3a1c678
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
669d1023a8 Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
Former-commit-id: 37d2411b26 [formerly 1f587e39f4 [formerly e3c5526f9b12ae38c12094e7ebf9f9d6823f3257]]
Former-commit-id: 1f587e39f4
Former-commit-id: e3bb8c80c9
2012-08-29 14:24:21 -05:00
Matt Nash
04ce96d74e Issue #1101 fix gfe keybindings for frame change in collaboration
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: ada6ecf5f3 [formerly 018f590c70 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]
Former-commit-id: 018f590c70
Former-commit-id: ba698ae69a
2012-08-27 12:16:38 -05:00
Steve Harris
948b22090c Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 076dccf42d [formerly 3ee334378c [formerly 534486bf918d5384d062d7501f0f1c4a0b4f0172]]
Former-commit-id: 3ee334378c
Former-commit-id: 2e6842016b
2012-08-27 11:32:45 -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
Nate Jensen
07ac473e55 Merge "Issue #1096 fix memory leaks in CcfpResource" into development
Former-commit-id: 168bee4bd7 [formerly 94b7f40d1d [formerly 0f98c3bfbf041cd46311517f2819ca2d81b1cd34]]
Former-commit-id: 94b7f40d1d
Former-commit-id: eac562204d
2012-08-27 09:21:50 -05:00