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: e51d86ce3a8a1f3a10a4
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: d4276e6474a576274c3c
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: 00822a4f39d1099addc6
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: e982c0f43a66606f88de
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: 76109f3bf76445081aa9
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: b5b472dee17d3f479031
2012-11-12 15:15:49 -06:00
Roger Ferrel
6ec9c1fac4
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: f48474fc829c9a068908
2012-11-12 14:22:02 -06:00
Lee Venable
72aedbcece
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: 7db247e33aab62adea95
2012-11-12 14:13:06 -06:00
Lee Venable
d9022d16a6
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: 62c42850e8879078484e
2012-11-12 14:09:44 -06:00
Roger Ferrel
ce6d6e277e
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: ee323d9c603676829e8f
2012-11-12 13:20:05 -06:00
Roger Ferrel
1f509c5a54
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 438731ca2e30ef939e3c
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: d489a7ef9fd89ce26aeb
2012-11-12 07:14:15 -06:00
Lee Venable
125ac804a7
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: dac9544eed109076cb73
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: cdd6a986e8a92bfa9393
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: 2b6e98954e595c421e47
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: 693090cb36535c73051d
2012-11-08 14:45:36 -06:00
Roger Ferrel
709798659d
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: 89617dda68e26b14a84d
2012-11-08 11:19:51 -06:00
Lee Venable
6c0bb76679
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: e791e73a30be460c956e
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: 01072652dc96cb1ecc7f
2012-11-08 11:08:48 -06:00
Lee Venable
c4526c5ba0
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: c44f90f675ff5083715b
2012-11-08 10:57:45 -06:00
Roger Ferrel
359ee69fa6
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: eae8a68fd5dfb55edb3d
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: 48dae3a5e99038ff4e10
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: c80dbffad89aa4221fdf
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: 1dbeb22893064ef82d1e
2012-11-08 09:57:16 -06:00
Roger Ferrel
3ad0d7d516
Issue #1298 Changes for non-blocking FuzzValueDialog.
...
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: c3f451f799023252fb84
2012-11-08 08:24:38 -06:00
Roger Ferrel
94a4440625
Issue #1298 Chnages for non-blocking FindReplaceDlg.
...
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 199475f67176f60240c5
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: 6b205399d4b32a9e839e
2012-11-07 18:18:06 -06:00
Lee Venable
c8955b5425
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
...
Former-commit-id: 895671896136c44db46b
2012-11-07 17:38:21 -06:00
Roger Ferrel
ee038e811c
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
...
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: 65d10be5d6a46535ee0c
2012-11-07 15:07:47 -06:00
Roger Ferrel
4b0c701d69
Issue #1298 Changes for non-blocking CallToActionsDlg.
...
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: 81de6cd45b190922a233
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: 297d2bbc9cf368b93484
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: 974431a13a82abbbf0b7
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: ca4177dd082f90120248
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: 284aecc6f99c9db6643a
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: 1f71a3bed7921134848b
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: 3045291a29986766487f
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: 31d7d09c1098d7beae50
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: 4b121fd7b364d4a1add7
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: 3c64544822d92be142ad
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: 2c86fdb2d0868fe53216
2012-10-30 16:46:30 -05:00
Lee Venable
08e6cd0a31
Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
...
Former-commit-id: e47d1beb09276ce2ad08
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: 0bc4ec213533525e4dff
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: 7c8f48fcb50c544da917
2012-10-30 15:19:08 -05:00
Roger Ferrel
9dcaf583f6
Issue #1298 Changes for non-blocking BrightnessDialog.
...
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483
Former-commit-id: 2fb06a145fbc1e462d07
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: e37a0975968952e1cef8
2012-10-30 12:35:48 -05:00
Ben Steffensmeier
272e057bf1
merge branch Unifeid_Grid into developement
...
Former-commit-id: b6a1563bb2d0a2ed32b5
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: 5355b7f62087d3ff985e
2012-10-30 10:34:40 -05:00
Lee Venable
3c6facf14b
Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development
...
Former-commit-id: 676856f62fa7eb12fd9e
2012-10-30 10:26:53 -05:00
Roger Ferrel
2f4ead5037
Issue #1298 Changes for non-blocking WeatherElementBrowserDialog.
...
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e
Former-commit-id: 4a13cfb8a6f65213c542
2012-10-30 09:00:10 -05:00
Roger Ferrel
a6f06c265b
Issue #1298 Changes for non-blocking TimeShiftDialog.
...
Change-Id: I60f60daee3b25fec2dabd09dd44c85bd3e57160c
Former-commit-id: 7af20b61301d67e245aa
2012-10-30 08:27:25 -05:00
