Commit graph

911 commits

Author SHA1 Message Date
Nate Jensen
254e88a70c 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 ef3483e14907e044a66cb6c5c677b6794bf9b03a]
Former-commit-id: 8a1f3a10a4
2012-11-12 17:16:07 -06:00
Lee Venable
e62c2fb732 Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: d4276e6474 [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]
Former-commit-id: a576274c3c
2012-11-12 16:58:17 -06:00
Max Schenkelberg
30c1802398 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 e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]
Former-commit-id: d1099addc6
2012-11-12 16:46:21 -06:00
Roger Ferrel
ab77dfa758 Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: e982c0f43a [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]
Former-commit-id: 66606f88de
2012-11-12 16:27:08 -06:00
Roger Ferrel
13c0fb3f3d Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.

Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f

Former-commit-id: 76109f3bf7 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]
Former-commit-id: 6445081aa9
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
65441372df 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 2242eefb25cd65edb4378b47b9cafbcab8510c53]
Former-commit-id: 7d3f479031
2012-11-12 15:15:49 -06:00
Roger Ferrel
6ec9c1fac4 Issue #1298 Changes for non-blocking NewToolDialog.
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5

Former-commit-id: f48474fc82 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]
Former-commit-id: 9c9a068908
2012-11-12 14:22:02 -06:00
Lee Venable
72aedbcece Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
Former-commit-id: 7db247e33a [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]
Former-commit-id: ab62adea95
2012-11-12 14:13:06 -06:00
Lee Venable
d9022d16a6 Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
Former-commit-id: 62c42850e8 [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]
Former-commit-id: 879078484e
2012-11-12 14:09:44 -06:00
Roger Ferrel
ce6d6e277e Issue #1298 Changes for non-blocking NewTextProductDialog.
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d

Former-commit-id: ee323d9c60 [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]
Former-commit-id: 3676829e8f
2012-11-12 13:20:05 -06:00
Roger Ferrel
1f509c5a54 Issue #1298 Changes for non-blocking GridInfoDialog.
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a

Former-commit-id: 438731ca2e [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]
Former-commit-id: 30ef939e3c
2012-11-12 12:00:03 -06:00
Roger Ferrel
b60cbeda7a Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
Changes from reviewer's comments.

Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079

Former-commit-id: d489a7ef9f [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]
Former-commit-id: d89ce26aeb
2012-11-12 07:14:15 -06:00
Lee Venable
125ac804a7 Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
Former-commit-id: dac9544eed [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]
Former-commit-id: 109076cb73
2012-11-08 17:06:54 -06:00
Nate Jensen
5e718ca85b Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
Former-commit-id: cdd6a986e8 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]
Former-commit-id: a92bfa9393
2012-11-08 14:50:17 -06:00
Dustin Johnson
db4d728eb7 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 49b999039c470a5df095a202b5a67bf036a5b71c]
Former-commit-id: 595c421e47
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
20e618eb4f 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 8db340a796df354059f3d4142db92dfd5fa527f5]
Former-commit-id: 535c73051d
2012-11-08 14:45:36 -06:00
Roger Ferrel
709798659d Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba

Former-commit-id: 89617dda68 [formerly a2a52b7754d831406e591763930f419def7cb1eb]
Former-commit-id: e26b14a84d
2012-11-08 11:19:51 -06:00
Lee Venable
6c0bb76679 Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: e791e73a30 [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]
Former-commit-id: be460c956e
2012-11-08 11:11:15 -06:00
Nate Jensen
e3487942ac 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 f6eeb7431fe55886a7958beeec7f8f67de7bf74a]
Former-commit-id: 96cb1ecc7f
2012-11-08 11:08:48 -06:00
Lee Venable
c4526c5ba0 Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
Former-commit-id: c44f90f675 [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]
Former-commit-id: ff5083715b
2012-11-08 10:57:45 -06:00
Roger Ferrel
359ee69fa6 Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f

Former-commit-id: eae8a68fd5 [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]
Former-commit-id: dfb55edb3d
2012-11-08 10:54:41 -06:00
Nate Jensen
ca5db2ec43 Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
Former-commit-id: 48dae3a5e9 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]
Former-commit-id: 9038ff4e10
2012-11-08 10:34:56 -06:00
Max Schenkelberg
5f0b4286ba 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 598e0268c95155536fb94798cc134d18b2566dbc]
Former-commit-id: 9aa4221fdf
2012-11-08 10:08:38 -06:00
Dustin Johnson
efd3d3735a 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 c04f7dca6f980ab7f3d77825312ddc34ba3b188d]
Former-commit-id: 064ef82d1e
2012-11-08 09:57:16 -06:00
Roger Ferrel
3ad0d7d516 Issue #1298 Changes for non-blocking FuzzValueDialog.
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef

Former-commit-id: c3f451f799 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]
Former-commit-id: 023252fb84
2012-11-08 08:24:38 -06:00
Roger Ferrel
94a4440625 Issue #1298 Chnages for non-blocking FindReplaceDlg.
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7

Former-commit-id: 199475f671 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]
Former-commit-id: 76f60240c5
2012-11-08 07:57:56 -06:00
Nate Jensen
20a63254e2 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 1902ab64c3ab11c41af906e5d78368689833561f]
Former-commit-id: b32a9e839e
2012-11-07 18:18:06 -06:00
Lee Venable
c8955b5425 Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
Former-commit-id: 8956718961 [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]
Former-commit-id: 36c44db46b
2012-11-07 17:38:21 -06:00
Roger Ferrel
ee038e811c Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0

