Commit graph

105 commits

Author SHA1 Message Date
Steve Harris
81db247276 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: 95727755c7 [formerly 3eff876edd] [formerly 6118445ed7c2dbe29fc3fbd891afff9ce39d62fb [formerly a7337d9160]] [formerly 1807100932 [formerly a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: a722324705ed3164c37a327413de2e52d14ffae3 [formerly 892e4df811]
Former-commit-id: 8486da2fd3
2012-10-18 16:01:05 -05:00
Steve Harris
ae73939b02 12.11.1-6 baseline
Former-commit-id: 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14]
Former-commit-id: 8beb6fc0b8
2012-10-18 15:53:01 -05:00
Roger Ferrel
85fbb59441 Issues #1229 Changes for non-blocking ColormapDialog.
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: bacff2f0f1 [formerly cdf5c546ab] [formerly 8e86f32714] [formerly 6833c7e04c [formerly 8e86f32714 [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]]
Former-commit-id: 6833c7e04c
Former-commit-id: 68aa8f3b270c031298664186936eadb3c07db89b [formerly d5acf40cc2]
Former-commit-id: 1075e8ba16
2012-10-17 10:20:18 -05:00
Steve Harris
d88afce365 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: c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]
Former-commit-id: d0e91329b4
2012-10-16 15:48:14 -05:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Ron Anderson
d4eaa7a659 Issue #1091 Fixed combination file generation.
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

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

Former-commit-id: a6c3e16c69 [formerly 7be572b27d] [formerly 634c6bd63f9ed7885295630247765c53b3e97028 [formerly 8c97afe03b]] [formerly 0895f22690 [formerly 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]]
Former-commit-id: 0895f22690
Former-commit-id: 0ccc977e5162ad8a17c1a30f58a15fa4f27ad13b [formerly 8dae024430]
Former-commit-id: 48a80a23e4
2012-10-08 13:29:34 -05:00
Steve Harris
6e0b2c55d7 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

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

Former-commit-id: cf62687a6a [formerly 8136beddc7] [formerly b041ccf099] [formerly 8e8c713884 [formerly b041ccf099 [formerly 4fb21077aba1dd9cfafc7f046b02f24f750c6384]]]
Former-commit-id: 8e8c713884
Former-commit-id: 4f69b16583e431bc4dc6d51faceef73068d0c3dd [formerly 60171b46a2]
Former-commit-id: 436284848c
2012-10-04 12:15:01 -05:00
Steven Harris
9c67bbab77 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]
Former-commit-id: f5e63d5f93
2012-09-27 15:57:45 -05:00
Ron Anderson
ac47481534 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: 00ec098d05 [formerly bfb241c335] [formerly d376c07465] [formerly ca74b829d1 [formerly d376c07465 [formerly 909e1e815a2665d415a151d7641876b9eee004bb]]]
Former-commit-id: ca74b829d1
Former-commit-id: 5da8c29b508a0b41bcb2db60f4d19919a77a4157 [formerly 9746609849]
Former-commit-id: fc7ee6aa6e
2012-09-26 13:20:48 -05:00
Ron Anderson
c63f5b5a0c Issue #1091 Code cleanup and update of online help files.
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: 1eebe679a0 [formerly f1fb73e815] [formerly 4373858ac6] [formerly 34382eb228 [formerly 4373858ac6 [formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]]]
Former-commit-id: 34382eb228
Former-commit-id: e5cdaf5d466bae7f7e1bccf0bf9aee3d7b754797 [formerly a609aab630]
Former-commit-id: 1612c8d2c8
2012-09-25 16:07:05 -05:00
Steve Harris
01f5a0b21a 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: 6cb180ff5b [formerly 686b1756c9] [formerly 8354ca4e68] [formerly 3827a78a7b [formerly 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]]
Former-commit-id: 3827a78a7b
Former-commit-id: 194b5d78ca44a987232c43b536b8a7d0f46623ae [formerly f5f59b6aa5]
Former-commit-id: 8edfe17e7d
2012-09-25 10:31:57 -05:00
Steve Harris
326954a0b8 12.10.1-8 baseline
Former-commit-id: e6f952f0ea [formerly b062e4de8f] [formerly dbd73151ca] [formerly 73d29311d0 [formerly dbd73151ca [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]]
Former-commit-id: 73d29311d0
Former-commit-id: 28e9acf68c2e0b1a4c89ad83acb71825adbd9965 [formerly 94137c6ba1]
Former-commit-id: f4e218c4dd
2012-09-25 10:26:58 -05:00
Steve Harris
d5ec4edea1 12.10.1-6 baseline
Former-commit-id: dd922048c0 [formerly 81d91a8289] [formerly ea3b8e2680937dc133fce53ac16b4f91b25d4bc7 [formerly cebe6534ae]] [formerly ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]
Former-commit-id: ba648f8e72
Former-commit-id: e2eff41ad429447d5c80be0157ac1ea818d306fa [formerly 5d5a61bd75]
Former-commit-id: 0e77eb2fe2
2012-09-25 10:14:23 -05:00
Max Schenkelberg
64d3ed2723 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: 96d8ddcf51 [formerly 7a53736cf3] [formerly 22be9bee2e] [formerly adbeffbb25 [formerly 22be9bee2e [formerly 5397776e07902b1deb68259128ae536fafa1d844]]]
Former-commit-id: adbeffbb25
Former-commit-id: 8e6f528a102b2a018db31f4d1dddc50e51d23e89 [formerly ab58fcb601]
Former-commit-id: 03146b0a16
2012-09-24 11:33:03 -05:00
David Gillingham
c3dd54de22 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: 5ec52e8a92 [formerly 414bb05da6] [formerly eca0d00313] [formerly 8f532d2900 [formerly eca0d00313 [formerly bd8cd6a08b1a2db61d75cc822ec3541279416e0d]]]
Former-commit-id: 8f532d2900
Former-commit-id: 00a220480415d7e00b76aa595a61ec10d341b9f2 [formerly 03d5b9e7f9]
Former-commit-id: ca6c1bdeec
2012-09-20 10:52:00 -05:00
Nate Jensen
8b8b2bc6d8 Merge "Issue #1091 Added localMaps.py capability" into development
Former-commit-id: 0dec8c75c9 [formerly d0fa730f08] [formerly 998b7fc209] [formerly c1defed68e [formerly 998b7fc209 [formerly 05bf20edb5d43f2a78af0ce8a7c595226ca4cd43]]]
Former-commit-id: c1defed68e
Former-commit-id: b61329311a0efe06e0e2d95f90a69604713c611d [formerly c9269ed3d0]
Former-commit-id: 2939da32d7
2012-09-19 17:45:26 -05:00
Ron Anderson
5d6911f931 Issue #1091 Added localMaps.py capability
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

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

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

Former-commit-id: 3b7e2b3627 [formerly f14efdfd7b] [formerly cd1acff953] [formerly a6d5f67f7a [formerly cd1acff953 [formerly 82a37521333d6cb471d9d770f99ba593a9ce76aa]]]
Former-commit-id: a6d5f67f7a
Former-commit-id: 9eca90d25acea37355c1a256a17e5cbef460f23d [formerly 4a2ebe8218]
Former-commit-id: c7f3c50a35
2012-09-14 10:50:44 -05:00
David Gillingham
a048dee4b3 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: 4d7f324f64 [formerly 03a202134a] [formerly 21739d1d38] [formerly 99ab0a124b [formerly 21739d1d38 [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]]
Former-commit-id: 99ab0a124b
Former-commit-id: cfc850e4fc58538a74d0f8c0490660cc9d30f0f8 [formerly 964927b19d]
Former-commit-id: 28ade875c5
2012-09-13 15:39:58 -05:00
Steve Harris
9d1f595fe6 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: bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6]
Former-commit-id: e23b030dfd
2012-09-13 13:26:13 -05:00
Steve Harris
424c32bd5d 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]
Former-commit-id: 684feb34e5
2012-09-13 12:08:11 -05:00
Steve Harris
047003d8c0 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: 2f57e328fe [formerly f94db138cd] [formerly 64d4e2bded] [formerly 012c526816 [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]
Former-commit-id: 012c526816
Former-commit-id: bf5ba423a5556426548660494a7905779f996b28 [formerly 41c82361f7]
Former-commit-id: b14d30591b
2012-09-11 16:57:03 -05:00
Steve Harris
64699fa90b 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
406bde9fd0 12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]
Former-commit-id: a66f3f4b60
Former-commit-id: f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]
Former-commit-id: ec74f638e5
2012-09-11 15:50:57 -05:00
Ron Anderson
064d7a2afc Issue #1144 Fixed sizing of Local Effects Area dropdown.
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5

