Steve Harris
fa6f4c608d
Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
...
Former-commit-id: 00eda3f9823301300c7e
2014-09-22 22:18:26 -05:00
Brian.Dyke
a1dd6b20ab
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 7996916e365d0347f589
2014-09-22 16:51:47 -04:00
Nate Jensen
9ef3bce809
Omaha #3356 fix apps_dir setting detection in viz/cave
...
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3
Former-commit-id: e637963736e163ae0e5b
2014-09-22 13:00:04 -05:00
Brian.Dyke
75f3bb31d5
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 8d665b93b54db67c581c
2014-09-19 16:56:50 -04:00
Ben Steffensmeier
766fdd80a8
Omaha #3300 Fix component and mosaic merge problems
...
Former-commit-id: 217caaba1572f5799c44
2014-09-19 15:08:21 -05:00
Slav Korolev
d2dd00d2ae
Issue #2757 - Updated handlers for dialog buttons.
...
Former-commit-id: 23ec338be071c4d8db07
2014-09-19 15:02:59 -04:00
Brian.Dyke
9fc3eb20c1
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 9c33ae6d2c6ad8d500ef
2014-09-19 14:42:29 -04:00
Brian.Dyke
813d2be68e
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: 9435507b2788d5f872ae
2014-09-19 13:14:13 -04:00
Brian.Dyke
279f67ff54
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: e601d3fa517f49052445
2014-09-19 13:08:06 -04:00
Mark Peters
e99d90307b
Omaha #3300 Merge fixes for 14.4.1
...
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: 26e4f86248048e8339fd
2014-09-19 12:01:07 -05:00
Darrel Kingfield
3eeaa8f359
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
...
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 88a8dddef31cabae50b1
2014-09-19 11:14:09 -05:00
Steve Harris
0ef8105b04
Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
...
Former-commit-id: fbab75af6607a7645fcd
2014-09-19 11:13:46 -05:00
Steve Harris
da530db540
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
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/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 4c56844e29091555cf10
2014-09-19 10:28:57 -05:00
Ana Rivera
2a25376398
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
...
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 56f409717f9d8c08a09a
2014-09-19 15:17:46 +00:00
Nate Jensen
2c31cb32d3
Merge "Omaha #2735 unpack plugins that contribute spring xml to viz" into omaha_14.4.1
...
Former-commit-id: 83cc50ad69b1ba40e577
2014-09-18 14:52:17 -05:00
Nate Jensen
ccafb51aef
Merge "Omaha #3531 fixed localization perspective refresh issue" into omaha_14.4.1
...
Former-commit-id: 81b78b957b71823085b4
2014-09-18 14:22:22 -05:00
Nate Jensen
d5d6a85ea8
Omaha #2735 unpack plugins that contribute spring xml to viz
...
Change-Id: Iaa9340cb255650d3980daef10f30667b1224ac07
Former-commit-id: 820f1ae0b88ec8b13aac
2014-09-18 12:27:33 -05:00
Nate Jensen
3276af7678
Merge "Omaha #3356 fix service loader lookup for event bus" into omaha_14.4.1
...
Former-commit-id: cd7c46dbd62cc83b3d33
2014-09-18 11:53:11 -05:00
Brian.Dyke
e70a9db68c
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 8b0603cdb8c6b0adfc53
2014-09-18 12:43:01 -04:00
Chip Gobs
0e4b8d2e9b
VLab Issue #4611
...
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: 31efce6b8f0d046a56e8
2014-09-18 12:12:42 -04:00
Brian Clements
7268d3dc76
Omaha #3531 fixed localization perspective refresh issue
...
paths were compared by string prefixes instead of path prefixes
Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba
Former-commit-id: 673ccf58513d790a851b
2014-09-18 10:56:32 -05:00
Matthew Howard
f3764d3bd3
Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1
...
Former-commit-id: 0d0aae923427c31ea90f
2014-09-18 10:36:17 -05:00
Qinglu.Lin
1aac17e599
ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
...
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683
Former-commit-id: c2047b94b110da99d3f7
2014-09-18 11:21:18 -04:00
Nate Jensen
406aff37e9
Omaha #3356 fix service loader lookup for event bus
...
Change-Id: I9d53f7aaf1046c43cd90dfe7bbc957cbf9d1df12
Former-commit-id: 27fee9b7149860c2e5ec
2014-09-17 16:56:39 -05:00
Nate Jensen
22a5011456
Merge "Omaha #3632 fixed index out of bounds for TCSResource" into omaha_14.4.1
...
Former-commit-id: c9e08540d12ed2275797
2014-09-17 16:26:52 -05:00
Matthew Howard
cfda29cc8a
Merge "ASM #537 - fix for AvnFPS: Syntax failed to flag format error" into asm_14.3.1
...
Former-commit-id: bb0e06d09d7b369e5ccc
2014-09-17 15:40:40 -05:00
Brian.Dyke
1c0d6624a3
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 57a361073de1c88f287a
2014-09-17 15:50:13 -04:00
Brian.Dyke
125760432b
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 0f6b0f3d9da155bbd8c1
2014-09-17 15:45:27 -04:00
Nate Jensen
c7710f39b0
Merge "Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin" into omaha_14.4.1
...
Former-commit-id: 6225047ff003c74e966d
2014-09-17 14:07:58 -05:00
Andrew Benak
2c0eb1b447
Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin
...
Change-Id: I7b16a52cfee029fa10fba0ec837e8d05b4849d6b
Former-commit-id: d38d9ceaea898eaf114c
2014-09-17 14:06:02 -05:00
Zhidong.Hao
8fadf3bf2c
ASM #537 - fix for AvnFPS: Syntax failed to flag format error
...
Change-Id: I39615891fb92f876e06d13eb3232ee937ec9080a
Former-commit-id: 396519b17a237b09c2ad
2014-09-17 15:02:13 -04:00
Brian.Dyke
c44811098f
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 97fc11f099cb7a266271
2014-09-17 14:39:56 -04:00
Brian.Dyke
c2033ff569
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 97dfb04eb64bd417b313
2014-09-17 13:32:25 -04:00
Roger Ferrel
88576d1bdf
Omaha #3609 Correct same spelling as in 14.3.1-backports
...
Former-commit-id: a560d254f87e4c964863
2014-09-17 11:31:01 -05:00
Brian Clements
a1b3579cf5
Omaha #3632 fixed index out of bounds for TCSResource
...
Change-Id: I1d0811d2565441a01b104a1ad2a1c1303c756907
Former-commit-id: 0808a6b6624a93d0e571
2014-09-17 11:16:55 -05:00
Brian Clements
84f85d1436
Omaha #2707 LSR rework
...
removed dataURI column from DB
removed eventType from hdf5
eventType in DB now string
unknown event types now render direct
Change-Id: I24f5041f761758371dcef1fd1157be0bcf329e73
Former-commit-id: 6fd51c01fe423421175f
2014-09-17 10:57:07 -05:00
Qinglu.Lin
4bce4db9ef
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: 5e939996620e2be5afd8
2014-09-17 10:26:25 -04:00
Steve Harris
c8c130f106
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: f93e6da22bfb64a6e616
2014-09-16 22:06:01 -05:00
Ron Anderson
f560ef000f
Issue #3592 Fix issue with priority of file updates
...
Change-Id: I1404fc8f3c03fab7e828bf40ee01c8d03cfbda58
Former-commit-id: d8471fce1ff0c5e465b8
2014-09-16 17:25:43 -05:00
Ron Anderson
7a5f911ae2
Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
...
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30
Former-commit-id: 19bd85af5e5c7290bf7c
2014-09-16 13:20:40 -05:00
Brian.Dyke
8e7ed6cdb5
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: aa5d3144076ad97675c4
2014-09-16 10:53:58 -04:00
Matthew Howard
167c388492
Merge "ASM #529 Invalid QC message for Areal Flood Advisory" into asm_14.3.1
...
Former-commit-id: 4786f2e19e9b7823084f
2014-09-16 08:32:37 -05:00
Michael Gamazaychikov
3291b69cca
ASM #529 Invalid QC message for Areal Flood Advisory
...
Change-Id: I392d32b4d7ccc94c88404a85f22f2f306d34ee33
Former-commit-id: 0b245d40aefdaf681e8c
2014-09-16 09:12:06 -04:00
Steve Harris
eb0a05ab81
Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
...
Former-commit-id: 57f0a992d9d5c0049ba2
2014-09-15 21:13:56 -05:00
Jordan Gerth
898b371293
VLab Issue #4487 - Dim. DR 17313, Additional true color capabilities; fixes #4487
...
Change-Id: I701f302aa5958e89522208fd7915f5077cf97616
Former-commit-id: 8f5903920c86b34a2f70
2014-09-15 19:14:13 -05:00
Slav Korolev
3ee0058def
Issue #2757 - Removed unnecessary dialogs.
...
Former-commit-id: 65d1cca6fdd682a69b8d
2014-09-15 17:46:10 -04:00
Matthew Howard
4c650fec35
Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
...
Former-commit-id: 6e0d48d840aa273ffb70
2014-09-15 15:03:36 -05:00
Daniel.Huffman
da198f916a
ASM #641 - Filtered cases where Areas do not match Zones.
...
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362
Former-commit-id: 0f30c0f897bacc914bd0
2014-09-15 19:18:33 +00:00
Roger Ferrel
e121422e82
Omaha #3353 Fix null pointer opening GenerateGeoDataSetDialog.
...
Former-commit-id: bab69dc58ca31f3e670f
2014-09-15 13:00:02 -05:00
Matthew Howard
b6d2bf1d13
Merge "ASM #16693 - Fix spelling checker suggests swear words" into asm_14.3.1
...
Former-commit-id: 155df2bedc811b79d748
2014-09-15 12:28:25 -05:00
