Commit graph

3208 commits

Author SHA1 Message Date
Nate Jensen
caf433d525 Omaha #3133 Removed dead hydro code and related dependencies
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a

Former-commit-id: a984e7ac9a [formerly 514c9d3a0c] [formerly a984e7ac9a [formerly 514c9d3a0c] [formerly 67ac5fa242 [formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]]
Former-commit-id: 67ac5fa242
Former-commit-id: a25a8b69eb [formerly c2f78a6888]
Former-commit-id: 11899e65e2
2014-05-27 18:23:38 -05:00
Brian Clements
d75008101f Omaha #3206 added version to servlet api in cave feature
without this, the build prefers the javax.servlet in the target platform

Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80

Former-commit-id: f0e8bf76a9 [formerly 6f76a9a328] [formerly f0e8bf76a9 [formerly 6f76a9a328] [formerly 2fd2b5aa16 [formerly d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2]]]
Former-commit-id: 2fd2b5aa16
Former-commit-id: 170e3644f2 [formerly af8a6806f0]
Former-commit-id: e88d9a2e8c
2014-05-23 17:04:49 -05:00
Nate Jensen
25e4982cb3 Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
Former-commit-id: 730831d465 [formerly 8f6dcfaa1b] [formerly 730831d465 [formerly 8f6dcfaa1b] [formerly b67bf1e492 [formerly 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d]]]
Former-commit-id: b67bf1e492
Former-commit-id: 76a2766ed4 [formerly 935086d60e]
Former-commit-id: dcfd7a07eb
2014-05-22 16:46:50 -05:00
Steve Harris
e30dfd21ee Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
	edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
	edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java

Former-commit-id: 376482d3b1 [formerly 518822ed83] [formerly 376482d3b1 [formerly 518822ed83] [formerly b6af2db9f5 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]]
Former-commit-id: b6af2db9f5
Former-commit-id: 1dfc15a77e [formerly 14b1ea307f]
Former-commit-id: d226dfb021
2014-05-22 14:31:06 -05:00
Brian Clements
67376b444a Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: 0a2ddfbc79 [formerly f9de79465a] [formerly 0a2ddfbc79 [formerly f9de79465a] [formerly c875f17719 [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]]
Former-commit-id: c875f17719
Former-commit-id: 53de96dd53 [formerly fd9f98b2ba]
Former-commit-id: e7730e2219
2014-05-22 14:09:07 -05:00
Steve Harris
5aca60f422 Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: 0a3b23d055 [formerly 4899c4f56a] [formerly 0a3b23d055 [formerly 4899c4f56a] [formerly 2059fc9c0e [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]]
Former-commit-id: 2059fc9c0e
Former-commit-id: 805aae1a70 [formerly 0df4af413b]
Former-commit-id: e7e48b2abb
2014-05-22 14:05:06 -05:00
Ron Anderson
307f61e609 Issue #3194 Fix GeoTIFF import
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a

Former-commit-id: a8ba16fc93 [formerly 52931af5ce] [formerly a8ba16fc93 [formerly 52931af5ce] [formerly 2a680b73ea [formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]]
Former-commit-id: 2a680b73ea
Former-commit-id: 8f0eb1fd10 [formerly b7338080e2]
Former-commit-id: 0d54a37b6c
2014-05-22 09:53:47 -05:00
Richard Peter
680a584473 Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1
Former-commit-id: dcaedf5d43 [formerly db4c6c8c22] [formerly dcaedf5d43 [formerly db4c6c8c22] [formerly f19fda01ad [formerly 052144dd9929d852543f4eaf959ca3ccce50c5a2]]]
Former-commit-id: f19fda01ad
Former-commit-id: 9faf57cf68 [formerly 02b136759b]
Former-commit-id: 79a88d24ef
2014-05-20 17:14:29 -05:00
Brian Clements
ebc9bfa351 Omaha #2536 merged edex.textdb into text plugins
Former-commit-id: c55124bcc7 [formerly 5b5295e5ad] [formerly c55124bcc7 [formerly 5b5295e5ad] [formerly da7d5888b0 [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]]
Former-commit-id: da7d5888b0
Former-commit-id: e4bb70cbe9 [formerly 003917f0ed]
Former-commit-id: 30fb567666
2014-05-20 16:07:20 -05:00
Richard Peter
6bccbaccd1 Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1
Former-commit-id: ab3a7a2804 [formerly 13ac6e8337] [formerly ab3a7a2804 [formerly 13ac6e8337] [formerly 2d4d89b3f0 [formerly 62674d17c73d8fdbbe26916aba7ecac572eca2eb]]]
Former-commit-id: 2d4d89b3f0
Former-commit-id: 3264e7bd93 [formerly 0b8c3e67a1]
Former-commit-id: 580dd1ed1d
2014-05-20 14:56:44 -05:00
Nate Jensen
9d1afa6876 Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1
Former-commit-id: 77c77c6b8f [formerly 1e408e7017] [formerly 77c77c6b8f [formerly 1e408e7017] [formerly 966cf1f96f [formerly 62054f8f2552058b0b53b79b077a4d7699cb41e9]]]
Former-commit-id: 966cf1f96f
Former-commit-id: eb086ff461 [formerly 88aa9471e1]
Former-commit-id: 95ed06119c
2014-05-20 14:51:05 -05:00
Brad Gonzales
26953a7864 Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf.
Amend: updated manifest.
       Removed static imports.
       Refactored String constants to Pattern constants in TafConstants.
       Refactored com.raytheon.edex.plugin.taf to com.raytheon.uf.edex.taf.
       Renamed com.raytheon.edex.plugin.taf project to com.raytheon.uf.edex.taf.
       fixed .project.  Updated yet more Patterns.

Change-Id: Ia5db9d185c6c32e6ce25748ae4b3b6fb389b2acc

Former-commit-id: c4890beb96 [formerly 6b0e578fc1] [formerly c4890beb96 [formerly 6b0e578fc1] [formerly e560ce4880 [formerly f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2]]]
Former-commit-id: e560ce4880
Former-commit-id: 6825727400 [formerly e2412ecb43]
Former-commit-id: fea1c9febe
2014-05-20 14:13:18 -05:00
Ben Steffensmeier
58e5704651 Omaha #2913 Remove dead code using JAI
Former-commit-id: 59a108822e [formerly d5d3f5605a] [formerly 59a108822e [formerly d5d3f5605a] [formerly d48333444c [formerly 767fc083618827ad06beff9f6728ea9dd42528f6]]]
Former-commit-id: d48333444c
Former-commit-id: a56f475076 [formerly 98ad1b079e]
Former-commit-id: 4b940cb599
2014-05-20 13:36:15 -05:00
Ron Anderson
31da20ef5b Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465

Former-commit-id: b794dd04e1 [formerly 3b404f4083] [formerly b794dd04e1 [formerly 3b404f4083] [formerly 809548b283 [formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]]
Former-commit-id: 809548b283
Former-commit-id: fd6e80dd27 [formerly 029201d4b9]
Former-commit-id: 3f20fc86df
2014-05-20 11:10:26 -05:00
Brian Clements
f0ce9a6ca8 Omaha #3172 fixed ui filtering for contacts and sessions
Former-commit-id: 455af3612f [formerly b774503931] [formerly 455af3612f [formerly b774503931] [formerly 8dce7e9b85 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]
Former-commit-id: 8dce7e9b85
Former-commit-id: c4447fc6c4 [formerly 4078bbaa63]
Former-commit-id: 213aab834f
2014-05-20 11:04:57 -05:00
Nate Jensen
508d1a8224 Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1
Former-commit-id: f3f64b1e5a [formerly 8d7125544b] [formerly f3f64b1e5a [formerly 8d7125544b] [formerly eff69410eb [formerly 3c5d7d4f0cecf0ff0ab17a97a3bff5342bfb9569]]]
Former-commit-id: eff69410eb
Former-commit-id: cc8ba31981 [formerly 7def9ead8e]
Former-commit-id: 1b18fd4584
2014-05-19 16:21:37 -05:00
Richard Peter
69fea4c8b3 Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
Former-commit-id: 80a5f2fc1b [formerly 40b7623c87] [formerly 80a5f2fc1b [formerly 40b7623c87] [formerly 87da8bd952 [formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]]
Former-commit-id: 87da8bd952
Former-commit-id: c799f78f5d [formerly 8baf897297]
Former-commit-id: 1776389eb7
2014-05-19 16:07:51 -05:00
Brian Clements
008c911f03 Omaha #3180 fixed inviting strangers and multiple users in collaboration
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited


Former-commit-id: b5e961d6b4 [formerly 0e18d45bdf] [formerly b5e961d6b4 [formerly 0e18d45bdf] [formerly 573ffcb0bf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: 6769aff618 [formerly e4433c5e10]
Former-commit-id: 3c6a10e154
2014-05-19 15:54:36 -05:00
Ben Steffensmeier
eeebf5ae7b Omaha #3133 remove topo from alertviz feature.
Former-commit-id: c4f9bab999 [formerly 24b879764f] [formerly c4f9bab999 [formerly 24b879764f] [formerly 31c323151c [formerly d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807]]]
Former-commit-id: 31c323151c
Former-commit-id: 87118964b1 [formerly 68aba0cdd5]
Former-commit-id: 0e0229c560
2014-05-19 14:21:23 -05:00
Nate Jensen
80b9e5ee6b Merge "Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore." into omaha_14.4.1
Former-commit-id: 9996d67317 [formerly 76bfba5945] [formerly 9996d67317 [formerly 76bfba5945] [formerly 94d032dbc4 [formerly 353d0ddca384a33fe529c0b920595a99c0f40548]]]
Former-commit-id: 94d032dbc4
Former-commit-id: 6fb3e37a29 [formerly 65ecb7e926]
Former-commit-id: 423bf2f21f
2014-05-19 13:36:26 -05:00
Richard Peter
8a71079141 Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1
Former-commit-id: 1e9c2b27b6 [formerly 0f9015e824] [formerly 1e9c2b27b6 [formerly 0f9015e824] [formerly 0480bfa478 [formerly 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c]]]
Former-commit-id: 0480bfa478
Former-commit-id: f3e7d16402 [formerly 802a043085]
Former-commit-id: fa926cd515
2014-05-19 12:12:05 -05:00
Nate Jensen
b7f846ac6d Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1
Former-commit-id: b93e410f60 [formerly cb6ef0e9a3] [formerly b93e410f60 [formerly cb6ef0e9a3] [formerly d79ef53ad0 [formerly 6f3d40c96cafe8f0f05d539534607067a2a37776]]]
Former-commit-id: d79ef53ad0
Former-commit-id: c5d944c52f [formerly 8a31eaf6e1]
Former-commit-id: 0bc127a4e9
2014-05-19 11:46:10 -05:00
Brian Clements
de232ae55c Omaha #2536 merged uf.edex.textdbsrv into text plugins
split into uf.common.dataplugin.text and uf.edex.plugin.text


Former-commit-id: 4d40a98ad7 [formerly a06d332ff4] [formerly 4d40a98ad7 [formerly a06d332ff4] [formerly 2f5cffbe15 [formerly 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1]]]
Former-commit-id: 2f5cffbe15
Former-commit-id: 7761b74112 [formerly 8ddae2fc54]
Former-commit-id: f61d1ac976
2014-05-19 10:53:37 -05:00
Ben Steffensmeier
c85c8b6283 Omaha #3164 Disable thin client request compression when it doesn't work.
Former-commit-id: d697592de2 [formerly ccf53a4c99] [formerly d697592de2 [formerly ccf53a4c99] [formerly 25f901a102 [formerly ce132a929437f18f531503701bb09e33261ae4c4]]]
Former-commit-id: 25f901a102
Former-commit-id: 9ddc32ee05 [formerly 7f46683fb0]
Former-commit-id: 92f4c86dac
2014-05-19 10:40:50 -05:00
brian.dyke
b2e3c50ec0 Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 9626317825 [formerly 011d121e4b] [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d [formerly bc4649765a]
Former-commit-id: b42011fc76
2014-05-19 09:45:37 -04:00
Ben Steffensmeier
eabe045d36 Omaha #3163 Remove all references to WORD_WRAP in A2 plugins.
Former-commit-id: 6a3d5f869e [formerly 885448b04d] [formerly 6a3d5f869e [formerly 885448b04d] [formerly a52718783a [formerly 8e7fa0cdb864d95c70fe1859d9ef9a1851c0b123]]]
Former-commit-id: a52718783a
Former-commit-id: 5607277ae2 [formerly 68244ce2d7]
Former-commit-id: 405e99e4ce
2014-05-16 14:40:50 -05:00
Ben Steffensmeier
c347188e0a Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore.
Former-commit-id: 01379cd329 [formerly 748ecc5fac] [formerly 01379cd329 [formerly 748ecc5fac] [formerly 8446ace149 [formerly bb8c1130a9da5cdb06590b20d7f5bde9e1d7c812]]]
Former-commit-id: 8446ace149
Former-commit-id: 2e88a0b800 [formerly 82d9c403d2]
Former-commit-id: 353b7c4090
2014-05-16 13:36:31 -05:00
Ben Steffensmeier
3ade0c85eb Omaha #3163 Add support for reading colored text styles from future versions of collaboration.
Former-commit-id: 08f7d7b8dd [formerly 67e68732d6] [formerly 08f7d7b8dd [formerly 67e68732d6] [formerly 79ef4a5301 [formerly 63d4e9f1e2bf95792fa82d101ce59f23e2cbdaf9]]]
Former-commit-id: 79ef4a5301
Former-commit-id: fcbd4cc9ee [formerly 126f47f725]
Former-commit-id: e38c19dd1d
2014-05-16 12:50:48 -05:00
Nate Jensen
126af61500 Omaha #3133 attempt to fix build
Change-Id: Ib6668229987cb136c16fb57128becb1624e0b212

Former-commit-id: 7cfbc3d06c [formerly 6240667b0f] [formerly 7cfbc3d06c [formerly 6240667b0f] [formerly 11c580549a [formerly 661a24eafe2374970982a137146c77d9ec1a1406]]]
Former-commit-id: 11c580549a
Former-commit-id: d0fc6945fd [formerly 94c289f944]
Former-commit-id: cedb413487
2014-05-15 17:02:27 -05:00
Nate Jensen
f0b89d994f Omaha #3133 remove unused dependencies
Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6

Former-commit-id: 63b925e17e [formerly 3db92e6c0b] [formerly 63b925e17e [formerly 3db92e6c0b] [formerly 1ae82b82db [formerly 5a00869db4e7467e49e9a632150a8135ea32b569]]]
Former-commit-id: 1ae82b82db
Former-commit-id: 3f73399ab8 [formerly 4731b10575]
Former-commit-id: 46767a2454
2014-05-15 13:57:55 -05:00
Nate Jensen
cbc5cbfb77 Merge "Omaha #3061 added better checks for when to send invite/session payloads" into omaha_14.4.1
Former-commit-id: 7ed74b7242 [formerly 198a63cef8] [formerly 7ed74b7242 [formerly 198a63cef8] [formerly 2cd5c8cca9 [formerly b65ddc7f6f3831117ad3c0d517335289cba8ede0]]]
Former-commit-id: 2cd5c8cca9
Former-commit-id: e0387c077e [formerly 01a5b4ba14]
Former-commit-id: 44df43cfa0
2014-05-15 08:36:51 -05:00
Steve Harris
dfc96a2fae Merge branch 'omaha_14.3.1' into omaha_14.4.1
Former-commit-id: 5e6b9943f1 [formerly 1a06d18686] [formerly 5e6b9943f1 [formerly 1a06d18686] [formerly c83753b4d3 [formerly 5c1f5dbf543c9cd27cf83158308a9ce34d057201]]]
Former-commit-id: c83753b4d3
Former-commit-id: 3337f2d6d1 [formerly 1b709fb6c3]
Former-commit-id: 3e4e9365ca
2014-05-15 08:31:27 -05:00
Brian Clements
cac498a5d4 Omaha #3061 added better checks for when to send invite/session payloads
Former-commit-id: ee51a84f50 [formerly a698d81571] [formerly ee51a84f50 [formerly a698d81571] [formerly 01269cd989 [formerly 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5]]]
Former-commit-id: 01269cd989
Former-commit-id: c71459d36e [formerly 6bf803303e]
Former-commit-id: 2da28330cb
2014-05-14 17:00:09 -05:00
Richard Peter
29a58d9c6a Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1
Former-commit-id: 02d94c61fb [formerly 7ae2b1299f] [formerly 02d94c61fb [formerly 7ae2b1299f] [formerly f6d1e1012e [formerly 1844df3fb769bccb3e5b19722e2fdeaec9c6bbe0]]]
Former-commit-id: f6d1e1012e
Former-commit-id: 72200f0892 [formerly 56d0cd836f]
Former-commit-id: e7bc7051df
2014-05-14 16:25:16 -05:00
Qinglu.Lin
603c6a1843 ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c

Former-commit-id: b7d276d00f [formerly 75c4b15e8e] [formerly b7d276d00f [formerly 75c4b15e8e] [formerly c5097660c2 [formerly 763641d787f7f8c79bf28456314dcc16786702ed]]]
Former-commit-id: c5097660c2
Former-commit-id: bdae3cdfdf [formerly 89fa05128e]
Former-commit-id: 42c5ce2aff
2014-05-14 15:30:16 -04:00
Ben Steffensmeier
1ac0aeacc5 Omaha #2697 Collaboration will no longer use local maps.
Former-commit-id: 270e8805cc [formerly 3e23857dcc] [formerly 270e8805cc [formerly 3e23857dcc] [formerly 1db137a21e [formerly 7e10b6d308a3bb17692abaefd9a8e84cc5016621]]]
Former-commit-id: 1db137a21e
Former-commit-id: fc54a7f697 [formerly 759b1460d4]
Former-commit-id: e8813c2f24
2014-05-14 13:53:29 -05:00
Brian Clements
7473191ba6 Omaha #2536 moved WMO Header into new common plugin
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: 437d9bb781 [formerly 2b1c7eaa37] [formerly 437d9bb781 [formerly 2b1c7eaa37] [formerly 6bd43f79ff [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]]
Former-commit-id: 6bd43f79ff
Former-commit-id: abd29bf492 [formerly ee9757ea39]
Former-commit-id: e9ee0bcbde
2014-05-14 13:45:09 -05:00
Nate Jensen
5da8849cf5 Omaha #3133 remove unused uf.common.cache from alertviz feature
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832

Former-commit-id: bab916f2be [formerly 68c8238275] [formerly bab916f2be [formerly 68c8238275] [formerly 5eaa5d7b0e [formerly e659b393f23e5e999c2b03ddad648f2748ee97e9]]]
Former-commit-id: 5eaa5d7b0e
Former-commit-id: e8661182d0 [formerly 2a6d25cf41]
Former-commit-id: 437d400966
2014-05-13 17:52:12 -05:00
Bryan Kowal
ddf6cc758d Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc

Former-commit-id: a352aadc90 [formerly 3535340136] [formerly a352aadc90 [formerly 3535340136] [formerly 8d5326cc1b [formerly 2b13221d7c644147f6eda1acb8b126667be00926]]]
Former-commit-id: 8d5326cc1b
Former-commit-id: 1c64a47950 [formerly 43eddea171]
Former-commit-id: 4e3afb78fc
2014-05-13 14:43:04 -05:00
Nate Jensen
824c2f805d Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851

Former-commit-id: e464500dfc [formerly 07426ce408] [formerly e464500dfc [formerly 07426ce408] [formerly 174fae77d1 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]]]
Former-commit-id: 174fae77d1
Former-commit-id: c31080d705 [formerly ea7b123eef]
Former-commit-id: 4a18f1e24b
2014-05-13 13:12:54 -05:00
Matthew Howard
26c357a549 Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 7b087f422d [formerly 5a20085f32] [formerly 7b087f422d [formerly 5a20085f32] [formerly 576a2d63ec [formerly 2052df4ca5f68165b477994b21357c245ff73546]]]
Former-commit-id: 576a2d63ec
Former-commit-id: c919d3503a [formerly 1026f04671]
Former-commit-id: 56778b394b
2014-05-13 07:49:18 -05:00
Nate Jensen
dc2ac6e07b Omaha #3133 remove edex dependencies from common.monitor plugin
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3

Former-commit-id: 88535c69f5 [formerly cc86f19bad] [formerly 88535c69f5 [formerly cc86f19bad] [formerly b05630b171 [formerly d25e1bee210a084e17d4ee781eddb42c14735140]]]
Former-commit-id: b05630b171
Former-commit-id: 5d099a3b4b [formerly 3aff81313f]
Former-commit-id: 363b019ceb
2014-05-12 16:46:06 -05:00
Steve Harris
ae3bc184ce Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
	edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java

Former-commit-id: b3bc71c8a4 [formerly 652fb19bc4] [formerly b3bc71c8a4 [formerly 652fb19bc4] [formerly 6964df0664 [formerly a20833879f1a0434c562a22a874b1e1722278954]]]
Former-commit-id: 6964df0664
Former-commit-id: 77b2da7a4f [formerly 661eceea83]
Former-commit-id: d33fbe7c31
2014-05-12 15:05:43 -05:00
Zhidong.Hao
af44604e04 ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4

Former-commit-id: 30b42030dd [formerly d6cae51207] [formerly 30b42030dd [formerly d6cae51207] [formerly 030b767299 [formerly a48b81894fed165aba58a0097359bbd0f1931be5]]]
Former-commit-id: 030b767299
Former-commit-id: 31678eb223 [formerly 88c5e2d94c]
Former-commit-id: 6dd1289c31
2014-05-12 15:16:38 -04:00
Juliya Dynina
00bab1367a Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
Former-commit-id: 43b45e9f53 [formerly 107b64a544] [formerly 43b45e9f53 [formerly 107b64a544] [formerly e33a27684c [formerly 0c54c56efa1306d781d64621ccf7f62b3bf70997]]]
Former-commit-id: e33a27684c
Former-commit-id: ed4e911992 [formerly a0b2051e7e]
Former-commit-id: ce9120be90
2014-05-12 14:01:40 -05:00
Juliya Dynina
2e191584e6 Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 6713e83ae6 [formerly d7bea845fe] [formerly 6713e83ae6 [formerly d7bea845fe] [formerly 4f7fa8a8de [formerly 350448988d24fd2eb58812128b062e3a0f44b956]]]
Former-commit-id: 4f7fa8a8de
Former-commit-id: cd1f437163 [formerly 190bf23ba8]
Former-commit-id: b65a50fd3e
2014-05-12 14:01:07 -05:00
Matthew Howard
edb7266206 Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: e64f60ba98 [formerly b807c877f4] [formerly e64f60ba98 [formerly b807c877f4] [formerly 0dc1db0072 [formerly 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f]]]
Former-commit-id: 0dc1db0072
Former-commit-id: 9593ff9ed5 [formerly da9b3dd158]
Former-commit-id: db59b081af
2014-05-12 13:52:12 -05:00
Loubna.Bousaidi
6e8a4ec60d ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff

Former-commit-id: e634d0cdcf [formerly ec5bd7a2bb] [formerly e634d0cdcf [formerly ec5bd7a2bb] [formerly d3be6d0476 [formerly 860ea4b3644a526ac10b4366f158824fe6cbdcb0]]]
Former-commit-id: d3be6d0476
Former-commit-id: ebd5400a4f [formerly 6f335c71fe]
Former-commit-id: c9d2ccb5ff
2014-05-12 18:42:12 +00:00
Zhidong.Hao
f06165d783 ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b

Former-commit-id: 29e7d7e888 [formerly 8d560036b1] [formerly 29e7d7e888 [formerly 8d560036b1] [formerly 074713bb4a [formerly 62f8c0ab0e046fd4365bd37394f93e8bca4e642d]]]
Former-commit-id: 074713bb4a
Former-commit-id: f03c0c46d5 [formerly 51680a6d04]
Former-commit-id: b1c20f92c1
2014-05-12 14:33:25 -04:00
Matthew Howard
6a44f74885 Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: f1dfdd2878 [formerly d40d9931db] [formerly f1dfdd2878 [formerly d40d9931db] [formerly 42cce01396 [formerly 59fb75bdc025a3b2feb95d20d263060b55e87b28]]]
Former-commit-id: 42cce01396
Former-commit-id: 6106a76640 [formerly a4827323e6]
Former-commit-id: aeef207dff
2014-05-12 13:00:55 -05:00