Steve Harris
beb08c98ce
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: dd6ac67e17dd6ac67e1739f15fe0329de7b02008
2012-09-17 15:46:11 -05:00
Steve Harris
430a11f72b
12.10.1-5 baseline
...
Former-commit-id: a96d35a1faa96d35a1fa4fd8893e55deed84c1a2
2012-09-17 15:42:31 -05:00
Steve Harris
f9166b9d83
Merge branch 'development' into Enhanced_points and Enhanced_points into development
...
Former-commit-id: 72ecefa9ee72ecefa9eefe92909f53b8d2ff47ca
2012-09-17 14:58:23 -05:00
Roger Ferrel
ed3663b145
Issue #875 Added tri-state for Point fields movable and hidden.
...
Change-Id: Idcb54906735a6f727f4db88ca39ae0e57deb2964
Former-commit-id: 70217e155670217e155666d98d068c7bbcb004be
2012-09-17 09:02:26 -05:00
Ron Anderson
6dbf6c9c81
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: 5c844b346c5c844b346c2dc48d6a85558cfd51cb
2012-09-13 17:41:14 -05:00
Nate Jensen
c1d12f5b54
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: 5e9ef6a2245e9ef6a2241af234456599a6312ae0
2012-09-13 16:26:02 -05:00
David Gillingham
527a457e55
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: 21739d1d3821739d1d3899ab0a124b964927b19d
2012-09-13 15:39:58 -05:00
Steve Harris
69b6272658
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 321e2191b1321e2191b16146f56ce49ca736f901
2012-09-13 15:25:12 -05:00
Steve Harris
e860b1ea6d
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: abc2a7fb62abc2a7fb62da0afec2c1dcae36f2d7
2012-09-13 15:21:40 -05:00
Max Schenkelberg
3962f6b156
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: 5a9d7eea355a9d7eea35932e4da3a9e6ca7b1122
2012-09-13 14:37:20 -05:00
Steve Harris
f80fb62837
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: 29e7427dc329e7427dc304d9735c8f53673f63e6
2012-09-13 13:26:13 -05:00
Steve Harris
26b7d083ec
12.10.1-4 baseline
...
Former-commit-id: fd19ca5624fd19ca562449c38615972ba58a3576
2012-09-13 12:08:11 -05:00
James Korman
a58854cd36
Issue #1011 - Corrected AIREP turbulence decoding
...
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1
Former-commit-id: c0e5570aa2c0e5570aa2d3fd8a53df029f9537c8
2012-09-13 10:18:39 -05:00
Brad Gonzales
b9937ef456
Issue #951 added Appender EnvConfigurableRollingFileAppender.
...
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b
Former-commit-id: 4b383c32744b383c3274d10cabc91741dc92ba3a
2012-09-13 07:50:56 -05:00
Steve Harris
d20a1de861
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 1dd1305a5d1dd1305a5dada1066831d85659d9de
2012-09-12 14:14:56 -05:00
Max Schenkelberg
411a8d43a0
Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT
...
Change-Id: I2e6e538870c605675d8070d79786398adbf7dbcb
Former-commit-id: eabc8d684beabc8d684bcc37173be9ec9b3c56fb
2012-09-12 09:22:25 -05:00
Richard Peter
c142137798
Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
...
Former-commit-id: 701960a246701960a24660b21393fcb5d3a41fb1
2012-09-12 08:27:11 -05:00
Steve Harris
dbd228eea2
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 503cddcc5e503cddcc5eadf25aa707865fd2f475
2012-09-11 17:06:26 -05:00
Steve Harris
bba73380ca
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: 64d4e2bded64d4e2bded012c52681641c82361f7
2012-09-11 16:57:03 -05:00
Steve Harris
faadb51529
12.10.1-3 baseline
...
Former-commit-id: 21f430062b21f430062b969e7e6dfd438d139fdd
2012-09-11 16:00:38 -05:00
Steve Harris
cc3c3dadee
12.10.1-2 baseline
...
Former-commit-id: 250f0ccac9250f0ccac9a66f3f4b6034d2ddee9d
2012-09-11 15:50:57 -05:00
Max Schenkelberg
6c5d3637e1
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: fffe220e05fffe220e05c4398c09a4a513b5830a
2012-09-11 14:04:14 -05:00
Lee Venable
aa256d89e5
Merge "Issue #1161 changed comparator" into development
...
Former-commit-id: 802b43036e802b43036ea6913861029f1f054f4c
2012-09-11 10:02:21 -05:00
Dave Hladky
6c4495a7e6
Issue #1161 changed comparator
...
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962
Former-commit-id: c78fb26fbfc78fb26fbfaf27b562d71c1ffc7793
2012-09-11 09:39:43 -05:00
Lee Venable
83c441319e
Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
...
Former-commit-id: 056e74d3cf056e74d3cf83fc018f381d0bdbd25c
2012-09-11 09:15:47 -05:00
Dave Hladky
8f3447ff9b
Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
...
Change-Id: I23212f3281290d86621e72c88478b00d37336494
Former-commit-id: 28912552fe28912552fe6818408d40655939bba7
2012-09-11 08:56:51 -05:00
Max Schenkelberg
264bc403d6
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: 80439b309b80439b309b84658dd03a20f5d966db
2012-09-10 10:45:37 -05:00
David Gillingham
7bb5d95ac5
Issue #1150 : Fix regression caused by previous text product generation changes by ensuring all
...
directories get created.
Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0
Former-commit-id: f192c8d115f192c8d11583681d1ff69d13d3244d
2012-09-07 12:29:36 -05:00
Bryan Kowal
6f159f35de
Issue #1134 - edex will now use the same jep library that CAVE does
...
Former-commit-id: ec89c440feec89c440fe04b574f56e84f7083b81
2012-09-07 10:28:51 -05:00
Steve Harris
e9582cb789
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: bba4eb12d0bba4eb12d0af106f1d2953e29f59e4
2012-09-04 12:11:03 -05:00
Steve Harris
d65f35ffe9
12.10.1-1 baseline
...
Former-commit-id: 195158c004195158c004d7089320297bd9c63dc7
2012-09-04 12:07:27 -05:00
Steve Harris
66ac1051bc
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 5feac55dbd5feac55dbd32cf7fd764592ab923bb
2012-08-30 15:43:06 -05:00
Steve Harris
5b4ee818b7
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 3a9d4961e23a9d4961e234cbde41243230e0b246
2012-08-30 14:40:34 -05:00
Steve Harris
f401755cde
12.9.1-11 baseline
...
Former-commit-id: 6eb6b0909b6eb6b0909bfc405efab7a14374fcd4
2012-08-30 14:36:12 -05:00
Steve Harris
5bb474d33c
12.9.1-10 baseline
...
Former-commit-id: 3adc50a7833adc50a783cb9b80f3a0dc08c5a71a
2012-08-30 14:28:27 -05:00
Steve Harris
0b647c0c9d
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: 91e39617cb91e39617cba71dac6cad87a602dfee
2012-08-27 09:53:55 -05:00
Jonathan Sanchez
acf62bb8d9
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: 1b45f1b6d91b45f1b6d9f646b185daa09fa0b649
2012-08-23 09:27:46 -05:00
Richard Peter
4a1c27bd22
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 6c1690e0636c1690e0634c56f4e20d252e8e7e2e
2012-08-22 17:07:17 -05:00
Steve Harris
8f1120f6d8
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: b8ab6066f6b8ab6066f6b77a4d40d7b2c0dd1abb
2012-08-22 16:00:33 -05:00
James Korman
36e4ea8147
Issue #798 - Correct for hdfFileId
...
Former-commit-id: 56d6b1e88656d6b1e886c2c228b429654ecefd3e
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
d8680dc631
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: a501aacb3ba501aacb3ba5c57e8d24c7bc786a60
2012-08-22 13:03:24 -05:00
Steve Harris
bbe382231f
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: 8e3ecc1efd8e3ecc1efdb8629a0f209565d18b96
2012-08-22 13:01:08 -05:00
Steve Harris
445d1a6a0d
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: d38f8b80f0d38f8b80f044a7cb75e777369f78a6
2012-08-21 16:17:58 -05:00
Steve Harris
9b5c2094ed
12.9.1-5 baseline
...
Former-commit-id: 61f269f54c61f269f54cf2fac3942872824561cb
2012-08-21 15:27:03 -05:00
Ron Anderson
1b655b0826
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: d7a818fd1dd7a818fd1d7662d249abd3693827a1
2012-08-17 12:41:49 -05:00
Ron Anderson
f7b9190b51
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 1321db6a991321db6a99819b9c8e566eafdda705
2012-08-17 12:20:08 -05:00
root
d1f2ac6698
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: 342bda7e5f342bda7e5f6eec24180eb3217ad886
2012-08-15 22:29:38 +00:00
root
64c3ccb4a4
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: b93989daafb93989daafba40e18fb23e9d1fa430
2012-08-15 22:29:07 +00:00
root
1792158ef8
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: cb46f57879cb46f578795a453ee9848a66b2f209
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
e23523ad80
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: 72c63e1a6f72c63e1a6f7bad34f90691493ee0b9
2012-08-15 16:22:39 -05:00
