Commit graph

3405 commits

Author SHA1 Message Date
Steve Harris
321e2191b1 Merge branch 'development' into Enhanced_points
Former-commit-id: ee63462d73511ef55dc0d80b3e94ef08a37f3305
2012-09-13 15:25:12 -05:00
Steve Harris
abc2a7fb62 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 165e2e8bfb9527ba1d5c274e351d63196eafa0e9
2012-09-13 15:21:40 -05:00
Max Schenkelberg
5a9d7eea35 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: ac26e6f39bc21ecb4b2bd13a20f72d4f4c470e67
2012-09-13 14:37:20 -05:00
Steve Harris
29e7427dc3 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: 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb
2012-09-13 13:26:13 -05:00
Steve Harris
fd19ca5624 12.10.1-4 baseline
Former-commit-id: 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed
2012-09-13 12:08:11 -05:00
James Korman
c0e5570aa2 Issue #1011 - Corrected AIREP turbulence decoding
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1

Former-commit-id: 41dd04864bbd4b510b5e1b0c6e4259bb140b9b2e
2012-09-13 10:18:39 -05:00
Brad Gonzales
4b383c3274 Issue #951 added Appender EnvConfigurableRollingFileAppender.
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b

Former-commit-id: 4d103fe06c94b8d5067e44aaabfdac88347f9a96
2012-09-13 07:50:56 -05:00
Steve Harris
1dd1305a5d Merge branch 'development' into Enhanced_points
Former-commit-id: 632a766ec44337156bab8df73aecdee8b7bc2853
2012-09-12 14:14:56 -05:00
Richard Peter
2c39f2e584 Merge "Issue #189 initial checkin of parameter plugin Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a" into Unified_Grid
Former-commit-id: a0ec82d660d95f6d8e0866d03ccc6fa97b361a71
2012-09-12 11:45:08 -05:00
Max Schenkelberg
eabc8d684b Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT
Change-Id: I2e6e538870c605675d8070d79786398adbf7dbcb

Former-commit-id: 42b8711fa44c85aee40070683729727192b62891
2012-09-12 09:22:25 -05:00
Richard Peter
701960a246 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
503cddcc5e 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
64d4e2bded 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
Steve Harris
21f430062b 12.10.1-3 baseline
Former-commit-id: 1a94c1ca3674c8e4dbb8847de5190efe33da371c
2012-09-11 16:00:38 -05:00
Steve Harris
250f0ccac9 12.10.1-2 baseline
Former-commit-id: 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c
2012-09-11 15:50:57 -05:00
Max Schenkelberg
fffe220e05 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
Lee Venable
802b43036e Merge "Issue #1161 changed comparator" into development
Former-commit-id: 2d9bf3e785e72e8bc3b3a04d186d3c76ddc1eebb
2012-09-11 10:02:21 -05:00
Dave Hladky
c78fb26fbf Issue #1161 changed comparator
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962

Former-commit-id: 36748378cf53d2ab7c6ba1e49be195d90e2dc385
2012-09-11 09:39:43 -05:00
Lee Venable
056e74d3cf 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
Dave Hladky
28912552fe 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
Ben Steffensmeier
b3ead4e169 Issue #189 initial checkin of parameter plugin
Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a

Former-commit-id: 65d5edae30817a65dd46374c18907894d92f2972
2012-09-10 14:24:32 -05:00
Max Schenkelberg
80439b309b 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
David Gillingham
f192c8d115 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
ec89c440fe 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
Steve Harris
bba4eb12d0 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 3eacf0da611b09faa416580b8d2db5bdc9af2d11
2012-09-04 12:11:03 -05:00
Steve Harris
195158c004 12.10.1-1 baseline
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
2012-09-04 12:07:27 -05:00
Steve Harris
5feac55dbd Merge branch 'development' into Enhanced_points
Former-commit-id: 3aec6326bfce36758b93c7955ce3d0ee49e30cc3
2012-08-30 15:43:06 -05:00
Steve Harris
3a9d4961e2 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
6eb6b0909b 12.9.1-11 baseline
Former-commit-id: 046d9078b7aa87ff8df98142556713fe38d95c63
2012-08-30 14:36:12 -05:00
Steve Harris
3adc50a783 12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
2012-08-30 14:28:27 -05:00
Steve Harris
91e39617cb 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: b9db13cf5bff60511d815f92f0239a4313498265
2012-08-27 09:53:55 -05:00
Jonathan Sanchez
1b45f1b6d9 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: a7f030f7ee05c60820c1ef82a5093b404e5e97a0
2012-08-23 09:27:46 -05:00
Richard Peter
6c1690e063 Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: 6aa68692dc050d61946be620a6f629c186e0fdaf
2012-08-22 17:07:17 -05:00
Steve Harris
b8ab6066f6 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e977bd92cef6986b14725164c9eaa417ecf359cf
2012-08-22 16:00:33 -05:00
James Korman
56d6b1e886 Issue #798 - Correct for hdfFileId
Former-commit-id: 3dd604623685cd5aba9e0a28001004cecef8d29a
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
a501aacb3b Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: ccb9b1b4e9caf8523706535b141b0e54dd798c70
2012-08-22 13:03:24 -05:00
Steve Harris
8e3ecc1efd 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: ef64da82bb8594eddead221f7c5bf5fa95e4ff8b
2012-08-22 13:01:08 -05:00
Steve Harris
d38f8b80f0 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: 6d33469c48d659279c02e5e9489b67b00576381a
2012-08-21 16:17:58 -05:00
Steve Harris
61f269f54c 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Ron Anderson
d7a818fd1d 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: 18f0efe7a8d9f2c31786fc449403f720b554b95d
2012-08-17 12:41:49 -05:00
Ron Anderson
1321db6a99 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 9287cf98369abb8a674fd5bab99439d055218a05
2012-08-17 12:20:08 -05:00
root
342bda7e5f Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: 2368421395496141fdc6467fd165babc282b65ac
2012-08-15 22:29:38 +00:00
root
b93989daaf 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: 6e4d168bf9ea0c252d0923e4e2595d9c4df06289
2012-08-15 22:29:07 +00:00
root
cb46f57879 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: a178af491f4b4cd75ed1517f023354bab0b9c8c8
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
72c63e1a6f Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: b30ec7ab0f96f1155e2c13587a1b4f179ce3da51
2012-08-15 16:22:39 -05:00
Steve Harris
dcda3a2290 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
36d80b1f60 12.9.1-3 baseline
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
2012-08-15 14:26:10 -05:00
Steve Harris
d1d877d319 12.9.1-2 baseline
Former-commit-id: 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
865136f6ef Issue #915 Set the user data.
Former-commit-id: d0e0b6160cc0969353555bd7282829a3440c9ef6
2012-08-15 14:05:50 -05:00
Steve Harris
31ae7ea218 12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00