Commit graph

1140 commits

Author SHA1 Message Date
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: c4398c09a4 [formerly fffe220e05 [formerly edbff1f2b607d53e8247155a5526a7c21e40ac71]]
Former-commit-id: fffe220e05
Former-commit-id: ab120dfec6
2012-09-11 14:04:14 -05:00
Lee Venable
1a5f514d00 Merge "Issue #1161 changed comparator" into development
Former-commit-id: a691386102 [formerly 802b43036e [formerly 2d9bf3e785e72e8bc3b3a04d186d3c76ddc1eebb]]
Former-commit-id: 802b43036e
Former-commit-id: f731ae885c
2012-09-11 10:02:21 -05:00
Dave Hladky
70ccfe678a Issue #1161 changed comparator
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962

Former-commit-id: af27b562d7 [formerly c78fb26fbf [formerly 36748378cf53d2ab7c6ba1e49be195d90e2dc385]]
Former-commit-id: c78fb26fbf
Former-commit-id: afb00feb6d
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: 83fc018f38 [formerly 056e74d3cf [formerly 19dc13a0d5ef2b0fc41300815dd6be34d7001afd]]
Former-commit-id: 056e74d3cf
Former-commit-id: 1f86d2c4ba
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: 6818408d40 [formerly 28912552fe [formerly 2088328c090d5a7d3f6218c42619fd3ab6d45dd9]]
Former-commit-id: 28912552fe
Former-commit-id: 33f222783d
2012-09-11 08:56:51 -05:00
Ben Steffensmeier
4841cf1373 Issue #189 initial checkin of parameter plugin
Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a

