Commit graph

442 commits

Author SHA1 Message Date
Brian.Dyke
fce029653d Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 46af1d0857 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]
Former-commit-id: 0a497fc015
2014-09-29 11:20:57 -04:00
Ron Anderson
8d0d43a437 Issue #3648 Improve GFE error handling for getAllAvailableParms.
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf

Former-commit-id: c37618c16c [formerly b77b3c916b4dcc9034408220006f941cd301ed3c]
Former-commit-id: 429de3224f
2014-09-23 18:47:38 -05:00
Ron Anderson
c7fbca0298 Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: 434d412882 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]
Former-commit-id: 46c62a1db6
2014-09-02 12:21:42 -05:00
Brian Clements
981390eb22 Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: cfeb16eff8 [formerly b3482522860408c2d052261e845899cf73c2ce96]
Former-commit-id: b352bd3944
2014-08-29 08:55:58 -05:00
Brian Clements
960eb2dc29 Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7

Former-commit-id: cf671dcda8 [formerly 2a0af03242692708b3e752417ca7d60d28520768]
Former-commit-id: 4314f71387
2014-08-25 13:34:36 -05:00
Brian Clements
bcc3e405e5 Issue #3500 remove locking on osgi internals, rework gfe client startup
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent

Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2

Former-commit-id: 9f7905b58d [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]
Former-commit-id: d62db22874
2014-08-22 08:56:56 -05:00
Brian Clements
1cd4dc7d4a Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files

(cherry picked from commit c63c8e2fc6 [formerly f9a8b68da5] [formerly 0076ec9aaf [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]])

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.product.awips/awips.product

Former-commit-id: 6859f8cca8 [formerly 7fb934f4782d23f1772ba32db05ed0c1c30ff6db]
Former-commit-id: 5a3c66323a
2014-08-05 08:21:27 -05:00
Ron Anderson
4b4629a2fd Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652

Former-commit-id: 5efba03474 [formerly b01b72b896b894568acce6a8dc4d45328a06067a]
Former-commit-id: 111b04296c
2014-07-09 08:56:06 -05:00
Steve Harris
16f5ff0979 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 ce5767f2bbf5c9627bd43e766c6193c261c48af3]
Former-commit-id: b84dda5930
2014-06-20 14:01:55 -04:00
Brian.Dyke
5064d24e26 CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]
Former-commit-id: 346bf852cd
2014-06-13 13:21:19 -04:00
Brian.Dyke
f38d0138e6 Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]
Former-commit-id: 627541512d
2014-05-14 16:08:16 -04:00
David Gillingham
850eecb1b9 Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf

Former-commit-id: f368412ef2 [formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]
Former-commit-id: aa78ed1b69
2014-05-01 16:19:51 -05:00
Ron Anderson
fcfd6e4c00 Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0

Former-commit-id: 613aa1e94a [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]
Former-commit-id: 374e8224f1
2014-04-30 17:26:57 +00:00
Brian.Dyke
88d44a3129 Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: a7c9ddc05e [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]
Former-commit-id: 2a4fe3dbae
2014-04-23 14:05:50 -04:00
Brian.Dyke
9df6fb2d4d Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]
Former-commit-id: 12a482e1d7
2014-04-17 14:42:35 -04:00
Nate Jensen
a5edace073 Issue #3039 fix ifpImage class cast exception
Former-commit-id: 31fb61e824 [formerly a2fd849c603aebacce09662557bf1f008d379982]
Former-commit-id: 2b6db445c0
2014-04-16 16:17:05 -05:00
Brian.Dyke
73be1016c0 Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: 9cce8eb0d1 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]
Former-commit-id: 8c2f601b59
2014-04-10 13:26:42 -04:00
Richard Peter
5676090443 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 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]
Former-commit-id: 95eba8dcf6
2014-04-09 16:00:54 -05:00
Brian.Dyke
e4136f79dd Merged 1354 -7 and -8 into 1412
Former-commit-id: 929b736038 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]
Former-commit-id: 947194c998
2014-04-09 11:39:07 -04:00
Brian.Dyke
17477e7db1 Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]
Former-commit-id: 6a28fcb156
2014-04-04 12:57:32 -04:00
Ron Anderson
346984b8ab Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.

Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b

Former-commit-id: d556055299 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]
Former-commit-id: 11fbd86558
2014-04-02 09:07:22 -05:00
David Friedman
32a7adbe4b 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 cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]
Former-commit-id: fd900e38c2
2014-03-27 19:17:03 +00:00
Rici.Yu
c559ade333 ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99

