Commit graph

1343 commits

Author SHA1 Message Date
Lee Venable
4c936e9bb8 Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
Former-commit-id: 4320165247 [formerly 2827143110] [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 989d5dc5e4 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]]
Former-commit-id: dbdfda1d04
Former-commit-id: a654acdd7cf3477fb8a44e9b6bf136dee6be7b3d [formerly 282e8858da]
Former-commit-id: 77af9b8699
2012-11-13 16:02:05 -06:00
Steve Harris
7abc2601da Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
Former-commit-id: 5569785336 [formerly 1f1659cb16] [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly 63b0f18a89 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]]
Former-commit-id: 5c23f057b3
Former-commit-id: b9c2ea0185e67881a053d4f784a50c258b57989c [formerly 1e0ad343d6]
Former-commit-id: 6db07e2e5e
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
fa599c93a8 Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]
Former-commit-id: 109ec1e778
2012-11-13 16:00:19 -06:00
Roger Ferrel
12ad9f9732 Issue #1298 Changes for non-blocking SetValueDialog.
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f

Former-commit-id: f9265a7f55 [formerly cbacc77367] [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 1d5bd95866 [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]]
Former-commit-id: dceb2cde5d
Former-commit-id: 064d919288c957d602a2f2cbce59be833dac3237 [formerly 29eb436b19]
Former-commit-id: c498e21b23
2012-11-13 15:53:03 -06:00
Lee Venable
57725df0a1 Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
Former-commit-id: 65c0b3953e [formerly 5b4f3c68f1] [formerly c1e46f52ca] [formerly 9d149bef29 [formerly c1e46f52ca [formerly 795564ae453a7afb423980679c3719a7c453aa74]]]
Former-commit-id: 9d149bef29
Former-commit-id: 1d750981a09a5ee9d6d9bde6568cd2d514c44071 [formerly 32f088d986]
Former-commit-id: 3d07136ccc
2012-11-13 15:35:13 -06:00
Lee Venable
9d69e051e9 Merge "Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open." into development
Former-commit-id: e51783c2e1 [formerly 20548994dd] [formerly 0c936a3f8c] [formerly d935fff585 [formerly 0c936a3f8c [formerly f037a61c9fd0c0d85a7596b95cdd35072f7bafe0]]]
Former-commit-id: d935fff585
Former-commit-id: 22affce710d4ea47f88e06aa55fe36b47d206fda [formerly a78cdc9ee4]
Former-commit-id: 69888e4517
2012-11-13 15:34:40 -06:00
Roger Ferrel
dce9814cc7 Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0

Former-commit-id: 9ec6ee1fe4 [formerly 6f6b9dd21a] [formerly 1e8dfdc857] [formerly b421a30116 [formerly 1e8dfdc857 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]]
Former-commit-id: b421a30116
Former-commit-id: 9fb3810dd061a915575be1fa8b5d2e12821cf89c [formerly d646f32d6e]
Former-commit-id: 1272837397
2012-11-13 13:20:28 -06:00
Lee Venable
56b783bd6d Merge "Issue #1317 - Fix problem in edexProcessStats.xml" into development
Former-commit-id: 3e671640a4 [formerly 4b8129ea58] [formerly 5fce4fde98] [formerly 548973dae0 [formerly 5fce4fde98 [formerly bde192a2c922a9bb239d1558794cf03ec6944118]]]
Former-commit-id: 548973dae0
Former-commit-id: 3949d88900153a0e55e529defe00c146b068a929 [formerly 89e28445e5]
Former-commit-id: 39f2ebaf14
2012-11-13 13:19:00 -06:00
Roger Ferrel
af8fa780d2 Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081

Former-commit-id: 2209d4d650 [formerly e3ae2eb355] [formerly 22f8bc10f0] [formerly 4c3af2a258 [formerly 22f8bc10f0 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]]
Former-commit-id: 4c3af2a258
Former-commit-id: 1c4ed8e46fd206b5fb6dfee23125c65e6807a1ec [formerly 8e85e1c8df]
Former-commit-id: c1c0e53b2d
2012-11-13 12:55:33 -06:00
Ron Anderson
88e7d313c4 Issue #1325 Update geotools source path entries per code review.
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0

