Commit graph

29 commits

Author SHA1 Message Date
Roger Ferrel
06808134bf Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: 09ae36d8de [formerly 960772ea44] [formerly 09ae36d8de [formerly 960772ea44] [formerly 42fe1bf5b2 [formerly 787261f13c47b5de81b2e7c4f861645614a11f1f]]]
Former-commit-id: 42fe1bf5b2
Former-commit-id: c43758bdbb [formerly 95d7540d05]
Former-commit-id: 5e9ed74eac
2014-06-12 10:08:51 -05:00
Roger Ferrel
b575bb7de2 Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5

Former-commit-id: 7510cc23af [formerly e1c011b157] [formerly 7510cc23af [formerly e1c011b157] [formerly 10e7a33f08 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]]
Former-commit-id: 10e7a33f08
Former-commit-id: e799ce4c59 [formerly aa085d9e59]
Former-commit-id: 050c2e87e7
2014-06-04 08:14:06 -05:00
brian.dyke
b2e3c50ec0 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: 9626317825 [formerly 011d121e4b] [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d [formerly bc4649765a]
Former-commit-id: b42011fc76
2014-05-19 09:45:37 -04:00
Zhidong.Hao
f06165d783 ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b

Former-commit-id: 29e7d7e888 [formerly 8d560036b1] [formerly 29e7d7e888 [formerly 8d560036b1] [formerly 074713bb4a [formerly 62f8c0ab0e046fd4365bd37394f93e8bca4e642d]]]
Former-commit-id: 074713bb4a
Former-commit-id: f03c0c46d5 [formerly 51680a6d04]
Former-commit-id: b1c20f92c1
2014-05-12 14:33:25 -04:00
Richard Peter
938e39a0fc 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: 67683dd891 [formerly 44b1782461] [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246 [formerly 80d4153878]
Former-commit-id: 24a3fe1466
2014-04-28 16:27:40 -05:00
Brian.Dyke
f31d8cc8cf 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: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
2014-04-25 11:06:11 -04:00
Ron Anderson
dd5c3bf2fd Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
Fixed Wx parsing for AvnFPS

Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73

Former-commit-id: 2f68fb8f2c [formerly 221a06e467] [formerly 2f68fb8f2c [formerly 221a06e467] [formerly f3185dd206 [formerly e636563052042d2dbfab6a4e476b71004b28c165]]]
Former-commit-id: f3185dd206
Former-commit-id: 00f2f374cd [formerly 3e37419dc6]
Former-commit-id: 78ef1d5c4c
2014-04-23 17:04:16 -05:00
Brian.Dyke
de500c093f Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7] [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917 [formerly 0ea7c51ad7]
Former-commit-id: a925ba6219
2014-04-17 14:42:35 -04:00
Richard Peter
a22345ea6b 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: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
2014-04-11 16:23:09 -05:00
Richard Peter
421b2716a4 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: 5676090443 [formerly 95eba8dcf6] [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: f1b85f6964 [formerly 73aab15d85]
Former-commit-id: b667e0509f
2014-04-09 16:00:54 -05:00
Lee Venable
f160e66a85 Issue #2925 - Fixed NPE found during testing.
Former-commit-id: cc7d240cfd [formerly c29981fa99] [formerly cc7d240cfd [formerly c29981fa99] [formerly 5b73c516d3 [formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]]
Former-commit-id: 5b73c516d3
Former-commit-id: 05a4c4e31b [formerly f08d4a827f]
Former-commit-id: 2384cc90c0
2014-03-21 12:42:13 -05:00
Max Schenkelberg
c6cf08db73 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: 59434c8a60 [formerly a01a6d68d0] [formerly 59434c8a60 [formerly a01a6d68d0] [formerly cbf8b9249c [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]
Former-commit-id: cbf8b9249c
Former-commit-id: 39e1c4fa46 [formerly 654da3c0a2]
Former-commit-id: f509321134
2014-03-04 09:23:36 -06:00
brian.dyke
ca9263003a merge 14.2.1-3 into asm-14.2.2
Former-commit-id: 4a62e83835 [formerly 2294c81a57] [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 621464ac0d [formerly e9e2eb3be0]
Former-commit-id: dcf5f25ed1
2014-01-27 15:27:49 -05:00
Max Schenkelberg
00364668a4 Issue #2277 Remove more ScriptCreator references
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747

Former-commit-id: 487775918d [formerly 17b38d9f72] [formerly 487775918d [formerly 17b38d9f72] [formerly 63e90f6955 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]]]
Former-commit-id: 63e90f6955
Former-commit-id: 96852b88ec [formerly e4b18ef410]
Former-commit-id: 87d33eb32f
2013-09-11 16:32:00 -05:00
Lee Venable
f0ec3034d0 Issue #2256 - Memory leak fixes and some code clean up fixes.
Change-Id: I7b16871f59e63218b1d5754ac460bbab056f78a5

Former-commit-id: 212c830986 [formerly 752371bc63] [formerly 212c830986 [formerly 752371bc63] [formerly 49c06062fe [formerly 67228c5208da07cc56b95ce378ec50370541a260]]]
Former-commit-id: 49c06062fe
Former-commit-id: c11caef6ca [formerly 606c25c093]
Former-commit-id: 23f828983a
2013-08-16 15:04:28 -05:00
Max Schenkelberg
f553c93092 Issue #2033 moved avnfps and text workstation files into respective plugins.
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2

Former-commit-id: bbad83c21a [formerly 6f60751ec6] [formerly bbad83c21a [formerly 6f60751ec6] [formerly c5575f9624 [formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]]
Former-commit-id: c5575f9624
Former-commit-id: 8139e0dfb7 [formerly 8de539020d]
Former-commit-id: 451eb54a36
2013-08-15 12:21:43 -05:00
Max Schenkelberg
5167a52b65 Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f

Former-commit-id: b95a96f4c9 [formerly 0f3c791120] [formerly b95a96f4c9 [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: 4fdb3c8306 [formerly 75c95e83ef]
Former-commit-id: 2178fac70d
2013-08-09 14:24:49 -05:00
Steve Harris
722e428c74 13.4.1-1 baseline
Former-commit-id: f95e0ad10b [formerly 2f517b7713] [formerly f95e0ad10b [formerly 2f517b7713] [formerly 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]
Former-commit-id: 00332e6305
Former-commit-id: 0e950655f1 [formerly 4accbb80db]
Former-commit-id: 4001e050e7
2013-04-24 17:15:55 -05:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Steve Harris
a10d7d3041 12.12.1-10 baseline
Former-commit-id: c7ec50d4f9 [formerly 45f5150eb6] [formerly c7ec50d4f9 [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]
Former-commit-id: 28018b8d9b
Former-commit-id: 8a41d325d2 [formerly 0c67cb78a3]
Former-commit-id: 8ada406bfe
2012-12-06 09:12:15 -06:00
Steve Harris
af59663a99 12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928 [formerly 214fcd3b63]
Former-commit-id: a5be98d6de
2012-11-07 12:41:20 -06:00
Steve Harris
e57e7237a9 12.10.1-4 baseline
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5 [formerly 2ba58a3576]
Former-commit-id: 26b7d083ec
2012-09-13 12:08:11 -05:00
Steve Harris
a924a8347a 12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
2012-09-04 12:07:27 -05:00
Steve Harris
37f2b6e138 12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
2012-07-10 07:53:49 -05:00
Steve Harris
0c25458510 12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5]
Former-commit-id: e5543a0e86
2012-05-01 18:06:13 -05:00
Steve Harris
74b66d9683 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
Steve Harris
293563cfe7 12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 8bc60b1e32 [formerly ce3b74c605]
Former-commit-id: 2e0f4b241b
2012-03-30 08:38:33 -05:00
Matt Nash
bcc32c10bc Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00