Lee Venable
207ddee191
Merge "Issue #1048 re-commit code cleanup changes from other branch" into development
...
Former-commit-id: acf062aa3e
[formerly c4485fd4ac
[formerly 1ca6642169c3541e3bbcddf3fc57fd1c84fba65b]]
Former-commit-id: c4485fd4ac
Former-commit-id: f375af2f63
2012-09-17 16:25:28 -05:00
Steve Harris
9ed9283b30
Merge branch 'ss_builds' (12.10.1-5) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
Former-commit-id: 39f15fe032
[formerly dd6ac67e17
[formerly 4e988dde641d01295134080111e738f25a110e6d]]
Former-commit-id: dd6ac67e17
Former-commit-id: 15a625adb7
2012-09-17 15:46:11 -05:00
Steve Harris
d0cd58d6bc
12.10.1-5 baseline
...
Former-commit-id: 4fd8893e55
[formerly a96d35a1fa
[formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: a96d35a1fa
Former-commit-id: 82feb4de50
2012-09-17 15:42:31 -05:00
Nate Jensen
d5b15b488d
Issue #1048 re-commit code cleanup changes from other branch
...
Change-Id: I2789e2c268f802c004f1594d7d2e5636065b5740
Former-commit-id: 8f7dbdb619
[formerly bdfb01c501
[formerly da4f41b2627e52bde097ab331e1f99c169a7e494]]
Former-commit-id: bdfb01c501
Former-commit-id: fa0043a012
2012-09-17 15:29:52 -05:00
Steve Harris
912cec518b
Merge branch 'development' into Enhanced_points and Enhanced_points into development
...
Former-commit-id: fe92909f53
[formerly 72ecefa9ee
[formerly 9f938d77412ff1d09a8314bb650ddef8eabf73fb]]
Former-commit-id: 72ecefa9ee
Former-commit-id: c64e9b0ad9
2012-09-17 14:58:23 -05:00
Roger Ferrel
65e9237959
Issue #875 Added tri-state for Point fields movable and hidden.
...
Change-Id: Idcb54906735a6f727f4db88ca39ae0e57deb2964
Former-commit-id: 66d98d068c
[formerly 70217e1556
[formerly 15833c5ca3b8415b3a2fef1da98c42e95721331d]]
Former-commit-id: 70217e1556
Former-commit-id: 4978b5305d
2012-09-17 09:02:26 -05:00
Bryan Kowal
cff13f2294
Issue #1181 - replace EnhancedPatternLayout with PatternLayout
...
Former-commit-id: 3a037ffd49
[formerly 77d12d0275
[formerly 29b131727eb8b5b9c450a7f0fd9d1c2c073cc393]]
Former-commit-id: 77d12d0275
Former-commit-id: 9915d4c006
2012-09-14 12:25:41 -05:00
Nate Jensen
994e1080ad
Merge "Issue #1117 : Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections." into development
...
Former-commit-id: 614c0f4248
[formerly b1a6ff5396
[formerly 31538baa1db02a946b2cec63e349025cd1f4676c]]
Former-commit-id: b1a6ff5396
Former-commit-id: 71f5f75f22
2012-09-14 11:04:04 -05:00
Brad Gonzales
f378cfec92
Issue #1171 updated TimeSeriesDisplayCanvas.findGraphMinMax(GraphData) to check the latest only setting before including historical traces in the calculation. Replaced System.err logging in TimeSeriesDlg with UFStatus handler logging. Since show latest forcast is always checked initially by default, removed some changes that were unncessary.
...
Change-Id: I68f80d5c1ffff9993bb9e2fb870a89426dca15aa
Former-commit-id: 09abbee8e9
[formerly f52f218813
[formerly 8bb318d9e42e855ccaab60dc763b42040c098e3e]]
Former-commit-id: f52f218813
Former-commit-id: 3fc699002f
2012-09-14 10:56:28 -05:00
David Gillingham
3b7e2b3627
Issue #1117 : Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections.
...
Change-Id: I7341de07e986227f0917191626cdff8e25bafa30
Former-commit-id: a6d5f67f7a
[formerly cd1acff953
[formerly 82a37521333d6cb471d9d770f99ba593a9ce76aa]]
Former-commit-id: cd1acff953
Former-commit-id: f14efdfd7b
2012-09-14 10:50:44 -05:00
Nate Jensen
e97b1fdbcc
Merge "Issue #1172 - Corrected update problem" into development
...
Former-commit-id: 3ae061edf8
[formerly 9daaa199ea
[formerly d04a01d963a40711e7ed78b0767b699adfd75b2b]]
Former-commit-id: 9daaa199ea
Former-commit-id: d24cc4440c
2012-09-14 10:42:59 -05:00
Nate Jensen
f3a1b17c06
Merge "Issue #1147 : for ifpIMAGE ensure map labels default to off." into development
...
Former-commit-id: 458900fe11
[formerly 9fd69051eb
[formerly 1f4d435e4b7b3db480db0b8aa41505acd44170dc]]
Former-commit-id: 9fd69051eb
Former-commit-id: cda905ffaa
2012-09-14 10:42:26 -05:00
Nate Jensen
483447405f
Merge "Issue #1143 Fixed GriddedImageDisplay2 which is what the CWAT resource uses so stops incorrectly doubling the size of the short array used for display." into development
...
Former-commit-id: 935d47f612
[formerly ee4fa911a2
[formerly 0bd2709db5b336ce5fe215234ba780ff48dc595b]]
Former-commit-id: ee4fa911a2
Former-commit-id: 58c99f5249
2012-09-14 10:41:59 -05:00
David Gillingham
3508097a55
Issue #1147 : for ifpIMAGE ensure map labels default to off.
...
Change-Id: If0e8d0ec18374132469729d1bb2db9cf767afaea
Former-commit-id: 89ee494e1a
[formerly f9f1b6981c
[formerly d865ea8fc6dbe66e05ea7d7271df4b43a60f2146]]
Former-commit-id: f9f1b6981c
Former-commit-id: b56f800d33
2012-09-14 10:08:01 -05:00
James Korman
60d3a92995
Issue #1172 - Corrected update problem
...
Change-Id: Id600728f8f9352b9c44c261c24bf1af8ae6c8e32
Former-commit-id: f0eafc3839
[formerly c228b73624
[formerly d436841050e4d96dbe3b3cb1e54a9d62525c5d08]]
Former-commit-id: c228b73624
Former-commit-id: 26ed32cb19
2012-09-14 09:46:08 -05:00
Lee Venable
5788991c34
Issue #1165 : initial update for the dialog refactor.
...
Issue #1165 - added JFACE code update.
Issue #1165 - changed method names.
Change-Id: I4fab0a7c1384a4f3e5f66a9daf90027d39421110
Former-commit-id: 14eb99add7
[formerly 045297e677
[formerly 687a13eb43abd6ff17b3aa82f2a0265159f5e6cc]]
Former-commit-id: 045297e677
Former-commit-id: 6ac7e90550
2012-09-14 08:39:38 -05:00
Ron Anderson
5b13a48b8d
Merge "Issue #1117 : Modify D2DGridDatabase to retrieve parms from GribParamInfo XML files, modify ParameterInfo to provide list of valid levels for each parameter, create utility script to convert A1 CDL to A2 XML format, modify WeatherElementBrowser so database lists are always current." into development
...
Former-commit-id: 2dc48d6a85
[formerly 5c844b346c
[formerly 5cc4ec7f99bb7e8d3185b4c5aa2b40f86125b618]]
Former-commit-id: 5c844b346c
Former-commit-id: b628c604ad
2012-09-13 17:41:14 -05:00
Max Schenkelberg
ac6c96dc4c
Issue #1143 Fixed GriddedImageDisplay2 which is what the CWAT resource uses so stops incorrectly doubling the size of the short array used for display.
...
Change-Id: I7fd59086fc75b7b72ebece857273c8d0c58d2abd
Former-commit-id: 0b361078b3
[formerly 2b20299319
[formerly 5698f8158b32789bab532e8820521f609e23a8c8]]
Former-commit-id: 2b20299319
Former-commit-id: dc613b2ba7
2012-09-13 16:40:00 -05:00
Nate Jensen
19bd82a901
Merge "Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well." into development
...
Former-commit-id: 1af2344565
[formerly 5e9ef6a224
[formerly 00c4c7a84f65c5c8bb45d3d3020d97c5b9d16eba]]
Former-commit-id: 5e9ef6a224
Former-commit-id: 661ef69489
2012-09-13 16:26:02 -05:00
David Gillingham
4d7f324f64
Issue #1117 : Modify D2DGridDatabase to retrieve parms from GribParamInfo
...
XML files, modify ParameterInfo to provide list of valid levels for each
parameter, create utility script to convert A1 CDL to A2 XML format,
modify WeatherElementBrowser so database lists are always current.
Change-Id: If0513ed8ce8c1134e92c6702c58b2a49f17a6dc5
Former-commit-id: 99ab0a124b
[formerly 21739d1d38
[formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]
Former-commit-id: 21739d1d38
Former-commit-id: 03a202134a
2012-09-13 15:39:58 -05:00
Steve Harris
b84b354c01
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 6146f56ce4
[formerly 321e2191b1
[formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]
Former-commit-id: 321e2191b1
Former-commit-id: 2e47ad78bc
2012-09-13 15:25:12 -05:00
Steve Harris
2a42503413
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: da0afec2c1
[formerly abc2a7fb62
[formerly 165e2e8bfb9527ba1d5c274e351d63196eafa0e9]]
Former-commit-id: abc2a7fb62
Former-commit-id: 9ae530cd1b
2012-09-13 15:21:40 -05:00
Max Schenkelberg
587b5bacc0
Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well.
...
Change-Id: I4756cffb310ba9c7eab707b3764f667db01f886f
Former-commit-id: 932e4da3a9
[formerly 5a9d7eea35
[formerly ac26e6f39bc21ecb4b2bd13a20f72d4f4c470e67]]
Former-commit-id: 5a9d7eea35
Former-commit-id: 3cdabeb7cd
2012-09-13 14:37:20 -05:00
Brad Gonzales
0750f76993
Issue #1158 Changed the scheduled and alerted alarm containers in SCANAlarmAlertManager to be sychronized. Changed the alarm button and alarm in SCANCellTableDlg to show and alarm only when the current table has alarms. Turn off alarms if the threshold has changed. Also a fix for ScanResource to initialize the ScanDrawer only after it has initialized the GeodeticCalculator.
...
Former-commit-id: 1ed32bdefc
[formerly 02ca1776b4
[formerly e1f97dfdf69c0cf625555372e8855d85967c4b2a]]
Former-commit-id: 02ca1776b4
Former-commit-id: 49f61f42f1
2012-09-13 14:20:23 -05:00
Steve Harris
bedc9569ca
Merge branch 'ss_builds' (12.10.1-4) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 04d9735c8f
[formerly 29e7427dc3
[formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 29e7427dc3
Former-commit-id: 04de1d5857
2012-09-13 13:26:13 -05:00
Steve Harris
0d8d18d7e2
12.10.1-4 baseline
...
Former-commit-id: 49c3861597
[formerly fd19ca5624
[formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
2012-09-13 12:08:11 -05:00
James Korman
972d96fe33
Issue #1011 - Corrected AIREP turbulence decoding
...
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1
Former-commit-id: d3fd8a53df
[formerly c0e5570aa2
[formerly 41dd04864bbd4b510b5e1b0c6e4259bb140b9b2e]]
Former-commit-id: c0e5570aa2
Former-commit-id: 6531df3ab0
2012-09-13 10:18:39 -05:00
Richard Peter
fc1e536f99
Merge "Issue #951 added Appender EnvConfigurableRollingFileAppender." into development
...
Former-commit-id: cc479cccc5
[formerly 01f8febfd5
[formerly 028d3984932a79fbdf290c9bf53971cf31f11ff8]]
Former-commit-id: 01f8febfd5
Former-commit-id: 89b376611f
2012-09-13 09:36:14 -05:00
Roger Ferrel
0743085c57
Issue #1155 Per email changed default id from 'blank' to hyphen '-'.
...
Change-Id: Iea2dcb2ecb15662d158c93a6e81989335860e581
Former-commit-id: 412337bc42
[formerly c1315ae6f5
[formerly 993c0cf0eb9e31b1aa1ffa339d49e323571aaa1b]]
Former-commit-id: c1315ae6f5
Former-commit-id: 6ceebcc2ee
2012-09-13 08:23:00 -05:00
Brad Gonzales
b384c8372b
Issue #951 added Appender EnvConfigurableRollingFileAppender.
...
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b
Former-commit-id: d10cabc917
[formerly 4b383c3274
[formerly 4d103fe06c94b8d5067e44aaabfdac88347f9a96]]
Former-commit-id: 4b383c3274
Former-commit-id: 32df328434
2012-09-13 07:50:56 -05:00
Nate Jensen
bed0deac22
Merge "Issue #875 Now does faster refresh and properly handle nofification of other CAVEs of changes." into Enhanced_points
...
Former-commit-id: b5309d2484
[formerly 60c1c059c6
[formerly d03287982238676b7f7f76cf1ff4e1404e66f038]]
Former-commit-id: 60c1c059c6
Former-commit-id: 0d2a6afbaf
2012-09-12 15:04:58 -05:00
Roger Ferrel
758b90b2b3
Issue #1155 changed default WMO id to 'blank'.
...
Change-Id: I1374b7584545e1510745882972e96011fd6db128
Former-commit-id: 00d7dea2eb
[formerly d61f796f31
[formerly c68617688bebf943fba3f46ab4df200ee4f99cc8]]
Former-commit-id: d61f796f31
Former-commit-id: 65b8cd58c3
2012-09-12 14:55:15 -05:00
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
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
Roger Ferrel
fa4d4e0ff8
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: be8e334da3
[formerly 6df929a87d
[formerly ae352e695a198b4f675249d1ef22118305d2f682]]
Former-commit-id: 6df929a87d
Former-commit-id: 5b320fe49d
2012-09-12 09:00:33 -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
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
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