Commit graph

6462 commits

Author SHA1 Message Date
Richard Peter
e3ecf2e99f Merge "Omaha #3503 common.serialization changes" into omaha_14.4.1
Former-commit-id: c4d9f519e8 [formerly c2997b1e02] [formerly c4d9f519e8 [formerly c2997b1e02] [formerly 62b4b9458d [formerly 797f86abfbfa65f33826fd95e2967a17e91ba2bd]]]
Former-commit-id: 62b4b9458d
Former-commit-id: d3fb951f44 [formerly 00af6e2c49]
Former-commit-id: 9449fd8949
2014-08-11 12:02:04 -05:00
Brian Clements
9d423b4aca Omaha #3502 removed common.convert from rcm feature
Change-Id: Ide8208d497a2054d8e2ed2a9d37a3aebdcfe174e

Former-commit-id: d1552244bf [formerly b93d4be8dd] [formerly d1552244bf [formerly b93d4be8dd] [formerly a1ab0d0e26 [formerly 5b81fd2b345855c7642654d2fd5481ae07e1052b]]]
Former-commit-id: a1ab0d0e26
Former-commit-id: 867cc336ec [formerly e7246ad695]
Former-commit-id: eeab9ba519
2014-08-11 09:56:53 -05:00
Brian Clements
651247576c Omaha #3502 added common.convert to alertviz and rcm features
Change-Id: I504f85bedf1a53c6016a1b73a93549ccf3161aac

Former-commit-id: a28a3d626a [formerly 96b496c98a] [formerly a28a3d626a [formerly 96b496c98a] [formerly a0e9de7745 [formerly b4de3831bd44735d3648d93129a4eeaf406a70d0]]]
Former-commit-id: a0e9de7745
Former-commit-id: 3ae5ced8c0 [formerly e4a601341c]
Former-commit-id: 0f23e0c5b5
2014-08-11 08:21:26 -05:00
Richard Peter
a33705144d Merge "Omaha #3502 common.util changes" into omaha_14.4.1
Former-commit-id: cf9f83502d [formerly 30e4033081] [formerly cf9f83502d [formerly 30e4033081] [formerly ddf406d1fd [formerly ba40f480460358435192de6c8aad771b10682eaa]]]
Former-commit-id: ddf406d1fd
Former-commit-id: 9be6d6b0b9 [formerly f66e1f101e]
Former-commit-id: 8dbe531164
2014-08-08 18:05:07 -05:00
Brian Clements
b83ec9df6c Omaha #3503 common.serialization changes
moved adapters to new plugins

Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6

Former-commit-id: 9c09de5779 [formerly 90d492c1dc] [formerly 9c09de5779 [formerly 90d492c1dc] [formerly 415f2dff64 [formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]]]
Former-commit-id: 415f2dff64
Former-commit-id: d6aae6eaeb [formerly 0e415fd863]
Former-commit-id: 54742cff70
2014-08-08 12:50:06 -05:00
Richard Peter
108bfba5b4 Merge "Omaha #3481 - match additional FOSS patterns in p2-build.xml. Make it possible to specify features that should not be built into an RPM for Work Assignments." into omaha_14.4.1
Former-commit-id: c98cfef25c [formerly 69dfcbe39e] [formerly c98cfef25c [formerly 69dfcbe39e] [formerly a009e70cdf [formerly 1db96f8ae03936ea8d3ce43e95fc9940485b040c]]]
Former-commit-id: a009e70cdf
Former-commit-id: e946ade6c6 [formerly f66b9e04cd]
Former-commit-id: cac059bd9d
2014-08-07 16:49:37 -05:00
Brian Clements
54c861d870 Omaha #3502 common.util changes
moved ConvertUtil, reworked StringUtil.split()

Change-Id: I82114f8a9ec7fb907c85258a070169dcba61be03

