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

201 commits

Author SHA1 Message Date
mjames-upc
4373760eaf further with the menus 2016-05-02 18:22:14 -05:00
mjames-upc
5e6a40e37c various D2D menu updates 2016-04-30 17:37:50 -05:00
mjames-upc
43513162db typo fix for DrawableString: verticallAlignment -> verticalAlignment 2016-04-27 10:09:41 -05:00
mjames-upc
e2d9ba9a4c merge unidata_15.1.1 to unidata_16.1.4 
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
 2016-03-25 13:09:32 -05:00
mjames-upc
3a59fefb09 cleaning up unidata_15.1.1 enough to launch in eclipse 
Former-commit-id: 0b01029e68
 2015-12-29 20:15:31 -07:00
mjames-upc
194adffea5 another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n 
Former-commit-id: f25e918e50
Former-commit-id: c921ec69d6
 2015-09-03 15:48:53 -06:00
Steve Harris
55b82a66ff Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1 
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java


Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
 2015-07-13 18:39:29 -05:00
Brian Clements
fc6ed8c5d1 Omaha #4606 added better style rules for grid lightning 
Change-Id: I5c438699bd61a1cb3fa3fed5dabde8edc1ca7d5c

Former-commit-id: 85bbc70d7f3c80f221e374c4fab74e00a560d9b7
 2015-07-02 14:22:34 -05:00
Nate Jensen
f6ca835ee9 Merge "Omaha #4597 better labels for lightning resources" into omaha_15.1.1 
Former-commit-id: 012b25ea74cafa905d88dc6b6ac266a3cb5e6547
 2015-07-01 14:51:48 -05:00
Nate Jensen
a6fb4146a0 Merge "Omaha #4595 fixed total lightning resource ordering" into omaha_15.1.1 
Former-commit-id: 4d3138ac1f4df02cb372722a7b6b57c41dd7bcc9
 2015-07-01 14:26:29 -05:00
Brian Clements
631cc5cabe Omaha #4597 better labels for lightning resources 
Change-Id: I5e7792e881c95cbb1ecea30320e9f0892457013c

Former-commit-id: d2b5d5e1d4bd2e67e34c212ff09595e36abbaeab
 2015-07-01 14:18:03 -05:00
Brian Clements
588b2d83f4 Omaha #4596 changed total lightning menu names to ENI Total Lightning 
Change-Id: Ia8c1f740d28d2cf063eb14132b3c403e6fa174de

Former-commit-id: 59c5fc0d7e49dfc4fe27435ef0664d90d78c4826
 2015-07-01 13:11:29 -05:00
Brian Clements
107d672250 Omaha #4595 fixed total lightning resource ordering 
Change-Id: I27928e04c9f809c1519d972e7161e852b74f86d6

Former-commit-id: 9fe972d808d520e42772f8dc9207a930f8f98111
 2015-07-01 12:48:20 -05:00
Nate Jensen
727f533e7d Merge "Omaha #4594 added 1-min plot menu items for total lightning" into omaha_15.1.1 
Former-commit-id: 60e77e4a4196b1a438b9dd0f81d05c40e080b484
 2015-07-01 11:00:47 -05:00
Brian Clements
489ee6c0c3 Omaha #4594 added 1-min plot menu items for total lightning 
Change-Id: I85dc8d484183c378cac1bc54a33160cf7b9104dc

Former-commit-id: 392356843cccb2c88ae616e1c2e5035e42c72845
 2015-07-01 10:38:45 -05:00
Brian Clements
04a0284fad Omaha #4592 lightning cloud flashes are now rendered as points 
Change-Id: I26bef7436106b76eebf8b3480de383ac8f029641

Former-commit-id: ca1497751c0f809dd02a10c77d3d382b6ea1136c
 2015-07-01 09:50:17 -05:00
AWIPS User
2d4e9525a9 sat menu changes. nws POES items muted 
Former-commit-id: e75187a1d4 [formerly 015d8a8547] [formerly 8953e0d543] [formerly 2dee357b7fc5fc866dfa14ff7851b3d2ec6d03c7 [formerly 22e82a5b033c5197843554bbe55331692f74609a] [formerly 8953e0d543 [formerly 8883d56fea]]]
Former-commit-id: bdbca8461602b4fe331fe5ca95c8f2d6a3598c43 [formerly 6952bb47e223961dff4b184dd9fde046ea5e25ef] [formerly 97fc0d0f5f [formerly 2b49132cbc]]
Former-commit-id: e80e973fcfc2254a489faf3b6109b8524de2bb1d [formerly 97fc0d0f5f]
Former-commit-id: 763ae44868
 2015-06-23 16:20:13 -06:00
