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

72 commits

Author SHA1 Message Date
Nate Jensen
48e85580e2 Omaha #3356 cleanup of unnecessary register buddies and buddy policies 
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: 9b72a1399d [formerly 253198b5bc [formerly b3083a663e] [formerly 9b72a1399d [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]
Former-commit-id: 253198b5bc [formerly b3083a663e]
Former-commit-id: 253198b5bc
Former-commit-id: d61c65787b
 2014-08-14 10:22:37 -05:00
Nate Jensen
db03a73688 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 de91441935 [formerly fed30c111e] [formerly 310f314b81 [formerly 76ca557a25e6b09b3412cfe7a2d154b3a522cf74]]]
Former-commit-id: de91441935 [formerly fed30c111e]
Former-commit-id: de91441935
Former-commit-id: 63fcba10af
 2014-08-11 13:25:17 -05:00
Mark Peters
e02065a73b 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 5121ddaa12 [formerly a73ca1f8c1] [formerly 490f7ea209 [formerly 1b0ac4736f7d63c5e49a48a28473ad6a38e6b6ea]]]
Former-commit-id: 5121ddaa12 [formerly a73ca1f8c1]
Former-commit-id: 5121ddaa12
Former-commit-id: 68f61a9454
 2014-08-11 10:08:38 -05:00
Brian Clements
b7fba0ee31 Omaha #3503 common.serialization changes 
moved adapters to new plugins

Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6

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

Former-commit-id: 857f1b70cc [formerly 41eb72aefd [formerly 06a64080e7] [formerly 857f1b70cc [formerly 41306351920aee44bdf2d9648616ddc8a4511632]]]
Former-commit-id: 41eb72aefd [formerly 06a64080e7]
Former-commit-id: 41eb72aefd
Former-commit-id: 9f0bd349b6
 2014-08-04 12:30:55 -05:00
Mark Peters
88a35686da 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 7aee990658 [formerly de149c4a4f] [formerly cf2a2d47b9 [formerly d81e1ac43cbf10b0cd6f475e41fc242ab3c6a3c7]]]
Former-commit-id: 7aee990658 [formerly de149c4a4f]
Former-commit-id: 7aee990658
Former-commit-id: e8e3c7858e
 2014-08-04 10:24:08 -05:00
Mark Peters
24108c38bd Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings() 
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548

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

