Commit graph

289 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Steve Harris
a71dac6cad 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
f646b185da 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
4c56f4e20d Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: 6aa68692dc050d61946be620a6f629c186e0fdaf
2012-08-22 17:07:17 -05:00
Steve Harris
b77a4d40d7 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
c2c228b429 Issue #798 - Correct for hdfFileId
Former-commit-id: 3dd604623685cd5aba9e0a28001004cecef8d29a
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
a5c57e8d24 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
b8629a0f20 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
44a7cb75e7 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
f2fac39428 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Ron Anderson
7662d249ab 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
819b9c8e56 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
6eec24180e 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
ba40e18fb2 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
5a453ee984 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: a178af491f4b4cd75ed1517f023354bab0b9c8c8
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
7bad34f906 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
33b95fb96d 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
84bbf2573e 12.9.1-3 baseline
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
2012-08-15 14:26:10 -05:00
Steve Harris
a198b3a807 12.9.1-2 baseline
Former-commit-id: 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
03ed8ee0b0 Issue #915 Set the user data.
Former-commit-id: d0e0b6160cc0969353555bd7282829a3440c9ef6
2012-08-15 14:05:50 -05:00
Steve Harris
79ce6cfd97 12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00
Steve Harris
f7f97d9f54 Merge branch 'development' into Enhanced_points
Former-commit-id: 25026a4d9955b76039bf25861380cadebff19665
2012-08-15 13:35:47 -05:00
Ron Anderson
81abb2c60b Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 373ac200fcd1c9a39244a2775d95c7b891334632
2012-08-14 16:27:11 -05:00
Ben Steffensmeier
70ba8d82db Issue #947 revert changes to dataTime format
Former-commit-id: 53a441f310e35d80ceb0ff28c156bf15ba1b5893
2012-08-14 16:20:36 -05:00
Ron Anderson
985167892d Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 564b72997c59a665398c8687d6bafdb54c469881
2012-08-14 16:20:23 -05:00
Ben Steffensmeier
434193b34b Issue #947 revert changes to dataTime format
Former-commit-id: 5c560da8d485f2ca2b6ca24925480aa61fb994de
2012-08-14 16:12:02 -05:00
Ben Steffensmeier
1e527f83f0 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 06c2c85159598ca803c663de97caed4b6841c135
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
b53fe917bc Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 045952304218c867d8fe89df9828f70632df2d00
2012-08-09 17:50:23 -05:00
Nate Jensen
4211a8deac Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
Former-commit-id: 70f2bcb38c03eee2d389774f92a4676b0d4cae43
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
ad1415948f Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 51acdac79ebfa11abb5d69707a0a7b059e1a2e57
2012-08-09 17:16:38 -05:00
Nate Jensen
fbbf74eb50 Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
Former-commit-id: b7cac9d262bd99e74a51d903042fb7ad79eddfa8
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
5da238c8b9 Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 30ebbadbbffce0c3b1a236d36be5f3013124e7cd
2012-08-08 14:41:33 -05:00
Steve Harris
d538fd8913 Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: d8080798d6c69b9cf0f9042660c5ad910cf123c6
2012-08-08 13:57:46 -05:00
Roger Ferrel
f4ae8eb150 Issue #875 Markers and group added to Cave.
Amend: Removed python file

Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.

Amend: deleted unwanted .project file

Amend: Removed comment out code and fix class descriptions

Amend: Changes based on reviewer comments.

Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8

Former-commit-id: c8e5bf1a82979ebc2445acb88682e32ca8813f43
2012-08-08 13:35:47 -05:00
Steve Harris
9e2e0fa166 Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 5717f9bf344b6d78ca30f1387679e535bac5a13c
2012-08-07 15:29:25 -05:00
Steve Harris
3f88fa9078 Fixed merge of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 34a733bb4701c6f083595be42e5b15cd4ba868bd
2012-08-07 10:04:39 -05:00
Steve Harris
f3babcf1a1 Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 2a2487546a533987bc618b06780bba4d0bc61da8
2012-08-06 11:13:47 -05:00