AWIPS User
2b410fa4cb USPLN support added to binlightning plugin 
Former-commit-id: 99bed9bee8 [formerly 1d894e9c65] [formerly d4634d3d23] [formerly 67d49142371a2abf5bfd518a03e634009d73038e [formerly 7148e21bf7ede4a8359964cea33acba6ca416d65] [formerly d4634d3d23 [formerly cc4a291081]]]
Former-commit-id: b29ea42696c57b110405a05da2d85cec40b70c91 [formerly ac894c4081b3271165c795fd6ea14f0aa1b2399f] [formerly ce7c0f2814 [formerly 4131ba0cd1]]
Former-commit-id: ce7c0f2814
Former-commit-id: 6d35b862e6
 2015-06-22 19:05:53 -06:00
David Lovely
80dc4c85d9 Omaha #4146 Bundled class files in a jar when unpacked. 
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02

Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
 2015-05-19 10:23:35 -05:00
Ben Steffensmeier
72d601a2a7 Omaha #4079 Extract core grid and point rendering capabilities. 
Former-commit-id: a0caefe923b18859fd89cb36749b31e3b24eecbe
 2015-05-15 13:55:10 -05:00
Ben Steffensmeier
6c2d341080 Omaha #4284 Create better id for obs/lightning menu. 
Former-commit-id: 31893413de438660784ee82274e23f361abb0c1c
 2015-05-07 10:53:46 -05:00
Brian Clements
dad7bd98c7 Omaha #4386 lightning resource updates frames asynchronously 
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379

Former-commit-id: cbe0a699fb [formerly feb9518f03 [formerly cbb6c52f8c] [formerly cbe0a699fb [formerly 9c82bcc5c93dcd30e3c645f673611ac6710c8fab]]]
Former-commit-id: feb9518f03 [formerly cbb6c52f8c]
Former-commit-id: feb9518f03
Former-commit-id: acbf97a041
 2015-04-09 10:25:28 -05:00
Brian Clements
cbe0a699fb Omaha #4386 lightning resource updates frames asynchronously 
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379

Former-commit-id: 9c82bcc5c93dcd30e3c645f673611ac6710c8fab
 2015-04-09 10:25:28 -05:00
Brian Clements
feb9518f03 Omaha #4386 lightning resource updates frames asynchronously 
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379

Former-commit-id: cbe0a699fb [formerly 9c82bcc5c93dcd30e3c645f673611ac6710c8fab]
Former-commit-id: cbb6c52f8c
 2015-04-09 10:25:28 -05:00
Fay.Liang
a10c5cfb94 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: 1c80edbed0 [formerly fd502062c5 [formerly 3b9e0864ab] [formerly 1c80edbed0 [formerly ec7875e9a4bec3752aeb8442fca15e4e4fd02571]]]
Former-commit-id: fd502062c5 [formerly 3b9e0864ab]
Former-commit-id: fd502062c5
Former-commit-id: 9b9a3bb1eb
 2015-03-18 15:08:01 -04:00
Fay.Liang
1c80edbed0 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: ec7875e9a4bec3752aeb8442fca15e4e4fd02571
 2015-03-18 15:08:01 -04:00
Fay.Liang
fd502062c5 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: 1c80edbed0 [formerly ec7875e9a4bec3752aeb8442fca15e4e4fd02571]
Former-commit-id: 3b9e0864ab
 2015-03-18 15:08:01 -04:00
Jason Burks
b970916a0e VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926 
Updated the based on feddback from Ben.

Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281

Former-commit-id: 3d3f3a6535 [formerly e1e7f27857 [formerly dc59270db2] [formerly 3d3f3a6535 [formerly 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992]]]
Former-commit-id: e1e7f27857 [formerly dc59270db2]
Former-commit-id: e1e7f27857
Former-commit-id: 11e66fcd1f
 2015-03-14 14:36:37 +00:00
Jason Burks
3d3f3a6535 VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926 
Updated the based on feddback from Ben.

Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281

Former-commit-id: 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992
 2015-03-14 14:36:37 +00:00
Jason Burks
e1e7f27857 VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926 
Updated the based on feddback from Ben.

Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281

Former-commit-id: 3d3f3a6535 [formerly 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992]
Former-commit-id: dc59270db2
 2015-03-14 14:36:37 +00:00
