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

130 commits

Author SHA1 Message Date
Roger Ferrel
10ef3046a4 Issue #1287 Changes for non-blocking ProductScriptsDialog. 
Change-Id: Ia68cd67bf7dd10eac5e0aacc9dcf68ca96f8b2f8

Former-commit-id: 17de26adfb [formerly 17de26adfb [formerly df3546eba27a1cbca6204351a7961e1aabc9c787]]
Former-commit-id: 73b4ca43c8
Former-commit-id: af40c442db
 2012-10-25 14:13:41 -05:00
Lee Venable
673bb4b340 Merge "Issue #1287 Changes for non-blocking ProcessMonitorDialog." into development 
Former-commit-id: c2e1e42e26 [formerly c2e1e42e26 [formerly 711419494f6ec18c3398bdded18b71d0ac4d37ae]]
Former-commit-id: d7ae341df2
Former-commit-id: b5eceeda7f
 2012-10-25 14:03:42 -05:00
Lee Venable
12954b7925 Merge "Issue #1287 Changes SampleSetDialog from review." into development 
Former-commit-id: 66dd846674 [formerly 66dd846674 [formerly 7e72d19330025ef611f509c9140103c28cd89b5d]]
Former-commit-id: 4aef416119
Former-commit-id: d6c9359dc9
 2012-10-25 13:31:50 -05:00
Lee Venable
88b9f8fffc Merge "Issue #1287 Changes for non-blocking HiddenWeatherElementDialog." into development 
Former-commit-id: e32da5af26 [formerly e32da5af26 [formerly 835cb07b70c7120003a8b45a5b628671e4cff956]]
Former-commit-id: 90e135a991
Former-commit-id: f9e4fba04d
 2012-10-25 13:20:44 -05:00
Roger Ferrel
00cbea46c9 Issue #1287 Changes for non-blocking ProcessMonitorDialog. 
Change-Id: Icba40d0766d796da155766005da1f3842920f286

Former-commit-id: bf86d2c98b [formerly bf86d2c98b [formerly 1dea100231893ca5a954c13e2f9e9770fec0f028]]
Former-commit-id: ff72fd0fbd
Former-commit-id: dd47425456
 2012-10-25 13:10:21 -05:00
Lee Venable
5ecb7df20e Merge "Issue #1287 Chamges for non-blocking GridsInterpolateDialog." into development 
Former-commit-id: 14294c1984 [formerly 14294c1984 [formerly b9746712b90aa685c91b4f484e5eed9bfc920a8b]]
Former-commit-id: 38ceefb7ef
Former-commit-id: c165d9dec9
 2012-10-25 13:08:33 -05:00
Roger Ferrel
9498b10294 Issue #1287 Changes for non-blocking HiddenWeatherElementDialog. 
Change-Id: Iccc5f755f0eab9ee952b1f6c8d33e1842bcddddf

Former-commit-id: ef8f1e5fdd [formerly ef8f1e5fdd [formerly c9b9cd92c8663d0ee896fbf98434eb1a63df2015]]
Former-commit-id: 5823279aa8
Former-commit-id: 66996e056f
 2012-10-25 12:29:39 -05:00
Roger Ferrel
75883c04c5 Issue #1287 Changes SampleSetDialog from review. 
Change-Id: Ifcca23bdacabf7495cdc08763b6ebad0b6961f09

Former-commit-id: 615b9b8fbb [formerly 615b9b8fbb [formerly 0eb964cc6bb9e2961b30f39e52a0b178f09d96ca]]
Former-commit-id: 5e4c7c0d53
Former-commit-id: c302c27ba7
 2012-10-25 11:09:55 -05:00
Roger Ferrel
843acc2786 Issue #1287 Chamges for non-blocking GridsInterpolateDialog. 
Change-Id: Ia3f01307a862a9cfa870f20ba5f05a56eb51e187

Former-commit-id: 3e7b9efcbd [formerly 3e7b9efcbd [formerly 1763a82ea33df9d61fd754523bca389ffe4b5f0f]]
Former-commit-id: e2365768d0
Former-commit-id: 5a1e45896c
 2012-10-25 09:42:15 -05:00
Roger Ferrel
7080506915 Issue #1287 Changes for non-blocking EditActionsDialog. 
Change-Id: Ic14a30846d68c016aedac183c5637d858c6c9687

Former-commit-id: 6525b553aa [formerly 6525b553aa [formerly acbfa37d7bb57078469fb63f31356c8500baa075]]
Former-commit-id: 44a1292bfe
Former-commit-id: 0c79b72381
 2012-10-25 08:51:43 -05:00
Lee Venable
46b0ec1eef Merge "Issue #1287 Changes for non-blocking SaveDeleteSelectTRDialog." into development 
Former-commit-id: 900bddaab9 [formerly 900bddaab9 [formerly bdf06545fdf40531cf42ff29ca8d1f130a849469]]
Former-commit-id: da5917e583
Former-commit-id: baf9c741db
 2012-10-25 08:23:15 -05:00
Roger Ferrel
a2feba9e51 Issue #1287 Changes for non-blocking SaveDeleteSelectTRDialog. 
Change-Id: I22500cf5f7e3f11c16abd50b1ad5c80be81283cb

