914 commits

Author	SHA1	Message	Date
Roger Ferrel	e82a2e2d5c	Issue #1298 Changes for non-blocking ZoneColorEditorDlg. ... Changes from reviewer's comments. Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f Former-commit-id: ae52206cc7 [formerly 5ce67ffd9e [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]] Former-commit-id: 5ce67ffd9e Former-commit-id: fdfa0f2030	2012-11-13 09:49:16 -06:00
Nate Jensen	dcff3f4711	Merge "Issue #1324 make times display in 24 hour time" into development ... Former-commit-id: e7045022ad [formerly 8a07ba3c11 [formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]] Former-commit-id: 8a07ba3c11 Former-commit-id: ca20259c16	2012-11-13 09:28:05 -06:00
Nate Jensen	35ea1b7773	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: e51d86ce3a [formerly 8a1f3a10a4 [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]] Former-commit-id: 8a1f3a10a4 Former-commit-id: 254e88a70c	2012-11-12 17:16:07 -06:00
Lee Venable	ca88126428	Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development ... Former-commit-id: d4276e6474 [formerly a576274c3c [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]] Former-commit-id: a576274c3c Former-commit-id: e62c2fb732	2012-11-12 16:58:17 -06:00
Max Schenkelberg	1ed5f10230	Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml ... Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e Former-commit-id: 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]] Former-commit-id: d1099addc6 Former-commit-id: 30c1802398	2012-11-12 16:46:21 -06:00
Roger Ferrel	5f0a583d86	Issue #1298 Changes for non-blocking WrapLengthDialog. ... Changes from reviewer's comments. Fix merge conflict. Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4 Former-commit-id: e982c0f43a [formerly 66606f88de [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]] Former-commit-id: 66606f88de Former-commit-id: ab77dfa758	2012-11-12 16:27:08 -06:00
Roger Ferrel	e6030885a1	Issue #1298 Changes for non-blocking StoreTransmitDlg. ... Changes from reviewer's coments. Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f Former-commit-id: 76109f3bf7 [formerly 6445081aa9 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]] Former-commit-id: 6445081aa9 Former-commit-id: 13c0fb3f3d	2012-11-12 15:26:03 -06:00
Ben Steffensmeier	dfe697a59c	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: b5b472dee1 [formerly 7d3f479031 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]] Former-commit-id: 7d3f479031 Former-commit-id: 65441372df	2012-11-12 15:15:49 -06:00
Roger Ferrel	499100c5b6	Issue #1298 Changes for non-blocking NewToolDialog. ... Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5 Former-commit-id: f48474fc82 [formerly 9c9a068908 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]] Former-commit-id: 9c9a068908 Former-commit-id: 6ec9c1fac4	2012-11-12 14:22:02 -06:00
Lee Venable	ca20167d7e	Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development ... Former-commit-id: 7db247e33a [formerly ab62adea95 [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]] Former-commit-id: ab62adea95 Former-commit-id: 72aedbcece	2012-11-12 14:13:06 -06:00
Lee Venable	6359f32b18	Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development ... Former-commit-id: 62c42850e8 [formerly 879078484e [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]] Former-commit-id: 879078484e Former-commit-id: d9022d16a6	2012-11-12 14:09:44 -06:00
Roger Ferrel	5ea786daaf	Issue #1298 Changes for non-blocking NewTextProductDialog. ... Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d Former-commit-id: ee323d9c60 [formerly 3676829e8f [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]] Former-commit-id: 3676829e8f Former-commit-id: ce6d6e277e	2012-11-12 13:20:05 -06:00
Matt Nash	0894e7800d	Issue #1324 make times display in 24 hour time ... Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2 Former-commit-id: 0a2f7c9ed2 [formerly 1480e0abfc [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]] Former-commit-id: 1480e0abfc Former-commit-id: 7fa21f5041	2012-11-12 12:53:26 -06:00
Roger Ferrel	dde8ce56c0	Issue #1298 Changes for non-blocking GridInfoDialog. ... Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a Former-commit-id: 438731ca2e [formerly 30ef939e3c [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]] Former-commit-id: 30ef939e3c Former-commit-id: 1f509c5a54	2012-11-12 12:00:03 -06:00
Roger Ferrel	259949bc5f	Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog. ... Changes from reviewer's comments. Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079 Former-commit-id: d489a7ef9f [formerly d89ce26aeb [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]] Former-commit-id: d89ce26aeb Former-commit-id: b60cbeda7a	2012-11-12 07:14:15 -06:00
Lee Venable	db5861e92a	Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development ... Former-commit-id: dac9544eed [formerly 109076cb73 [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]] Former-commit-id: 109076cb73 Former-commit-id: 125ac804a7	2012-11-08 17:06:54 -06:00
Nate Jensen	78d49992a3	Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development ... Former-commit-id: cdd6a986e8 [formerly a92bfa9393 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]] Former-commit-id: a92bfa9393 Former-commit-id: 5e718ca85b	2012-11-08 14:50:17 -06:00
Dustin Johnson	19c2e301b8	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: 2b6e98954e [formerly 595c421e47 [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]] Former-commit-id: 595c421e47 Former-commit-id: db4d728eb7	2012-11-08 14:47:17 -06:00
Ben Steffensmeier	a0f6c320cb	Issue #1108 initial implementation of mappings ... Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d Conflicts: edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF Former-commit-id: 693090cb36 [formerly 535c73051d [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]] Former-commit-id: 535c73051d Former-commit-id: 20e618eb4f	2012-11-08 14:45:36 -06:00
Roger Ferrel	fb742c6dbf	Issue #1298 Changes for non-blocking IssuanceSiteIdDlg. ... Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba Former-commit-id: 89617dda68 [formerly e26b14a84d [formerly a2a52b7754d831406e591763930f419def7cb1eb]] Former-commit-id: e26b14a84d Former-commit-id: 709798659d	2012-11-08 11:19:51 -06:00
Lee Venable	72972d37b7	Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development ... Former-commit-id: e791e73a30 [formerly be460c956e [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]] Former-commit-id: be460c956e Former-commit-id: 6c0bb76679	2012-11-08 11:11:15 -06:00
Nate Jensen	00dcf33480	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: 01072652dc [formerly 96cb1ecc7f [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]] Former-commit-id: 96cb1ecc7f Former-commit-id: e3487942ac	2012-11-08 11:08:48 -06:00
Lee Venable	fae33021a4	Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development ... Former-commit-id: c44f90f675 [formerly ff5083715b [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]] Former-commit-id: ff5083715b Former-commit-id: c4526c5ba0	2012-11-08 10:57:45 -06:00
Roger Ferrel	853a3e6593	Issue #1298 Changes for non-blocking SaveDeleteComboDlg. ... Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f Former-commit-id: eae8a68fd5 [formerly dfb55edb3d [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]] Former-commit-id: dfb55edb3d Former-commit-id: 359ee69fa6	2012-11-08 10:54:41 -06:00
Nate Jensen	d701700a35	Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development ... Former-commit-id: 48dae3a5e9 [formerly 9038ff4e10 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]] Former-commit-id: 9038ff4e10 Former-commit-id: ca5db2ec43	2012-11-08 10:34:56 -06:00
Max Schenkelberg	001d0710e7	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: c80dbffad8 [formerly 9aa4221fdf [formerly 598e0268c95155536fb94798cc134d18b2566dbc]] Former-commit-id: 9aa4221fdf Former-commit-id: 5f0b4286ba	2012-11-08 10:08:38 -06:00
Dustin Johnson	acd4cf94d8	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: 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]] Former-commit-id: 064ef82d1e Former-commit-id: efd3d3735a	2012-11-08 09:57:16 -06:00
Roger Ferrel	c44dd45f87	Issue #1298 Changes for non-blocking FuzzValueDialog. ... Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef Former-commit-id: c3f451f799 [formerly 023252fb84 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]] Former-commit-id: 023252fb84 Former-commit-id: 3ad0d7d516	2012-11-08 08:24:38 -06:00
Roger Ferrel	4aafcb8311	Issue #1298 Chnages for non-blocking FindReplaceDlg. ... Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7 Former-commit-id: 199475f671 [formerly 76f60240c5 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]] Former-commit-id: 76f60240c5 Former-commit-id: 94a4440625	2012-11-08 07:57:56 -06:00
Nate Jensen	b0bb920fde	Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development ... Former-commit-id: 6b205399d4 [formerly b32a9e839e [formerly 1902ab64c3ab11c41af906e5d78368689833561f]] Former-commit-id: b32a9e839e Former-commit-id: 20a63254e2	2012-11-07 18:18:06 -06:00
Lee Venable	dbeb600e58	Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development ... Former-commit-id: 8956718961 [formerly 36c44db46b [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]] Former-commit-id: 36c44db46b Former-commit-id: c8955b5425	2012-11-07 17:38:21 -06:00
Roger Ferrel	d6d99f5e30	Issue #1298 Changes for non-blocking ClearZoneGroupsDialog. ... Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0 Former-commit-id: 65d10be5d6 [formerly a46535ee0c [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]] Former-commit-id: a46535ee0c Former-commit-id: ee038e811c	2012-11-07 15:07:47 -06:00
Roger Ferrel	dd9e28d58a	Issue #1298 Changes for non-blocking CallToActionsDlg. ... Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc Former-commit-id: 81de6cd45b [formerly 190922a233 [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]] Former-commit-id: 190922a233 Former-commit-id: 4b0c701d69	2012-11-07 14:35:38 -06:00
Lee Venable	f4a62abbda	Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development ... Former-commit-id: 297d2bbc9c [formerly f368b93484 [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]] Former-commit-id: f368b93484 Former-commit-id: 074543d75e	2012-11-07 12:31:39 -06:00
Roger Ferrel	977d7c5ead	Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking. ... Change-Id: I6c5679269985eeb32d48afa44862632e00939a91 Former-commit-id: 974431a13a [formerly 82abbbf0b7 [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]] Former-commit-id: 82abbbf0b7 Former-commit-id: 8bf89ad495	2012-11-07 11:27:36 -06:00
Max Schenkelberg	94e64c9b0d	Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration. ... Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345 Former-commit-id: ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]] Former-commit-id: 2f90120248 Former-commit-id: f069f34a96	2012-11-07 10:44:42 -06:00
Matt Nash	5b17b0f296	Issue #1273 product browser can now change order for grid ... Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2 Former-commit-id: 284aecc6f9 [formerly 9c9db6643a [formerly 9c7477357508794a00267991b825d169df5ae71a]] Former-commit-id: 9c9db6643a Former-commit-id: 76cdfc09bb	2012-11-06 14:06:49 -06:00
Roger Ferrel	48141292fb	Issue #1304 Clear text field when point removed. ... Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc Former-commit-id: 1f71a3bed7 [formerly 921134848b [formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]] Former-commit-id: 921134848b Former-commit-id: a6b093c2ce	2012-11-05 12:56:07 -06:00
Roger Ferrel	d6916f4ec3	Issue #1304 Added Point change listners to ChooseByIdDialog and RangeRingDialog. ... Change-Id: Id2933ae7ccfb6ed260da619a822c2b5b706f64d3 Former-commit-id: 3045291a29 [formerly 986766487f [formerly d296028a9a0add9a81836030ff7b65be8883956b]] Former-commit-id: 986766487f Former-commit-id: 120764c5ef	2012-11-05 11:22:28 -06:00
Dustin Johnson	7d0e4a6e75	Issue #1302 Merge branch '5-Data_Delivery' into development ... Conflicts: edexOsgi/build.edex/deploy-common/external-rules.xml edexOsgi/build.edex/deploy-common/plugin-methods.xml edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java edexOsgi/build.edex/build.xml edexOsgi/build.edex/esb/conf/modes.xml edexOsgi/com.raytheon.edex.feature.uframe/feature.xml edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0 Former-commit-id: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]] Former-commit-id: 98d7beae50 Former-commit-id: 8e69107b5a	2012-11-01 13:36:06 -05:00
Ben Steffensmeier	ca1037e96b	Issue #189 a few fixes to grid resources for FFG Mosaic ... Former-commit-id: 4b121fd7b3 [formerly 64d4a1add7 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]] Former-commit-id: 64d4a1add7 Former-commit-id: dc0e75eb29	2012-10-31 11:39:32 -05:00
Roger Ferrel	ac49925d87	Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog. ... Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc Former-commit-id: 3c64544822 [formerly d92be142ad [formerly 17f789e76f77467935002d3b466b764ddb0b81f4]] Former-commit-id: d92be142ad Former-commit-id: 2b80c2c2b5	2012-10-30 17:09:52 -05:00
Lee Venable	0b9b82f99d	Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development ... Former-commit-id: 2c86fdb2d0 [formerly 868fe53216 [formerly 08784a33471cc96472370081f31d7d7edb2a61f7]] Former-commit-id: 868fe53216 Former-commit-id: 51c60c1876	2012-10-30 16:46:30 -05:00
Lee Venable	06ae8809fa	Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development ... Former-commit-id: e47d1beb09 [formerly 276ce2ad08 [formerly 8d14e957dc2152a31c813a9278646904e2a3c777]] Former-commit-id: 276ce2ad08 Former-commit-id: 08e6cd0a31	2012-10-30 16:45:35 -05:00
Lee Venable	c98c1c4e22	Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development ... Former-commit-id: 0bc4ec2135 [formerly 33525e4dff [formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]] Former-commit-id: 33525e4dff Former-commit-id: eed01fd643	2012-10-30 16:44:56 -05:00
Roger Ferrel	b57c7c2db8	Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog. ... Change-Id: I6151274f455066c03db49618d6b5801248d48527 Former-commit-id: 7c8f48fcb5 [formerly 0c544da917 [formerly c67543535ff38b777f14df1f41d96dbdacddeb09]] Former-commit-id: 0c544da917 Former-commit-id: 84a338fd4c	2012-10-30 15:19:08 -05:00
Roger Ferrel	0c3a8eb482	Issue #1298 Changes for non-blocking BrightnessDialog. ... Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483 Former-commit-id: 2fb06a145f [formerly bc1e462d07 [formerly 535d952595adfcd749ee132e45736120aa25cd3d]] Former-commit-id: bc1e462d07 Former-commit-id: 9dcaf583f6	2012-10-30 14:00:20 -05:00
Roger Ferrel	a155a8522e	Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking. ... Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0 Former-commit-id: e37a097596 [formerly 8952e1cef8 [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]] Former-commit-id: 8952e1cef8 Former-commit-id: 3b96d312cd	2012-10-30 12:35:48 -05:00
Ben Steffensmeier	c789e1fd94	merge branch Unifeid_Grid into developement ... Former-commit-id: b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]] Former-commit-id: d0a2ed32b5 Former-commit-id: 272e057bf1	2012-10-30 12:24:54 -05:00
Roger Ferrel	ade948f7c9	Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog. ... Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620 Former-commit-id: 5355b7f620 [formerly 87d3ff985e [formerly 13f856685e36155909e7c4f4f9ac36d3a5633e4a]] Former-commit-id: 87d3ff985e Former-commit-id: 6291083e5b	2012-10-30 10:34:40 -05:00