Former-commit-id: 4d3bb07573 [formerly c3e1b5c9a2] [formerly 4d3bb07573 [formerly c3e1b5c9a2] [formerly fc322a74b2 [formerly 72b5092e87e71f78fa35065dfc8bcb8e746f67b8]]]
Former-commit-id: fc322a74b2
Former-commit-id: 809d40d388 [formerly fa89fae529]
Former-commit-id: 62f529ebe2
2014-08-07 16:48:57 -05:00
Nate Jensen
67c2ce00ae Merge "Omaha #3483 Split Volume Browser fields menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: 2df0a00989 [formerly 58bb6bbe07] [formerly 2df0a00989 [formerly 58bb6bbe07] [formerly 07bb8808cc [formerly 9996ecfcbb3074f571163cc195118d5254f24c6c]]]
Former-commit-id: 07bb8808cc
Former-commit-id: 088b53f2bb [formerly 1686f63a0b]
Former-commit-id: 219a3815e0
2014-08-07 11:22:45 -05:00
Nate Jensen
3d9a084204 Merge "Omaha #3478 removed PointDataDescription.Type.Double from code and config" into omaha_14.4.1
Former-commit-id: d315ccd78d [formerly 9c6e850045] [formerly d315ccd78d [formerly 9c6e850045] [formerly 98db472128 [formerly d432ac935d2fff4e729ea29dec8c5babe4ffd6e7]]]
Former-commit-id: 98db472128
Former-commit-id: 66d44106ee [formerly 4b77fef432]
Former-commit-id: 9eee05c8fb
2014-08-07 11:12:29 -05:00
Brian Clements
2425a855a3 Omaha #3478 removed PointDataDescription.Type.Double from code and config
Change-Id: I85eabcbe7afc0543c98d23e2c194b9e30a14db13

Former-commit-id: 1538c88955 [formerly 9374355af3] [formerly 1538c88955 [formerly 9374355af3] [formerly a46c71bbfb [formerly b548a88c6850a558c021a55657edaa6466d57e51]]]
Former-commit-id: a46c71bbfb
Former-commit-id: 30efe7a212 [formerly b52a9a1e23]
Former-commit-id: 2333e17e5b
2014-08-07 10:40:14 -05:00
Mark Peters
c3b25c2d78 Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()
Change-Id: I68c4757365ad1bcb6254f78fe26b98b333cf7b5a

Former-commit-id: f7205e8a31 [formerly dd85085986] [formerly f7205e8a31 [formerly dd85085986] [formerly 3ef2459491 [formerly fbebe6213718025ecf2288c0d57627df53e4bc5e]]]
Former-commit-id: 3ef2459491
Former-commit-id: 09c8f1f35e [formerly 5ad8c291e7]
Former-commit-id: 4f714fd6aa
2014-08-07 10:00:34 -05:00
Nate Jensen
191216070b Merge "Omaha #3185 only import java DAF support classes when they're actually used" into omaha_14.4.1
Former-commit-id: f55ac6a1ba [formerly e814b8b302] [formerly f55ac6a1ba [formerly e814b8b302] [formerly 2c942239bb [formerly 6d2d12891f1ca1b7cf3dcc492c5418d5ff10b2e3]]]
Former-commit-id: 2c942239bb
Former-commit-id: 3b8c410a15 [formerly ee2e4cdf20]
Former-commit-id: 1a52979047
2014-08-07 09:11:17 -05:00
Bryan Kowal
13cd362f8a Omaha #3481 - match additional FOSS patterns in p2-build.xml. Make it possible to specify features that should not be
built into an RPM for Work Assignments.


Former-commit-id: 5ec6da9f31 [formerly 2687b16d49] [formerly 5ec6da9f31 [formerly 2687b16d49] [formerly 1ad9e31075 [formerly 6a5bfb0e00bee647632f12d81bb532a3583f955e]]]
Former-commit-id: 1ad9e31075
Former-commit-id: 623ae93747 [formerly 782b92e376]
Former-commit-id: 657c028e4e
2014-08-06 17:46:39 -05:00
Nate Jensen
450176babc Omaha #3185 only import java DAF support classes when they're actually used
Change-Id: Ie7db12940fb0b6a0efbd3e43566cc2f647cd40ec

Former-commit-id: 414b8ab56c [formerly ed409784ed] [formerly 414b8ab56c [formerly ed409784ed] [formerly e929584e65 [formerly eb435ae129753ea739d236a2d24165a4b3bbe109]]]
Former-commit-id: e929584e65
Former-commit-id: fed739748c [formerly c3d5ee8174]
Former-commit-id: b5e9f56590
2014-08-06 17:31:06 -05:00
Mark Peters
cbc69af4f1 Omaha #3483 Split Volume Browser fields menus into multiple reusable components.
Change-Id: I708204d02f566c6e2ce8b7867908ea200aa07baa