Former-commit-id: a563707ad5 [formerly b3ead4e169 [formerly 65d5edae30817a65dd46374c18907894d92f2972]]
Former-commit-id: b3ead4e169
Former-commit-id: 0bfedb4e54
2012-09-10 14:24:32 -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
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: 83681d1ff6 [formerly f192c8d115 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]
Former-commit-id: f192c8d115
Former-commit-id: cff73c9e1d
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: 04b574f56e [formerly ec89c440fe [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]
Former-commit-id: ec89c440fe
Former-commit-id: 3c63f21cfc
2012-09-07 10:28:51 -05:00
Steve Harris
319927240c Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]
Former-commit-id: bba4eb12d0
Former-commit-id: 0e046d847a
2012-09-04 12:11:03 -05:00
Steve Harris
7248f8b762 12.10.1-1 baseline
Former-commit-id: d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: 195158c004
Former-commit-id: 0abf64b77c
2012-09-04 12:07:27 -05:00
Steve Harris
feccb1205d Merge branch 'development' into Enhanced_points
Former-commit-id: 32cf7fd764 [formerly 5feac55dbd [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]
Former-commit-id: 5feac55dbd
Former-commit-id: fa7c31206b
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: 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]
Former-commit-id: 3a9d4961e2
Former-commit-id: f52c8b374d
2012-08-30 14:40:34 -05:00
Steve Harris
a2bb1dabe0 12.9.1-11 baseline
Former-commit-id: fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]
Former-commit-id: 6eb6b0909b
Former-commit-id: d07c18918d
2012-08-30 14:36:12 -05:00
Steve Harris
264d870cbf 12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: 3adc50a783
Former-commit-id: bdb45cdfae
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: a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: 91e39617cb
Former-commit-id: 51eb89eb2a
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: f646b185da [formerly 1b45f1b6d9 [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]
Former-commit-id: 1b45f1b6d9
Former-commit-id: 20c65a4677
2012-08-23 09:27:46 -05:00
Richard Peter
f9878c21f7 Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: 4c56f4e20d [formerly 6c1690e063 [formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]]
Former-commit-id: 6c1690e063
Former-commit-id: 0dd2c44c9c
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: b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b8ab6066f6
Former-commit-id: 7a4f4ac493
2012-08-22 16:00:33 -05:00
James Korman
7d61470ce7 Issue #798 - Correct for hdfFileId
Former-commit-id: c2c228b429 [formerly 56d6b1e886 [formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]]
Former-commit-id: 56d6b1e886
Former-commit-id: 6d250cf9f3
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: a5c57e8d24 [formerly a501aacb3b [formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]]
Former-commit-id: a501aacb3b
Former-commit-id: 04389b9f21
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: b8629a0f20 [formerly 8e3ecc1efd [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]
Former-commit-id: 8e3ecc1efd
Former-commit-id: 04c8c3ca55
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: 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: d38f8b80f0
Former-commit-id: 084ac9fbd4
2012-08-21 16:17:58 -05:00
Steve Harris
77cbd6c1e5 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
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: 7662d249ab [formerly d7a818fd1d [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]
Former-commit-id: d7a818fd1d
Former-commit-id: 16231374f8
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: 819b9c8e56 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]
Former-commit-id: 1321db6a99
Former-commit-id: 93c632c1ff
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: 6eec24180e [formerly 342bda7e5f [formerly 2368421395496141fdc6467fd165babc282b65ac]]
Former-commit-id: 342bda7e5f
Former-commit-id: ac8888ae10
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: ba40e18fb2 [formerly b93989daaf [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]
Former-commit-id: b93989daaf
Former-commit-id: d170ae704b
2012-08-15 22:29:07 +00:00
root
bb7b5341dd Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: cb46f57879
Former-commit-id: 0987fc6b3d
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
ec41ec59ee Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: 7bad34f906 [formerly 72c63e1a6f [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]
Former-commit-id: 72c63e1a6f
Former-commit-id: dd8ed9eca0
2012-08-15 16:22:39 -05:00
Steve Harris
71b024e3a1 12.9.1-4 baseline
Former-commit-id: 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: dcda3a2290
Former-commit-id: 36c108e960
2012-08-15 15:19:10 -05:00
Steve Harris
8083b81729 12.9.1-3 baseline
Former-commit-id: 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 36d80b1f60
Former-commit-id: c11f7d396e
2012-08-15 14:26:10 -05:00
Steve Harris
ecba93c959 12.9.1-2 baseline
Former-commit-id: a198b3a807 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: d1d877d319
Former-commit-id: 27871051e3
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
55ac7d7684 Issue #915 Set the user data.
Former-commit-id: 03ed8ee0b0 [formerly 865136f6ef [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]
Former-commit-id: 865136f6ef
Former-commit-id: f37a75f265
2012-08-15 14:05:50 -05:00
Steve Harris
b9fb1c89d4 12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
2012-08-15 13:59:00 -05:00
Steve Harris
9a5ad2fdae Merge branch 'development' into Enhanced_points
Former-commit-id: f7f97d9f54 [formerly 346d775f57 [formerly 25026a4d9955b76039bf25861380cadebff19665]]
Former-commit-id: 346d775f57
Former-commit-id: e372481f81
2012-08-15 13:35:47 -05:00
Ron Anderson
9b35518fe5 Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 81abb2c60b [formerly 17f636c2a2 [formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]
Former-commit-id: 17f636c2a2
Former-commit-id: bac68cc1de
2012-08-14 16:27:11 -05:00
Ben Steffensmeier
4c45df4e3f Issue #947 revert changes to dataTime format
Former-commit-id: 70ba8d82db [formerly 50cb7383a6 [formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]
Former-commit-id: 50cb7383a6
Former-commit-id: 54b538bb07
2012-08-14 16:20:36 -05:00
Ron Anderson
0328f2f50a Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 985167892d [formerly 71d74b1dcf [formerly 564b72997c59a665398c8687d6bafdb54c469881]]
Former-commit-id: 71d74b1dcf
Former-commit-id: 5c80f582b3
2012-08-14 16:20:23 -05:00
Ben Steffensmeier
85bba2f435 Issue #947 revert changes to dataTime format
Former-commit-id: 434193b34b [formerly ce689ad5fa [formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]
Former-commit-id: ce689ad5fa
Former-commit-id: fd2bf26119
2012-08-14 16:12:02 -05:00
Ben Steffensmeier
4ac95d6f30 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 1e527f83f0 [formerly c6a121962f [formerly 06c2c85159598ca803c663de97caed4b6841c135]]
Former-commit-id: c6a121962f
Former-commit-id: 573cc270e8
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
702f11b85d Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: b53fe917bc [formerly 525c0b21a9 [formerly 045952304218c867d8fe89df9828f70632df2d00]]
Former-commit-id: 525c0b21a9
Former-commit-id: 8d118c392a
2012-08-09 17:50:23 -05:00
Nate Jensen
80b312f764 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: 4211a8deac [formerly eeaa2c798f [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]
Former-commit-id: eeaa2c798f
Former-commit-id: 32cc46ec4e
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
16187575d7 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: ad1415948f [formerly 066a5af2a6 [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]
Former-commit-id: 066a5af2a6
Former-commit-id: 64caa963b1
2012-08-09 17:16:38 -05:00
Nate Jensen
3aeaced4dc Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
Former-commit-id: fbbf74eb50 [formerly a88d7bcedc [formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]
Former-commit-id: a88d7bcedc
Former-commit-id: 8cd83e1571
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
ee8a4896bd Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 5da238c8b9 [formerly 97ba96759c [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]
Former-commit-id: 97ba96759c
Former-commit-id: cac790ac5a
2012-08-08 14:41:33 -05:00
Steve Harris
655b5932d9 Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: d538fd8913 [formerly bbf4b18204 [formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]]
Former-commit-id: bbf4b18204
Former-commit-id: fc39ef78e4
2012-08-08 13:57:46 -05:00
Roger Ferrel
f8d0512703 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: f4ae8eb150 [formerly 2e3fc4b400 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]
Former-commit-id: 2e3fc4b400
Former-commit-id: b3c357c964
2012-08-08 13:35:47 -05:00
Steve Harris
c72218985b Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 9e2e0fa166 [formerly 926ff5dc5a [formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]]
Former-commit-id: 926ff5dc5a
Former-commit-id: e2267aa186
2012-08-07 15:29:25 -05:00
Steve Harris
f19c9fa55d Fixed merge of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 3f88fa9078 [formerly 6dae0398d3 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]
Former-commit-id: 6dae0398d3
Former-commit-id: 6615c96f33
2012-08-07 10:04:39 -05:00