xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6685 commits 31 branches 40 tags 3.8 GiB
Commit graph

76 commits

Author SHA1 Message Date
Steve Harris
3619a11a8a 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: 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]
Former-commit-id: 793064063b
Former-commit-id: bddf9c0f27
 2014-08-29 10:17:52 -05:00
Brian.Dyke
0a5ddf7457 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: aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: e654318431
Former-commit-id: a08db8d73d
 2014-08-27 11:19:19 -04:00
Qinglu.Lin
bd03ec7a6f ASM #15700 - Warngen issues an error and toggles off on Radar update 
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b

Former-commit-id: 2157a4aa3b [formerly fb92838427 [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]
Former-commit-id: fb92838427
Former-commit-id: 3cc94603a2
 2014-08-21 10:43:22 -04:00
Mark Peters
3b4f4394be Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style 
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f

Former-commit-id: 4011a4392c [formerly 308ada356b [formerly e409b578fcb15caadf28da57d2cb1860e1ea246c]]
Former-commit-id: 308ada356b
Former-commit-id: f6799659ea
 2014-08-14 15:43:17 -05:00
Nate Jensen
d61c65787b Omaha #3356 cleanup of unnecessary register buddies and buddy policies 
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]
Former-commit-id: b3083a663e
Former-commit-id: 253198b5bc
 2014-08-14 10:22:37 -05:00
Nate Jensen
63fcba10af 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: 310f314b81 [formerly fed30c111e [formerly 76ca557a25e6b09b3412cfe7a2d154b3a522cf74]]
Former-commit-id: fed30c111e
Former-commit-id: de91441935
 2014-08-11 13:25:17 -05:00
Mark Peters
68f61a9454 Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump 
Change-Id: I5dc3fc528a8e62dd32d87524f99adb1a8c9e610e

Former-commit-id: 490f7ea209 [formerly a73ca1f8c1 [formerly 1b0ac4736f7d63c5e49a48a28473ad6a38e6b6ea]]
Former-commit-id: a73ca1f8c1
Former-commit-id: 5121ddaa12
 2014-08-11 10:08:38 -05:00
Brian Clements
81144aa9e2 Omaha #3503 common.serialization changes 
moved adapters to new plugins

Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6

Former-commit-id: 415f2dff64 [formerly 90d492c1dc [formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]]
Former-commit-id: 90d492c1dc
Former-commit-id: 9c09de5779
 2014-08-08 12:50:06 -05:00
Nate Jensen
9b617fb455 Merge "Omaha #3356 remove unnecessary usage of ext and global buddy policies" into omaha_14.4.1 
Former-commit-id: 61654ad2d1 [formerly b3af25916c [formerly 01773a5dfc82902e28fa730e174177b2ce08934e]]
Former-commit-id: b3af25916c
Former-commit-id: c30297b1b0
 2014-08-04 14:49:57 -05:00
Nate Jensen
9f0bd349b6 Omaha #3356 remove unnecessary usage of ext and global buddy policies 
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d

Former-commit-id: 857f1b70cc [formerly 06a64080e7 [formerly 41306351920aee44bdf2d9648616ddc8a4511632]]
Former-commit-id: 06a64080e7
Former-commit-id: 41eb72aefd
 2014-08-04 12:30:55 -05:00
Mark Peters
e8e3c7858e Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode 
Change-Id: Iba81f6dc58b1223252711296b66a88a8afb02cdd

Former-commit-id: cf2a2d47b9 [formerly de149c4a4f [formerly d81e1ac43cbf10b0cd6f475e41fc242ab3c6a3c7]]
Former-commit-id: de149c4a4f
Former-commit-id: 7aee990658
 2014-08-04 10:24:08 -05:00
Mark Peters
90a74cb89b Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings() 
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548

Former-commit-id: 47aec2aae3 [formerly ad794f8fba [formerly 29d170af7a0c36e614a84923c2fb5054db73c390]]
Former-commit-id: ad794f8fba
Former-commit-id: b40e589488
 2014-07-30 16:03:57 -05:00
Mark Peters
6376572795 Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine() 
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf

Former-commit-id: bac12d844b [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]
Former-commit-id: 437e127ebc
Former-commit-id: 11abefd4de
 2014-07-29 11:20:53 -05:00
Mark Peters
14604bcc7b Omaha #3430 Remove errors returned when MB3 clicking off the map with snapping tool in editable mode 
Change-Id: Id4fbe8480e1d796eed448a791982570bb85f657c

Former-commit-id: cc690ec2c3 [formerly 33e311c361 [formerly b27dc2ad7076e73461d880e4daa987f49496f30d]]
Former-commit-id: 33e311c361
Former-commit-id: 23538197f6
 2014-07-28 14:44:28 -05:00
