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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Dustin Johnson
|
31d7d09c10
|
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: 89583d97c8823818f87dc1a234078d85ba7bea4a
|
2012-11-01 13:36:06 -05:00 |
|
Roger Ferrel
|
3c64544822
|
Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog.
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc
Former-commit-id: 17f789e76f77467935002d3b466b764ddb0b81f4
|
2012-10-30 17:09:52 -05:00 |
|
Lee Venable
|
2c86fdb2d0
|
Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development
Former-commit-id: 08784a33471cc96472370081f31d7d7edb2a61f7
|
2012-10-30 16:46:30 -05:00 |
|
Lee Venable
|
e47d1beb09
|
Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
Former-commit-id: 8d14e957dc2152a31c813a9278646904e2a3c777
|
2012-10-30 16:45:35 -05:00 |
|
Lee Venable
|
0bc4ec2135
|
Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development
Former-commit-id: 3bb9ad3e1fb050dba420fc634b742a73b4443ba2
|
2012-10-30 16:44:56 -05:00 |
|
Roger Ferrel
|
7c8f48fcb5
|
Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog.
Change-Id: I6151274f455066c03db49618d6b5801248d48527
Former-commit-id: c67543535ff38b777f14df1f41d96dbdacddeb09
|
2012-10-30 15:19:08 -05:00 |
|
Roger Ferrel
|
2fb06a145f
|
Issue #1298 Changes for non-blocking BrightnessDialog.
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483
Former-commit-id: 535d952595adfcd749ee132e45736120aa25cd3d
|
2012-10-30 14:00:20 -05:00 |
|
Roger Ferrel
|
e37a097596
|
Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking.
Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0
Former-commit-id: 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11
|
2012-10-30 12:35:48 -05:00 |
|
Roger Ferrel
|
5355b7f620
|
Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog.
Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620
Former-commit-id: 13f856685e36155909e7c4f4f9ac36d3a5633e4a
|
2012-10-30 10:34:40 -05:00 |
|
Lee Venable
|
676856f62f
|
Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development
Former-commit-id: d6040334d8c3ea717966b54dc6bcc333d67d5b1b
|
2012-10-30 10:26:53 -05:00 |
|
Roger Ferrel
|
4a13cfb8a6
|
Issue #1298 Changes for non-blocking WeatherElementBrowserDialog.
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e
Former-commit-id: f37d9edd9803c6a2bbf039662b3f2750b1cec8db
|
2012-10-30 09:00:10 -05:00 |
|
Roger Ferrel
|
7af20b6130
|
Issue #1298 Changes for non-blocking TimeShiftDialog.
Change-Id: I60f60daee3b25fec2dabd09dd44c85bd3e57160c
Former-commit-id: 1deeb17d498a883af24fe983b7967918b3c3deb9
|
2012-10-30 08:27:25 -05:00 |
|
Roger Ferrel
|
4a2ae2f6db
|
Issue #1287 Changes for blocking ServiceBackupDlg in stand alone mode and removal no longer uses class.
Change-Id: Ice2b62bd22044f77536e00650962bfb9ea7d4082
Former-commit-id: ac8b26304f847a41c7b9befcc0d16b76e9a8e16d
|
2012-10-29 13:31:43 -05:00 |
|
Steve Harris
|
afb534db67
|
Merge branch 'ss_builds' into development
Former-commit-id: 791639aecd4c192b4bb8d8bb692f2c696cde1daa
|
2012-10-29 12:17:12 -05:00 |
|
Steve Harris
|
9ff9cb8aa3
|
12.11.1-12 baseline
Former-commit-id: 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f
|
2012-10-29 12:15:56 -05:00 |
|
Lee Venable
|
4bc57aec7e
|
Merge "Issue #1287 Changes for non-blocking TimeScalePeriodsDialog." into development
Former-commit-id: edfda206905211559bfd5b384ccae129d11bb5cb
|
2012-10-29 08:40:34 -05:00 |
|
Roger Ferrel
|
99179463f5
|
Issue #1287 Changes for non-blocking TimeScalePeriodsDialog.
Change-Id: I5bed1a9f3ee792099749b26071ed2816c84f6049
Former-commit-id: aa32e71beadc5b9302abddedeb53003a66a57261
|
2012-10-29 08:09:57 -05:00 |
|
Roger Ferrel
|
2ab4a8508a
|
Issue #1287 Changes for non-blocking SiteActivationDlg.
Change-Id: Id059058fda486b57df5d461f3c9eb13981f7f744
Former-commit-id: ae1185cb5825915820314fdc48c897676ead8538
|
2012-10-29 07:21:00 -05:00 |
|
Lee Venable
|
ddbed06f64
|
Merge "Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog." into development
Former-commit-id: e16cb0c6c05d7e2fc4ab6eac04217f60df5bcc4b
|
2012-10-26 15:28:37 -05:00 |
|
Lee Venable
|
0967a6348b
|
Merge "Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog." into development
Former-commit-id: 53a9d4129eadd0156855a5c9248ce2848cb08d95
|
2012-10-26 15:28:07 -05:00 |
|
Roger Ferrel
|
37c7d61195
|
Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog.
Change-Id: I7726f8934351cea98edbf7751f23f42248e5b17c
Former-commit-id: a8e412f5d0cd625b6c421b0609bc7149d7386f1a
|
2012-10-26 15:03:26 -05:00 |
|
Roger Ferrel
|
e2b35d015f
|
Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog.
Change-Id: Ia01b3de6959392afacfc47ac42e794e0b8e357f2
Former-commit-id: 15e80fd970393b74f6a320a794004f89bf3619a5
|
2012-10-26 14:44:29 -05:00 |
|
Roger Ferrel
|
7a3149dbb3
|
Issue #1287 changes for non-blocking ISCRequestReplyDlg and SendISCDialog; removal of no longer used classes.
Change-Id: I25b8caa1a1316a63d051fa29d913330355afcc75
Former-commit-id: 7d57a8ae96ff778892438fb41cd84ce1bb1a8dc7
|
2012-10-26 14:27:00 -05:00 |
|
Roger Ferrel
|
51369fbd50
|
Issue #1287 Changes for non-blocking WESaveDialog.
Change-Id: Ic2dbc76126b3b38c27cdd3fc07ca1317725d12fd
Former-commit-id: e02ff1c81c669ae0bcf5c068487a9c35bc542ff2
|
2012-10-26 09:01:46 -05:00 |
|
Roger Ferrel
|
4d2c234072
|
Issue #1287 Changes for non-blocking WERevertDialog.
Change-Id: I7112fadab6eaaac1c7145fd998e8dfca3f975f3b
Former-commit-id: 50b20b90ad974962334fb7dbf9c8fa3c369b01a1
|
2012-10-26 08:23:04 -05:00 |
|
Roger Ferrel
|
93472a82e5
|
Issue #1287 Changes for non-blocking PublishDialog.
Change-Id: I551850f82ad40bfa9c49d10c6b8193ec365ccea2
Former-commit-id: a0b4c4eb635ce39cf1a25c78620d317e59d33061
|
2012-10-26 07:07:18 -05:00 |
|
Lee Venable
|
02ad711e0c
|
Merge "Issue #1287 Changes for non-blocking RefSetAppearanceDialog." into development
Former-commit-id: 9f7230c0e0aafc6d7bd1f3608f020ed33a9f4a4d
|
2012-10-25 16:06:53 -05:00 |
|