Commit graph

835 commits

Author SHA1 Message Date
Nate Jensen
b5309d2484 Merge "Issue #875 Now does faster refresh and properly handle nofification of other CAVEs of changes." into Enhanced_points
Former-commit-id: d03287982238676b7f7f76cf1ff4e1404e66f038
2012-09-12 15:04:58 -05:00
Steve Harris
ada1066831 Merge branch 'development' into Enhanced_points
Former-commit-id: 632a766ec44337156bab8df73aecdee8b7bc2853
2012-09-12 14:14:56 -05:00
Steve Harris
ce5f09ec5c Merge branch 'ss_builds' (12.10.1-3 - better version) into development
Former-commit-id: 028c1bb9fe740017da11979d492eaec84d97a75f
2012-09-12 13:17:30 -05:00
Steve Harris
fd5e214e72 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: af8ffe73c81cd980843f137800f9fbb453c9e2c0
2012-09-12 13:10:36 -05:00
Nate Jensen
bb68c93607 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: 9b20aae000c7d4ac25dada94390eb3e8d70a6cc9
2012-09-12 09:18:24 -05:00
Roger Ferrel
be8e334da3 Issue #875 Now does faster refresh and properly handle nofification of other CAVEs of changes.
Amend: Changes from code review

Change-Id: I556174de78c98730cabcd194b657db55328cf551

Former-commit-id: ae352e695a198b4f675249d1ef22118305d2f682
2012-09-12 09:00:33 -05:00
Richard Peter
60b21393fc Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
Former-commit-id: 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6
2012-09-12 08:27:11 -05:00
Steve Harris
adf25aa707 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 6d859accd185300997d14e7daf17f3c3257c348d
2012-09-11 17:06:26 -05:00
Steve Harris
012c526816 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: e4e12a182b674b136c2753e3fd2f79a3a338ebee
2012-09-11 16:57:03 -05:00
Max Schenkelberg
2f8f1ce9b2 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: 64194223bc30a629b32ca8aa5cefbcfdf8fd6776
2012-09-11 16:27:41 -05:00
Steve Harris
969e7e6dfd 12.10.1-3 baseline
Former-commit-id: 1a94c1ca3674c8e4dbb8847de5190efe33da371c
2012-09-11 16:00:38 -05:00
Steve Harris
a66f3f4b60 12.10.1-2 baseline
Former-commit-id: 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c
2012-09-11 15:50:57 -05:00
Max Schenkelberg
c4398c09a4 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: edbff1f2b607d53e8247155a5526a7c21e40ac71
2012-09-11 14:04:14 -05:00
Nate Jensen
d58af3e377 Issue #1096 fixed sampling order
Change-Id: Ib5fa01c281a50f792abc6a813167455c51076bed

Former-commit-id: 6274438941aef5d7e5ee284488ffe0300ee3a68e
2012-09-11 13:11:23 -05:00
Lee Venable
a691386102 Merge "Issue #1161 changed comparator" into development
Former-commit-id: 2d9bf3e785e72e8bc3b3a04d186d3c76ddc1eebb
2012-09-11 10:02:21 -05:00
Dave Hladky
af27b562d7 Issue #1161 changed comparator
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962

Former-commit-id: 36748378cf53d2ab7c6ba1e49be195d90e2dc385
2012-09-11 09:39:43 -05:00
Lee Venable
83fc018f38 Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
Former-commit-id: 19dc13a0d5ef2b0fc41300815dd6be34d7001afd
2012-09-11 09:15:47 -05:00
Nate Jensen
7c1bc79df7 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: 603632fbca6e67b9e1f3cd1f4a48026bca3f1f35
2012-09-11 09:06:26 -05:00
Dave Hladky
6818408d40 Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
Change-Id: I23212f3281290d86621e72c88478b00d37336494

Former-commit-id: 2088328c090d5a7d3f6218c42619fd3ab6d45dd9
2012-09-11 08:56:51 -05:00
Mike Duff
7825863940 Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
Former-commit-id: 5504abfd272649dad36357ae7fdce83c75b3e3fa
2012-09-11 08:50:55 -05:00
Jonathan Sanchez
44d21bfe36 Issue #1006 fix supdirs
Former-commit-id: 09109d26f68e527f843013883dc7f3082f01dd7a
2012-09-10 17:39:36 -05:00
Lee Venable
903c220ecb Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
Former-commit-id: bacccfd683e71eab49c69d815aafbef2e395e863
2012-09-10 15:13:47 -05:00
Roger Ferrel
e55c9ca0bd Issue #1159 No longer wrap text pasted to empty text field.
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d