Former-commit-id: 42cfd9018d [formerly 53586ec52c] [formerly 42cfd9018d [formerly 53586ec52c] [formerly f930f1032f [formerly f44418a1e872dfea47a94325306198b65e5e0214]]]
Former-commit-id: f930f1032f
Former-commit-id: cc524668f6 [formerly 8da4bc58ca]
Former-commit-id: e136d6b85d
2014-08-06 16:35:32 -05:00
Brian Clements
7b8253f02e Omaha #3499 added sparse array memory optimization to grid
Change-Id: I1db409a565e371fe5aa90f3dc7f921ea1004baa9

Former-commit-id: 9b4a50cef9 [formerly 8dc30a64de] [formerly 9b4a50cef9 [formerly 8dc30a64de] [formerly fcb130e3f8 [formerly 3b6b13dcf270aac9d19dee095dfd6bd78f13137d]]]
Former-commit-id: fcb130e3f8
Former-commit-id: b37123e294 [formerly f3edb035d4]
Former-commit-id: bb0bb8dce0
2014-08-06 16:23:33 -05:00
Nate Jensen
f6852a28f9 Merge "Omaha #3482 Removed org.apache.xml.apis. Update org.apache.ws.security version to 1.6.14" into omaha_14.4.1
Former-commit-id: 64c365e198 [formerly 317548b267] [formerly 64c365e198 [formerly 317548b267] [formerly 75e8c49fba [formerly 1a6f8e111a7f160bc50fd160356187e23c055da7]]]
Former-commit-id: 75e8c49fba
Former-commit-id: 83191b8886 [formerly 0dbd0dd71d]
Former-commit-id: 3233b85725
2014-08-06 15:57:20 -05:00
Lee Venable
93cf334208 Merge "Omaha #3453 Refreshing the viewer on every spell check job to correctly update underlining." into omaha_14.4.1
Former-commit-id: cbc6b73ee0 [formerly 5059f537d9] [formerly cbc6b73ee0 [formerly 5059f537d9] [formerly 73eb3e7bbb [formerly 12b398f07485e5c12b3f8970732720814eee2987]]]
Former-commit-id: 73eb3e7bbb
Former-commit-id: f746feef4f [formerly 3b25f28008]
Former-commit-id: e98b858faa
2014-08-06 15:26:08 -05:00
Robert Blum
b871d4263a Omaha #3453 Refreshing the viewer on every spell check job to correctly update underlining.
Change-Id: I5e037a7b3e85fd794966bd351ae37777abb0d193

Former-commit-id: fc1487a56b [formerly 8b6fd81e10] [formerly fc1487a56b [formerly 8b6fd81e10] [formerly 6d49b0f7ae [formerly f27b34bc0aa50d13415dde6153676d3a9484c9ab]]]
Former-commit-id: 6d49b0f7ae
Former-commit-id: 9e54c50009 [formerly 344eb050a5]
Former-commit-id: 5eb75cb326
2014-08-06 15:09:17 -05:00
Nathan Bowler
35de01a191 Omaha #3482 Removed org.apache.xml.apis. Update org.apache.ws.security version to 1.6.14
Change-Id: Ie3d5e557e4a748ad80202006ccecfb6388612e10

Former-commit-id: a2dc4559dd [formerly 3f2c4818d9] [formerly a2dc4559dd [formerly 3f2c4818d9] [formerly 2cede8a84f [formerly 661677010f27b455c19677d22a27f42e3dba184e]]]
Former-commit-id: 2cede8a84f
Former-commit-id: 3f1ccc0de6 [formerly 0a0daa69a7]
Former-commit-id: 525427b631
2014-08-06 14:41:01 -04:00
Nate Jensen
315f15a417 Merge "Omaha #3157 Fix merge issue in ActiveTable.py" into omaha_14.4.1
Former-commit-id: 0dd86d4ba8 [formerly a0e549548e] [formerly 0dd86d4ba8 [formerly a0e549548e] [formerly d7b2aafc28 [formerly 23531f3f952d0c1f00502e446b10350400e26953]]]
Former-commit-id: d7b2aafc28
Former-commit-id: b553d0b3df [formerly 77919a2895]
Former-commit-id: 0c9078c53b
2014-08-06 12:49:55 -05:00
Ron Anderson
71bc965ad5 Omaha #3157 Fix merge issue in ActiveTable.py
Change-Id: I39550855a413791beb2e02c536f9bdfdf80ff514