Former-commit-id: 5f016cac30 [formerly 5f016cac30 [formerly 86f70d36d7eac5b472a1aa22922c30390436f880]]
Former-commit-id: d2122ef959
Former-commit-id: fbc8331f28
 2012-10-25 08:08:33 -05:00
Roger Ferrel
6752ed4a22 Issue #1287 Changes for non-blocking SampleSetDialog. 
Change-Id: I6b3eab5386418f9303190892f1a746d63a82ce65

Former-commit-id: 8af2d4a404 [formerly 8af2d4a404 [formerly 622b739d6e1352aacb96b7dd0f797f2b43fe5847]]
Former-commit-id: af299023e2
Former-commit-id: 3eb28edd6c
 2012-10-24 17:12:14 -05:00
Roger Ferrel
76602c775f Issue #1287 Changes for non-blocking SaveDeleteEditAreaGroupDialog. 
Change-Id: I5be631699cb9e8c977b36c07bf1edc1d088d0877

Former-commit-id: 255213d1ec [formerly 255213d1ec [formerly 27f8eaeb8ea82c0fbd6631c3c4ec33bf0d818bed]]
Former-commit-id: 711e738bdd
Former-commit-id: d849958e69
 2012-10-24 14:41:50 -05:00
Roger Ferrel
f0867f4c40 Issue #1287 Code changes for non-blocking SaveDeleteRefDialog. 
Change-Id: I6bf23b8f3d9bac171f9a296e3d47b86851a3e1e0

Former-commit-id: c2def88db1 [formerly c2def88db1 [formerly 085fc755257ed8728a293d59670a79f79293dcbb]]
Former-commit-id: 347ad433ef
Former-commit-id: 56515fc4d6
 2012-10-24 12:41:33 -05:00
Roger Ferrel
823e1099e9 Issue #1287 Changes for non-blocking CreateFromScratchDialog. 
Change-Id: I8a2152d834966992f8d4bbe8e4b72f7d9c7c3da0

Former-commit-id: 50d65fefcb [formerly 50d65fefcb [formerly 1cf83fa5e226f551c5d4cad3b5fa9f97b3203733]]
Former-commit-id: 9fa924aecb
Former-commit-id: c6752668e4
 2012-10-24 10:52:51 -05:00
Roger Ferrel
0a60b2f0ba Issue #1287 Changes for non-blocking DefineRefSetDialog. 
Change-Id: I0aa3ec5b80140ae79fffd3edd230b1d8e8f68e43

Former-commit-id: eb5aa48960 [formerly eb5aa48960 [formerly 3fd7556be39d7381c3cdc92a3b72a6ff10c2ebed]]
Former-commit-id: c627c6af24
Former-commit-id: be40b56d18
 2012-10-24 10:42:33 -05:00
Roger Ferrel
fba81ec4b0 Issue #1287 Changes for non-blocking DefineSamplesViaLatLongDialog. 
Change-Id: Id9b6d7feec00ae483f80cfa386ad31fdce3d8dea

Former-commit-id: 8d8850174e [formerly 8d8850174e [formerly a90e1b6f168e54d3a1a6581b692e84288de537f3]]
Former-commit-id: 122012d767
Former-commit-id: 6aab2f1d8b
 2012-10-24 09:30:03 -05:00
Roger Ferrel
724ddea4d2 Issue #1287 Changes for non-blocking but modal CopyGridsDialog. 
Changes from reviewer comments.

Change-Id: I743752720d1c770e740912e2d6c3049d516c8183

Former-commit-id: 1cac983c4f [formerly 1cac983c4f [formerly ced609c6997ae3a4fc51d254218be600d5338ac2]]
Former-commit-id: e49535d318
Former-commit-id: 277c5c1a1d
 2012-10-24 07:35:59 -05:00
Roger Ferrel
627c685f42 Issue #1287 Changes for non-blocking BreakLockDialog. 
Change-Id: Ie2626e8960d69a200bc1b5c6ee28c6aa361f30ca

Former-commit-id: a9dbaae595 [formerly a9dbaae595 [formerly 2dc320c31ceed44bba70d6738ce40d703858be68]]
Former-commit-id: d33179f009
Former-commit-id: 9f0586231f
 2012-10-23 14:54:47 -05:00
Ron Anderson
15f600afa7 Merge "Issue #1257: Fix GFE HDF5 Retrievel to time correlate results to requested times." into development 
Former-commit-id: aeff911d8b [formerly aeff911d8b [formerly 5ea502772674571298bf8801863d2711a9d201fd]]
Former-commit-id: d942797296
Former-commit-id: d9a00da60f
 2012-10-23 14:47:57 -05:00
Roger Ferrel
2ac417247f Issue #1287 Changes for non-blocking AutoSaveIntervalDialog. 
Change-Id: I5ea021d0658e68553542c88c8850fea4b9de696b

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

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

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

Former-commit-id: 8152c49231 [formerly 8152c49231 [formerly 4dca1f343e38090c21e27f0470cc68042c22c811]]
Former-commit-id: b0c5e6472b
Former-commit-id: 8ac665a0ca
 2012-10-22 15:35:50 -05:00