Lee Venable
8c010849e9 Omaha #3400 - removed application modal shell style 
Former-commit-id: c068efccc3 [formerly 143e42b887 [formerly 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa]]
Former-commit-id: 143e42b887
Former-commit-id: 4ec7dd68dc
 2014-07-25 10:56:48 -05:00
Mark Peters
d04f7dd252 Omaha #3412 Replace drawCircle calls 
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

Former-commit-id: e4c455f5c0 [formerly e638d2f41b [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]
Former-commit-id: e638d2f41b
Former-commit-id: b5a25e7372
 2014-07-21 17:07:02 -05:00
Richard Peter
ed38bf2372 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: 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]
Former-commit-id: 93bbd98cbc
Former-commit-id: 6636b301e5
 2014-07-01 15:34:39 -05:00
Steve Harris
741dc31fcb 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: 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: d4dc1723c1
Former-commit-id: 2f2958df37
 2014-07-01 11:08:46 -04:00
Steve Harris
869235c02a 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: 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: b84dda5930
Former-commit-id: 16f5ff0979
 2014-06-20 14:01:55 -04:00
Brian.Dyke
e3dc97e246 CM-MERGE:OB13.5.6-4 into 14.1.3 
Former-commit-id: 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]
Former-commit-id: 399c06820a
Former-commit-id: be589ceb9b
 2014-06-18 08:55:49 -04:00
Ben Steffensmeier
db668f8b63 Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings. 
Former-commit-id: fc25774506 [formerly f292f204c9 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]
Former-commit-id: f292f204c9
Former-commit-id: 5a4f7a1fd4
 2014-06-11 13:45:42 -05:00
Ben Steffensmeier
e7128150f9 Omaha #3263 Synchronize dataTimes of storm track resources. 
Former-commit-id: cad15768cc [formerly eff1921f70 [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]
Former-commit-id: eff1921f70
Former-commit-id: 8783e9e23c
 2014-06-10 16:34:44 -05:00
Brian.Dyke
7056d79f70 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: 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]
Former-commit-id: f72380ad60
Former-commit-id: 0f07e14bf1
 2014-06-10 13:56:03 -04:00
Brian.Dyke
64a10ce12d CM-MERGE:OB13.5.6-1,-2 into 14.1.3 
Former-commit-id: 8874d41872 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]
Former-commit-id: c1b3f9d180
Former-commit-id: ef5c74dece
 2014-06-10 12:52:59 -04:00
Michael Gamazaychikov
efd0fb50b8 ASM #114 - Problem with Distance Speed Tool. 
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75

Former-commit-id: 50ab77046b [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]
Former-commit-id: c07bcacbf8
Former-commit-id: e5a9fa0827
 2014-06-05 13:43:04 +01:00
Michael Gamazaychikov
b3d76892d1 ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes). 
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85

Former-commit-id: 5bff9f2ac8 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]
Former-commit-id: 63409ef272
Former-commit-id: 8ae5d535de
 2014-05-21 15:12:08 +01:00
brian.dyke
4d161aaf90 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: 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]
Former-commit-id: 011d121e4b
Former-commit-id: 9626317825
 2014-05-19 09:45:37 -04:00
Qinglu.Lin
d3220c8e71 ASM #514 - Line of Storms functionality behaving oddly in WarnGen 
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39

Former-commit-id: d8753a4145 [formerly 18e92f03c1 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]
Former-commit-id: 18e92f03c1
Former-commit-id: 5f0e0bda69
 2014-05-05 11:54:56 -04:00
Richard Peter
8b1a177110 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: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 44b1782461
Former-commit-id: 67683dd891
 2014-04-28 16:27:40 -05:00
Brian.Dyke
362d882b40 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: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: fb1f5aa593
Former-commit-id: f0b8ea5822
 2014-04-25 11:06:11 -04:00
Lee Venable
ed407b11c6 Issue #3041 - added dispose check to runAsync call and cleaned up code. 
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da

Former-commit-id: dcb7e697e8 [formerly 3c45a24efb [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]
Former-commit-id: 3c45a24efb
Former-commit-id: ac914e72e7
 2014-04-21 13:47:31 -05:00
Brian.Dyke
735801a7e7 Merged 14.2.1 -17, -18 into 1422-3 
Former-commit-id: b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]
Former-commit-id: 12a482e1d7
Former-commit-id: 9df6fb2d4d
 2014-04-17 14:42:35 -04:00
Richard Peter
9b12d9ddaf 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: 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 3575d6586f
Former-commit-id: cd51f3fa87
 2014-04-11 16:23:09 -05:00
Richard Peter
efd1003a50 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: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
 2014-04-09 16:00:54 -05:00
Brian.Dyke
7de936dfba Merged 1354 -7 and -8 into 1412 
Former-commit-id: 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]
Former-commit-id: 947194c998
Former-commit-id: e4136f79dd
 2014-04-09 11:39:07 -04:00