Former-commit-id: 65d10be5d6 [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]
Former-commit-id: a46535ee0c
2012-11-07 15:07:47 -06:00
Roger Ferrel
4b0c701d69 Issue #1298 Changes for non-blocking CallToActionsDlg.
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc

Former-commit-id: 81de6cd45b [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]
Former-commit-id: 190922a233
2012-11-07 14:35:38 -06:00
Lee Venable
074543d75e Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
Former-commit-id: 297d2bbc9c [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]
Former-commit-id: f368b93484
2012-11-07 12:31:39 -06:00
Roger Ferrel
8bf89ad495 Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91

Former-commit-id: 974431a13a [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]
Former-commit-id: 82abbbf0b7
2012-11-07 11:27:36 -06:00
Max Schenkelberg
f069f34a96 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 a9c7374d162296c170f7c1b80e1fb2978b854cfd]
Former-commit-id: 2f90120248
2012-11-07 10:44:42 -06:00
Matt Nash
76cdfc09bb Issue #1273 product browser can now change order for grid
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2

Former-commit-id: 284aecc6f9 [formerly 9c7477357508794a00267991b825d169df5ae71a]
Former-commit-id: 9c9db6643a
2012-11-06 14:06:49 -06:00
Roger Ferrel
a6b093c2ce Issue #1304 Clear text field when point removed.
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc

Former-commit-id: 1f71a3bed7 [formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]
Former-commit-id: 921134848b
2012-11-05 12:56:07 -06:00
Roger Ferrel
120764c5ef Issue #1304 Added Point change listners to ChooseByIdDialog and RangeRingDialog.
Change-Id: Id2933ae7ccfb6ed260da619a822c2b5b706f64d3

Former-commit-id: 3045291a29 [formerly d296028a9a0add9a81836030ff7b65be8883956b]
Former-commit-id: 986766487f
2012-11-05 11:22:28 -06:00
Dustin Johnson
8e69107b5a 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 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 98d7beae50
2012-11-01 13:36:06 -05:00
Ben Steffensmeier
dc0e75eb29 Issue #189 a few fixes to grid resources for FFG Mosaic
Former-commit-id: 4b121fd7b3 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]
Former-commit-id: 64d4a1add7
2012-10-31 11:39:32 -05:00
Roger Ferrel
2b80c2c2b5 Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog.
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc

Former-commit-id: 3c64544822 [formerly 17f789e76f77467935002d3b466b764ddb0b81f4]
Former-commit-id: d92be142ad
2012-10-30 17:09:52 -05:00
Lee Venable
51c60c1876 Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development
Former-commit-id: 2c86fdb2d0 [formerly 08784a33471cc96472370081f31d7d7edb2a61f7]
Former-commit-id: 868fe53216
2012-10-30 16:46:30 -05:00
Lee Venable
08e6cd0a31 Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
Former-commit-id: e47d1beb09 [formerly 8d14e957dc2152a31c813a9278646904e2a3c777]
Former-commit-id: 276ce2ad08
2012-10-30 16:45:35 -05:00
Lee Venable
eed01fd643 Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development
Former-commit-id: 0bc4ec2135 [formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]
Former-commit-id: 33525e4dff
2012-10-30 16:44:56 -05:00
Roger Ferrel
84a338fd4c Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog.
Change-Id: I6151274f455066c03db49618d6b5801248d48527

Former-commit-id: 7c8f48fcb5 [formerly c67543535ff38b777f14df1f41d96dbdacddeb09]
Former-commit-id: 0c544da917
2012-10-30 15:19:08 -05:00
Roger Ferrel
9dcaf583f6 Issue #1298 Changes for non-blocking BrightnessDialog.
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483

Former-commit-id: 2fb06a145f [formerly 535d952595adfcd749ee132e45736120aa25cd3d]
Former-commit-id: bc1e462d07
2012-10-30 14:00:20 -05:00
Roger Ferrel
3b96d312cd Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking.
Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0

Former-commit-id: e37a097596 [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]
Former-commit-id: 8952e1cef8
2012-10-30 12:35:48 -05:00
Ben Steffensmeier
272e057bf1 merge branch Unifeid_Grid into developement
Former-commit-id: b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]
Former-commit-id: d0a2ed32b5
2012-10-30 12:24:54 -05:00
Roger Ferrel
6291083e5b Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog.
Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620

Former-commit-id: 5355b7f620 [formerly 13f856685e36155909e7c4f4f9ac36d3a5633e4a]
Former-commit-id: 87d3ff985e
2012-10-30 10:34:40 -05:00
Lee Venable
3c6facf14b Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development
Former-commit-id: 676856f62f [formerly d6040334d8c3ea717966b54dc6bcc333d67d5b1b]
Former-commit-id: a7eb12fd9e
2012-10-30 10:26:53 -05:00
Roger Ferrel
2f4ead5037 Issue #1298 Changes for non-blocking WeatherElementBrowserDialog.
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e

Former-commit-id: 4a13cfb8a6 [formerly f37d9edd9803c6a2bbf039662b3f2750b1cec8db]
Former-commit-id: f65213c542
2012-10-30 09:00:10 -05:00
Roger Ferrel
a6f06c265b Issue #1298 Changes for non-blocking TimeShiftDialog.
Change-Id: I60f60daee3b25fec2dabd09dd44c85bd3e57160c

Former-commit-id: 7af20b6130 [formerly 1deeb17d498a883af24fe983b7967918b3c3deb9]
Former-commit-id: 1d67e245aa
2012-10-30 08:27:25 -05:00