Former-commit-id: 49988ea258 [formerly 6393d231e1] [formerly 49988ea258 [formerly 6393d231e1] [formerly 0f20f6d251 [formerly 295f52411e700afddc04390b7016e627d7c676bd]]]
Former-commit-id: 0f20f6d251
Former-commit-id: bdf078f597 [formerly 16a4e017b3]
Former-commit-id: 2e1bfdb05d
2014-08-06 09:59:14 -05:00
Greg Armendariz
1e7b9aa541 Omaha #3327 - update topo rpm to include gmted2010.h5
Former-commit-id: b369662fd9 [formerly f6842be3ed] [formerly b369662fd9 [formerly f6842be3ed] [formerly 7f7c443494 [formerly 8cef78cfc21dd561ebfd5d1af60da915d2a64961]]]
Former-commit-id: 7f7c443494
Former-commit-id: 05fda7902b [formerly 3fc7b439f2]
Former-commit-id: ac45aa9132
2014-08-06 09:46:45 -05:00
Nate Jensen
9dfe5f89b1 Merge "Omaha #3328 Merged it.geosolutions into org.geotools." into omaha_14.4.1
Former-commit-id: 5d667a7248 [formerly a70659b106] [formerly 5d667a7248 [formerly a70659b106] [formerly 3c7013475b [formerly 026b22dcb808198ae3bc59aa3d6884da80a3073e]]]
Former-commit-id: 3c7013475b
Former-commit-id: 2212436f9e [formerly 7f68c7a257]
Former-commit-id: f53ceec4df
2014-08-05 18:00:03 -05:00
Mark Peters
07b3787440 Omaha #3489 Replace Raytheon plugin calls to deprecated IGraphicsTarget.getStringBounds()
Change-Id: Ie4c6093ff96e88332b719b9f88434bdd128770ea

Former-commit-id: 90be52aac1 [formerly 1b5b707601] [formerly 90be52aac1 [formerly 1b5b707601] [formerly 7d82d522e4 [formerly 331b5994cc4bcd95138b15461b5040004f03d3fd]]]
Former-commit-id: 7d82d522e4
Former-commit-id: 8f36e24d00 [formerly 942962b61f]
Former-commit-id: 0b868bef6a
2014-08-05 14:30:06 -05:00
Nate Jensen
e0b2b6f0e5 Merge "Omaha #3356 remove unreferenced registered buddy policies" into omaha_14.4.1
Former-commit-id: 7165ef7f12 [formerly 04083235ad] [formerly 7165ef7f12 [formerly 04083235ad] [formerly 5e8797ef77 [formerly 3b2a9a4d79bdf3fe4ce72ab342f035f7f58045ae]]]
Former-commit-id: 5e8797ef77
Former-commit-id: 7d8c92cd1c [formerly 824906f4e0]
Former-commit-id: fc8114397a
2014-08-05 10:33:40 -05:00
Nate Jensen
7a7fa85742 Merge "Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui since those plugins don't even have buddy policies" into omaha_14.4.1
Former-commit-id: a6ac3609a9 [formerly 0873be5eac] [formerly a6ac3609a9 [formerly 0873be5eac] [formerly 69a7955015 [formerly 4e837f409cdc55d597b8fcd019381353a5bd5b29]]]
Former-commit-id: 69a7955015
Former-commit-id: ff6775a9dc [formerly 936e7d5d81]
Former-commit-id: f16219cf0f
2014-08-05 10:33:29 -05:00
Nate Jensen
49dcd538b6 Omaha #3356 remove unreferenced registered buddy policies
Change-Id: Ib3192d9da29129f5ed0db35ed903f33b111a8eb6