Former-commit-id: 88ba04e791 [formerly 8ca431ab8b] [formerly ee7985bd57] [formerly 16260530e9 [formerly ee7985bd57 [formerly 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5]]]
Former-commit-id: 16260530e9
Former-commit-id: 22524cf34987f12d7db2178a5437262655f63666 [formerly 309196b6e1]
Former-commit-id: e0e3e4a044
2012-09-06 17:44:00 -05:00
Steve Harris
20e088a957 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]
Former-commit-id: f224e3e8ad
2012-09-04 12:11:03 -05:00
Steve Harris
9f4fa7bf83 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]
Former-commit-id: e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
15fa63819d 12.9.1-12 baseline
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e]
Former-commit-id: 782941ccc1
2012-09-04 11:47:38 -05:00
Steve Harris
a3a1864f56 Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]
Former-commit-id: 34cbde4124
Former-commit-id: b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246]
Former-commit-id: ffe253196a
2012-08-30 14:40:34 -05:00
Steve Harris
c704490769 12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]
Former-commit-id: f43a5af47f
2012-08-30 14:28:27 -05:00
Matt Nash
d35027f45e Issue #1101 fix gfe keybindings for frame change in collaboration
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: 04ce96d74e [formerly ba698ae69a] [formerly 018f590c70] [formerly ada6ecf5f3 [formerly 018f590c70 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]]
Former-commit-id: ada6ecf5f3
Former-commit-id: 5dd2067f359bb03dbe5cae64c69ba82ef563a1de [formerly 1242054a50]
Former-commit-id: cac1c2bb2e
2012-08-27 12:16:38 -05:00
Steve Harris
fd6e8d5b63 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: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]
Former-commit-id: dbcb28ce77
2012-08-27 09:53:55 -05:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Ron Anderson
21b48541c3 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: 0a6de388dd [formerly 16231374f8] [formerly d7a818fd1d] [formerly 7662d249ab [formerly d7a818fd1d [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]
Former-commit-id: 7662d249ab
Former-commit-id: eadb27af146fe75ce647766fdd43f9aa8948307f [formerly d3693827a1]
Former-commit-id: 6e3674f9fc
2012-08-17 12:41:49 -05:00
Ron Anderson
0a32c7c683 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: c71ee18e6e [formerly 93c632c1ff] [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]
Former-commit-id: 819b9c8e56
Former-commit-id: 5cae0d5653a03ef5095386e62d4e0139bdd634e9 [formerly 6eafdda705]
Former-commit-id: e5952c1c99
2012-08-17 12:20:08 -05:00
root
791f3f5b85 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]
Former-commit-id: 537dbadf64
2012-08-15 22:15:20 +00:00
Steve Harris
80655bf0a3 12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]
Former-commit-id: d7d60cc623
2012-08-15 15:19:10 -05:00
Steve Harris
d3023f15ac 12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]
Former-commit-id: aed7a644df
2012-08-15 13:59:00 -05:00
Steve Harris
4f1a7eb689 Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 7b6c223552 [formerly 9e2d161f8d] [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]
Former-commit-id: 85f82b18b3
Former-commit-id: ee22b108589d0c82dcd1216d6f772ca807503da2 [formerly b2432e096f]
Former-commit-id: 52e0da2293
2012-08-06 09:38:26 -05:00
Steve Harris
330df3323f 12.8.1-10 baseline
Former-commit-id: 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340]
Former-commit-id: 78d34d65d2
2012-08-06 09:34:26 -05:00
Steve Harris
330c7a877c 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: 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b]
Former-commit-id: d2291ba23f
2012-08-01 12:43:12 -05:00
Steve Harris
4f47148ced 12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]
Former-commit-id: dab00b12e6
2012-08-01 10:45:37 -05:00
Ron Anderson
701d77f90a Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: c2937d7303 [formerly e9f24e8660] [formerly 7c6686f2f4] [formerly b1650b6143 [formerly 7c6686f2f4 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]]]
Former-commit-id: b1650b6143
Former-commit-id: 7e61eb27b9b666aa966565378d537d64b5825d69 [formerly 6a3e6f599f]
Former-commit-id: 4efd9149f7
2012-07-31 08:36:27 -05:00
Ron Anderson
5a58fc89bf Issue #851 removed obsolete GFE code.
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02

