Steve Harris
868acb808b
Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
...
Former-commit-id: d4686333a1ab8b1ae64dd4686333a1ab8b1ae64dce72ebb094ce72ebb09415849ae72a113fdcb679db24093e42
2012-12-11 08:56:54 -06:00
Steve Harris
b0a60923c4
Merge branch 'ss_builds' (12.12.1-12) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: 4d4771ee3a43ddfe98c44d4771ee3a43ddfe98c4f6988eeffff6988eeffff02c1ef71d6287b32e7debcc9975c4
2012-12-11 08:45:53 -06:00
Max Schenkelberg
40f67f7e54
Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw
...
Change-Id: I8207e9e3082db861c8040858ef11dc67e63747da
Former-commit-id: 72f31d5f0cd833d917db72f31d5f0cd833d917dbd7c9ac3b84d7c9ac3b84d0e091312ae27d415da51fbb76abfd
2012-12-07 11:44:46 -06:00
Ron Anderson
b02f3a733f
Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
...
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06
Former-commit-id: 45914e0a46bb163074fa45914e0a46bb163074fab6fcd999f4b6fcd999f4c5b311179570cca3900b111c0495a4
2012-12-06 17:02:56 -06:00
Max Schenkelberg
d47f34fb45
Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type
...
Change-Id: I71f9f9b23573394e9f98895164be4aef659ec02a
Former-commit-id: 5693e567ef032b0948a45693e567ef032b0948a42e1bb4f7c62e1bb4f7c68974e33edc2e51e024b837b94ec835
2012-12-06 11:23:22 -06:00
Steve Harris
f8a9ae24cb
12.12.1-12 baseline
...
Former-commit-id: 89def5cf03e8e41630e889def5cf03e8e41630e86d610f8e8a6d610f8e8a69ab975fab7bb37caa23190378beeb
2012-12-06 09:18:28 -06:00
Steve Harris
a10d7d3041
12.12.1-10 baseline
...
Former-commit-id: c7ec50d4f945f5150eb6c7ec50d4f945f5150eb628018b8d9b28018b8d9b8a41d325d20c67cb78a38ada406bfe
2012-12-06 09:12:15 -06:00
Max Schenkelberg
a488900f51
Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation
...
Amend: Fixed time matcher index error when no data is available in GFE
Change-Id: Ie222ba72cb3890d3dc32699828b45012cd1783e5
Former-commit-id: b744ba68e0624cafb066b744ba68e0624cafb0661328deac561328deac5647c7518388c5536a9a84b1c2bf1cc4
2012-11-30 14:17:50 -06:00
Roger Ferrel
bb21c0b2f7
Issue #1298 Plugin changes to get localization import of files to work for test procedures.
...
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d
Former-commit-id: ac09c59d382a1024ff50ac09c59d382a1024ff50230e24addc230e24addc0011eb0ff4ea3b2aebc62cc1b72f9e
2012-11-27 10:37:06 -06:00
Roger Ferrel
619197cbb2
Issue #1298 Changes for non-blocking SelectionDlg.
...
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b
Former-commit-id: 5f3fab467700693d83bb5f3fab467700693d83bb59181213a059181213a0d0cdc594f8fdfcb2ebeae424cb4bf2
2012-11-15 12:55:49 -06:00
Roger Ferrel
aeb27b3c88
Issue #1298 Changes for non-blocking MoveWeatherElementDialog.
...
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455
Former-commit-id: fc87eccb77a6fdc7b580fc87eccb77a6fdc7b580acf1881cb7acf1881cb78881e4d3ecd6c5839e0e265adb9b1c
2012-11-14 16:33:27 -06:00
Lee Venable
f3cf44ffb4
Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
...
Former-commit-id: 6152ecccda695cf853356152ecccda695cf853356134e5d3f76134e5d3f7d82072b9757ed335793f3369913a84
2012-11-14 16:06:02 -06:00
Roger Ferrel
9a04b3847b
Issue #1298 Changes for non-blocking DisplayAttributesDialog.
...
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d
Former-commit-id: 82f9c74bef7ca75756ae82f9c74bef7ca75756ae212045c1a6212045c1a67f33d6ba18d069f186e19cf45444c3
2012-11-14 14:56:42 -06:00
Roger Ferrel
52425e6b99
Issue #1298 Changes for non-blocking TEWxSetValueDialog.
...
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b
Former-commit-id: 679d9673827f22145bf2679d9673827f22145bf2dd8f8a9fa7dd8f8a9fa756ed69fc8389653eb5e1eb20af7237
2012-11-14 14:20:40 -06:00
Roger Ferrel
51b30ca9b5
Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
...
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8
Former-commit-id: 62faa06ddfe267248b5762faa06ddfe267248b572331b8e1f52331b8e1f5ce623db3673f0dc83f8955b052c849
2012-11-14 14:02:01 -06:00
Lee Venable
12e2e49950
Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
...
Former-commit-id: a6e88a6856e755889643a6e88a6856e755889643e9ae25e781e9ae25e781680373301f09591687a99cbd7cdcbe
2012-11-14 13:30:42 -06:00
Roger Ferrel
51e6ed0bcb
Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
...
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072
Former-commit-id: 7f3d893c84d16a448e057f3d893c84d16a448e05590eca2cba590eca2cba78422d9893950300e16da39abc035b
2012-11-14 12:04:18 -06:00
Roger Ferrel
d5e0266a5e
Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
...
Changes from reviewer comments.
Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac
Former-commit-id: 5e805da0e1049ecefe1d5e805da0e1049ecefe1db32480ed08b32480ed08be24ca5ed6af0ad0433bbdeb05acbb
2012-11-14 11:36:52 -06:00
Steve Harris
ae9d9985cd
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 8fc896f7d4448dd1c35f8fc896f7d4448dd1c35f00f3d5154600f3d5154621ecd53719c8cac5291559efd9a217
2012-11-13 17:28:50 -06:00
Steve Harris
53d74c66e7
12.12.1-2 baseline
...
Former-commit-id: ed809a02dba8560580f8ed809a02dba8560580f86868eb9b236868eb9b23111e7607cfdf89fe9bed96a4a4f3f5
2012-11-13 17:14:24 -06:00
Lee Venable
4353b75410
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
...
Former-commit-id: 2827143110989d5dc5e42827143110989d5dc5e4dbdfda1d04dbdfda1d0477af9b8699282e8858da5f79e0f562
2012-11-13 16:02:05 -06:00
Steve Harris
81015f6f41
Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
...
Former-commit-id: 1f1659cb1663b0f18a891f1659cb1663b0f18a895c23f057b35c23f057b36db07e2e5e1e0ad343d607abe90d1c
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
9f2f2591ee
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: ed4f88aa2269fc030bb4ed4f88aa2269fc030bb4e8090e654be8090e654b109ec1e77860f78c22e37761060a12
2012-11-13 16:00:19 -06:00
Roger Ferrel
de65e19817
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: cbacc773671d5bd95866cbacc773671d5bd95866dceb2cde5ddceb2cde5dc498e21b2329eb436b190b8ecada1b
2012-11-13 15:53:03 -06:00
Roger Ferrel
295c73d59e
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
...
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: 6f6b9dd21a1e8dfdc8576f6b9dd21a1e8dfdc857b421a30116b421a301161272837397d646f32d6e3eb1da1b66
2012-11-13 13:20:28 -06:00
Roger Ferrel
58dc77407c
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
...
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: fdfa0f20305ce67ffd9efdfa0f20305ce67ffd9eae52206cc7ae52206cc7122a5cf0a430c70cc181d31e866744
2012-11-13 09:49:16 -06:00
Roger Ferrel
3bc3bf17fd
Issue #1298 Changes for non-blocking WrapLengthDialog.
...
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: ab77dfa75866606f88deab77dfa75866606f88dee982c0f43ae982c0f43a3b07bb1ae6de21a3f2efd9c7c4ae56
2012-11-12 16:27:08 -06:00
Roger Ferrel
a3608d98fd
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 13c0fb3f3d6445081aa913c0fb3f3d6445081aa976109f3bf776109f3bf701899535e3e7cd99ff0d3ebaaa8992
2012-11-12 15:26:03 -06:00
Roger Ferrel
577c2b88ab
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 6ec9c1fac49c9a0689086ec9c1fac49c9a068908f48474fc82f48474fc82398f71471db11413b7f06b0c3820d8
2012-11-12 14:22:02 -06:00
Lee Venable
b02aebcfad
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: 72aedbceceab62adea9572aedbceceab62adea957db247e33a7db247e33a6ab3480255ded0bfb92f92063028bc
2012-11-12 14:13:06 -06:00
Lee Venable
19bf7ac8aa
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: d9022d16a6879078484ed9022d16a6879078484e62c42850e862c42850e82b1be166a24f26da9a9a0a39d42de1
2012-11-12 14:09:44 -06:00
Roger Ferrel
d3eda170ed
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: ce6d6e277e3676829e8fce6d6e277e3676829e8fee323d9c60ee323d9c6088968c54e573d9e78e924f86b0b521
2012-11-12 13:20:05 -06:00
Roger Ferrel
f5343fae99
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 1f509c5a5430ef939e3c1f509c5a5430ef939e3c438731ca2e438731ca2e8490814573195d876753df5b8485c6
2012-11-12 12:00:03 -06:00
Roger Ferrel
e1bf6814d8
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: b60cbeda7ad89ce26aebb60cbeda7ad89ce26aebd489a7ef9fd489a7ef9fecba7301a1e01a4ae24326afb7f186
2012-11-12 07:14:15 -06:00
Roger Ferrel
e3b4a7d750
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: 709798659de26b14a84d709798659de26b14a84d89617dda6889617dda68553344fb3b05825bd6f3f13bedab32
2012-11-08 11:19:51 -06:00
Lee Venable
2f390bd372
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: 6c0bb76679be460c956e6c0bb76679be460c956ee791e73a30e791e73a301e61d4bd087b5f085643b3991fa4c9
2012-11-08 11:11:15 -06:00
Lee Venable
4329af5cea
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: c4526c5ba0ff5083715bc4526c5ba0ff5083715bc44f90f675c44f90f6759523ad60854a22ded4433bdfe02fe3
2012-11-08 10:57:45 -06:00
Roger Ferrel
b895611562
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: 359ee69fa6dfb55edb3d359ee69fa6dfb55edb3deae8a68fd5eae8a68fd5e7aa940f5224a2e79b28062109f9a7
2012-11-08 10:54:41 -06:00
Roger Ferrel
eea2a76c7f
Issue #1298 Changes for non-blocking FuzzValueDialog.
...
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: 3ad0d7d516023252fb843ad0d7d516023252fb84c3f451f799c3f451f7999a1283fb1ede534f5b43bf4c19927c
2012-11-08 08:24:38 -06:00
Roger Ferrel
056dbf2fb3
Issue #1298 Chnages for non-blocking FindReplaceDlg.
...
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 94a444062576f60240c594a444062576f60240c5199475f671199475f671c1d0b744b2e072532a773aa144b2df
2012-11-08 07:57:56 -06:00
Lee Venable
374a019df4
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
...
Former-commit-id: c8955b542536c44db46bc8955b542536c44db46b8956718961895671896115842d7d22eacc1ca32c139ca20a3c
2012-11-07 17:38:21 -06:00
Roger Ferrel
dda46f3046
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
...
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: ee038e811ca46535ee0cee038e811ca46535ee0c65d10be5d665d10be5d642f453ffca35f3a3953cf2f0d2320f
2012-11-07 15:07:47 -06:00
Roger Ferrel
51b57e0dfa
Issue #1298 Changes for non-blocking CallToActionsDlg.
...
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: 4b0c701d69190922a2334b0c701d69190922a23381de6cd45b81de6cd45bd6e00b6c35d6560d77301d7ee19deb
2012-11-07 14:35:38 -06:00
Steve Harris
af59663a99
12.12.1-1 baseline
...
Former-commit-id: c2839cc86de4bd20a515c2839cc86de4bd20a515e1498006c7e1498006c74f243de928214fcd3b63a5be98d6de
2012-11-07 12:41:20 -06:00
Roger Ferrel
9f91e9326e
Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
...
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91
Former-commit-id: 8bf89ad49582abbbf0b78bf89ad49582abbbf0b7974431a13a974431a13a35b0dc2cefc6749e37409f6f6c9c16
2012-11-07 11:27:36 -06:00
Dustin Johnson
931d94d1de
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: 8e69107b5a98d7beae508e69107b5a98d7beae5031d7d09c1031d7d09c10e7a0f96a9abcf575966b4d9c945388
2012-11-01 13:36:06 -05:00
Roger Ferrel
0d1b4baba6
Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog.
...
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc
Former-commit-id: 2b80c2c2b5d92be142ad2b80c2c2b5d92be142ad3c645448223c64544822b289472e491e0241e509e27cbc2edb
2012-10-30 17:09:52 -05:00
Lee Venable
8be54fc2ed
Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development
...
Former-commit-id: 51c60c1876868fe5321651c60c1876868fe532162c86fdb2d02c86fdb2d07b0e8774db881a8e726b3163b91c70
2012-10-30 16:46:30 -05:00
Lee Venable
bb7ec69f5d
Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
...
Former-commit-id: 08e6cd0a31276ce2ad0808e6cd0a31276ce2ad08e47d1beb09e47d1beb09f5008c2296cebd35bb472cdc38472f
2012-10-30 16:45:35 -05:00
Lee Venable
629769bf4a
Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development
...
Former-commit-id: eed01fd64333525e4dffeed01fd64333525e4dff0bc4ec21350bc4ec2135364fb3f4632d3eeeaacfc2f84c7c52
2012-10-30 16:44:56 -05:00
