xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2147 commits 31 branches 40 tags 3.8 GiB
Commit graph

259 commits

Author SHA1 Message Date
Roger Ferrel
7f59b9efa1 Issue #1287 Changes for non-blocking AutoSaveIntervalDialog. 
Change-Id: I5ea021d0658e68553542c88c8850fea4b9de696b

Former-commit-id: 2048a41563 [formerly 3e852fc9b5] [formerly 2048a41563 [formerly 3e852fc9b5] [formerly 17085ba699 [formerly d1601fee5b3de86e0120553d17ee18cf0b482e63]]]
Former-commit-id: 17085ba699
Former-commit-id: 1ce417b106 [formerly 6b9f409486]
Former-commit-id: 2ac417247f
 2012-10-23 13:54:50 -05:00
Richard Peter
ddf41c8de6 Issue #1257: Fix GFE HDF5 Retrievel to time correlate results to requested times. 
Change-Id: I4fb15e8e712155f6099bd27880fbcbdf1948fc5f

Former-commit-id: f94ba53663 [formerly 2e025e09e2] [formerly f94ba53663 [formerly 2e025e09e2] [formerly 0d10680b28 [formerly 6077558dbd06f8fdb568f03c163352b080a9eb5e]]]
Former-commit-id: 0d10680b28
Former-commit-id: 5dd0edf429 [formerly 5bc200bb88]
Former-commit-id: f53f3ea64f
 2012-10-23 13:52:25 -05:00
Roger Ferrel
346e8851fb Issue #1287 Changes for non-blocking FormatterLauncherDialog and code cleanup. 
Change-Id: If2fbef2f2a128ff151525eed4feaf4273fa99855

Former-commit-id: 257bdcaa91 [formerly 656f582e22] [formerly 257bdcaa91 [formerly 656f582e22] [formerly 525a5bb8d1 [formerly 936092efc2f69ab3e2060334fddd630100da4157]]]
Former-commit-id: 525a5bb8d1
Former-commit-id: d82d50faf1 [formerly cc5ef23f23]
Former-commit-id: 38bc6ea4e9
 2012-10-23 12:40:48 -05:00
Roger Ferrel
5843833581 Issue #1287 Changes for non-blocking but modal DisplayAttributesDialog. 
Change-Id: I57df579cd29ffa2bb54589bf5862121857abedb0

Former-commit-id: 04053afeb7 [formerly 8152c49231] [formerly 04053afeb7 [formerly 8152c49231] [formerly b0c5e6472b [formerly 4dca1f343e38090c21e27f0470cc68042c22c811]]]
Former-commit-id: b0c5e6472b
Former-commit-id: f96c5a1e28 [formerly 8ac665a0ca]
Former-commit-id: ed86da12d7
 2012-10-22 15:35:50 -05:00