Steve Harris
8a17564ba3 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: a7337d9160 [formerly a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]
Former-commit-id: 1807100932
Former-commit-id: 892e4df811
 2012-10-18 16:01:05 -05:00
Steve Harris
4f27cbb406 12.11.1-6 baseline 
Former-commit-id: fba4a443a0 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
 2012-10-18 15:53:01 -05:00
Roger Ferrel
a53f94e93d Issues #1229 Changes for non-blocking ColormapDialog. 
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: 8e86f32714 [formerly 8e86f32714 [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]
Former-commit-id: 6833c7e04c
Former-commit-id: d5acf40cc2
 2012-10-17 10:20:18 -05:00
Steve Harris
ad78266035 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: 4610ecc513 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 751563e331
Former-commit-id: 0c0c1144c6
 2012-10-16 15:48:14 -05:00
Steve Harris
560f0d9cc3 12.11.1-4 baseline 
Former-commit-id: d3497e47eb [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Ron Anderson
47da164ca6 Issue #1091 Fixed combination file generation. 
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

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

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

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

Former-commit-id: b041ccf099 [formerly b041ccf099 [formerly 4fb21077aba1dd9cfafc7f046b02f24f750c6384]]
Former-commit-id: 8e8c713884
Former-commit-id: 60171b46a2
 2012-10-04 12:15:01 -05:00
Steven Harris
a544be6d83 12.11.1-1 baseline 
Former-commit-id: 618aa3f316 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
 2012-09-27 15:57:45 -05:00
Ron Anderson
4a8b9b6f0d 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: d376c07465 [formerly d376c07465 [formerly 909e1e815a2665d415a151d7641876b9eee004bb]]
Former-commit-id: ca74b829d1
Former-commit-id: 9746609849
 2012-09-26 13:20:48 -05:00
Ron Anderson
6f00c3b872 Issue #1091 Code cleanup and update of online help files. 
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: 4373858ac6 [formerly 4373858ac6 [formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]]
Former-commit-id: 34382eb228
Former-commit-id: a609aab630
 2012-09-25 16:07:05 -05:00
Steve Harris
a20533b551 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: 8354ca4e68 [formerly 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]
Former-commit-id: 3827a78a7b
Former-commit-id: f5f59b6aa5
 2012-09-25 10:31:57 -05:00
Steve Harris
57d4eacbb5 12.10.1-8 baseline 
Former-commit-id: dbd73151ca [formerly dbd73151ca [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]
Former-commit-id: 73d29311d0
Former-commit-id: 94137c6ba1
 2012-09-25 10:26:58 -05:00
Steve Harris
e39023bb85 12.10.1-6 baseline 
Former-commit-id: cebe6534ae [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]
Former-commit-id: ba648f8e72
Former-commit-id: 5d5a61bd75
 2012-09-25 10:14:23 -05:00
Max Schenkelberg
4b2023b359 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: 22be9bee2e [formerly 22be9bee2e [formerly 5397776e07902b1deb68259128ae536fafa1d844]]
Former-commit-id: adbeffbb25
Former-commit-id: ab58fcb601
 2012-09-24 11:33:03 -05:00
David Gillingham
1a4d07ad87 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: eca0d00313 [formerly eca0d00313 [formerly bd8cd6a08b1a2db61d75cc822ec3541279416e0d]]
Former-commit-id: 8f532d2900
Former-commit-id: 03d5b9e7f9
 2012-09-20 10:52:00 -05:00
Nate Jensen
7bac64faf6 Merge "Issue #1091 Added localMaps.py capability" into development 
Former-commit-id: 998b7fc209 [formerly 998b7fc209 [formerly 05bf20edb5d43f2a78af0ce8a7c595226ca4cd43]]
Former-commit-id: c1defed68e
Former-commit-id: c9269ed3d0
 2012-09-19 17:45:26 -05:00
Ron Anderson
af7cac638e Issue #1091 Added localMaps.py capability 
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

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

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

Former-commit-id: cd1acff953 [formerly cd1acff953 [formerly 82a37521333d6cb471d9d770f99ba593a9ce76aa]]
Former-commit-id: a6d5f67f7a
Former-commit-id: 4a2ebe8218
 2012-09-14 10:50:44 -05:00
David Gillingham
527a457e55 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: 21739d1d38 [formerly 21739d1d38 [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]
Former-commit-id: 99ab0a124b
Former-commit-id: 964927b19d
 2012-09-13 15:39:58 -05:00
Steve Harris
f80fb62837 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: 29e7427dc3 [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 04d9735c8f
Former-commit-id: 53673f63e6
 2012-09-13 13:26:13 -05:00
Steve Harris
26b7d083ec 12.10.1-4 baseline 
Former-commit-id: fd19ca5624 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
 2012-09-13 12:08:11 -05:00
Steve Harris
bba73380ca 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: 64d4e2bded [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]
Former-commit-id: 012c526816
Former-commit-id: 41c82361f7
 2012-09-11 16:57:03 -05:00