Everett Kladstrup
eab1358602 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: 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]
Former-commit-id: 06d6961c0f
Former-commit-id: 8b19b3601a
 2014-04-09 09:31:12 -05:00
Brian.Dyke
2eec862ebb Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
 2014-04-04 12:57:32 -04:00
David Friedman
ee37afaf7b Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]
Former-commit-id: fd900e38c2
Former-commit-id: 32a7adbe4b
 2014-03-27 19:17:03 +00:00
Max Schenkelberg
4bcdc9f85b Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done. 
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada

Former-commit-id: 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]
Former-commit-id: dbcbd1b560
Former-commit-id: 6edfb8965f
 2014-03-03 17:59:48 -06:00
Juliya Dynina
dd71746c6f Merge "ASM #114" into asm_14.2.2 
Former-commit-id: c6253811e8 [formerly 575ed3610d [formerly d719e88d510424020955f06d8b597d2df3573836]]
Former-commit-id: 575ed3610d
Former-commit-id: 3edd73f78c
 2014-02-05 10:42:30 -05:00
David Friedman
0372fdd6cc ASM #110 
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f

Former-commit-id: e18c49ea72 [formerly 769086c0b7 [formerly c4b3411f4d5f7632e3c804316bd5959d16cc97f0]]
Former-commit-id: 769086c0b7
Former-commit-id: d36cbb2ca9
 2014-01-29 20:23:55 +00:00
Michael Gamazaychikov
73deca037f ASM #114 
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02

Former-commit-id: 8f90c0dee2 [formerly 97f9c2ea92 [formerly 56dc40096e58fa8ae40b9f2cd6a1bd8f9dd3d35a]]
Former-commit-id: 97f9c2ea92
Former-commit-id: 297d1cffc6
 2014-01-29 10:58:18 -05:00
brian.dyke
becf6322c6 merge 14.2.1-3 into asm-14.2.2 
Former-commit-id: f10f6d4e8a [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]
Former-commit-id: 2294c81a57
Former-commit-id: 4a62e83835
 2014-01-27 15:27:49 -05:00
David Friedman
846bc47100 Issue #114 
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d

Former-commit-id: fe50967163 [formerly 01d657fd50 [formerly cd136c3a57f7836606755ad9d1de7a3b8234d1d8]]
Former-commit-id: 01d657fd50
Former-commit-id: 6c1b1f33ee
 2013-12-20 20:33:18 +00:00
Ben Steffensmeier
230309c25f Issue #2491 Remove uneeded ISerializableObject files. 
Former-commit-id: cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]
Former-commit-id: c14cc609a8
Former-commit-id: f34bfc1e5b
 2013-10-25 15:31:39 -05:00
Nate Jensen
6f44e0c9e3 Issue #2400 fix so active map editor is used if applicable 
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1

Former-commit-id: c1dd4b40fb [formerly 8e9e495149 [formerly 563212924964f8ca66cba789d7867b19c68d0682]]
Former-commit-id: 8e9e495149
Former-commit-id: 58c9aced4e
 2013-09-30 11:47:26 -05:00
Nate Jensen
9b3101dd50 Issue #2360 don't allow mouse actions on layer if layer is invisible 
Change-Id: Id8e169d4af96902e72b2509d2f53e39ac6cc0a8a

Former-commit-id: ce457b5be4 [formerly 08bd2c0241 [formerly e4e6f46be381f83c7273d84e62d274575048aac2]]
Former-commit-id: 08bd2c0241
Former-commit-id: 906e9ad7e9
 2013-09-18 17:33:20 -05:00
Max Schenkelberg
3509baaa74 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator 
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: 2d1db7d0e2 [formerly b633f9987a [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]]
Former-commit-id: b633f9987a
Former-commit-id: 8a500677d3
 2013-09-09 10:10:11 -05:00
Ben Steffensmeier
6f29122c14 Issue #2310 Switch awipstools to load using bundles. 
Change-Id: I9a24e6359bd43bfb7c8f84686348f532748503c4

Former-commit-id: 87b6474106 [formerly d75fdcb916 [formerly afc80cb00cce9b22f1ecd730b60da1de1afbfb2e]]
Former-commit-id: d75fdcb916
Former-commit-id: ecf667fce9
 2013-09-04 16:05:09 -05:00
Ben Steffensmeier
c3d7a13d82 Issue #2281 Fix shear click distance calculations. 
Change-Id: I67980264723512a4167cf90cfc3adac2c9ba1d08

Former-commit-id: 057d7b9381 [formerly bf8dba768a [formerly eac729a60aab70e4940c03d8aba5e7dee0072b59]]
Former-commit-id: bf8dba768a
Former-commit-id: ed989ef777
 2013-08-29 13:20:56 -05:00