Former-commit-id: dbc5a5bb97 [formerly 1bb7258935] [formerly 8a5a2dc532] [formerly 795dfdc9dd [formerly 8a5a2dc532 [formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]]
Former-commit-id: 795dfdc9dd
Former-commit-id: 20e198ff53cca6785546ec870a4e207bdb8ddfbc [formerly bad09a9c0d]
Former-commit-id: d6a33fb39f
2012-11-13 12:06:54 -06:00
Mike Duff
5aadd96ae5 Issue #1317 - Fix problem in edexProcessStats.xml
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03

Former-commit-id: 24aa44a46d [formerly 248db814c1] [formerly 0e32ab85db] [formerly e14b372f42 [formerly 0e32ab85db [formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]]
Former-commit-id: e14b372f42
Former-commit-id: 965fd4a7f301467fa40bb5165f739960f012cec8 [formerly 363aa7bec6]
Former-commit-id: b91dca252e
2012-11-13 11:44:02 -06:00
Roger Ferrel
e4283e3ccd Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.

Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f

Former-commit-id: e82a2e2d5c [formerly fdfa0f2030] [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 5ce67ffd9e [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]]
Former-commit-id: ae52206cc7
Former-commit-id: e30f66c230e0ca09d4cf1ce286c67a28b4b91763 [formerly 30c70cc181]
Former-commit-id: 122a5cf0a4
2012-11-13 09:49:16 -06:00
Nate Jensen
e6f79c3e2a Merge "Issue #1324 make times display in 24 hour time" into development
Former-commit-id: dcff3f4711 [formerly ca20259c16] [formerly 8a07ba3c11] [formerly e7045022ad [formerly 8a07ba3c11 [formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]]
Former-commit-id: e7045022ad
Former-commit-id: 0145a91c7598ae528ddbebde30ec8710ab7722e0 [formerly 7baf10fc53]
Former-commit-id: 2be953df6b
2012-11-13 09:28:05 -06:00
Ron Anderson
ece8bb15e9 Merge "Issue #1325 Update GeoTools for WA4.7" into development
Former-commit-id: 2f6d7cc03b [formerly 8632dfa784] [formerly 024d384292] [formerly 41f68a9cac [formerly 024d384292 [formerly c7fe4cfae35393df26461d4c4892c2bbfaad0fbe]]]
Former-commit-id: 41f68a9cac
Former-commit-id: 3fe9dfb1515573a495d252408ae0fc1a18702e06 [formerly d07cb8c041]
Former-commit-id: a4d6e197be
2012-11-13 09:17:32 -06:00
Nate Jensen
6719a66001 Merge "Issue #1323 initial commit of interfaces of data access framework" into development
Former-commit-id: 73636a68e9 [formerly b43634a58f] [formerly 7ee0c96e34c72df6266bc727e910f2ab3ca5f8ee [formerly c2631b5ba6]] [formerly ff16f82b18 [formerly c2631b5ba6 [formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]]
Former-commit-id: ff16f82b18
Former-commit-id: bdd1ffdd3e03e63afdf42976f2fb37cc88db659c [formerly 14a139c813]
Former-commit-id: 9170b7f75e
2012-11-13 09:01:43 -06:00
Nate Jensen
826c997e0b Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
Former-commit-id: 35ea1b7773 [formerly 254e88a70c] [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly 8a1f3a10a4 [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]]
Former-commit-id: e51d86ce3a
Former-commit-id: 41eca00d43f0977ae5f16683be5bae42fb520906 [formerly cf8fd9f731]
Former-commit-id: 14b61ef0f8
2012-11-12 17:16:07 -06:00
Lee Venable
70142d8fa5 Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: ca88126428 [formerly e62c2fb732] [formerly a576274c3c] [formerly d4276e6474 [formerly a576274c3c [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]]
Former-commit-id: d4276e6474
Former-commit-id: dfb666f53c8640e84e9243b56e5e8a82310819b7 [formerly fb4b76b003]
Former-commit-id: eaf7e7c724
2012-11-12 16:58:17 -06:00
Max Schenkelberg
25f5a9b1aa Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]
Former-commit-id: 00822a4f39
Former-commit-id: 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94]
Former-commit-id: 4408af827f
2012-11-12 16:46:21 -06:00
Nate Jensen
6d3beb139e Issue #1323 initial commit of interfaces of data access framework
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02

Former-commit-id: d7f7152e93 [formerly b24c9eb456] [formerly f255f65b3c] [formerly bf72e29752 [formerly f255f65b3c [formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]]
Former-commit-id: bf72e29752
Former-commit-id: 321cb3de1f60b624ae9aad5c85b473334d3d249e [formerly 78a1185b19]
Former-commit-id: cfed9d9664
2012-11-12 16:45:33 -06:00
Roger Ferrel
4f08c126b6 Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: 5f0a583d86 [formerly ab77dfa758] [formerly 66606f88de] [formerly e982c0f43a [formerly 66606f88de [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]
Former-commit-id: e982c0f43a
Former-commit-id: bad97768d4ebf7b70752c8307f99e51df3dd9fe0 [formerly de21a3f2ef]
Former-commit-id: 3b07bb1ae6
2012-11-12 16:27:08 -06:00
Roger Ferrel
4a8b71a632 Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.

Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f

Former-commit-id: e6030885a1 [formerly 13c0fb3f3d] [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 6445081aa9 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]]
Former-commit-id: 76109f3bf7
Former-commit-id: d744cdfac526c0ce2d581c461d6fbaafbdfaa2c9 [formerly e7cd99ff0d]
Former-commit-id: 01899535e3
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
58ba7be711 Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
Former-commit-id: dfe697a59c [formerly 65441372df] [formerly 7d3f479031] [formerly b5b472dee1 [formerly 7d3f479031 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]]
Former-commit-id: b5b472dee1
Former-commit-id: 4bb07970a3378bedd6d8d48f328087592e3c8036 [formerly 220f41ec4c]
Former-commit-id: 810e0abd77
2012-11-12 15:15:49 -06:00
Ron Anderson
366df432bc Issue #1325 Update GeoTools for WA4.7
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94

Former-commit-id: e7cd1f9def [formerly 7aaf4db2dc] [formerly f709ab812a] [formerly 303994ff1b [formerly f709ab812a [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]]]
Former-commit-id: 303994ff1b
Former-commit-id: eb6052e7b3aef0480bd8fd7500f4d915b645104c [formerly 7bf1316e8c]
Former-commit-id: 3ae270a65d
2012-11-12 15:02:08 -06:00
Roger Ferrel
0ff9252024 Issue #1298 Changes for non-blocking NewToolDialog.
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5

Former-commit-id: 499100c5b6 [formerly 6ec9c1fac4] [formerly 9c9a068908] [formerly f48474fc82 [formerly 9c9a068908 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]]
Former-commit-id: f48474fc82
Former-commit-id: bd145bd7ef91d95a7d99e1c2c708c0288c079123 [formerly b11413b7f0]
Former-commit-id: 398f71471d
2012-11-12 14:22:02 -06:00
Lee Venable
9715b63d07 Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
Former-commit-id: ca20167d7e [formerly 72aedbcece] [formerly ab62adea95] [formerly 7db247e33a [formerly ab62adea95 [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]]
Former-commit-id: 7db247e33a
Former-commit-id: f8b76144c6d9b8fab6faf09c7b74e630b40f12eb [formerly ded0bfb92f]
Former-commit-id: 6ab3480255
2012-11-12 14:13:06 -06:00
Lee Venable
65e6121178 Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
Former-commit-id: 6359f32b18 [formerly d9022d16a6] [formerly 879078484e] [formerly 62c42850e8 [formerly 879078484e [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]]
Former-commit-id: 62c42850e8
Former-commit-id: 1f8212cdab972e8581982c2fcbe3c6e04bac34f3 [formerly 4f26da9a9a]
Former-commit-id: 2b1be166a2
2012-11-12 14:09:44 -06:00
Roger Ferrel
fe965f064e Issue #1298 Changes for non-blocking NewTextProductDialog.
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d

Former-commit-id: 5ea786daaf [formerly ce6d6e277e] [formerly 3676829e8f] [formerly ee323d9c60 [formerly 3676829e8f [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]]
Former-commit-id: ee323d9c60
Former-commit-id: 43f3c54726102723a37b2f0b8b134e1f63f433fd [formerly 73d9e78e92]
Former-commit-id: 88968c54e5
2012-11-12 13:20:05 -06:00
Matt Nash
ffa1d74e12 Issue #1324 make times display in 24 hour time
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2

Former-commit-id: 0894e7800d [formerly 7fa21f5041] [formerly 1480e0abfc] [formerly 0a2f7c9ed2 [formerly 1480e0abfc [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]]]
Former-commit-id: 0a2f7c9ed2
Former-commit-id: f7c0905a51bc5c78ca29098eb0992a3aaccdc911 [formerly d728ffadd0]
Former-commit-id: dcda4b3fa4
2012-11-12 12:53:26 -06:00
Roger Ferrel
5e77bcf8bd Issue #1298 Changes for non-blocking GridInfoDialog.
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a

Former-commit-id: dde8ce56c0 [formerly 1f509c5a54] [formerly 30ef939e3c] [formerly 438731ca2e [formerly 30ef939e3c [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]]
Former-commit-id: 438731ca2e
Former-commit-id: 3a0ae83fcc9d5bbb65ad3b13ffe372cc97db6e13 [formerly 195d876753]
Former-commit-id: 8490814573
2012-11-12 12:00:03 -06:00
Roger Ferrel
2916b0a3b8 Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
Changes from reviewer's comments.

Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079

Former-commit-id: 259949bc5f [formerly b60cbeda7a] [formerly d89ce26aeb] [formerly d489a7ef9f [formerly d89ce26aeb [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]]
Former-commit-id: d489a7ef9f
Former-commit-id: 8767fadd2a0a8ed1a13ec17c8ffe7adca41ac200 [formerly e01a4ae243]
Former-commit-id: ecba7301a1
2012-11-12 07:14:15 -06:00
Ben Steffensmeier
3789a954e4 Issue #1108 fix the order of arguments for grib 1 parameter mappings
Former-commit-id: f0add08709 [formerly 894998b95f] [formerly adf0fec9a2] [formerly c4f99aae63 [formerly adf0fec9a2 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]]
Former-commit-id: c4f99aae63
Former-commit-id: dffdc11f9cdd9bfde1d32282b4a7f3429e11fcd4 [formerly 87ec259477]
Former-commit-id: 5ee5347fc0
2012-11-09 13:36:49 -06:00
Lee Venable
449d8fe737 Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
Former-commit-id: db5861e92a [formerly 125ac804a7] [formerly 109076cb73] [formerly dac9544eed [formerly 109076cb73 [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]]]
Former-commit-id: dac9544eed
Former-commit-id: 76216f132fefed0fdc4bd9c84d50f9a3ed79b5c9 [formerly a267d9020b]
Former-commit-id: ff21b8d604
2012-11-08 17:06:54 -06:00
Nate Jensen
974598ee1c Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
Former-commit-id: 78d49992a3 [formerly 5e718ca85b] [formerly a92bfa9393] [formerly cdd6a986e8 [formerly a92bfa9393 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]]]
Former-commit-id: cdd6a986e8
Former-commit-id: 67d145eb7b7c1dca029604c66311e8cc639f5e68 [formerly 5e3c076506]
Former-commit-id: 38511f0e95
2012-11-08 14:50:17 -06:00
Dustin Johnson
272761ae41 Issue #1302 Restore jdom.jar, delete net.jcip/.project
Amend:
  Also change the manifest and .classpath for ohd common

Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b

Former-commit-id: 19c2e301b8 [formerly db4d728eb7] [formerly 595c421e47] [formerly 2b6e98954e [formerly 595c421e47 [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]]
Former-commit-id: 2b6e98954e
Former-commit-id: 3fe0762a484ee2e5830878352f009474c977d9f7 [formerly 0806be04dd]
Former-commit-id: eac5bc8197
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
0f58b01a58 Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: a0f6c320cb [formerly 20e618eb4f] [formerly 535c73051d] [formerly 693090cb36 [formerly 535c73051d [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 0198876d17ad6ff76ff77ca6660a268c711628d2 [formerly 884c82c4fe]
Former-commit-id: 7c93db759c
2012-11-08 14:45:36 -06:00
Richard Peter
9e1e81e840 Merge "Issue #189 add more comments to grib decoder." into development
Former-commit-id: cd8c43078b [formerly 7f49c5fe04] [formerly db28cc26aa] [formerly 7077a82458 [formerly db28cc26aa [formerly 1ad439769c601fe61365f015bc56da0442553be5]]]
Former-commit-id: 7077a82458
Former-commit-id: 6c3e03fe9fc18f974ee8a5be0a2bda96c5aff4f6 [formerly e1852956e2]
Former-commit-id: fa6141c745
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
b664a9e649 Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: c17b92afc5 [formerly f62cf2713d] [formerly e6b0751f5c] [formerly fbed67a208 [formerly e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]
Former-commit-id: fbed67a208
Former-commit-id: b5eb27fb49abd5ab7570ad430a356c40d5ae9848 [formerly 7c9341a3a6]
Former-commit-id: d75b59622a
2012-11-08 14:34:55 -06:00
Richard Peter
e4aad5fcad Merge "Issue #189 fix another Unknown Model" into development
Former-commit-id: 50ddeed8e6 [formerly 10138f3ae8] [formerly 7d8dfb9c01] [formerly 675b1666fd [formerly 7d8dfb9c01 [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]]
Former-commit-id: 675b1666fd
Former-commit-id: be2444c1dd881e3611f5733295f49ae808e5d940 [formerly ed90d0aa23]
Former-commit-id: e7151070ee
2012-11-08 13:43:37 -06:00
Richard Peter
4699630bee Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
Former-commit-id: fbe5195de2 [formerly 62e5aff255] [formerly 3450ca3cd3] [formerly 2e9cdbe43e [formerly 3450ca3cd3 [formerly 6fce68b90116d30cf090db64032322916276136b]]]
Former-commit-id: 2e9cdbe43e
Former-commit-id: a52da4e3f534d6b1c014b4090e04029d85686d2b [formerly 4e0c207306]
Former-commit-id: b8ea93cb95
2012-11-08 13:30:27 -06:00
Dustin Johnson
0eb86d565e Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c

Former-commit-id: 67e02347b5 [formerly 1220f5167e] [formerly ddaa681d8a] [formerly 9784b563cf [formerly ddaa681d8a [formerly 217a17fe79d9156f03597d72e51ab47325b00991]]]
Former-commit-id: 9784b563cf
Former-commit-id: 4d6abc650d9441b7590743271c86e80abcff2657 [formerly 9bb53555a9]
Former-commit-id: d0867fedef
2012-11-08 12:00:15 -06:00
Roger Ferrel
ddeecc6e98 Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba

Former-commit-id: fb742c6dbf [formerly 709798659d] [formerly e26b14a84d] [formerly 89617dda68 [formerly e26b14a84d [formerly a2a52b7754d831406e591763930f419def7cb1eb]]]
Former-commit-id: 89617dda68
Former-commit-id: 905e3bb90604a5bd868eee7dd06299aedc0f819f [formerly 05825bd6f3]
Former-commit-id: 553344fb3b
2012-11-08 11:19:51 -06:00
Lee Venable
40c27a2403 Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: 72972d37b7 [formerly 6c0bb76679] [formerly edb9de6c440b9a5c36c7215f719f9a7570523b1e [formerly be460c956e]] [formerly e791e73a30 [formerly be460c956e [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]]
Former-commit-id: e791e73a30
Former-commit-id: 7998fddf765b511c29eef50d418b778e580e742f [formerly 7b5f085643]
Former-commit-id: 1e61d4bd08
2012-11-08 11:11:15 -06:00
Nate Jensen
650f477e09 Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
Former-commit-id: 00dcf33480 [formerly e3487942ac] [formerly 96cb1ecc7f] [formerly 01072652dc [formerly 96cb1ecc7f [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]]
Former-commit-id: 01072652dc
Former-commit-id: aaf573b212c0441c984a07ad356d4eb57494bd79 [formerly 375c864d28]
Former-commit-id: bdbad943ef
2012-11-08 11:08:48 -06:00
Lee Venable
b1b2512819 Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
Former-commit-id: fae33021a4 [formerly c4526c5ba0] [formerly ff5083715b] [formerly c44f90f675 [formerly ff5083715b [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]]
Former-commit-id: c44f90f675
Former-commit-id: 0f61b7daa2e57b5bf03170e39269f6b4fa2377a4 [formerly 4a22ded443]
Former-commit-id: 9523ad6085
2012-11-08 10:57:45 -06:00
Roger Ferrel
3851d5161c Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f

Former-commit-id: 853a3e6593 [formerly 359ee69fa6] [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly dfb55edb3d [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]]
Former-commit-id: eae8a68fd5
Former-commit-id: 0211367abde3087618fb2170a6c9b3664254ca94 [formerly 24a2e79b28]
Former-commit-id: e7aa940f52
2012-11-08 10:54:41 -06:00
Nate Jensen
3c7d135bc5 Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
Former-commit-id: d701700a35 [formerly ca5db2ec43] [formerly 9038ff4e10] [formerly 48dae3a5e9 [formerly 9038ff4e10 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]]
Former-commit-id: 48dae3a5e9
Former-commit-id: a70bb91d05156498a7bfb00ef3a008ed19da7cae [formerly 7da4882cfb]
Former-commit-id: fca1922f7b
2012-11-08 10:34:56 -06:00
Mike Duff
26210e06ef Issue #1317 - Update the stats config files
Issue #1317 - Peer review comments.

Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f

Former-commit-id: 7398e4fd68 [formerly e72c2822ad] [formerly 1372c08cdc] [formerly 50f0c4c226 [formerly 1372c08cdc [formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]]]
Former-commit-id: 50f0c4c226
Former-commit-id: f2b77e9dc771b60a8323ff83614ff068514ec645 [formerly 688b7cce30]
Former-commit-id: 7bed38a373
2012-11-08 10:15:41 -06:00
Max Schenkelberg
577a6e3631 Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time.
Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b

Former-commit-id: 001d0710e7 [formerly 5f0b4286ba] [formerly 9aa4221fdf] [formerly c80dbffad8 [formerly 9aa4221fdf [formerly 598e0268c95155536fb94798cc134d18b2566dbc]]]
Former-commit-id: c80dbffad8
Former-commit-id: 07b9c0188335e4ff522ce4e82831fe234a9fdd70 [formerly 0a410412db]
Former-commit-id: c219fcb112
2012-11-08 10:08:38 -06:00
Dustin Johnson
cd5faf58bf Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]
Former-commit-id: 2d1e886cf3
2012-11-08 09:57:16 -06:00
Roger Ferrel
7bd36bb2c7 Issue #1298 Changes for non-blocking FuzzValueDialog.
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef

Former-commit-id: c44dd45f87 [formerly 3ad0d7d516] [formerly 023252fb84] [formerly c3f451f799 [formerly 023252fb84 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]]
Former-commit-id: c3f451f799
Former-commit-id: 9bc5add0937b47a44fcc72985df13d60bf528a0c [formerly de534f5b43]
Former-commit-id: 9a1283fb1e
2012-11-08 08:24:38 -06:00