89 commits

Author	SHA1	Message	Date
Roger Ferrel	a5f2fcf963	Omaha #3401 Enter events to upper case verification added. ... Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3 Former-commit-id: 334d738c79 [formerly 334d738c79 [formerly 414f6e16547e0535ae36c5c4cc86f43db54b689c]] Former-commit-id: 8cde49f98e Former-commit-id: ae35ba438a	2014-11-12 10:50:43 -06:00
Steve Harris	040e641ec9	Merge tag 'OB_14.3.1-27m' into omaha_14.4.1 ... Conflicts: edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml Former-commit-id: dc557b2d0c [formerly dc557b2d0c [formerly ea787b645974850607658e5a7dfc4a072d831a3b]] Former-commit-id: bfade7674d Former-commit-id: 9e7ce04543	2014-10-22 11:45:39 -05:00
David Friedman	f325e4ad55	ASM #16844 - WarnGen can become disabled when moving storm track ... Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a Former-commit-id: 955809450d [formerly 955809450d [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]] Former-commit-id: 68f985d668 Former-commit-id: 7176b476a2	2014-10-10 19:33:21 +00:00
Steve Harris	57f5294f08	Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1 ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml Issue #3648: edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java Issue #3560: edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java Also modified with the resolution of #3560: edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java Former-commit-id: da463c484e [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]] Former-commit-id: 2616fe04b6 Former-commit-id: 523cedbb56	2014-10-03 10:18:34 -05:00
dmsys	e00ea2d8cd	Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1 ... Conflicts: cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm Former-commit-id: 8c3625cfec [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]] Former-commit-id: 9f4560c480 Former-commit-id: b884e5e32d	2014-09-30 13:45:54 -04:00
Steve Harris	30f0d27dfb	Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1 ... Conflicts: cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py Former-commit-id: 90e08b96e1 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]] Former-commit-id: 3b6a8a1447 Former-commit-id: 6330a62e85	2014-09-29 12:58:56 -05:00
David Friedman	f6a6032d61	ASM #16773 - WarnGen can become disabled when a followup is selected ... Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0 Former-commit-id: b3025aacb0 [formerly b3025aacb0 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]] Former-commit-id: 8ab4649312 Former-commit-id: c19d9ee755	2014-09-25 21:07:16 +00:00
Matthew Howard	1f79bceb26	Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1 ... Former-commit-id: 6e0dbf4fb5 [formerly 6e0dbf4fb5 [formerly 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7]] Former-commit-id: 7121e2e6e1 Former-commit-id: 03f33b687b	2014-09-11 08:56:49 -05:00
Qinglu.Lin	975fe54092	ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool ... Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09 Former-commit-id: 51d48a6fdc [formerly 51d48a6fdc [formerly 7a75687b76584b4578fad4c31c8557d78e507f46]] Former-commit-id: 3f666817e0 Former-commit-id: 61d967b1cd	2014-09-09 08:07:46 -04:00
Nate Jensen	165b5fd49b	Merge "Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times" into omaha_14.4.1 ... Former-commit-id: 51d910af00 [formerly 51d910af00 [formerly 03fc1d04092135970a6c7089bcbbf11d5c584dd1]] Former-commit-id: cf41d7e3a3 Former-commit-id: 96b3c08bd1	2014-09-04 13:49:36 -05:00
Nate Jensen	d87cfb8131	Omaha #3356 remove more unnecessary register buddies and policies ... Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13 Former-commit-id: c0dab26b92 [formerly c0dab26b92 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]] Former-commit-id: 9d462e1dd9 Former-commit-id: 05a73b1e4b	2014-09-03 11:34:10 -05:00
Mark Peters	e7e58b4e78	Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times ... Change-Id: I68642e05ce970545a516d4fab1492a860c530032 Former-commit-id: 06b98bb48a [formerly 06b98bb48a [formerly 725354074d54112c8658dc34a8ac564739acbebb]] Former-commit-id: ee36d09cb0 Former-commit-id: a3feb0de78	2014-09-02 16:31:44 -05:00
Steve Harris	e681e0a457	Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java edexOsgi/com.raytheon.uf.tools.cli/impl/capture ldm/src/pqact/pqact.c Former-commit-id: 793064063b [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]] Former-commit-id: 5d58625abc Former-commit-id: d984dd538f	2014-08-29 10:17:52 -05:00
Brian.Dyke	c0dc594eda	Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 ... Conflicts: cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java Former-commit-id: e654318431 [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]] Former-commit-id: aa83bf804f Former-commit-id: f7f16ff9eb	2014-08-27 11:19:19 -04:00
Qinglu.Lin	040e1071b2	ASM #15700 - Warngen issues an error and toggles off on Radar update ... Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b Former-commit-id: fb92838427 [formerly fb92838427 [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]] Former-commit-id: 2157a4aa3b Former-commit-id: 3037a17366	2014-08-21 10:43:22 -04:00
Mark Peters	b7209bee6e	Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style ... Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f Former-commit-id: 308ada356b [formerly 308ada356b [formerly e409b578fcb15caadf28da57d2cb1860e1ea246c]] Former-commit-id: 4011a4392c Former-commit-id: 03229efe86	2014-08-14 15:43:17 -05:00
Nate Jensen	951feab33d	Omaha #3356 cleanup of unnecessary register buddies and buddy policies ... Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0 Former-commit-id: b3083a663e [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]] Former-commit-id: 9b72a1399d Former-commit-id: d67083655a	2014-08-14 10:22:37 -05:00
Nate Jensen	424d770910	Merge "Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump" into omaha_14.4.1 ... Former-commit-id: fed30c111e [formerly fed30c111e [formerly 76ca557a25e6b09b3412cfe7a2d154b3a522cf74]] Former-commit-id: 310f314b81 Former-commit-id: b6163075ef	2014-08-11 13:25:17 -05:00
Mark Peters	164928997d	Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump ... Change-Id: I5dc3fc528a8e62dd32d87524f99adb1a8c9e610e Former-commit-id: a73ca1f8c1 [formerly a73ca1f8c1 [formerly 1b0ac4736f7d63c5e49a48a28473ad6a38e6b6ea]] Former-commit-id: 490f7ea209 Former-commit-id: ff4ac7cbab	2014-08-11 10:08:38 -05:00
Brian Clements	54742cff70	Omaha #3503 common.serialization changes ... moved adapters to new plugins Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6 Former-commit-id: 90d492c1dc [formerly 90d492c1dc [formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]] Former-commit-id: 415f2dff64 Former-commit-id: 0e415fd863	2014-08-08 12:50:06 -05:00
Nate Jensen	f05fd71463	Merge "Omaha #3356 remove unnecessary usage of ext and global buddy policies" into omaha_14.4.1 ... Former-commit-id: b3af25916c [formerly b3af25916c [formerly 01773a5dfc82902e28fa730e174177b2ce08934e]] Former-commit-id: 61654ad2d1 Former-commit-id: 94994852f0	2014-08-04 14:49:57 -05:00
Nate Jensen	f51d409d97	Omaha #3356 remove unnecessary usage of ext and global buddy policies ... Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d Former-commit-id: 06a64080e7 [formerly 06a64080e7 [formerly 41306351920aee44bdf2d9648616ddc8a4511632]] Former-commit-id: 857f1b70cc Former-commit-id: a920937cb5	2014-08-04 12:30:55 -05:00
Mark Peters	5d22073714	Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode ... Change-Id: Iba81f6dc58b1223252711296b66a88a8afb02cdd Former-commit-id: de149c4a4f [formerly de149c4a4f [formerly d81e1ac43cbf10b0cd6f475e41fc242ab3c6a3c7]] Former-commit-id: cf2a2d47b9 Former-commit-id: 29bd1467dc	2014-08-04 10:24:08 -05:00
Mark Peters	79b4f922ec	Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings() ... Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548 Former-commit-id: ad794f8fba [formerly ad794f8fba [formerly 29d170af7a0c36e614a84923c2fb5054db73c390]] Former-commit-id: 47aec2aae3 Former-commit-id: 6103909706	2014-07-30 16:03:57 -05:00
Mark Peters	baecaaaca0	Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine() ... Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf Former-commit-id: 437e127ebc [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]] Former-commit-id: bac12d844b Former-commit-id: 6edd39cc9e	2014-07-29 11:20:53 -05:00
Mark Peters	7685d6ac9a	Omaha #3430 Remove errors returned when MB3 clicking off the map with snapping tool in editable mode ... Change-Id: Id4fbe8480e1d796eed448a791982570bb85f657c Former-commit-id: 33e311c361 [formerly 33e311c361 [formerly b27dc2ad7076e73461d880e4daa987f49496f30d]] Former-commit-id: cc690ec2c3 Former-commit-id: c4eb912c7d	2014-07-28 14:44:28 -05:00
Lee Venable	7efc684837	Omaha #3400 - removed application modal shell style ... Former-commit-id: 143e42b887 [formerly 143e42b887 [formerly 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa]] Former-commit-id: c068efccc3 Former-commit-id: 82b9b320c5	2014-07-25 10:56:48 -05:00
Mark Peters	3aee17fbb5	Omaha #3412 Replace drawCircle calls ... Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca Former-commit-id: e638d2f41b [formerly e638d2f41b [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]] Former-commit-id: e4c455f5c0 Former-commit-id: e48c2b7116	2014-07-21 17:07:02 -05:00
Richard Peter	0fefdc7cd6	Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1 ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61 Former-commit-id: 93bbd98cbc [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]] Former-commit-id: 8ecc27f714 Former-commit-id: fc27824dbc	2014-07-01 15:34:39 -05:00
Steve Harris	71357da9d2	Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1 ... Conflicts: cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5 Former-commit-id: d4dc1723c1 [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]] Former-commit-id: 7acd9ab2dd Former-commit-id: dcbab5621f	2014-07-01 11:08:46 -04:00
Qinglu.Lin	12081d6035	ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool ... Change-Id: I73ca64048b00338b82ee13c5958d6b823cc4a43d Former-commit-id: edb9dd1ff2 [formerly edb9dd1ff2 [formerly 4d58f21546e01f4dda1414b60d0de48c13608c99]] Former-commit-id: 30bc1b7450 Former-commit-id: 166004b927	2014-06-25 08:28:55 -04:00
Steve Harris	935542914d	CM-MERGE:14.1.3-2,-3 into 14.2.2 ... Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14) Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java Former-commit-id: b84dda5930 [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]] Former-commit-id: 419c5f4aba Former-commit-id: 66d30e59a3	2014-06-20 14:01:55 -04:00
Brian.Dyke	3e10995d87	CM-MERGE:OB13.5.6-4 into 14.1.3 ... Former-commit-id: 399c06820a [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]] Former-commit-id: 8ecdd9a192 Former-commit-id: 9031f58d02	2014-06-18 08:55:49 -04:00
Ben Steffensmeier	3c8b94e08a	Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings. ... Former-commit-id: f292f204c9 [formerly f292f204c9 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]] Former-commit-id: fc25774506 Former-commit-id: 94b465fa15	2014-06-11 13:45:42 -05:00
Ben Steffensmeier	f60667703f	Omaha #3263 Synchronize dataTimes of storm track resources. ... Former-commit-id: eff1921f70 [formerly eff1921f70 [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]] Former-commit-id: cad15768cc Former-commit-id: b02383f878	2014-06-10 16:34:44 -05:00
Brian.Dyke	a4b39dfca5	Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2 ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py Former-commit-id: f72380ad60 [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]] Former-commit-id: 9ab17ddecb Former-commit-id: 49cd9574d9	2014-06-10 13:56:03 -04:00
Brian.Dyke	81d732477e	CM-MERGE:OB13.5.6-1,-2 into 14.1.3 ... Former-commit-id: c1b3f9d180 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]] Former-commit-id: 8874d41872 Former-commit-id: f568b5606a	2014-06-10 12:52:59 -04:00
Michael Gamazaychikov	29e197404f	ASM #114 - Problem with Distance Speed Tool. ... Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75 Former-commit-id: c07bcacbf8 [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]] Former-commit-id: 50ab77046b Former-commit-id: 5efb82ea3e	2014-06-05 13:43:04 +01:00
Michael Gamazaychikov	55d44735ef	ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes). ... Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85 Former-commit-id: 63409ef272 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]] Former-commit-id: 5bff9f2ac8 Former-commit-id: 134f486069	2014-05-21 15:12:08 +01:00
brian.dyke	b42011fc76	Merge branch 'master_14.3.1-4' into asm_14.3.1 ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml Former-commit-id: 011d121e4b [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]] Former-commit-id: 58683ad040 Former-commit-id: bc4649765a	2014-05-19 09:45:37 -04:00
Qinglu.Lin	6ba15bd00c	ASM #514 - Line of Storms functionality behaving oddly in WarnGen ... Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39 Former-commit-id: 18e92f03c1 [formerly 18e92f03c1 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]] Former-commit-id: d8753a4145 Former-commit-id: 8de2d2f718	2014-05-05 11:54:56 -04:00
Richard Peter	24a3fe1466	Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 ... Conflicts: cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900 Former-commit-id: 44b1782461 [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]] Former-commit-id: 32957285fc Former-commit-id: 80d4153878	2014-04-28 16:27:40 -05:00
Brian.Dyke	c6d3fe6952	Merge branch 'master_14.2.2' into master_14.3.1 ... Merge (14.2.2-5 into 14.3.1-1) Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java Former-commit-id: fb1f5aa593 [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]] Former-commit-id: 3524838f9f Former-commit-id: 029f5753ad	2014-04-25 11:06:11 -04:00
Lee Venable	294d8ff917	Issue #3041 - added dispose check to runAsync call and cleaned up code. ... Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da Former-commit-id: 3c45a24efb [formerly 3c45a24efb [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]] Former-commit-id: dcb7e697e8 Former-commit-id: 20764b1d97	2014-04-21 13:47:31 -05:00
Brian.Dyke	a925ba6219	Merged 14.2.1 -17, -18 into 1422-3 ... Former-commit-id: 12a482e1d7 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]] Former-commit-id: b8829139a2 Former-commit-id: 0ea7c51ad7	2014-04-17 14:42:35 -04:00
Richard Peter	b6482f2e54	Merge branch 'omaha_14.2.2' (14.2.2-3) into development ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml Former-commit-id: 3575d6586f [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]] Former-commit-id: 21ae3b5fcd Former-commit-id: a7ec0bcf66	2014-04-11 16:23:09 -05:00
Richard Peter	b667e0509f	Merge branch 'master_14.1.2' into master_14.2.1 ... Conflicts: cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java edexOsgi/build.edex/esb/conf/log4j.xml edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py Former-commit-id: 95eba8dcf6 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]] Former-commit-id: b15d288530 Former-commit-id: 73aab15d85	2014-04-09 16:00:54 -05:00
Brian.Dyke	462952ce65	Merged 1354 -7 and -8 into 1412 ... Former-commit-id: 947194c998 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]] Former-commit-id: 929b736038 Former-commit-id: 5163a31a66	2014-04-09 11:39:07 -04:00
Everett Kladstrup	d96b56c91a	Issue #2725 Move derived parameters logic to common ... * Make derived parameters not use VizException * Move derived parameters packages from the viz hierarchy to the common hierarchy * Move data cube classes that don't depend on derived parameters to thier own plugin * Moved DataCubeContainer and supporting frontend classes from viz.core to viz.datacube Former-commit-id: 06d6961c0f [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]] Former-commit-id: 0699041518 Former-commit-id: 260d0beddc	2014-04-09 09:31:12 -05:00
Brian.Dyke	be574897cc	Merged 1354 -5 and -6 into 1412 based on 1411-25 ... Former-commit-id: 6a28fcb156 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]] Former-commit-id: dd98c213c7 Former-commit-id: 9f37f61cf8	2014-04-04 12:57:32 -04:00