Former-commit-id: 58f9857344 [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]
Former-commit-id: 74b1c827ee
2014-03-14 14:39:56 -04:00
Steve Harris
068297b90a Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]
Former-commit-id: 92232fa063
2014-03-07 15:16:18 -06:00
Steve Harris
3ba28aabea Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	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.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: 069093884f
2014-03-06 08:39:43 -06:00
Brian.Dyke
363403fb34 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]
Former-commit-id: 2faab606e5
2014-02-24 14:51:00 -05:00
Ron Anderson
45ccac0859 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]
Former-commit-id: 4364e7497c
2014-02-24 13:46:48 -06:00
Brian.Dyke
779553142c OB_14.1.1-19 baseline
Former-commit-id: 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: cfa4997978
2014-02-21 06:50:59 -05:00
Ron Anderson
e7f2b6883d Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]
Former-commit-id: 32bcf9d0d0
2014-02-18 10:45:20 -06:00
Steve Harris
d0352c69d4 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 9fcc5ad930 [formerly a494febee5f45d211797843d56077ac0ef358dbf]
Former-commit-id: 267cc881a4
2014-02-17 08:54:34 -06:00
Ron Anderson
3e78908bb5 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]
Former-commit-id: fcf45916f4
2014-02-13 10:10:34 -06:00
Brian.Dyke
f05a2220cd 14.1.1-18 baseline
Former-commit-id: 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]
Former-commit-id: 575e328123
2014-02-11 15:52:50 -05:00
David Gillingham
b12e29dd7c Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00

Former-commit-id: e8ffc73893 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]
Former-commit-id: 03d36b8309
2014-02-07 09:51:42 -06:00
Rici.Yu
6c8fa82be2 ASM #102
Change-Id: Idae87ce34f52bc79144742b92cff7e3537a84e99

Former-commit-id: 3bc070a8ec [formerly 6874b003afcebb837e11579eae048e2aa90cbfc7]
Former-commit-id: 4010ef5fd8
2014-02-07 10:43:29 -05:00
Brian.Dyke
f2e56b268c Issue #83
Former-commit-id: fb15dd5dfb [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]
Former-commit-id: 484119f6b0
2014-02-04 16:32:42 -05:00
Brian.Dyke
f3d34b0c38 14.1.1-17 baseline
Former-commit-id: 23280af290 [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]
Former-commit-id: 180d1356cd
2014-02-04 12:33:46 -05:00
brian.dyke
4a62e83835 merge 14.2.1-3 into asm-14.2.2
Former-commit-id: f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]
Former-commit-id: 2294c81a57
2014-01-27 15:27:49 -05:00
Steve Harris
5fcccbff1b Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 9371eeeee0 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]
Former-commit-id: 454d557884
2014-01-20 10:17:44 -06:00
gerritcm
9e935404d8 14.1.1-16 baseline
Former-commit-id: b84f7d4203 [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]
Former-commit-id: 6be938e6eb
2014-01-16 16:43:05 -05:00
Rici.Yu
f4fd057900 Issue #92
Change-Id: Ib8d12e9be787c9b5b41a776eb22bb4c4a8c2fc7d

Former-commit-id: a36e9b3219 [formerly c12f51881a565e2ec812e83e79b4bc59fbb5af1e]
Former-commit-id: ac72d56ae0
2014-01-15 11:48:36 -05:00
Ron Anderson
0bde38cef3 Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.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.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]
Former-commit-id: ba7a25a88f
2014-01-13 17:45:20 -06:00
Steve Harris
6df7c67f95 14.1.1-14 baseline
Former-commit-id: 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]
Former-commit-id: f2ad9da4eb
2014-01-06 14:02:30 -05:00
Rici.Yu
795cb798c6 Issue #86
Change-Id: Iccda23ba7bdfd0619adcd6333ae10f35dd1fdf7c

Former-commit-id: feda1354ca [formerly 38ae417a29d24e6ffc0f71cde94882989098903d]
Former-commit-id: 2b011e9ead
2013-12-20 15:47:50 -05:00
David Gillingham
c48c0523ff Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: 09bfdc49e3 [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]
Former-commit-id: 136265183d
2013-12-18 16:18:47 -06:00
Richard Peter
e4f59ea119 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]
Former-commit-id: 1de516964b
2013-12-17 21:04:53 -06:00
Steve Harris
85eebac7e2 14.1.1-13 baseline
Former-commit-id: b0b55a676b [formerly 6eef3022653638f9031a85932d8d551aba5600d2]
Former-commit-id: c88b10039a
2013-12-12 16:59:57 -05:00
Richard Peter
b3b23647b4 Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	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/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]
Former-commit-id: 0c4ae068ad
2013-12-05 12:12:27 -06:00
Ron Anderson
497236ca74 Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 20eeb2796e [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]
Former-commit-id: b5906249cc
2013-12-04 17:10:48 -06:00
Steve Harris
371d1ca63c 14.1.1-12 baseline
Former-commit-id: a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]
Former-commit-id: b24d9c80b0
2013-12-04 16:47:59 -05:00
Ron Anderson
54219aa03d Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: c9cb2bdb6a [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]
Former-commit-id: 7459d65134
2013-12-04 15:29:28 -06:00