Former-commit-id: 0b418dc248fd3c2107f2d6c045c8da51f13f1faa
2012-09-10 13:25:29 -05:00
Max Schenkelberg
84658dd03a 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: 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd
2012-09-10 10:45:37 -05:00
Brad Gonzales
1b028a6d54 Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
Former-commit-id: ecbe261f768452fc30a6641d25f5303565d18cbb
2012-09-10 09:24:28 -05:00
Roger Ferrel
caff5053cb Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377

Former-commit-id: 8506d363eff80306d0413e942c52d90b977ea887
2012-09-10 08:28:58 -05:00
David Gillingham
83681d1ff6 Issue #1150: Fix regression caused by previous text product generation changes by ensuring all
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: 74e7d98c5bde7cefaedf354ecfbac147b2ff801a
2012-09-07 12:29:36 -05:00
Bryan Kowal
04b574f56e Issue #1134 - edex will now use the same jep library that CAVE does
Former-commit-id: 70b61ecb34df8dc082fb9dcd35eec13aff4c042c
2012-09-07 10:28:51 -05:00
Lee Venable
7e32db36fb Merge "Issue #1144 Fixed sizing of Local Effects Area dropdown." into development
Former-commit-id: 822993b3728f939e7e57ca9cd1c6fa7b0737ea25
2012-09-07 07:35:15 -05:00
Ron Anderson
16260530e9 Issue #1144 Fixed sizing of Local Effects Area dropdown.
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5

Former-commit-id: 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5
2012-09-06 17:44:00 -05:00
Greg Armendariz
58b74d05e5 Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 9dc5230757d9a09f718fdf1f802e698ac6dd21d2
2012-09-06 13:50:36 -05:00
Steve Harris
259bb4dfed Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: d84394c2f8f62406fee0e039ba0aa283bbbd857e
2012-09-06 11:09:24 -05:00
James Korman
eb17151f74 Issue #1090 - pattern corrections
Former-commit-id: 7849341873013b71b6fe5f01ae3fe274bfc7e8a7
2012-09-06 09:20:03 -05:00
Bryan Kowal
7b45633097 Issue #1141 - Merging KML into the Common Baseline
Former-commit-id: c3f584fdc5f53ecd62afe41c481aaa96cf532009
2012-09-05 18:39:08 -05:00
Bryan Kowal
3e1556a981 Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 9a0cd58382909965a6c44cf05fec28eb69835a26
2012-09-05 14:44:36 -05:00
Max Schenkelberg
28d6308444 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: a4dd750d4bbdaae4a548c9a296436cc783d2d71a
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
c618ee9057 Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8

Former-commit-id: 5da7b54e1bff66ed46400bc624b9d881d0b967ce
2012-09-04 13:41:10 -05:00
Steve Harris
af106f1d29 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 3eacf0da611b09faa416580b8d2db5bdc9af2d11
2012-09-04 12:11:03 -05:00
Steve Harris
d708932029 12.10.1-1 baseline
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
2012-09-04 12:07:27 -05:00
Steve Harris
150bc967a5 12.9.1-12 baseline
Former-commit-id: 09035ea929c2e926b2dce13429c29d3fd3707880
2012-09-04 11:47:38 -05:00
Steve Harris
32cf7fd764 Merge branch 'development' into Enhanced_points
Former-commit-id: 3aec6326bfce36758b93c7955ce3d0ee49e30cc3
2012-08-30 15:43:06 -05:00
Steve Harris
34cbde4124 Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 73ab8bdcc39291fbe36b5bcffe53d9106cc00238
2012-08-30 14:40:34 -05:00
Steve Harris
fc405efab7 12.9.1-11 baseline
Former-commit-id: 046d9078b7aa87ff8df98142556713fe38d95c63
2012-08-30 14:36:12 -05:00
Steve Harris
cb9b80f3a0 12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
2012-08-30 14:28:27 -05:00
Max Schenkelberg
0de737ad64 Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4

Former-commit-id: b9568b79f531250c859b77296115da32b628318d
2012-08-29 18:17:30 -05:00
Nate Jensen
b47baedad4 Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
Former-commit-id: c06f87cd60290f34b0c9b1ac955f0b72f9de5c5b
2012-08-29 16:09:50 -05:00
Max Schenkelberg
81f78fa819 Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9

Former-commit-id: 3ff192dfb09a0e4512287d45df864375e3900ca1
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
37d2411b26 Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
Former-commit-id: e3c5526f9b12ae38c12094e7ebf9f9d6823f3257
2012-08-29 14:24:21 -05:00
Matt Nash
ada6ecf5f3 Issue #1101 fix gfe keybindings for frame change in collaboration
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: 2c766c16bf8fdbc801097acfe8f8fdfd00e53367
2012-08-27 12:16:38 -05:00
Steve Harris
076dccf42d Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 534486bf918d5384d062d7501f0f1c4a0b4f0172
2012-08-27 11:32:45 -05:00