Commit graph

1121 commits

Author SHA1 Message Date
Richard Peter
e838f2db25 Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838 [formerly 345dfd2ca9]
Former-commit-id: cd2014bf8d
2013-01-14 18:07:17 -06:00
Richard Peter
ff672cac47 Merge "Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development" into development
Former-commit-id: d2cc93281a [formerly 59368e93e1] [formerly d2cc93281a [formerly 59368e93e1] [formerly 4176d078a7 [formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]
Former-commit-id: 4176d078a7
Former-commit-id: ea7d2eaff1 [formerly 2049e40d87]
Former-commit-id: 57e68e7872
2013-01-14 17:49:29 -06:00
Lee Venable
6101a97ad0 Merge "Issue #1480 guarantee that framesInfo returned from descriptor is always valid." into development
Former-commit-id: c3dec53498 [formerly 7009876544] [formerly c3dec53498 [formerly 7009876544] [formerly a3a7dc44c9 [formerly 2069b8265416fae4c8fbeb37b4686b85428eca7f]]]
Former-commit-id: a3a7dc44c9
Former-commit-id: baa5496a72 [formerly 4e2b009db0]
Former-commit-id: 4c2353f110
2013-01-14 17:47:59 -06:00
Steve Harris
b4556ea28f 13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca]
Former-commit-id: ebff2a6275
2013-01-14 18:42:21 -05:00
Richard Peter
ef2dc06b69 Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: ae3ea75cbf [formerly 1318f53902] [formerly ae3ea75cbf [formerly 1318f53902] [formerly b8e42dabc0 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: fa6247baf7 [formerly aa9e16b038]
Former-commit-id: 096134d917
2013-01-14 17:38:38 -06:00
Richard Peter
9cf234df1e Merge "Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository." into development
Former-commit-id: 461a503837 [formerly 32d4bc3d9f] [formerly 461a503837 [formerly 32d4bc3d9f] [formerly 69c6cfd196 [formerly c8cf77295c7f53dbd2821271298391ba136e034c]]]
Former-commit-id: 69c6cfd196
Former-commit-id: ab38a1f89b [formerly a634690867]
Former-commit-id: 2f507e1245
2013-01-14 17:33:22 -06:00
Richard Peter
e59ea72456 Issue #1408: Merge branch 'ss_builds' (13.1.2-6) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.core/res/spring/viz.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.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.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
	cave/ohd.hseb.common/externaljars/jdom.jar
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/bin/setup.env
	edexOsgi/build.edex/esb/bin/wrapper.conf
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/build.edex/esb/etc/registry.sh
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	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/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid104.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FSL-59.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NOAA-161.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NWSTG-8.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
	edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
	edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
	edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
	edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: I80504ec890827bb512be138f319380d04bdfc402

Former-commit-id: 1a1a69d38c [formerly 970216e4c9] [formerly 1a1a69d38c [formerly 970216e4c9] [formerly 19d923f387 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]
Former-commit-id: 19d923f387
Former-commit-id: f1262388ce [formerly 8ccc791566]
Former-commit-id: 2575e4e4ea
2013-01-14 16:53:05 -06:00
Brad Gonzales
7be1cf3631 Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository.
Change-Id: I49b715f4b9f998e933948d3803194aa41deec979

Former-commit-id: 1644eee264 [formerly 5bbe5d5dbf] [formerly 1644eee264 [formerly 5bbe5d5dbf] [formerly 72cb336592 [formerly 9341aa5fe927e38db949be280a323300cd9fc62d]]]
Former-commit-id: 72cb336592
Former-commit-id: bd8eaa6dc8 [formerly 881cc10e84]
Former-commit-id: 063551fb18
2013-01-14 14:47:51 -06:00
Ben Steffensmeier
08311ccdf5 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: e00348a124 [formerly cf8a9e3f64] [formerly e00348a124 [formerly cf8a9e3f64] [formerly ac9ba67919 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]]
Former-commit-id: ac9ba67919
Former-commit-id: c1ae999c81 [formerly 147a379a81]
Former-commit-id: 6b95c98e8e
2013-01-14 14:30:17 -06:00
Richard Peter
e2207bce78 Merge "Issue #1464 fix saving of spatial subsets." into development
Former-commit-id: fe28e371a6 [formerly 65715d4154] [formerly fe28e371a6 [formerly 65715d4154] [formerly e180a2ff86 [formerly 7a5c93c668bb409857ff0d50a9506c67cae7a081]]]
Former-commit-id: e180a2ff86
Former-commit-id: 62d3bd6837 [formerly 712fb1cb05]
Former-commit-id: f298a42853
2013-01-14 11:56:33 -06:00
Richard Peter
6825617baf Merge "Issue #1473: Fix Alarm Alert NPE" into development
Former-commit-id: 621a4cd147 [formerly 0f705ac355] [formerly 621a4cd147 [formerly 0f705ac355] [formerly e176fcbf06 [formerly edaf980163ff2f3770cb125b9a837a23ca1b16b2]]]
Former-commit-id: e176fcbf06
Former-commit-id: 521e7cf5af [formerly 157e75f7aa]
Former-commit-id: d446c490ba
2013-01-14 11:55:35 -06:00
Ben Steffensmeier
1ffcc3ada2 Issue #1464 fix saving of spatial subsets.
Former-commit-id: 0933461f40 [formerly bc5233748a] [formerly 0933461f40 [formerly bc5233748a] [formerly c8ef480815 [formerly 185311ebfda70bf29adb3898682f37ea55bca467]]]
Former-commit-id: c8ef480815
Former-commit-id: 053b673790 [formerly 4fd3d47385]
Former-commit-id: 244de069da
2013-01-14 10:49:14 -06:00
Richard Peter
bd03eaff5f Issue #1473: Fix Alarm Alert NPE
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff

Former-commit-id: 1d61d65a1e [formerly a4f3a2a174] [formerly 1d61d65a1e [formerly a4f3a2a174] [formerly e71db46db9 [formerly ed157e199cb95e5db44095b638332bb9563548d5]]]
Former-commit-id: e71db46db9
Former-commit-id: c68dcf4554 [formerly 8ea3bb4d17]
Former-commit-id: 58d09ab54b
2013-01-14 09:59:28 -06:00
Richard Peter
f0dcd53a2c Merge "Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state." into development
Former-commit-id: 854bd1d4e0 [formerly d2a1388b0e] [formerly 854bd1d4e0 [formerly d2a1388b0e] [formerly 061fa21537 [formerly 888b839152d86c536b249e795666c596a213da86]]]
Former-commit-id: 061fa21537
Former-commit-id: fdf83d8623 [formerly 6176588496]
Former-commit-id: a82f86b26b
2013-01-11 16:32:03 -06:00
Ben Steffensmeier
1d91b721d1 Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state.
Former-commit-id: 83cf6ec05c [formerly 5c5b2e3c20] [formerly 83cf6ec05c [formerly 5c5b2e3c20] [formerly 52f55e6d3a [formerly acb73f44d4cbea7f36419b1cb44bfff47e87c474]]]
Former-commit-id: 52f55e6d3a
Former-commit-id: 0a5da321d6 [formerly c617b3cc70]
Former-commit-id: 79d9115a7a
2013-01-11 16:26:14 -06:00
Steve Harris
92f1e9416c 13.1.2-8 baseline
Former-commit-id: b864fdc303 [formerly e6217a17de] [formerly b864fdc303 [formerly e6217a17de] [formerly 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 7d0109a349 [formerly 3caf592e83]
Former-commit-id: 066c14dcd2
2013-01-11 16:19:07 -05:00
Steve Harris
1ef10eaf2c 13.1.2-7 baseline
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0] [formerly a8d90da9c0 [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: f1256f2a9e [formerly b7f1dbe72b]
Former-commit-id: 775a338b90
2013-01-11 16:12:09 -05:00
Mike Duff
66dc038d02 Issue #1420 - Additional changes and cleanup
Issue #1420 - remove commented out code, move method
Issue #1420 - fix for max latency
Change-Id: I8a983812e4fab7477659d7f175eaa005bb92f064

Former-commit-id: 329a010b07 [formerly 279729e88e] [formerly 329a010b07 [formerly 279729e88e] [formerly 8411a46e3e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]]
Former-commit-id: 8411a46e3e
Former-commit-id: d3ed6f6148 [formerly 950c71c164]
Former-commit-id: 772154de38
2013-01-11 14:38:34 -06:00
Richard Peter
87b4521a69 Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: 58242a600c [formerly 32e5d79e7a] [formerly 58242a600c [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: cf815a4c72 [formerly d3df89181f]
Former-commit-id: a9f01d5846
2013-01-11 12:37:05 -06:00
Richard Peter
23899a125f Merge "Issue #1346 - added addtional information to the data browser dataset details dialog" into development
Former-commit-id: c309d2dc1e [formerly a595356025] [formerly c309d2dc1e [formerly a595356025] [formerly f9e39660d4 [formerly 410b7e917c48645ef1337b531e18bdb4cbe7fc4f]]]
Former-commit-id: f9e39660d4
Former-commit-id: ff1dc7e236 [formerly b9e409357d]
Former-commit-id: feeea305a9
2013-01-11 12:25:54 -06:00
Dustin Johnson
ef31fc45a9 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: 3e1878c5f9 [formerly 7716f1baa9] [formerly 3e1878c5f9 [formerly 7716f1baa9] [formerly c4068d27bf [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]
Former-commit-id: c4068d27bf
Former-commit-id: a4414d409a [formerly 0b3f803f6c]
Former-commit-id: 9b3cf3308f
2013-01-11 12:23:15 -06:00
Mike Duff
ad0f7088af Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab.
Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a

Former-commit-id: 16a86f47e6 [formerly 35d73f0354] [formerly 16a86f47e6 [formerly 35d73f0354] [formerly 4cbe807a52 [formerly 843a771d3c6247326d1e832eb598072f7c313499]]]
Former-commit-id: 4cbe807a52
Former-commit-id: c498087b96 [formerly 98ec2a5269]
Former-commit-id: 855af43259
2013-01-11 12:22:47 -06:00
Richard Peter
27535c8f2f Merge "Issue #1441 Cleaned up editing/deleting groups and handling of user permissions" into development
Former-commit-id: eaf0cbc118 [formerly dd2f1044c2] [formerly eaf0cbc118 [formerly dd2f1044c2] [formerly c5338da7be [formerly 08646c4b84f2e86507452dabf30228e0a0c96528]]]
Former-commit-id: c5338da7be
Former-commit-id: 6c5c815c0b [formerly afbc50da00]
Former-commit-id: 159e963c88
2013-01-11 11:55:23 -06:00
Dustin Johnson
f269969791 Issue #1441 Cleaned up editing/deleting groups and handling of user permissions
Amend:
  Split creation and edit group dialogs.
  Add some javadoc and remove sysouts.
  Add missing test data causing broken tests.
  Rebased.

Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185

Former-commit-id: 8473eb60fb [formerly 4ae1a9645c] [formerly 8473eb60fb [formerly 4ae1a9645c] [formerly 446f65776e [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]
Former-commit-id: 446f65776e
Former-commit-id: 7bf029eb7e [formerly 64ececeda1]
Former-commit-id: 6fb6bc8f87
2013-01-11 11:53:02 -06:00
Ben Steffensmeier
cbebc15454 Issue #1470 remove times from grid resources when updates arrive.
Former-commit-id: 6e7b5a0e3d [formerly 211a9b6cee] [formerly 6e7b5a0e3d [formerly 211a9b6cee] [formerly a1afabe4e3 [formerly 355bd4c62d4f56064341930145ad2a29cb807eed]]]
Former-commit-id: a1afabe4e3
Former-commit-id: 3b72ea7f19 [formerly 7b6bc3f69b]
Former-commit-id: d2667da4b9
2013-01-11 11:46:32 -06:00
Matt Nash
e5379c7c15 Issue #1471 fix product browser issues
Change-Id: Ic37ef8f288a4949d13db75b27e7aebb03c8e3062

Former-commit-id: 0a8448cfed [formerly 90fa08596e] [formerly 0a8448cfed [formerly 90fa08596e] [formerly 6bfbf6b0e3 [formerly 87ca33679bc3b6ff5fbfffd1f95398b255de9137]]]
Former-commit-id: 6bfbf6b0e3
Former-commit-id: 1ab332b654 [formerly addac12b84]
Former-commit-id: e85d6610e4
2013-01-11 10:48:06 -06:00
Richard Peter
9312478e41 Merge "Issue #1432 - Fix case sensative and exclude check boxes." into development
Former-commit-id: 942140cca5 [formerly cffe035019] [formerly 942140cca5 [formerly cffe035019] [formerly e91b5bd035 [formerly 8da35969c383bb7d22e5f629859311d8783069dc]]]
Former-commit-id: e91b5bd035
Former-commit-id: c4c2ae3256 [formerly 6857211fc6]
Former-commit-id: 9492e77036
2013-01-10 17:25:09 -06:00
Richard Peter
4552b5f71a Issue #1454: Update Dataset size calculation
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 45e6e286bb [formerly deca70207d] [formerly 45e6e286bb [formerly deca70207d] [formerly 73263e270e [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]
Former-commit-id: 73263e270e
Former-commit-id: 4a097586f6 [formerly 69818573a6]
Former-commit-id: 49da28ead4
2013-01-10 17:17:58 -06:00
Mike Duff
d23c9266d8 Issue #1432 - Fix case sensative and exclude check boxes.
Former-commit-id: d2981a8275 [formerly 9526199a9c] [formerly d2981a8275 [formerly 9526199a9c] [formerly 78440f2b5a [formerly 29d620050a3b2aefd2b9eda664e3139e146558be]]]
Former-commit-id: 78440f2b5a
Former-commit-id: f2da1df6e6 [formerly bde6be532e]
Former-commit-id: ae8eecc95b
2013-01-10 15:35:33 -06:00
Mike Duff
7b76dbba46 Issue #1346 - added addtional information to the data browser dataset details dialog
Former-commit-id: 674ddfedb2 [formerly 02bfe05a27] [formerly 674ddfedb2 [formerly 02bfe05a27] [formerly b72c2e4b04 [formerly 682e4831f76b3a220aeedb9fc292886f24582e72]]]
Former-commit-id: b72c2e4b04
Former-commit-id: 8b23902cea [formerly b42395d6ea]
Former-commit-id: 910401bd23
2013-01-10 12:26:59 -06:00
Ron Anderson
d7fbeb15d7 Merge "Issue #1395 Fixed dynamic update of opacity." into development
Former-commit-id: bbc314f50c [formerly 9d3405dd68] [formerly bbc314f50c [formerly 9d3405dd68] [formerly 001bdc84b9 [formerly f3a9eed298a3b776f8b2b83416e8f98981d92912]]]
Former-commit-id: 001bdc84b9
Former-commit-id: cd33ded3e7 [formerly c0e80aa175]
Former-commit-id: 9464c329e9
2013-01-10 11:40:43 -06:00
Richard Peter
c8c4f68603 Merge "Issue #1420 - Rules Peer review comments" into development
Former-commit-id: 206ffc0e15 [formerly 507a3d641c] [formerly 206ffc0e15 [formerly 507a3d641c] [formerly c0e712f682 [formerly eded38dc13847cc764bcc4cb71997b8abb685c89]]]
Former-commit-id: c0e712f682
Former-commit-id: 9524f5a52b [formerly 9543d23d23]
Former-commit-id: 6dbbf56c1d
2013-01-10 10:51:28 -06:00
Nate Jensen
3fff3b0d0b Merge "Issue #1467 - updated the memory settings for 64-bit GFE" into development
Former-commit-id: d02e1ff0a7 [formerly a3e10f6dcd] [formerly d02e1ff0a7 [formerly a3e10f6dcd] [formerly 62f89e6189 [formerly 5f262d2cb46ad8ff0ec355e64ee73b6deb7ed454]]]
Former-commit-id: 62f89e6189
Former-commit-id: ef3468acd4 [formerly 5733a44770]
Former-commit-id: 4d91741212
2013-01-10 10:31:05 -06:00
Richard Peter
a9a245dfe2 Merge "Issue #1412 User Admin dialog should refresh with changes made to authentication data" into development
Former-commit-id: e1547982b0 [formerly ee6513bad3] [formerly e1547982b0 [formerly ee6513bad3] [formerly 2d1a6c4833 [formerly 5f26573ba4c0881e1ee6c7a4809f9465589164a1]]]
Former-commit-id: 2d1a6c4833
Former-commit-id: 27a06e14b8 [formerly 46faa0f68d]
Former-commit-id: 58a28b4193
2013-01-10 10:18:39 -06:00
Ron Anderson
b6bb0a5319 Issue #1395 Fixed dynamic update of opacity.
Change-Id: Ic552a759c23035dfe2d830323d4dbe170e0d0187

Former-commit-id: 37d6ed5232 [formerly 145665c496] [formerly 37d6ed5232 [formerly 145665c496] [formerly 3df3cf7f7b [formerly cae505a088e959670f4cacb92e439a82f13559b9]]]
Former-commit-id: 3df3cf7f7b
Former-commit-id: 2c364744bb [formerly 1f298b87b5]
Former-commit-id: d855e9ada0
2013-01-10 10:00:56 -06:00
Richard Peter
e81e4c0593 Merge "Issue #1465 fix import derived parameter." into development
Former-commit-id: 856959f0d5 [formerly 9293a7e3f7] [formerly 856959f0d5 [formerly 9293a7e3f7] [formerly 86f5fec292 [formerly cfc04313c76c75db5a5bd7bc1bd32577a4615974]]]
Former-commit-id: 86f5fec292
Former-commit-id: fa41b57e14 [formerly 68f8878d4f]
Former-commit-id: 5e75d7409e
2013-01-10 09:35:16 -06:00
Richard Peter
398b47967d Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28 [formerly 6a5a0d7d09]
Former-commit-id: 709af3b25e
2013-01-09 17:55:05 -06:00
Ron Anderson
afef7ce174 Issue #1468 Make DataStoreResource update labels when magnification is changed.
Change-Id: I1337db46d620aba6cc8939f4f42b25322dc81a98

Former-commit-id: 56364be3ce [formerly 3acf0edad0] [formerly 56364be3ce [formerly 3acf0edad0] [formerly 5918458b70 [formerly 473cfc2dbd3406a1602f84daf1ca320228b3b1ed]]]
Former-commit-id: 5918458b70
Former-commit-id: 65327a9221 [formerly 0476d4ccc6]
Former-commit-id: 19b6b94e67
2013-01-09 15:52:08 -06:00
Dustin Johnson
d4d1a95461 Issue #1412 User Admin dialog should refresh with changes made to authentication data
Change-Id: I407dc061a50bf30cb2b37a5fa3b1fe8c5e63ce23

Former-commit-id: bad7b754e5 [formerly b7ed75896b] [formerly bad7b754e5 [formerly b7ed75896b] [formerly a354bac4da [formerly 5e89b4f6c1cbb9db68b5ac185ba09ca5a6543e3b]]]
Former-commit-id: a354bac4da
Former-commit-id: 424a70dbfe [formerly 0d5bb5ba95]
Former-commit-id: 09a33ab8ac
2013-01-09 15:40:36 -06:00
Bryan Kowal
b6ceffe69a Issue #1467 - updated the memory settings for 64-bit GFE
Change-Id: I40df3faed89bd23c5e37b81f3a4e6b256b5a2cc3

Former-commit-id: 6129a00225 [formerly 0645a9fe40] [formerly 6129a00225 [formerly 0645a9fe40] [formerly 73bdd66283 [formerly 2d6bf1e42cb628a5b5af6a261202d01c7fa236fb]]]
Former-commit-id: 73bdd66283
Former-commit-id: 777b804edc [formerly e9dd794082]
Former-commit-id: 4f1a822578
2013-01-09 13:03:38 -06:00
Ben Steffensmeier
8d6310adfb Issue #1465 fix import derived parameter.
Former-commit-id: c0ea76eb90 [formerly 6a2b73b816] [formerly c0ea76eb90 [formerly 6a2b73b816] [formerly a9ece85f9b [formerly fb133aac1ba6013e826ff38a29f5f1720127aa53]]]
Former-commit-id: a9ece85f9b
Former-commit-id: 0df360a83a [formerly d7c2668b88]
Former-commit-id: 7a693e3f66
2013-01-09 12:04:00 -06:00
Mike Duff
660064ea6a Issue #1420 - Rules Peer review comments
Former-commit-id: f41d525fa3 [formerly 4c63333a96] [formerly f41d525fa3 [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: ed95eae2e3 [formerly 67486aa43b]
Former-commit-id: 8313877a3a
2013-01-09 12:02:21 -06:00
Richard Peter
920867e5cd Merge "Issue #1299 Log if invalid forecast index is requested" into development
Former-commit-id: c29aad09b2 [formerly c138f7b351] [formerly c29aad09b2 [formerly c138f7b351] [formerly b43a21f4b5 [formerly 5eef3aa833a8940435fe965e060501e27a6c5eec]]]
Former-commit-id: b43a21f4b5
Former-commit-id: 27356fb873 [formerly 42848170a9]
Former-commit-id: 189254a1dc
2013-01-08 16:48:09 -06:00
Richard Peter
6eed9166d7 Merge "Issue #1436 Fixed selection icon reset, Fixed area text box display check." into development
Former-commit-id: 6b2edffd7e [formerly f25f22c569] [formerly 6b2edffd7e [formerly f25f22c569] [formerly 6a54b7f4d3 [formerly 26e37784cac5ffd690e7280aa394711a3bd86820]]]
Former-commit-id: 6a54b7f4d3
Former-commit-id: 7b4c0a6750 [formerly 34bc572bb9]
Former-commit-id: e97eead930
2013-01-08 16:45:58 -06:00
Dustin Johnson
9368311f93 Issue #1299 Log if invalid forecast index is requested
Change-Id: If550175be76c99a90acd228dc8f4542fb39ee644

Former-commit-id: 2e8172899c [formerly cb9a603da8] [formerly 2e8172899c [formerly cb9a603da8] [formerly d3f2a7a19e [formerly 30b3c809902e82b40855ddf31f2c6faecf59f861]]]
Former-commit-id: d3f2a7a19e
Former-commit-id: 8b42d8aa2e [formerly 004bad506d]
Former-commit-id: a06204192f
2013-01-08 14:51:53 -06:00
Brad Gonzales
2dfc5f99c5 Issue #1436 Fixed selection icon reset, Fixed area text box display check.
Change-Id: Ib7545ff9e23eadac26daf927ce428b805f3be4b2

Former-commit-id: 701c572625 [formerly c9c68424f9] [formerly 701c572625 [formerly c9c68424f9] [formerly a78c49e2b1 [formerly 4fb8c74153e6da96943cf6ee71b03f5c3ff73176]]]
Former-commit-id: a78c49e2b1
Former-commit-id: 21e8f98ee8 [formerly 5a5644a2c5]
Former-commit-id: 720a30f639
2013-01-08 14:12:22 -06:00
Dustin Johnson
b24ddaeb4e Issue #1453 Fix the handling of subscription active period dates.
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 1975cd0442 [formerly 6a90779214] [formerly 1975cd0442 [formerly 6a90779214] [formerly 2635e05723 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]
Former-commit-id: 2635e05723
Former-commit-id: 885f315d30 [formerly 492cee4992]
Former-commit-id: b1c159fc7f
2013-01-08 12:44:29 -06:00
Steve Harris
4f75e85c8f Merge "Issue #1459 fix interp function when data is shared amongst multiple parameters." into development
Former-commit-id: 41906e5278 [formerly d9650b113c] [formerly 41906e5278 [formerly d9650b113c] [formerly 4c5a92876f [formerly 217b8d82c7b558a8c78126c3ba37f915a8c9e693]]]
Former-commit-id: 4c5a92876f
Former-commit-id: 33b21a127c [formerly 64f6a70c37]
Former-commit-id: 02e2a634cf
2013-01-08 10:46:29 -06:00
Bryan Kowal
2ec11e041a Issue #1460 - Merge 4.7-GIS_Viewer into AWIPS2_baseline
Former-commit-id: 87d0821429 [formerly 76fe910606] [formerly 87d0821429 [formerly 76fe910606] [formerly 03f108f80b [formerly 9e0eae1725af06ce834c926a4d70195a075e8152]]]
Former-commit-id: 03f108f80b
Former-commit-id: 7dd7d1cfa7 [formerly bbeb6b5101]
Former-commit-id: 74f4811f07
2013-01-07 18:14:07 -06:00
Brad Gonzales
64f14fab4f Issue #1456 Changed ArrayList parameter to List.
Change-Id: I47e7a054b774f5f2707f53b1c3692c3ec07ac157

Former-commit-id: 69fcfd55bb [formerly 1c6cfee5cc] [formerly 69fcfd55bb [formerly 1c6cfee5cc] [formerly 71230cc246 [formerly 6ba091caf7aa4de243fbea57ed19ae99ddb39585]]]
Former-commit-id: 71230cc246
Former-commit-id: d0fae4de6d [formerly 9bcf7cbd07]
Former-commit-id: 844ee8cd77
2013-01-07 16:55:04 -06:00