Roger Ferrel
590eca2cba
Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
...
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072
Former-commit-id: eadf4e9a28df6687a8e0bee6c6cef74356cd26d7
2012-11-14 12:04:18 -06:00
Steve Harris
00f3d51546
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 7a44f29952ec89991e578c67357e1ef3f3c51d59
2012-11-13 17:28:50 -06:00
Steve Harris
b3b5e6d28f
12.12.1-3 baseline
...
Former-commit-id: 8481c91f9918a61631198331c324c4c5a76aac0f
2012-11-13 17:27:04 -06:00
Steve Harris
6868eb9b23
12.12.1-2 baseline
...
Former-commit-id: 90019fdb91dad949f125e46de9300ccd44f6e315
2012-11-13 17:14:24 -06:00
Lee Venable
dbdfda1d04
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
...
Former-commit-id: 7f22292e89e05b881466efd1d81ef851c454246a
2012-11-13 16:02:05 -06:00
Steve Harris
5c23f057b3
Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
...
Former-commit-id: b0c071ca9877eb73e312a530d6abb94563cbc980
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
e8090e654b
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: 911c845199714c07e93f9847ab00fcd6d28a4223
2012-11-13 16:00:19 -06:00
Roger Ferrel
dceb2cde5d
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: 5c94dd5727420ff612ff1fa5bbdb06a041e89459
2012-11-13 15:53:03 -06:00
Lee Venable
9d149bef29
Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
...
Former-commit-id: 795564ae453a7afb423980679c3719a7c453aa74
2012-11-13 15:35:13 -06:00
Roger Ferrel
b421a30116
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
...
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: 149198a0ab46b58518edb02c1bfb19e2f432726c
2012-11-13 13:20:28 -06:00
Roger Ferrel
4c3af2a258
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
...
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: 4da71d30d62eeeee3546c3019850e77cab757c78
2012-11-13 12:55:33 -06:00
Roger Ferrel
ae52206cc7
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
...
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5
2012-11-13 09:49:16 -06:00
Nate Jensen
e7045022ad
Merge "Issue #1324 make times display in 24 hour time" into development
...
Former-commit-id: 40c13a1ca4345f791c9f6f3849fe896ba27a2830
2012-11-13 09:28:05 -06:00
Nate Jensen
e51d86ce3a
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: ef3483e14907e044a66cb6c5c677b6794bf9b03a
2012-11-12 17:16:07 -06:00
Lee Venable
d4276e6474
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
...
Former-commit-id: 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5
2012-11-12 16:58:17 -06:00
Max Schenkelberg
00822a4f39
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7
2012-11-12 16:46:21 -06:00
Roger Ferrel
e982c0f43a
Issue #1298 Changes for non-blocking WrapLengthDialog.
...
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: 50327729d4b0b135cf959a9093dc90a32cf091e6
2012-11-12 16:27:08 -06:00
Roger Ferrel
76109f3bf7
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 35e8deb27aecf5c805f0c007e70c45d8cc9988cb
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
b5b472dee1
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: 2242eefb25cd65edb4378b47b9cafbcab8510c53
2012-11-12 15:15:49 -06:00
Roger Ferrel
f48474fc82
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: b24c130aa9c612822dda92a9820912b0cd7bc852
2012-11-12 14:22:02 -06:00
Lee Venable
7db247e33a
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: bec0ccddba047ab9e9b6fa64bf839e9930dc675b
2012-11-12 14:13:06 -06:00
Lee Venable
62c42850e8
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: a2a570c55e93b328735e2d2af887eadada92b6ea
2012-11-12 14:09:44 -06:00
Roger Ferrel
ee323d9c60
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac
2012-11-12 13:20:05 -06:00
Matt Nash
0a2f7c9ed2
Issue #1324 make times display in 24 hour time
...
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: d7eab0e3c398b9ab90c9aa32e1d45920177620e4
2012-11-12 12:53:26 -06:00
Roger Ferrel
438731ca2e
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433
2012-11-12 12:00:03 -06:00
Roger Ferrel
d489a7ef9f
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: ac9b159e639b51da8ae6b527907926d1fe8efdd0
2012-11-12 07:14:15 -06:00
Lee Venable
dac9544eed
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: 5d3efae3ddbfafd2cbab419daa14a8259b2863e6
2012-11-08 17:06:54 -06:00
Nate Jensen
cdd6a986e8
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
...
Former-commit-id: e08068e0f400abe1a6bddef1462f9f67d8dac2de
2012-11-08 14:50:17 -06:00
Dustin Johnson
2b6e98954e
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: 49b999039c470a5df095a202b5a67bf036a5b71c
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
693090cb36
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 8db340a796df354059f3d4142db92dfd5fa527f5
2012-11-08 14:45:36 -06:00
Roger Ferrel
89617dda68
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: a2a52b7754d831406e591763930f419def7cb1eb
2012-11-08 11:19:51 -06:00
Lee Venable
e791e73a30
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: ac3fa82789459f71be3ef8cea589606e10b6506f
2012-11-08 11:11:15 -06:00
Nate Jensen
01072652dc
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: f6eeb7431fe55886a7958beeec7f8f67de7bf74a
2012-11-08 11:08:48 -06:00
Lee Venable
c44f90f675
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: e8ed91fc876a3f7e6dd67e058c3117cb616c96d2
2012-11-08 10:57:45 -06:00
Roger Ferrel
eae8a68fd5
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec
2012-11-08 10:54:41 -06:00
Nate Jensen
48dae3a5e9
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
...
Former-commit-id: 92480a9a89c2768e7af9d8d1bcb9afe141d76f55
2012-11-08 10:34:56 -06:00
Max Schenkelberg
c80dbffad8
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: 598e0268c95155536fb94798cc134d18b2566dbc
2012-11-08 10:08:38 -06:00
Dustin Johnson
1dbeb22893
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: c04f7dca6f980ab7f3d77825312ddc34ba3b188d
2012-11-08 09:57:16 -06:00
Roger Ferrel
c3f451f799
Issue #1298 Changes for non-blocking FuzzValueDialog.
...
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: 74c370aa04efb9493d995f8f62a07dcd43702465
2012-11-08 08:24:38 -06:00
Roger Ferrel
199475f671
Issue #1298 Chnages for non-blocking FindReplaceDlg.
...
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900
2012-11-08 07:57:56 -06:00
Nate Jensen
6b205399d4
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: 1902ab64c3ab11c41af906e5d78368689833561f
2012-11-07 18:18:06 -06:00
Lee Venable
8956718961
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
...
Former-commit-id: 9b634a3ba62f8c151e6adf85fac26b9174defc7e
2012-11-07 17:38:21 -06:00
Roger Ferrel
65d10be5d6
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
...
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4
2012-11-07 15:07:47 -06:00
Roger Ferrel
81de6cd45b
Issue #1298 Changes for non-blocking CallToActionsDlg.
...
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: 7e987f7743a068b14e3eb7149f933cdf56e59f61
2012-11-07 14:35:38 -06:00
Steve Harris
e1498006c7
12.12.1-1 baseline
...
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Lee Venable
297d2bbc9c
Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
...
Former-commit-id: badb1ba2ed966e920a0dce9d1612dc07e4a21049
2012-11-07 12:31:39 -06:00
Roger Ferrel
974431a13a
Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
...
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91
Former-commit-id: 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e
2012-11-07 11:27:36 -06:00
Max Schenkelberg
ca4177dd08
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: a9c7374d162296c170f7c1b80e1fb2978b854cfd
2012-11-07 10:44:42 -06:00
Matt Nash
284aecc6f9
Issue #1273 product browser can now change order for grid
...
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2
Former-commit-id: 9c7477357508794a00267991b825d169df5ae71a
2012-11-06 14:06:49 -06:00
Roger Ferrel
1f71a3bed7
Issue #1304 Clear text field when point removed.
...
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc
Former-commit-id: c927e2eb8a516cf555c0c83a86c51ad209f2a0ab
2012-11-05 12:56:07 -06:00