Former-commit-id: b1a633e121 [formerly 74478728de] [formerly 35d140f0fb] [formerly d87c0b6c4b [formerly 35d140f0fb [formerly c91b6fc2c506096f37f175e8196f9aaeb356141d]]]
Former-commit-id: d87c0b6c4b
Former-commit-id: 6f790834b05690824c16344926fd96fe4133d97f [formerly 6b7f1b3611]
Former-commit-id: 4459afa40c
2012-07-30 15:34:16 -05:00
Steve Harris
e9f4d5b474 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: e6f4b3f257 [formerly 302aa05586] [formerly de9034c96c] [formerly 4688ac304f [formerly de9034c96c [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]]
Former-commit-id: 4688ac304f
Former-commit-id: 1e9f1a509a3a3df6aa114b32afd9c50a0af22853 [formerly b82d6772c3]
Former-commit-id: f2ab9cfe1a
2012-07-27 14:50:45 -05:00
Steve Harris
c18e221e26 Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d]
Former-commit-id: 9e4df42326
2012-07-27 14:44:44 -05:00
Ben Steffensmeier
3b989242c3 Issue #921 register GFEColorbarResource as a listener when recycling.
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0

Former-commit-id: 23fa86c332 [formerly 7514bfd6cd] [formerly e3cfa52237] [formerly 044836cd2c [formerly e3cfa52237 [formerly 90ce1b3643af750a19bc29156137f18848e7dc77]]]
Former-commit-id: 044836cd2c
Former-commit-id: 861eca1c82baae5dd8124c5f8fb397c9bd50877e [formerly 6f9ec1af50]
Former-commit-id: 97776790cb
2012-07-24 11:29:51 -05:00