Ben Steffensmeier
4c1676a2fa Omaha #4233 Remove cloud flash and pulse menu items from GLD and NLDN menus. 
Change-Id: I73f67925b0f14fd1eb062ea8f157dc7487f0b030

Former-commit-id: 989acdf74b [formerly b47c266ed0 [formerly 3ec9b5dac6] [formerly 989acdf74b [formerly 0e31a9da60cfa9d99a8aae21f3bf2f403b838312]]]
Former-commit-id: b47c266ed0 [formerly 3ec9b5dac6]
Former-commit-id: b47c266ed0
Former-commit-id: c440725187
 2015-03-05 16:20:44 -06:00
Ben Steffensmeier
989acdf74b Omaha #4233 Remove cloud flash and pulse menu items from GLD and NLDN menus. 
Change-Id: I73f67925b0f14fd1eb062ea8f157dc7487f0b030

Former-commit-id: 0e31a9da60cfa9d99a8aae21f3bf2f403b838312
 2015-03-05 16:20:44 -06:00
Ben Steffensmeier
b47c266ed0 Omaha #4233 Remove cloud flash and pulse menu items from GLD and NLDN menus. 
Change-Id: I73f67925b0f14fd1eb062ea8f157dc7487f0b030

Former-commit-id: 989acdf74b [formerly 0e31a9da60cfa9d99a8aae21f3bf2f403b838312]
Former-commit-id: 3ec9b5dac6
 2015-03-05 16:20:44 -06:00
Brian Clements
6539979bf7 Omaha #3608 improved error handling in lightning frame retriever 
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080

Former-commit-id: c56645dd01 [formerly ce24dad434 [formerly b9dd6d798b] [formerly c56645dd01 [formerly 0551b91b995c893fddee52cabdfbdccf83121a31]]]
Former-commit-id: ce24dad434 [formerly b9dd6d798b]
Former-commit-id: ce24dad434
Former-commit-id: 7ff7c235e8
 2014-09-11 11:52:23 -05:00
Brian Clements
c56645dd01 Omaha #3608 improved error handling in lightning frame retriever 
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080

Former-commit-id: 0551b91b995c893fddee52cabdfbdccf83121a31
 2014-09-11 11:52:23 -05:00
Brian Clements
ce24dad434 Omaha #3608 improved error handling in lightning frame retriever 
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080

Former-commit-id: c56645dd01 [formerly 0551b91b995c893fddee52cabdfbdccf83121a31]
Former-commit-id: b9dd6d798b
 2014-09-11 11:52:23 -05:00
Brian Clements
965833dca6 Omaha #3608 improved error handling in lightning frame retriever 
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080

Former-commit-id: 6539979bf7 [formerly 7ff7c235e8] [formerly ce24dad434] [formerly ce24dad434 [formerly b9dd6d798b]] [formerly 6539979bf7 [formerly 7ff7c235e8] [formerly ce24dad434] [formerly ce24dad434 [formerly b9dd6d798b]] [formerly c56645dd01 [formerly ce24dad434 [formerly b9dd6d798b] [formerly c56645dd01 [formerly 0551b91b995c893fddee52cabdfbdccf83121a31]]]]]
Former-commit-id: c56645dd01
Former-commit-id: e9e210fa40 [formerly 25667d5118] [formerly 6a333bde00] [formerly 2557319ade134e99997efe65e3e558607fb241ce [formerly 9b6ea83663e975004ebb1c19cdbeebcd018f9fa6] [formerly 6a333bde00 [formerly 07b48207a2]]]
Former-commit-id: a07dcc83803a058ccbd1744153863482fc7cbd05 [formerly 79358852df6492b2e74356e9c5cf360a1b0d60c1] [formerly f3d1bf85b4 [formerly b4b45c0152]]
Former-commit-id: f3d1bf85b4
Former-commit-id: 155084d533
 2014-09-11 11:52:23 -05:00
Steve Harris
e31665a400 Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 5d58625abc [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: bddf9c0f27 [formerly 793064063b]
Former-commit-id: bddf9c0f27
Former-commit-id: 3619a11a8a
 2014-08-29 10:17:52 -05:00
Steve Harris
5d58625abc Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 8793dca41f756ba812206b48391caea6e593a657
 2014-08-29 10:17:52 -05:00
Steve Harris
bddf9c0f27 Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]
Former-commit-id: 793064063b
 2014-08-29 10:17:52 -05:00
