Roger Ferrel
0b8ecada1b
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: 1d5bd95866
[formerly 1d5bd95866
[formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]
Former-commit-id: dceb2cde5d
Former-commit-id: 29eb436b19
2012-11-13 15:53:03 -06:00
Lee Venable
07c1a3b61b
Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
...
Former-commit-id: c1e46f52ca
[formerly c1e46f52ca
[formerly 795564ae453a7afb423980679c3719a7c453aa74]]
Former-commit-id: 9d149bef29
Former-commit-id: 32f088d986
2012-11-13 15:35:13 -06:00
Roger Ferrel
3eb1da1b66
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
...
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: 1e8dfdc857
[formerly 1e8dfdc857
[formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]
Former-commit-id: b421a30116
Former-commit-id: d646f32d6e
2012-11-13 13:20:28 -06:00
Roger Ferrel
1b582e49a6
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
...
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: 22f8bc10f0
[formerly 22f8bc10f0
[formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]
Former-commit-id: 4c3af2a258
Former-commit-id: 8e85e1c8df
2012-11-13 12:55:33 -06:00
Roger Ferrel
d31e866744
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
...
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: 5ce67ffd9e
[formerly 5ce67ffd9e
[formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]
Former-commit-id: ae52206cc7
Former-commit-id: 30c70cc181
2012-11-13 09:49:16 -06:00
Nate Jensen
b4bfd19895
Merge "Issue #1324 make times display in 24 hour time" into development
...
Former-commit-id: 8a07ba3c11
[formerly 8a07ba3c11
[formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]
Former-commit-id: e7045022ad
Former-commit-id: 7baf10fc53
2012-11-13 09:28:05 -06:00
Nate Jensen
d94afa6a55
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: 8a1f3a10a4
[formerly 8a1f3a10a4
[formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]
Former-commit-id: e51d86ce3a
Former-commit-id: cf8fd9f731
2012-11-12 17:16:07 -06:00
Lee Venable
85b200a973
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
...
Former-commit-id: a576274c3c
[formerly a576274c3c
[formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]
Former-commit-id: d4276e6474
Former-commit-id: fb4b76b003
2012-11-12 16:58:17 -06:00
Max Schenkelberg
9a13824af2
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: d1099addc6
[formerly d1099addc6
[formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: 00822a4f39
Former-commit-id: c4e5092f94
2012-11-12 16:46:21 -06:00
Roger Ferrel
d9c7c4ae56
Issue #1298 Changes for non-blocking WrapLengthDialog.
...
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: 66606f88de
[formerly 66606f88de
[formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]
Former-commit-id: e982c0f43a
Former-commit-id: de21a3f2ef
2012-11-12 16:27:08 -06:00
Roger Ferrel
3ebaaa8992
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 6445081aa9
[formerly 6445081aa9
[formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]
Former-commit-id: 76109f3bf7
Former-commit-id: e7cd99ff0d
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
94d44ed440
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: 7d3f479031
[formerly 7d3f479031
[formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]
Former-commit-id: b5b472dee1
Former-commit-id: 220f41ec4c
2012-11-12 15:15:49 -06:00
Roger Ferrel
6b0c3820d8
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 9c9a068908
[formerly 9c9a068908
[formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]
Former-commit-id: f48474fc82
Former-commit-id: b11413b7f0
2012-11-12 14:22:02 -06:00
Lee Venable
92063028bc
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: ab62adea95
[formerly ab62adea95
[formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]
Former-commit-id: 7db247e33a
Former-commit-id: ded0bfb92f
2012-11-12 14:13:06 -06:00
Lee Venable
0a39d42de1
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: 879078484e
[formerly 879078484e
[formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]
Former-commit-id: 62c42850e8
Former-commit-id: 4f26da9a9a
2012-11-12 14:09:44 -06:00
Roger Ferrel
4f86b0b521
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: 3676829e8f
[formerly 3676829e8f
[formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]
Former-commit-id: ee323d9c60
Former-commit-id: 73d9e78e92
2012-11-12 13:20:05 -06:00
Matt Nash
31241c2d94
Issue #1324 make times display in 24 hour time
...
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 1480e0abfc
[formerly 1480e0abfc
[formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]]
Former-commit-id: 0a2f7c9ed2
Former-commit-id: d728ffadd0
2012-11-12 12:53:26 -06:00
Roger Ferrel
df5b8485c6
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 30ef939e3c
[formerly 30ef939e3c
[formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]
Former-commit-id: 438731ca2e
Former-commit-id: 195d876753
2012-11-12 12:00:03 -06:00
Roger Ferrel
26afb7f186
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: d89ce26aeb
[formerly d89ce26aeb
[formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]
Former-commit-id: d489a7ef9f
Former-commit-id: e01a4ae243
2012-11-12 07:14:15 -06:00
Lee Venable
458133c121
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: 109076cb73
[formerly 109076cb73
[formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]]
Former-commit-id: dac9544eed
Former-commit-id: a267d9020b
2012-11-08 17:06:54 -06:00
Nate Jensen
cbd03947da
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
...
Former-commit-id: a92bfa9393
[formerly a92bfa9393
[formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]]
Former-commit-id: cdd6a986e8
Former-commit-id: 5e3c076506
2012-11-08 14:50:17 -06:00
Dustin Johnson
1317e0b3ef
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: 595c421e47
[formerly 595c421e47
[formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]
Former-commit-id: 2b6e98954e
Former-commit-id: 0806be04dd
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
74d1381180
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 535c73051d
[formerly 535c73051d
[formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 693090cb36
Former-commit-id: 884c82c4fe
2012-11-08 14:45:36 -06:00
Roger Ferrel
f13bedab32
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: e26b14a84d
[formerly e26b14a84d
[formerly a2a52b7754d831406e591763930f419def7cb1eb]]
Former-commit-id: 89617dda68
Former-commit-id: 05825bd6f3
2012-11-08 11:19:51 -06:00
Lee Venable
b3991fa4c9
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: be460c956e
[formerly be460c956e
[formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]
Former-commit-id: e791e73a30
Former-commit-id: 7b5f085643
2012-11-08 11:11:15 -06:00
Nate Jensen
7430e8dbfe
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: 96cb1ecc7f
[formerly 96cb1ecc7f
[formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]
Former-commit-id: 01072652dc
Former-commit-id: 375c864d28
2012-11-08 11:08:48 -06:00
Lee Venable
3bdfe02fe3
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: ff5083715b
[formerly ff5083715b
[formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]
Former-commit-id: c44f90f675
Former-commit-id: 4a22ded443
2012-11-08 10:57:45 -06:00
Roger Ferrel
062109f9a7
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: dfb55edb3d
[formerly dfb55edb3d
[formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]
Former-commit-id: eae8a68fd5
Former-commit-id: 24a2e79b28
2012-11-08 10:54:41 -06:00
Nate Jensen
7d8c983f1e
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
...
Former-commit-id: 9038ff4e10
[formerly 9038ff4e10
[formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]
Former-commit-id: 48dae3a5e9
Former-commit-id: 7da4882cfb
2012-11-08 10:34:56 -06:00
Max Schenkelberg
d7afa4376e
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: 9aa4221fdf
[formerly 9aa4221fdf
[formerly 598e0268c95155536fb94798cc134d18b2566dbc]]
Former-commit-id: c80dbffad8
Former-commit-id: 0a410412db
2012-11-08 10:08:38 -06:00
Dustin Johnson
6613c51d3b
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: 064ef82d1e
[formerly 064ef82d1e
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
2012-11-08 09:57:16 -06:00
Roger Ferrel
bf4c19927c
Issue #1298 Changes for non-blocking FuzzValueDialog.
...
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: 023252fb84
[formerly 023252fb84
[formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]
Former-commit-id: c3f451f799
Former-commit-id: de534f5b43
2012-11-08 08:24:38 -06:00
Roger Ferrel
3aa144b2df
Issue #1298 Chnages for non-blocking FindReplaceDlg.
...
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 76f60240c5
[formerly 76f60240c5
[formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]]
Former-commit-id: 199475f671
Former-commit-id: e072532a77
2012-11-08 07:57:56 -06:00
Nate Jensen
01e11761d8
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: b32a9e839e
[formerly b32a9e839e
[formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: 6b205399d4
Former-commit-id: e3208d48a0
2012-11-07 18:18:06 -06:00
Lee Venable
139ca20a3c
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
...
Former-commit-id: 36c44db46b
[formerly 36c44db46b
[formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]
Former-commit-id: 8956718961
Former-commit-id: eacc1ca32c
2012-11-07 17:38:21 -06:00
Roger Ferrel
f2f0d2320f
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
...
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: a46535ee0c
[formerly a46535ee0c
[formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]
Former-commit-id: 65d10be5d6
Former-commit-id: 35f3a3953c
2012-11-07 15:07:47 -06:00
Roger Ferrel
1d7ee19deb
Issue #1298 Changes for non-blocking CallToActionsDlg.
...
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: 190922a233
[formerly 190922a233
[formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]
Former-commit-id: 81de6cd45b
Former-commit-id: d6560d7730
2012-11-07 14:35:38 -06:00
Steve Harris
a5be98d6de
12.12.1-1 baseline
...
Former-commit-id: e4bd20a515
[formerly e4bd20a515
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
2012-11-07 12:41:20 -06:00
Lee Venable
c6f4c2e53b
Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
...
Former-commit-id: f368b93484
[formerly f368b93484
[formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]]
Former-commit-id: 297d2bbc9c
Former-commit-id: 24dd8a1bc7
2012-11-07 12:31:39 -06:00
Roger Ferrel
9f6f6c9c16
Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
...
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91
Former-commit-id: 82abbbf0b7
[formerly 82abbbf0b7
[formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]]
Former-commit-id: 974431a13a
Former-commit-id: c6749e3740
2012-11-07 11:27:36 -06:00
Max Schenkelberg
50625b0453
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: 2f90120248
[formerly 2f90120248
[formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
2012-11-07 10:44:42 -06:00
Matt Nash
fc838f3de2
Issue #1273 product browser can now change order for grid
...
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2
Former-commit-id: 9c9db6643a
[formerly 9c9db6643a
[formerly 9c7477357508794a00267991b825d169df5ae71a]]
Former-commit-id: 284aecc6f9
Former-commit-id: 46f695b72d
2012-11-06 14:06:49 -06:00
Roger Ferrel
7dc93cee73
Issue #1304 Clear text field when point removed.
...
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc
Former-commit-id: 921134848b
[formerly 921134848b
[formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]]
Former-commit-id: 1f71a3bed7
Former-commit-id: a996839d2c
2012-11-05 12:56:07 -06:00
Roger Ferrel
f360225043
Issue #1304 Added Point change listners to ChooseByIdDialog and RangeRingDialog.
...
Change-Id: Id2933ae7ccfb6ed260da619a822c2b5b706f64d3
Former-commit-id: 986766487f
[formerly 986766487f
[formerly d296028a9a0add9a81836030ff7b65be8883956b]]
Former-commit-id: 3045291a29
Former-commit-id: 2b18983017
2012-11-05 11:22:28 -06:00
Dustin Johnson
4d9c945388
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: 98d7beae50
[formerly 98d7beae50
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
Ben Steffensmeier
b830e7c9c2
Issue #189 a few fixes to grid resources for FFG Mosaic
...
Former-commit-id: 64d4a1add7
[formerly 64d4a1add7
[formerly f8420e7052145c856b12310776e6acd7362dc9cb]]
Former-commit-id: 4b121fd7b3
Former-commit-id: bde106e70d
2012-10-31 11:39:32 -05:00
Roger Ferrel
e27cbc2edb
Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog.
...
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc
Former-commit-id: d92be142ad
[formerly d92be142ad
[formerly 17f789e76f77467935002d3b466b764ddb0b81f4]]
Former-commit-id: 3c64544822
Former-commit-id: 1e0241e509
2012-10-30 17:09:52 -05:00
Lee Venable
3163b91c70
Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development
...
Former-commit-id: 868fe53216
[formerly 868fe53216
[formerly 08784a33471cc96472370081f31d7d7edb2a61f7]]
Former-commit-id: 2c86fdb2d0
Former-commit-id: 881a8e726b
2012-10-30 16:46:30 -05:00
Lee Venable
2cdc38472f
Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
...
Former-commit-id: 276ce2ad08
[formerly 276ce2ad08
[formerly 8d14e957dc2152a31c813a9278646904e2a3c777]]
Former-commit-id: e47d1beb09
Former-commit-id: cebd35bb47
2012-10-30 16:45:35 -05:00
Lee Venable
c2f84c7c52
Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development
...
Former-commit-id: 33525e4dff
[formerly 33525e4dff
[formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]]
Former-commit-id: 0bc4ec2135
Former-commit-id: 2d3eeeaacf
2012-10-30 16:44:56 -05:00