Steve Harris
35c2a8e26f Merge branch 'ss_builds' (12.11.1-6) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 3eff876edd [formerly a7337d9160] [formerly 3eff876edd [formerly a7337d9160] [formerly 1807100932 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: 8486da2fd3 [formerly 892e4df811]
Former-commit-id: 8a17564ba3
 2012-10-18 16:01:05 -05:00
Steve Harris
9c597c7060 12.11.1-6 baseline 
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 8beb6fc0b8 [formerly 08fc9f6b14]
Former-commit-id: 4f27cbb406
 2012-10-18 15:53:01 -05:00
Roger Ferrel
382f5b234c Issues #1229 Changes for non-blocking ColormapDialog. 
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: cdf5c546ab [formerly 8e86f32714] [formerly cdf5c546ab [formerly 8e86f32714] [formerly 6833c7e04c [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]]
Former-commit-id: 6833c7e04c
Former-commit-id: 1075e8ba16 [formerly d5acf40cc2]
Former-commit-id: a53f94e93d
 2012-10-17 10:20:18 -05:00
Steve Harris
1e4c737ff2 Merge branch 'ss_builds' (12.11.1-4) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: da7a11fe97 [formerly 4610ecc513] [formerly da7a11fe97 [formerly 4610ecc513] [formerly 751563e331 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: d0e91329b4 [formerly 0c0c1144c6]
Former-commit-id: ad78266035
 2012-10-16 15:48:14 -05:00
Steve Harris
35e34308c5 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
 2012-10-16 13:27:07 -05:00
Ron Anderson
9a588ce114 Issue #1091 Fixed combination file generation. 
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

Former-commit-id: c264f72a53 [formerly 4ca413a222] [formerly c264f72a53 [formerly 4ca413a222] [formerly 510cabe655 [formerly 0c4bf9ce1271334d2a07205a42efc60cf7c397f0]]]
Former-commit-id: 510cabe655
Former-commit-id: 488d357413 [formerly e0fc2a36c6]
Former-commit-id: 47da164ca6
 2012-10-12 10:32:36 -05:00
Steve Harris
198eca2a6c Merge branch 'ss_builds' (12.11.1-2) into development 
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73

Former-commit-id: 7be572b27d [formerly 8c97afe03b] [formerly 7be572b27d [formerly 8c97afe03b] [formerly 0895f22690 [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]]
Former-commit-id: 0895f22690
Former-commit-id: 48a80a23e4 [formerly 8dae024430]
Former-commit-id: 8c81601905
 2012-10-08 13:29:34 -05:00
Steve Harris
ff9321e3ce 12.11.1-2 baseline 
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 772c60efa4 [formerly 42bf60b2fc]
Former-commit-id: e72b6d5da6
 2012-10-08 13:26:20 -05:00
Ron Anderson
419eac95ff Issue #1242 Fix wierd GFE behavior when Grid Manager is maximized. 
Change-Id: I2e6d6929a8a8af8dab3320bdf8cda3466fe05fa8

Former-commit-id: 8136beddc7 [formerly b041ccf099] [formerly 8136beddc7 [formerly b041ccf099] [formerly 8e8c713884 [formerly 4fb21077aba1dd9cfafc7f046b02f24f750c6384]]]
Former-commit-id: 8e8c713884
Former-commit-id: 436284848c [formerly 60171b46a2]
Former-commit-id: 51abd858bc
 2012-10-04 12:15:01 -05:00
Steven Harris
2f855322f6 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
 2012-09-27 15:57:45 -05:00
Ron Anderson
93464b8a98 Issue #436 Fix problem with Hazard Type and ETN/Seg not being correctly picked up when modifying a hazard grid. 
Change-Id: I58aef667f4f465c8550a51d20bb750b400d4f781

Former-commit-id: bfb241c335 [formerly d376c07465] [formerly bfb241c335 [formerly d376c07465] [formerly ca74b829d1 [formerly 909e1e815a2665d415a151d7641876b9eee004bb]]]
Former-commit-id: ca74b829d1
Former-commit-id: fc7ee6aa6e [formerly 9746609849]
Former-commit-id: 4a8b9b6f0d
 2012-09-26 13:20:48 -05:00
Ron Anderson
763b5aa86b Issue #1091 Code cleanup and update of online help files. 
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: f1fb73e815 [formerly 4373858ac6] [formerly f1fb73e815 [formerly 4373858ac6] [formerly 34382eb228 [formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]]]
Former-commit-id: 34382eb228
Former-commit-id: 1612c8d2c8 [formerly a609aab630]
Former-commit-id: 6f00c3b872
 2012-09-25 16:07:05 -05:00
Steve Harris
94cb625e91 Merge branch 'ss_builds' (12.10.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java

Former-commit-id: 686b1756c9 [formerly 8354ca4e68] [formerly 686b1756c9 [formerly 8354ca4e68] [formerly 3827a78a7b [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]]
Former-commit-id: 3827a78a7b
Former-commit-id: 8edfe17e7d [formerly f5f59b6aa5]
Former-commit-id: a20533b551
 2012-09-25 10:31:57 -05:00
Steve Harris
659a009c00 12.10.1-8 baseline 
Former-commit-id: b062e4de8f [formerly dbd73151ca] [formerly b062e4de8f [formerly dbd73151ca] [formerly 73d29311d0 [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]]
Former-commit-id: 73d29311d0
Former-commit-id: f4e218c4dd [formerly 94137c6ba1]
Former-commit-id: 57d4eacbb5
 2012-09-25 10:26:58 -05:00
Steve Harris
20732fcbd5 12.10.1-6 baseline 
Former-commit-id: 81d91a8289 [formerly cebe6534ae] [formerly 81d91a8289 [formerly cebe6534ae] [formerly ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]
Former-commit-id: ba648f8e72
Former-commit-id: 0e77eb2fe2 [formerly 5d5a61bd75]
Former-commit-id: e39023bb85
 2012-09-25 10:14:23 -05:00
Max Schenkelberg
8a68ac417e Issue #1192 Changed rename dialog to allow specifying a directory path along with the new file name. Made so directories can be attempted to be deleted as well. Cleaned up FileTreeView code so directory and file deletions show up in tree correctly 
Change-Id: I3080a03fcbed0de39908945d899e0c8200c2dc9a

Former-commit-id: 7a53736cf3 [formerly 22be9bee2e] [formerly 7a53736cf3 [formerly 22be9bee2e] [formerly adbeffbb25 [formerly 5397776e07902b1deb68259128ae536fafa1d844]]]
Former-commit-id: adbeffbb25
Former-commit-id: 03146b0a16 [formerly ab58fcb601]
Former-commit-id: 4b2023b359
 2012-09-24 11:33:03 -05:00
David Gillingham
c7085ff04c Issue #1190: Replace all calls to WsId.getNetworkId().getHostName() with calls to WsId.getHostName() 
which uses new host name cache.

Change-Id: I7e6cab90d449732df807fb273b117da63de0a611

Former-commit-id: 414bb05da6 [formerly eca0d00313] [formerly 414bb05da6 [formerly eca0d00313] [formerly 8f532d2900 [formerly bd8cd6a08b1a2db61d75cc822ec3541279416e0d]]]
Former-commit-id: 8f532d2900
Former-commit-id: ca6c1bdeec [formerly 03d5b9e7f9]
Former-commit-id: 1a4d07ad87
 2012-09-20 10:52:00 -05:00
Nate Jensen
6c01684d8e Merge "Issue #1091 Added localMaps.py capability" into development 
Former-commit-id: d0fa730f08 [formerly 998b7fc209] [formerly d0fa730f08 [formerly 998b7fc209] [formerly c1defed68e [formerly 05bf20edb5d43f2a78af0ce8a7c595226ca4cd43]]]
Former-commit-id: c1defed68e
Former-commit-id: 2939da32d7 [formerly c9269ed3d0]
Former-commit-id: 7bac64faf6
 2012-09-19 17:45:26 -05:00
Ron Anderson
43f30abdf3 Issue #1091 Added localMaps.py capability 
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

Former-commit-id: dbe4f8f9b8 [formerly 6e2130a790] [formerly dbe4f8f9b8 [formerly 6e2130a790] [formerly 776214bf24 [formerly 21db6a603d237716744d7cac93482c9a51952403]]]
Former-commit-id: 776214bf24
Former-commit-id: f5463c2e83 [formerly e917b45f38]
Former-commit-id: af7cac638e
 2012-09-19 17:41:48 -05:00
Bryan Kowal
5379fa670d Issue #1148 - the resources used by the gfesuite component in CAVE are now configurable. 
Change-Id: Id0d2ae388ddd7c4a27c4fbae19de9c53ae8b718d

Former-commit-id: fef603df01 [formerly e0eeb865a1] [formerly fef603df01 [formerly e0eeb865a1] [formerly 59dba27c24 [formerly 73e4cd41a465984eeba2dbf8d52be3682624a27d]]]
Former-commit-id: 59dba27c24
Former-commit-id: 6068e5ee89 [formerly 66db0593fe]
Former-commit-id: 8310e9ebc9
 2012-09-19 10:55:59 -05:00
David Gillingham
d8e181911e Issue #1117: Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections. 
Change-Id: I7341de07e986227f0917191626cdff8e25bafa30

Former-commit-id: f14efdfd7b [formerly cd1acff953] [formerly f14efdfd7b [formerly cd1acff953] [formerly a6d5f67f7a [formerly 82a37521333d6cb471d9d770f99ba593a9ce76aa]]]
Former-commit-id: a6d5f67f7a
Former-commit-id: c7f3c50a35 [formerly 4a2ebe8218]
Former-commit-id: 9c0d31db01
 2012-09-14 10:50:44 -05:00
David Gillingham
dcc5c7789d 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: 03a202134a [formerly 21739d1d38] [formerly 03a202134a [formerly 21739d1d38] [formerly 99ab0a124b [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]]
Former-commit-id: 99ab0a124b
Former-commit-id: 28ade875c5 [formerly 964927b19d]
Former-commit-id: 527a457e55
 2012-09-13 15:39:58 -05:00
Steve Harris
30b0700044 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: 04de1d5857 [formerly 29e7427dc3] [formerly 04de1d5857 [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: e23b030dfd [formerly 53673f63e6]
Former-commit-id: f80fb62837
 2012-09-13 13:26:13 -05:00
Steve Harris
e57e7237a9 12.10.1-4 baseline 
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5 [formerly 2ba58a3576]
Former-commit-id: 26b7d083ec
 2012-09-13 12:08:11 -05:00
Steve Harris
3bec22460f 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: f94db138cd [formerly 64d4e2bded] [formerly f94db138cd [formerly 64d4e2bded] [formerly 012c526816 [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]
Former-commit-id: 012c526816
Former-commit-id: b14d30591b [formerly 41c82361f7]
Former-commit-id: bba73380ca
 2012-09-11 16:57:03 -05:00
Steve Harris
5030894212 12.10.1-3 baseline 
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db [formerly 438d139fdd]
Former-commit-id: faadb51529
 2012-09-11 16:00:38 -05:00
Steve Harris
5684a84a46 12.10.1-2 baseline 
Former-commit-id: dde1f4c54d [formerly 250f0ccac9] [formerly dde1f4c54d [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]
Former-commit-id: a66f3f4b60
Former-commit-id: ec74f638e5 [formerly 34d2ddee9d]
Former-commit-id: cc3c3dadee
 2012-09-11 15:50:57 -05:00
Ron Anderson
8f85204091 Issue #1144 Fixed sizing of Local Effects Area dropdown. 
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5

Former-commit-id: 8ca431ab8b [formerly ee7985bd57] [formerly 8ca431ab8b [formerly ee7985bd57] [formerly 16260530e9 [formerly 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5]]]
Former-commit-id: 16260530e9
Former-commit-id: e0e3e4a044 [formerly 309196b6e1]
Former-commit-id: 86455f1e6a
 2012-09-06 17:44:00 -05:00
Steve Harris
f8e7459dfb Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: 0e046d847a [formerly bba4eb12d0] [formerly 0e046d847a [formerly bba4eb12d0] [formerly af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: f224e3e8ad [formerly 53e29f59e4]
Former-commit-id: e9582cb789
 2012-09-04 12:11:03 -05:00
Steve Harris
a924a8347a 12.10.1-1 baseline 
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
 2012-09-04 12:07:27 -05:00
Steve Harris
c1e601dc30 12.9.1-12 baseline 
Former-commit-id: 4bf4f0043a [formerly 948766c387] [formerly 4bf4f0043a [formerly 948766c387] [formerly 150bc967a5 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 782941ccc1 [formerly 9311c1737e]
Former-commit-id: 38aa573545
 2012-09-04 11:47:38 -05:00
Steve Harris
b63855f152 Merge branch 'ss_builds' (12.9.1-11) into development 
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: f52c8b374d [formerly 3a9d4961e2] [formerly f52c8b374d [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]
Former-commit-id: 34cbde4124
Former-commit-id: ffe253196a [formerly 3230e0b246]
Former-commit-id: 5b4ee818b7
 2012-08-30 14:40:34 -05:00
Steve Harris
ede38c4b3f 12.9.1-10 baseline 
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: f43a5af47f [formerly dc08c5a71a]
Former-commit-id: 5bb474d33c
 2012-08-30 14:28:27 -05:00
Matt Nash
1b9d645810 Issue #1101 fix gfe keybindings for frame change in collaboration 
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: ba698ae69a [formerly 018f590c70] [formerly ba698ae69a [formerly 018f590c70] [formerly ada6ecf5f3 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]]
Former-commit-id: ada6ecf5f3
Former-commit-id: cac1c2bb2e [formerly 1242054a50]
Former-commit-id: 5c568beda7
 2012-08-27 12:16:38 -05:00
Steve Harris
3f44e46a6f 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: 51eb89eb2a [formerly 91e39617cb] [formerly 51eb89eb2a [formerly 91e39617cb] [formerly a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: dbcb28ce77 [formerly 87a602dfee]
Former-commit-id: 0b647c0c9d
 2012-08-27 09:53:55 -05:00
Steve Harris
2d928d328e 12.9.1-5 baseline 
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
 2012-08-21 15:27:03 -05:00
Ron Anderson
f69d7b9c64 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: 16231374f8 [formerly d7a818fd1d] [formerly 16231374f8 [formerly d7a818fd1d] [formerly 7662d249ab [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]
Former-commit-id: 7662d249ab
Former-commit-id: 6e3674f9fc [formerly d3693827a1]
Former-commit-id: 1b655b0826
 2012-08-17 12:41:49 -05:00
Ron Anderson
b78c280ac8 Issue #436 merging elevation base changes into branch off of development baseline. 
Former-commit-id: 93c632c1ff [formerly 1321db6a99] [formerly 93c632c1ff [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]
Former-commit-id: 819b9c8e56
Former-commit-id: e5952c1c99 [formerly 6eafdda705]
Former-commit-id: f7b9190b51
 2012-08-17 12:20:08 -05:00
root
0eb9520e15 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
 2012-08-15 22:15:20 +00:00
Steve Harris
7e1d1f6e08 12.9.1-4 baseline 
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
 2012-08-15 15:19:10 -05:00
Steve Harris
16d7d955fc 12.9.1-1 baseline 
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416]
Former-commit-id: 63bcadf121
 2012-08-15 13:59:00 -05:00
Steve Harris
9fd142b98e Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds 
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 9e2d161f8d [formerly f0b7d5e4c5] [formerly 9e2d161f8d [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]
Former-commit-id: 85f82b18b3
Former-commit-id: 52e0da2293 [formerly b2432e096f]
Former-commit-id: dcc56b8a23
 2012-08-06 09:38:26 -05:00
Steve Harris
78d66ba6df 12.8.1-10 baseline 
Former-commit-id: 6244359a80 [formerly b5e8fee24d] [formerly 6244359a80 [formerly b5e8fee24d] [formerly ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: 78d34d65d2 [formerly d5563fc340]
Former-commit-id: 46daa48f1c
 2012-08-06 09:34:26 -05:00
Steve Harris
078b4fff3c Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: fb47934159 [formerly 6d77b94217] [formerly fb47934159 [formerly 6d77b94217] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: d2291ba23f [formerly 3476fe755b]
Former-commit-id: e892eb4628
 2012-08-01 12:43:12 -05:00
Steve Harris
d3be09bd74 12.8.1-5 baseline 
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
 2012-08-01 10:45:37 -05:00
Ron Anderson
d4a29dace5 Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks. 
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: e9f24e8660 [formerly 7c6686f2f4] [formerly e9f24e8660 [formerly 7c6686f2f4] [formerly b1650b6143 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]]]
Former-commit-id: b1650b6143
Former-commit-id: 4efd9149f7 [formerly 6a3e6f599f]
Former-commit-id: e328b61d87
 2012-07-31 08:36:27 -05:00