Steve Harris
aeef8875da Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly 5d58625abc [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]]
Former-commit-id: 5d58625abc
Former-commit-id: bdf54d6c9b [formerly 10070d2762] [formerly 66b485c000] [formerly ae5df07fa69c767a230e2a3c9b71b0100d0048c1 [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54] [formerly 66b485c000 [formerly d984dd538f]]]
Former-commit-id: 529333408e5e144c649cd66c50031cc56795aa1e [formerly ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4] [formerly ecf26b3ac5 [formerly e681e0a457]]
Former-commit-id: e61b05086c2c01b59d4b8382331f85c7ecd4efa2 [formerly ecf26b3ac5]
Former-commit-id: 3c8bfc8160
 2014-08-29 10:17:52 -05:00
Brian.Dyke
f13953059a Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: a08db8d73d [formerly e654318431]
Former-commit-id: a08db8d73d
Former-commit-id: 0a5ddf7457
 2014-08-27 11:19:19 -04:00
Brian.Dyke
aa83bf804f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
 2014-08-27 11:19:19 -04:00
Brian.Dyke
a08db8d73d Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: e654318431
 2014-08-27 11:19:19 -04:00
Brian.Dyke
d238fe909f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly aa83bf804f [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]]
Former-commit-id: aa83bf804f
Former-commit-id: a19455a35a [formerly 4a56b6f6e1] [formerly f90649d7e7] [formerly 68463cb724c8468f8978b5fb07a99445cf027313 [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3] [formerly f90649d7e7 [formerly f7f16ff9eb]]]
Former-commit-id: 44ca35c910c7065b51dd3a76485e002ac8fcb63b [formerly 2b5f667a78842762d60c8ab0ba442f22b9229095] [formerly 7e4ab705cc [formerly c0dc594eda]]
Former-commit-id: 1cde9cd7bdfb3330564a42c1fce83730b50bbe4c [formerly 7e4ab705cc]
Former-commit-id: 2da6c7b93b
 2014-08-27 11:19:19 -04:00
Steve Harris
52b2c70c7b Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 038b284066 [formerly 8c5026314c [formerly 99ae9bdc10] [formerly 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]
Former-commit-id: 8c5026314c [formerly 99ae9bdc10]
Former-commit-id: 8c5026314c
Former-commit-id: 33b4901c09
 2014-08-26 16:25:21 -05:00
Steve Harris
038b284066 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 03ba5101d6f277b55173f72c2a63869e9dc31c3f
 2014-08-26 16:25:21 -05:00
Steve Harris
8c5026314c Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]
Former-commit-id: 99ae9bdc10
 2014-08-26 16:25:21 -05:00
Steve Harris
298fb6fc84 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 52b2c70c7b [formerly 33b4901c09] [formerly 8c5026314c] [formerly 8c5026314c [formerly 99ae9bdc10]] [formerly 52b2c70c7b [formerly 33b4901c09] [formerly 8c5026314c] [formerly 8c5026314c [formerly 99ae9bdc10]] [formerly 038b284066 [formerly 8c5026314c [formerly 99ae9bdc10] [formerly 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]]]
Former-commit-id: 038b284066
Former-commit-id: b7e9afde18 [formerly 00b3ad8eb6] [formerly 1da31a86dc] [formerly ee767ef8495ee8de670f1acbae84552ce983603d [formerly c9abc2fce0e20d37683d43d809074ccd92db5423] [formerly 1da31a86dc [formerly c8ba2b1ae6]]]
Former-commit-id: 013fcf0643fa8ac69b47e283848a777c2528c73c [formerly c07303fea0c9c3e107dabbeefbd395be90d9018f] [formerly 9d263bc542 [formerly 84edac842e]]
Former-commit-id: 9d263bc542
Former-commit-id: 146dc3aec7
 2014-08-26 16:25:21 -05:00
Brian Clements
98a9b39ae5 Issue #3542 fixed lightning count clipping issue 
Change-Id: I40aa62558542d3da9b3abd8f82de9e5d8244870b

Former-commit-id: fc2e7f52b9 [formerly 9e33cf1f5f [formerly 78796c3f6e] [formerly fc2e7f52b9 [formerly 937c656ba2a9fc98bfa5655a5020d470f83b898f]]]
Former-commit-id: 9e33cf1f5f [formerly 78796c3f6e]
Former-commit-id: 9e33cf1f5f
Former-commit-id: 7ac071e0f9
 2014-08-19 09:00:58 -05:00