Former-commit-id: bac12d844b [formerly 11abefd4de [formerly 437e127ebc] [formerly bac12d844b [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]
Former-commit-id: 11abefd4de [formerly 437e127ebc]
Former-commit-id: 11abefd4de
Former-commit-id: 6376572795
 2014-07-29 11:20:53 -05:00
Mark Peters
a8d9bb2c3f 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 23538197f6 [formerly 33e311c361] [formerly cc690ec2c3 [formerly b27dc2ad7076e73461d880e4daa987f49496f30d]]]
Former-commit-id: 23538197f6 [formerly 33e311c361]
Former-commit-id: 23538197f6
Former-commit-id: 14604bcc7b
 2014-07-28 14:44:28 -05:00
Lee Venable
2d2fba8962 Omaha #3400 - removed application modal shell style 
Former-commit-id: c068efccc3 [formerly 4ec7dd68dc [formerly 143e42b887] [formerly c068efccc3 [formerly 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa]]]
Former-commit-id: 4ec7dd68dc [formerly 143e42b887]
Former-commit-id: 4ec7dd68dc
Former-commit-id: 8c010849e9
 2014-07-25 10:56:48 -05:00
Mark Peters
cda57bcb66 Omaha #3412 Replace drawCircle calls 
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

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

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

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

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

Former-commit-id: dcb7e697e8 [formerly ac914e72e7 [formerly 3c45a24efb] [formerly dcb7e697e8 [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]
Former-commit-id: ac914e72e7 [formerly 3c45a24efb]
Former-commit-id: ac914e72e7
Former-commit-id: ed407b11c6
 2014-04-21 13:47:31 -05:00
Brian.Dyke
ad705df872 Merged 14.2.1 -17, -18 into 1422-3 
Former-commit-id: b8829139a2 [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7]
Former-commit-id: 9df6fb2d4d
Former-commit-id: 735801a7e7
 2014-04-17 14:42:35 -04:00
Richard Peter
0fa9c8709a 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 cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: cd51f3fa87 [formerly 3575d6586f]
Former-commit-id: cd51f3fa87
Former-commit-id: 9b12d9ddaf
 2014-04-11 16:23:09 -05:00
Richard Peter
288febacc7 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 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: 5676090443 [formerly 95eba8dcf6]
Former-commit-id: 5676090443
Former-commit-id: efd1003a50
 2014-04-09 16:00:54 -05:00
Brian.Dyke
2ab8bd77d9 Merged 1354 -7 and -8 into 1412 
Former-commit-id: 929b736038 [formerly e4136f79dd [formerly 947194c998] [formerly 929b736038 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]
Former-commit-id: e4136f79dd [formerly 947194c998]
Former-commit-id: e4136f79dd
Former-commit-id: 7de936dfba
 2014-04-09 11:39:07 -04:00
Everett Kladstrup
853bc4ad0b 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 8b19b3601a [formerly 06d6961c0f] [formerly 0699041518 [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]
Former-commit-id: 8b19b3601a [formerly 06d6961c0f]
Former-commit-id: 8b19b3601a
Former-commit-id: eab1358602
 2014-04-09 09:31:12 -05:00
Brian.Dyke
0c8117982f Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: dd98c213c7 [formerly 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]
Former-commit-id: 17477e7db1 [formerly 6a28fcb156]
Former-commit-id: 17477e7db1
Former-commit-id: 2eec862ebb
 2014-04-04 12:57:32 -04:00
David Friedman
b3492e55de 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 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: 32a7adbe4b [formerly fd900e38c2]
Former-commit-id: 32a7adbe4b
Former-commit-id: ee37afaf7b
 2014-03-27 19:17:03 +00:00
Max Schenkelberg
70fec6a068 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 6edfb8965f [formerly dbcbd1b560] [formerly 1854bbb477 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]
Former-commit-id: 6edfb8965f [formerly dbcbd1b560]
Former-commit-id: 6edfb8965f
Former-commit-id: 4bcdc9f85b
 2014-03-03 17:59:48 -06:00
Juliya Dynina
a337a92f7b Merge "ASM #114" into asm_14.2.2 
Former-commit-id: c6253811e8 [formerly 3edd73f78c [formerly 575ed3610d] [formerly c6253811e8 [formerly d719e88d510424020955f06d8b597d2df3573836]]]
Former-commit-id: 3edd73f78c [formerly 575ed3610d]
Former-commit-id: 3edd73f78c
Former-commit-id: dd71746c6f
 2014-02-05 10:42:30 -05:00
David Friedman
8d32611be4 ASM #110 
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f

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

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

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

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

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

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

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

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

Former-commit-id: 057d7b9381 [formerly ed989ef777 [formerly bf8dba768a] [formerly 057d7b9381 [formerly eac729a60aab70e4940c03d8aba5e7dee0072b59]]]
Former-commit-id: ed989ef777 [formerly bf8dba768a]
Former-commit-id: ed989ef777
Former-commit-id: c3d7a13d82
 2013-08-29 13:20:56 -05:00
Richard Peter
be6e9a56c2 Merge branch 'omaha_13.5.1' (13.5.1-15) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 2a9276c728 [formerly 1f32ef9c7a [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]
Former-commit-id: 1f32ef9c7a [formerly 5e5047cc4f]
Former-commit-id: 1f32ef9c7a
Former-commit-id: 181df35afc
 2013-08-14 15:23:18 -05:00
Steve Harris
05ec949b01 13.5.1-14 baseline 
Former-commit-id: 80e5f7fbd4 [formerly b848317203 [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]
Former-commit-id: b848317203 [formerly d695e5debe]
Former-commit-id: b848317203
Former-commit-id: c6465a3398
 2013-08-14 10:07:41 -04:00
Richard Peter
36361ae0c8 Merge branch 'omaha_13.5.1' (13.5.1-7) into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: c6386e306f [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: 401ed88e44 [formerly 15d1a6eab0]
Former-commit-id: 401ed88e44
Former-commit-id: 19dacc32c1
 2013-07-22 09:40:18 -05:00
Steve Harris
65139f6e11 13.5.1-7 baseline 
Former-commit-id: 86ce1248c2 [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 630705aa3f [formerly bf58a81b38]
Former-commit-id: 630705aa3f
Former-commit-id: 67299457b1
 2013-07-18 12:07:22 -04:00