Richard Peter
aeadf13cdb
Merge "Issue #626 update WMOHeaderRemover to remove any extra bytes before wmo header found from WMOHeaderFinder." into development
...
Former-commit-id: 3cf933fa4c9268dee2749268dee274a61fc2ca7b
2012-09-18 08:19:18 -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: 39f15fe032dd6ac67e17dd6ac67e1715a625adb7
2012-09-17 15:46:11 -05:00
Steve Harris
d0cd58d6bc
12.10.1-5 baseline
...
Former-commit-id: 4fd8893e55a96d35a1faa96d35a1fa82feb4de50
2012-09-17 15:42:31 -05:00
Steve Harris
912cec518b
Merge branch 'development' into Enhanced_points and Enhanced_points into development
...
Former-commit-id: fe92909f5372ecefa9ee72ecefa9eec64e9b0ad9
2012-09-17 14:58:23 -05:00
Max Schenkelberg
32a463034a
Issue #626 update WMOHeaderRemover to remove any extra bytes before wmo header found from WMOHeaderFinder.
...
Change-Id: I836fbc496c2dd2da610dbdd16b6bea0428a7966a
Former-commit-id: b0addbc1dbc4a3ff3076c4a3ff307638da9ec0c1
2012-09-17 12:59:10 -05:00
Roger Ferrel
65e9237959
Issue #875 Added tri-state for Point fields movable and hidden.
...
Change-Id: Idcb54906735a6f727f4db88ca39ae0e57deb2964
Former-commit-id: 66d98d068c70217e155670217e15564978b5305d
2012-09-17 09:02:26 -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: 2dc48d6a855c844b346c5c844b346cb628c604ad
2012-09-13 17:41:14 -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: 1af23445655e9ef6a2245e9ef6a224661ef69489
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: 99ab0a124b21739d1d3821739d1d3803a202134a
2012-09-13 15:39:58 -05:00
Steve Harris
b84b354c01
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 6146f56ce4321e2191b1321e2191b12e47ad78bc
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: da0afec2c1abc2a7fb62abc2a7fb629ae530cd1b
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: 932e4da3a95a9d7eea355a9d7eea353cdabeb7cd
2012-09-13 14:37:20 -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: 04d9735c8f29e7427dc329e7427dc304de1d5857
2012-09-13 13:26:13 -05:00
Steve Harris
0d8d18d7e2
12.10.1-4 baseline
...
Former-commit-id: 49c3861597fd19ca5624fd19ca5624e38e81ab8c
2012-09-13 12:08:11 -05:00
James Korman
972d96fe33
Issue #1011 - Corrected AIREP turbulence decoding
...
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1
Former-commit-id: d3fd8a53dfc0e5570aa2c0e5570aa26531df3ab0
2012-09-13 10:18:39 -05:00
Brad Gonzales
b384c8372b
Issue #951 added Appender EnvConfigurableRollingFileAppender.
...
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b
Former-commit-id: d10cabc9174b383c32744b383c327432df328434
2012-09-13 07:50:56 -05:00
Steve Harris
bb6fe85a47
Merge branch 'development' into Enhanced_points
...
Former-commit-id: ada10668311dd1305a5d1dd1305a5d892598dc66
2012-09-12 14:14:56 -05:00
Max Schenkelberg
863ecb1ad6
Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT
...
Change-Id: I2e6e538870c605675d8070d79786398adbf7dbcb
Former-commit-id: cc37173be9eabc8d684beabc8d684be1b01588d1
2012-09-12 09:22:25 -05:00
Richard Peter
5baaa6593f
Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
...
Former-commit-id: 60b21393fc701960a246701960a246c8443cf85c
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: adf25aa707503cddcc5e503cddcc5ed39a318583
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: 012c52681664d4e2bded64d4e2bdedf94db138cd
2012-09-11 16:57:03 -05:00
Steve Harris
0403e7d0a9
12.10.1-3 baseline
...
Former-commit-id: 969e7e6dfd21f430062b21f430062bde1639aea2
2012-09-11 16:00:38 -05:00
Steve Harris
bb190a66a1
12.10.1-2 baseline
...
Former-commit-id: a66f3f4b60250f0ccac9250f0ccac9dde1f4c54d
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: c4398c09a4fffe220e05fffe220e05ab120dfec6
2012-09-11 14:04:14 -05:00
Lee Venable
1a5f514d00
Merge "Issue #1161 changed comparator" into development
...
Former-commit-id: a691386102802b43036e802b43036ef731ae885c
2012-09-11 10:02:21 -05:00
Dave Hladky
70ccfe678a
Issue #1161 changed comparator
...
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962
Former-commit-id: af27b562d7c78fb26fbfc78fb26fbfafb00feb6d
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: 83fc018f38056e74d3cf056e74d3cf1f86d2c4ba
2012-09-11 09:15:47 -05:00
Dave Hladky
7ea2655805
Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
...
Change-Id: I23212f3281290d86621e72c88478b00d37336494
Former-commit-id: 6818408d4028912552fe28912552fe33f222783d
2012-09-11 08:56:51 -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: 84658dd03a80439b309b80439b309b6d78afd423
2012-09-10 10:45:37 -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: 83681d1ff6f192c8d115f192c8d115cff73c9e1d
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: 04b574f56eec89c440feec89c440fe3c63f21cfc
2012-09-07 10:28:51 -05:00
Steve Harris
319927240c
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: af106f1d29bba4eb12d0bba4eb12d00e046d847a
2012-09-04 12:11:03 -05:00
Steve Harris
7248f8b762
12.10.1-1 baseline
...
Former-commit-id: d708932029195158c004195158c0040abf64b77c
2012-09-04 12:07:27 -05:00
Steve Harris
feccb1205d
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 32cf7fd7645feac55dbd5feac55dbdfa7c31206b
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: 34cbde41243a9d4961e23a9d4961e2f52c8b374d
2012-08-30 14:40:34 -05:00
Steve Harris
a2bb1dabe0
12.9.1-11 baseline
...
Former-commit-id: fc405efab76eb6b0909b6eb6b0909bd07c18918d
2012-08-30 14:36:12 -05:00
Steve Harris
264d870cbf
12.9.1-10 baseline
...
Former-commit-id: cb9b80f3a03adc50a7833adc50a783bdb45cdfae
2012-08-30 14:28:27 -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: a71dac6cad91e39617cb91e39617cb51eb89eb2a
2012-08-27 09:53:55 -05:00
Jonathan Sanchez
caaa78a981
Issue #1006 Implemented urban areas. Cherry picked from development on SS builds
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
Change-Id: Ife20e07ccffeb6e6f5cc4aabdc6c57c9ed6e9ff8
Former-commit-id: f646b185da1b45f1b6d91b45f1b6d920c65a4677
2012-08-23 09:27:46 -05:00
Richard Peter
f9878c21f7
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 4c56f4e20d6c1690e0636c1690e0630dd2c44c9c
2012-08-22 17:07:17 -05:00
Steve Harris
e1cf4b0b9a
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: b77a4d40d7b8ab6066f6b8ab6066f67a4f4ac493
2012-08-22 16:00:33 -05:00
James Korman
7d61470ce7
Issue #798 - Correct for hdfFileId
...
Former-commit-id: c2c228b42956d6b1e88656d6b1e8866d250cf9f3
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
e69aa93735
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: a5c57e8d24a501aacb3ba501aacb3b04389b9f21
2012-08-22 13:03:24 -05:00
Steve Harris
deb39fdbea
Issue #915 Set the user data. (cherry picked from development_on_ss_builds)
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
Former-commit-id: b8629a0f208e3ecc1efd8e3ecc1efd04c8c3ca55
2012-08-22 13:01:08 -05:00
Steve Harris
57c1be9f5a
Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/build.edex/edex/customAssembly.xml
edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
nativeLib/rary.cots.jasper/jasper-1.900.1/configure
rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/i386/build.sh
tools/scripts/commit-msg
tools/scripts/git-u-setup
tools/scripts/uamend
tools/scripts/ucommit
tools/scripts/upull
tools/scripts/upush
tools/scripts/ustat
Former-commit-id: 44a7cb75e7d38f8b80f0d38f8b80f0084ac9fbd4
2012-08-21 16:17:58 -05:00
Steve Harris
77cbd6c1e5
12.9.1-5 baseline
...
Former-commit-id: f2fac3942861f269f54c61f269f54ca1d931fd44
2012-08-21 15:27:03 -05:00
Ron Anderson
0a6de388dd
Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
...
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.
Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff
Former-commit-id: 7662d249abd7a818fd1dd7a818fd1d16231374f8
2012-08-17 12:41:49 -05:00
Ron Anderson
c71ee18e6e
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 819b9c8e561321db6a991321db6a9993c632c1ff
2012-08-17 12:20:08 -05:00
root
e2b7a1679b
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: 6eec24180e342bda7e5f342bda7e5fac8888ae10
2012-08-15 22:29:38 +00:00
root
b6e17e9b02
Merge branch 'reconcile' into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
Former-commit-id: ba40e18fb2b93989daafb93989daafd170ae704b
2012-08-15 22:29:07 +00:00