Former-commit-id: 69d1481634 [formerly cc56bc4b3b] [formerly 69d1481634 [formerly cc56bc4b3b] [formerly 7fb8a476f7 [formerly 9ff58fb62685fbb2f9322842ecdab40c78a8536e]]]
Former-commit-id: 7fb8a476f7
Former-commit-id: eab34f1fa0 [formerly ae7aa599bb]
Former-commit-id: 6c23f261a2
2014-08-05 09:27:10 -05:00
Steve Harris
a0fdc76880 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: a92dc418c6 [formerly 0fb743ec44] [formerly a92dc418c6 [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: b848e05aa1 [formerly 46fe792d83]
Former-commit-id: 5e2f7a9f74
2014-08-04 22:20:29 -05:00
Nate Jensen
875a4ae026 Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui
since those plugins don't even have buddy policies

Change-Id: Ib81ac30111b9c3020e486d6db52dde3e15d7dacf

Former-commit-id: 92b1fb11e5 [formerly 6e94ea9d2b] [formerly 92b1fb11e5 [formerly 6e94ea9d2b] [formerly f8d9235104 [formerly 4f691341c0368c3e015c73f25aab0cf8877802ac]]]
Former-commit-id: f8d9235104
Former-commit-id: 8e6d26df88 [formerly 619f0ac245]
Former-commit-id: 2889a0fedb
2014-08-04 18:03:15 -05:00
Steve Harris
c1c551dc0b Merge branch 'master_14.3.1' (14.3.1-14) into omaha_14.3.1
Former-commit-id: 3a10442f6e [formerly 941efaf857] [formerly 3a10442f6e [formerly 941efaf857] [formerly 7a8cdaea54 [formerly f158314a854a081cb12cd15cab3f6340d5c0fb78]]]
Former-commit-id: 7a8cdaea54
Former-commit-id: e875a9ded5 [formerly 1cdfc11ce4]
Former-commit-id: 038cd986eb
2014-08-04 16:04:11 -05:00
Nate Jensen
c7512d7308 Merge "Omaha #3356 remove unnecessary usage of ext and global buddy policies" into omaha_14.4.1
Former-commit-id: c30297b1b0 [formerly b3af25916c] [formerly c30297b1b0 [formerly b3af25916c] [formerly 61654ad2d1 [formerly 01773a5dfc82902e28fa730e174177b2ce08934e]]]
Former-commit-id: 61654ad2d1
Former-commit-id: 251a3f7686 [formerly 94994852f0]
Former-commit-id: f05fd71463
2014-08-04 14:49:57 -05:00
Nate Jensen
671e9940b2 Merge "Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()" into omaha_14.4.1
Former-commit-id: 28f6f0b924 [formerly 3d742ecce7] [formerly 28f6f0b924 [formerly 3d742ecce7] [formerly 163da01258 [formerly 6192b481a59657fea18c2a2e19a7decb717972a9]]]
Former-commit-id: 163da01258
Former-commit-id: b20c5b5042 [formerly 9fcef65b02]
Former-commit-id: a7a33cca73
2014-08-04 14:02:06 -05:00
Nate Jensen
229748cb67 Merge "Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode" into omaha_14.4.1
Former-commit-id: 1df98fb269 [formerly 9cfc0e27d5] [formerly 1df98fb269 [formerly 9cfc0e27d5] [formerly 478216de93 [formerly 1858a9b22e9b34c5fbe167ab8636c1a03e820a5e]]]
Former-commit-id: 478216de93
Former-commit-id: cce133d913 [formerly c3bff44386]
Former-commit-id: efdf2c386a
2014-08-04 13:57:11 -05:00
Nate Jensen
2e64f9ee10 Merge "Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()" into omaha_14.4.1
Former-commit-id: ccf1c4296c [formerly 105cfe7208] [formerly ccf1c4296c [formerly 105cfe7208] [formerly 5a15ce6706 [formerly 6e832a42daf9c235a8f5df9c99efc3862cf99cbf]]]
Former-commit-id: 5a15ce6706
Former-commit-id: f338ff48b1 [formerly 372ce0099a]
Former-commit-id: abfc0bd71f
2014-08-04 13:57:00 -05:00
Nate Jensen
9ca0daba86 Merge "Omaha #3427 decoder interface now takes full path to jar" into omaha_14.4.1
Former-commit-id: 549b05fd37 [formerly 964582d277] [formerly 549b05fd37 [formerly 964582d277] [formerly f697efd6be [formerly 8587fe7d4577fc1667c75e79535e81129b871e35]]]
Former-commit-id: f697efd6be
Former-commit-id: 327741264f [formerly a18875e61d]
Former-commit-id: a502cc1b03
2014-08-04 13:56:37 -05:00
Mark Peters
7a4c25190e Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9

Former-commit-id: 9be02c8dfe [formerly 22c077d77f] [formerly 9be02c8dfe [formerly 22c077d77f] [formerly 88b334cf14 [formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]]
Former-commit-id: 88b334cf14
Former-commit-id: 469f73cb43 [formerly 666c988f64]
Former-commit-id: ca4003ca7f
2014-08-04 13:27:45 -05:00
Richard Peter
69ac46f721 Merge "Omaha #3474 AWIPS2-Development portion of DD #2752" into omaha_14.4.1
Former-commit-id: f0322219fd [formerly 620e7c52f9] [formerly f0322219fd [formerly 620e7c52f9] [formerly d9f5afd301 [formerly e56490121bf24585f7836705745aec9df7c08ef7]]]
Former-commit-id: d9f5afd301
Former-commit-id: 572aba497e [formerly 6efdfd147b]
Former-commit-id: bc93da4256
2014-08-04 13:22:14 -05:00
Nate Jensen
cbf0360401 Omaha #3356 remove unnecessary usage of ext and global buddy policies
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d

Former-commit-id: 41eb72aefd [formerly 06a64080e7] [formerly 41eb72aefd [formerly 06a64080e7] [formerly 857f1b70cc [formerly 41306351920aee44bdf2d9648616ddc8a4511632]]]
Former-commit-id: 857f1b70cc
Former-commit-id: 94399b57de [formerly a920937cb5]
Former-commit-id: f51d409d97
2014-08-04 12:30:55 -05:00
Brian.Dyke
803ceadaec Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 301f3094be [formerly 9abb02ea8a] [formerly 301f3094be [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: bbe6ec4d50 [formerly 37aacfcb96]
Former-commit-id: b9daa26f7d
2014-08-04 13:10:13 -04:00
Mark Peters
b5f329e3ba Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: If0ada7c887b532e98c7d0d6df56c5b1b195c9d8b

Former-commit-id: 22f86459ae [formerly b15b09ee50] [formerly 22f86459ae [formerly b15b09ee50] [formerly dbc0015671 [formerly 3bae11d54bee5bf3b4a650bce02b85902ced1cbc]]]
Former-commit-id: dbc0015671
Former-commit-id: 90ae0ac085 [formerly 5fcbd767bf]
Former-commit-id: 069691fa0c
2014-08-04 12:10:02 -05:00
Mark Peters
5fec6a3fa8 Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode
Change-Id: Iba81f6dc58b1223252711296b66a88a8afb02cdd

Former-commit-id: 7aee990658 [formerly de149c4a4f] [formerly 7aee990658 [formerly de149c4a4f] [formerly cf2a2d47b9 [formerly d81e1ac43cbf10b0cd6f475e41fc242ab3c6a3c7]]]
Former-commit-id: cf2a2d47b9
Former-commit-id: dce12dda03 [formerly 29bd1467dc]
Former-commit-id: 5d22073714
2014-08-04 10:24:08 -05:00
Brian Clements
9d37d84624 Omaha #3427 decoder interface now takes full path to jar
Change-Id: I8212017cce74cb70314a2a6f72fad72f59ff19fb

Former-commit-id: cdd64aa7ea [formerly 32d46b0155] [formerly cdd64aa7ea [formerly 32d46b0155] [formerly 516575c326 [formerly 1aee051869b8aac10a233a142f758fdca82c11ab]]]
Former-commit-id: 516575c326
Former-commit-id: fb25c54535 [formerly 3687dd978c]
Former-commit-id: 7b83403a1b
2014-08-04 09:23:59 -05:00
Greg Armendariz
9dc639046f Merge "Omaha #3318 split deltascript one for dx1 the other for dx2." into omaha_14.4.1
Former-commit-id: 32cbdfff27 [formerly 122cf829d1] [formerly 32cbdfff27 [formerly 122cf829d1] [formerly 45c070c2d9 [formerly 8e9c405183b7f85fc72f1d5a3bbbfd3e02e026b3]]]
Former-commit-id: 45c070c2d9
Former-commit-id: 55e65f5b2e [formerly e152bc9a6a]
Former-commit-id: 0aa7bb4c53
2014-08-01 15:43:36 -05:00
Roger Ferrel
5839142739 Omaha #3352 Better logging and threading added.
Change-Id: I0011085bed8f758b151526683c57ea2ad5ee7c69

Former-commit-id: 934d96b72a [formerly 6c5675cb2d] [formerly 934d96b72a [formerly 6c5675cb2d] [formerly 80fe6531b4 [formerly 638cb3e45b8f75f251b4de4b8670c530721615ff]]]
Former-commit-id: 80fe6531b4
Former-commit-id: c762e53d74 [formerly 55a1680a40]
Former-commit-id: 180cd9f29e
2014-08-01 15:03:40 -05:00
Roger Ferrel
c1d4433fdb Omaha #3318 split deltascript one for dx1 the other for dx2.
Change-Id: If230b4c1bb24b4d2d9b73b357019275534803691

Former-commit-id: 7208fc1f29 [formerly 8ea817f6d0] [formerly 7208fc1f29 [formerly 8ea817f6d0] [formerly 44029681c8 [formerly abbaca59ff431f420bc700ad11de3cda89f82277]]]
Former-commit-id: 44029681c8
Former-commit-id: d751500485 [formerly 37eb414dd0]
Former-commit-id: b8905460d6
2014-08-01 14:13:25 -05:00
Nathan Bowler
1ebf2b1371 Omaha #3328 Merged it.geosolutions into org.geotools.
Change-Id: I7e2d449864b46c3b1d73d84c6387cddbfcf5ff58

Former-commit-id: 26ed86fbed [formerly 632229ec07] [formerly 26ed86fbed [formerly 632229ec07] [formerly 10913a4876 [formerly 16e95239c901b82a402963268c2d3fb900e415d7]]]
Former-commit-id: 10913a4876
Former-commit-id: 0375bab129 [formerly a23389ba5f]
Former-commit-id: 6c8b317302
2014-08-01 14:01:16 -04:00
Nate Jensen
427475109a Merge "Omaha #3410 added data uri reformatting to lon lat precision change delta script" into omaha_14.4.1
Former-commit-id: f0b8284665 [formerly b222ac062c] [formerly f0b8284665 [formerly b222ac062c] [formerly 126debf79e [formerly 524845d989c7568c99f6e6985a85c890baef9e17]]]
Former-commit-id: 126debf79e
Former-commit-id: b673013d52 [formerly 328c00b8a4]
Former-commit-id: 852b98b2d7
2014-07-31 16:43:54 -05:00
Nate Jensen
8de6e37c71 Merge "Omaha #3410 removed duplicate fields from hdf5" into omaha_14.4.1
Former-commit-id: e90e2af013 [formerly f3142d341c] [formerly e90e2af013 [formerly f3142d341c] [formerly 6df1004c0d [formerly 7c71a9a7e57af9731310df2ceb0494f3f79adb89]]]
Former-commit-id: 6df1004c0d
Former-commit-id: 1b023b25e1 [formerly e0a01cf225]
Former-commit-id: 62c7f288c6
2014-07-31 14:35:41 -05:00
Brian Clements
2703d2f6d6 Omaha #3410 added data uri reformatting to lon lat precision change delta script
Change-Id: I3335e3d0f62b702845f26fe4ed408600debc20d6

Former-commit-id: d5a0586bf4 [formerly aa84d39ec5] [formerly d5a0586bf4 [formerly aa84d39ec5] [formerly edb0244e9f [formerly e3c680ad83d542beed195d3b1f983e122e6f21ec]]]
Former-commit-id: edb0244e9f
Former-commit-id: af8b704465 [formerly 3b734fe71f]
Former-commit-id: 801299c2d1
2014-07-31 14:14:17 -05:00