Commit graph

1129 commits

Author SHA1 Message Date
Nate Jensen
44606a58a4 Issue #1497 fix build
Former-commit-id: bd08d7a537 [formerly 13b5619297] [formerly 6e0f0d330e] [formerly b52aa82213 [formerly 6e0f0d330e [formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]]
Former-commit-id: b52aa82213
Former-commit-id: da7e2f9e2766d8828401b92dfc04d9fa22173489 [formerly 98ec6fcc1c]
Former-commit-id: cc0725f0b7
2013-01-17 18:42:38 -06:00
Dustin Johnson
ceee5c6ad4 Issue #1501 Use registry version of subscription when sending notification responses
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962

Former-commit-id: 5ce7601dfa [formerly 9f775d2dd7] [formerly d9064bdc98] [formerly 38036a0e8b [formerly d9064bdc98 [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]]
Former-commit-id: 38036a0e8b
Former-commit-id: 0a9edd87c8a06f3382e4aca4205e470a2f005410 [formerly 13a75fabad]
Former-commit-id: 9681f57fac
2013-01-17 14:53:36 -06:00
Mike Duff
504dd2f5c0 Issue #1420 - More Rules changes.
Peer review comments

Change-Id: I3ed89b332764bba2d995a248e361d20c1eec6edf

Former-commit-id: 5210083e95 [formerly 1df1b5a94d] [formerly 2a31447d6d] [formerly 8d0a79703f [formerly 2a31447d6d [formerly 84f2d0ed39e11059359558676c988a0bf1e989b9]]]
Former-commit-id: 8d0a79703f
Former-commit-id: dd2462fb0ac1bd87f0124290fd6e8c8a6b100b4b [formerly c6924b6920]
Former-commit-id: 72a70a6eaf
2013-01-16 14:34:55 -06:00
Brad Gonzales
927d6df024 Issue #1452 Clear current filters when creating a new filter configuration.
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500

Former-commit-id: 9c295d4f42 [formerly 5fd396acaf] [formerly 026c98298b] [formerly e7ecc52e25 [formerly 026c98298b [formerly c4f47262403a56a0e6fe28bb1b5ac523fb91e43f]]]
Former-commit-id: e7ecc52e25
Former-commit-id: e681b7568c05bb90bf8bfa1123327c5e349b5e23 [formerly 253ac8f1d3]
Former-commit-id: 382a21f3a2
2013-01-15 15:50:43 -06:00
Dave Hladky
81ef046069 Issue #1475 QPF standalonoe displays appear slow
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a

Former-commit-id: 0b8d399f64 [formerly ffd3faa84b] [formerly 0f7a64798d] [formerly 6822591e1a [formerly 0f7a64798d [formerly 6e7c86aba7103c445823ac2a11a2241939e4b6c2]]]
Former-commit-id: 6822591e1a
Former-commit-id: b34b35f09adc05a6a90fe87bd4081a824d7698fd [formerly 81c9f8e21e]
Former-commit-id: 9d935baf22
2013-01-15 15:50:27 -06:00
Richard Peter
a463891c8e Merge "Issue #1286 Fix bugs found during 1286 testing" into 13.2.1_delivery
Former-commit-id: 75f41d14eb [formerly d30a607764] [formerly c8d963d541] [formerly dc6ee0b9e1 [formerly c8d963d541 [formerly e2516f60d0748830d5849f42819e2dcc66b67bb6]]]
Former-commit-id: dc6ee0b9e1
Former-commit-id: 313b538a60cf36a05c010c4dcf3f45a5c2b0bd4a [formerly b456405145]
Former-commit-id: fe2c8b320e
2013-01-15 15:37:42 -06:00
Max Schenkelberg
cea378c445 Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: f51398595e [formerly 9aac1d2871] [formerly 02e7c79de9] [formerly aa88b83859 [formerly 02e7c79de9 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]
Former-commit-id: aa88b83859
Former-commit-id: 451ec6f6d7261a1c251d7e39253fc41e3af7c367 [formerly c6b6823228]
Former-commit-id: 410abb1144
2013-01-15 14:13:36 -06:00
Dustin Johnson
b18fc5ff5e Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 50fa22f710 [formerly 99f8d40bed] [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 3d74a68e94 [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]
Former-commit-id: 2cf52d976b
Former-commit-id: d2caf5c394290add805dceb28270a72f9b600765 [formerly aa7acedf0a]
Former-commit-id: 94e95f3e07
2013-01-15 10:18:14 -06:00
Richard Peter
d880361e06 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: 6e42fa32d3 [formerly a966546e31] [formerly 20520c8f0152154419357d990f91f1ce998a888a [formerly 3fb7d96ec1]] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]
Former-commit-id: 79ef100838
2013-01-14 18:07:17 -06:00
Richard Peter
dd346fa040 Merge "Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development" into development
Former-commit-id: 4c82ddaa12 [formerly d2cc93281a] [formerly 59368e93e1] [formerly 4176d078a7 [formerly 59368e93e1 [formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]
Former-commit-id: 4176d078a7
Former-commit-id: f0175e39c5b471bab4e4eaa25e855a6631e81662 [formerly 2049e40d87]
Former-commit-id: ea7d2eaff1
2013-01-14 17:49:29 -06:00
Lee Venable
9d53072b41 Merge "Issue #1480 guarantee that framesInfo returned from descriptor is always valid." into development
Former-commit-id: 66aab3680d [formerly c3dec53498] [formerly 7009876544] [formerly a3a7dc44c9 [formerly 7009876544 [formerly 2069b8265416fae4c8fbeb37b4686b85428eca7f]]]
Former-commit-id: a3a7dc44c9
Former-commit-id: fdd917cd63082600218ba6b454499b49789ae013 [formerly 4e2b009db0]
Former-commit-id: baa5496a72
2013-01-14 17:47:59 -06:00
Steve Harris
3d35fd52d5 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]
Former-commit-id: e34695538d
2013-01-14 18:42:21 -05:00
Richard Peter
9da3b7e2dd 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: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]
Former-commit-id: fa6247baf7
2013-01-14 17:38:38 -06:00
Richard Peter
715d5bd5f2 Merge "Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository." into development
Former-commit-id: 99414fa1f0 [formerly 461a503837] [formerly 32d4bc3d9f] [formerly 69c6cfd196 [formerly 32d4bc3d9f [formerly c8cf77295c7f53dbd2821271298391ba136e034c]]]
Former-commit-id: 69c6cfd196
Former-commit-id: 7eb1dd62e445e03b2b2d4d9248f1dfaad042460e [formerly a634690867]
Former-commit-id: ab38a1f89b
2013-01-14 17:33:22 -06:00
Richard Peter
7af4fc10a8 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: 9cad9f0c54 [formerly 1a1a69d38c] [formerly 970216e4c9] [formerly 19d923f387 [formerly 970216e4c9 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]
Former-commit-id: 19d923f387
Former-commit-id: 8835cc0deb6ecb25ed3f4f23af4a1a62f0414be7 [formerly 8ccc791566]
Former-commit-id: f1262388ce
2013-01-14 16:53:05 -06:00
Brad Gonzales
eacfe73d3f Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository.
Change-Id: I49b715f4b9f998e933948d3803194aa41deec979

Former-commit-id: 7391e3c0fe [formerly 1644eee264] [formerly 5bbe5d5dbf] [formerly 72cb336592 [formerly 5bbe5d5dbf [formerly 9341aa5fe927e38db949be280a323300cd9fc62d]]]
Former-commit-id: 72cb336592
Former-commit-id: bbcec7aca93cd7df0525463803027bc994288c8e [formerly 881cc10e84]
Former-commit-id: bd8eaa6dc8
2013-01-14 14:47:51 -06:00
Ben Steffensmeier
dea702c873 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: 4547887fe6 [formerly e00348a124] [formerly cf8a9e3f64] [formerly ac9ba67919 [formerly cf8a9e3f64 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]]
Former-commit-id: ac9ba67919
Former-commit-id: c92b1fa2bb66c18a0319bba6df102f7c8450428d [formerly 147a379a81]
Former-commit-id: c1ae999c81
2013-01-14 14:30:17 -06:00
Richard Peter
8c0a79611e Merge "Issue #1464 fix saving of spatial subsets." into development
Former-commit-id: 16ccbec7fa [formerly fe28e371a6] [formerly 65715d4154] [formerly e180a2ff86 [formerly 65715d4154 [formerly 7a5c93c668bb409857ff0d50a9506c67cae7a081]]]
Former-commit-id: e180a2ff86
Former-commit-id: bb8dc777c2dc2e01f0556a7a8c7253bf8db95622 [formerly 712fb1cb05]
Former-commit-id: 62d3bd6837
2013-01-14 11:56:33 -06:00
Richard Peter
4b57dccb57 Merge "Issue #1473: Fix Alarm Alert NPE" into development
Former-commit-id: b731360a84 [formerly 621a4cd147] [formerly 0f705ac355] [formerly e176fcbf06 [formerly 0f705ac355 [formerly edaf980163ff2f3770cb125b9a837a23ca1b16b2]]]
Former-commit-id: e176fcbf06
Former-commit-id: 668863fe0d8c1e551660ffd2408217fac215e66b [formerly 157e75f7aa]
Former-commit-id: 521e7cf5af
2013-01-14 11:55:35 -06:00
Ben Steffensmeier
19104e6cbf Issue #1464 fix saving of spatial subsets.
Former-commit-id: e787fdcaf9 [formerly 0933461f40] [formerly bc5233748a] [formerly c8ef480815 [formerly bc5233748a [formerly 185311ebfda70bf29adb3898682f37ea55bca467]]]
Former-commit-id: c8ef480815
Former-commit-id: c53d9b72c0b2f445296e31570c1b1f5aa26bb092 [formerly 4fd3d47385]
Former-commit-id: 053b673790
2013-01-14 10:49:14 -06:00
Richard Peter
c9dd98496b Issue #1473: Fix Alarm Alert NPE
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff

Former-commit-id: f1dc664a00 [formerly 1d61d65a1e] [formerly a4f3a2a174] [formerly e71db46db9 [formerly a4f3a2a174 [formerly ed157e199cb95e5db44095b638332bb9563548d5]]]
Former-commit-id: e71db46db9
Former-commit-id: 20466293ab658f7939eaea6be47b45f720037a67 [formerly 8ea3bb4d17]
Former-commit-id: c68dcf4554
2013-01-14 09:59:28 -06:00
Richard Peter
b933bd56c7 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: 7e14eb1840 [formerly 854bd1d4e0] [formerly d2a1388b0e] [formerly 061fa21537 [formerly d2a1388b0e [formerly 888b839152d86c536b249e795666c596a213da86]]]
Former-commit-id: 061fa21537
Former-commit-id: 4731e8fe09be84df4c8258189e64a2405c94b0a5 [formerly 6176588496]
Former-commit-id: fdf83d8623
2013-01-11 16:32:03 -06:00
Ben Steffensmeier
b9baedab39 Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state.
Former-commit-id: d92f2de0c3 [formerly 83cf6ec05c] [formerly 5c5b2e3c20] [formerly 52f55e6d3a [formerly 5c5b2e3c20 [formerly acb73f44d4cbea7f36419b1cb44bfff47e87c474]]]
Former-commit-id: 52f55e6d3a
Former-commit-id: 13be1753e7eb83458858e4291537dbb830a7ef05 [formerly c617b3cc70]
Former-commit-id: 0a5da321d6
2013-01-11 16:26:14 -06:00
Steve Harris
13be9f8987 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]
Former-commit-id: 7d0109a349
2013-01-11 16:19:07 -05:00
Steve Harris
4c8e604619 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]
Former-commit-id: f1256f2a9e
2013-01-11 16:12:09 -05:00
Mike Duff
135fd5c13d 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: 0eb256fc41 [formerly 329a010b07] [formerly 279729e88e] [formerly 8411a46e3e [formerly 279729e88e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]]
Former-commit-id: 8411a46e3e
Former-commit-id: 8b9f15d6e0da73076d2f6aec446ddc93878baabc [formerly 950c71c164]
Former-commit-id: d3ed6f6148
2013-01-11 14:38:34 -06:00
Richard Peter
dd12b3fe0f Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 32e5d79e7a [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: 0dc63b9bd4f59e8fed895f177efe7f6278747845 [formerly d3df89181f]
Former-commit-id: cf815a4c72
2013-01-11 12:37:05 -06:00
Richard Peter
b0050959af Merge "Issue #1346 - added addtional information to the data browser dataset details dialog" into development
Former-commit-id: 7f595074ae [formerly c309d2dc1e] [formerly a595356025] [formerly f9e39660d4 [formerly a595356025 [formerly 410b7e917c48645ef1337b531e18bdb4cbe7fc4f]]]
Former-commit-id: f9e39660d4
Former-commit-id: 1c18c0a235839ef85ff98f2d1031b2307daefd8d [formerly b9e409357d]
Former-commit-id: ff1dc7e236
2013-01-11 12:25:54 -06:00
Dustin Johnson
2a306b4122 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

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

Former-commit-id: c12824d7bf [formerly 16a86f47e6] [formerly 35d73f0354] [formerly 4cbe807a52 [formerly 35d73f0354 [formerly 843a771d3c6247326d1e832eb598072f7c313499]]]
Former-commit-id: 4cbe807a52
Former-commit-id: 076bb9b030781d1f36bd984fff6daf176073a6f4 [formerly 98ec2a5269]
Former-commit-id: c498087b96
2013-01-11 12:22:47 -06:00
Richard Peter
ed2e9c59e1 Merge "Issue #1441 Cleaned up editing/deleting groups and handling of user permissions" into development
Former-commit-id: d3bb78a262 [formerly eaf0cbc118] [formerly dd2f1044c2] [formerly c5338da7be [formerly dd2f1044c2 [formerly 08646c4b84f2e86507452dabf30228e0a0c96528]]]
Former-commit-id: c5338da7be
Former-commit-id: 93b5bc836fb851dfa8b1af7af168a935aaef9ded [formerly afbc50da00]
Former-commit-id: 6c5c815c0b
2013-01-11 11:55:23 -06:00
Dustin Johnson
6984791be8 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: b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly 446f65776e [formerly 4ae1a9645c [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]
Former-commit-id: 446f65776e
Former-commit-id: 23c340a1e9db08699dd6472e0937d44ae0e67cc5 [formerly 64ececeda1]
Former-commit-id: 7bf029eb7e
2013-01-11 11:53:02 -06:00
Ben Steffensmeier
3f17e60975 Issue #1470 remove times from grid resources when updates arrive.
Former-commit-id: b210023c96 [formerly 6e7b5a0e3d] [formerly 211a9b6cee] [formerly a1afabe4e3 [formerly 211a9b6cee [formerly 355bd4c62d4f56064341930145ad2a29cb807eed]]]
Former-commit-id: a1afabe4e3
Former-commit-id: b4a7ccd68b59466072f1a849836b8ea6dc674c1c [formerly 7b6bc3f69b]
Former-commit-id: 3b72ea7f19
2013-01-11 11:46:32 -06:00
Matt Nash
0e04e3e1d2 Issue #1471 fix product browser issues
Change-Id: Ic37ef8f288a4949d13db75b27e7aebb03c8e3062

Former-commit-id: 3f6ffe12e3 [formerly 0a8448cfed] [formerly 90fa08596e] [formerly 6bfbf6b0e3 [formerly 90fa08596e [formerly 87ca33679bc3b6ff5fbfffd1f95398b255de9137]]]
Former-commit-id: 6bfbf6b0e3
Former-commit-id: dc95ddec2b8f59c1d1a2eb1f098a077fdf7a1dd2 [formerly addac12b84]
Former-commit-id: 1ab332b654
2013-01-11 10:48:06 -06:00
Richard Peter
60392a7a7c Merge "Issue #1432 - Fix case sensative and exclude check boxes." into development
Former-commit-id: cea19a313a [formerly 942140cca5] [formerly cffe035019] [formerly e91b5bd035 [formerly cffe035019 [formerly 8da35969c383bb7d22e5f629859311d8783069dc]]]
Former-commit-id: e91b5bd035
Former-commit-id: 4a63d9342225528410d684780a44036549f31886 [formerly 6857211fc6]
Former-commit-id: c4c2ae3256
2013-01-10 17:25:09 -06:00
Richard Peter
9d0c8ff714 Issue #1454: Update Dataset size calculation
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 9405cb94ae [formerly 45e6e286bb] [formerly deca70207d] [formerly 73263e270e [formerly deca70207d [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]
Former-commit-id: 73263e270e
Former-commit-id: 9f6c7c2bc9e428381b9ce3bd65c4d503ebf7348a [formerly 69818573a6]
Former-commit-id: 4a097586f6
2013-01-10 17:17:58 -06:00
Mike Duff
c21d02d8fb Issue #1432 - Fix case sensative and exclude check boxes.
Former-commit-id: 7ba0d71d7c [formerly d2981a8275] [formerly 9526199a9c] [formerly 78440f2b5a [formerly 9526199a9c [formerly 29d620050a3b2aefd2b9eda664e3139e146558be]]]
Former-commit-id: 78440f2b5a
Former-commit-id: c2ca6a0936930afda3caca73c5ca608bee2b795a [formerly bde6be532e]
Former-commit-id: f2da1df6e6
2013-01-10 15:35:33 -06:00
Mike Duff
f167689caf Issue #1346 - added addtional information to the data browser dataset details dialog
Former-commit-id: 38aae63ee3 [formerly 674ddfedb2] [formerly 02bfe05a27] [formerly b72c2e4b04 [formerly 02bfe05a27 [formerly 682e4831f76b3a220aeedb9fc292886f24582e72]]]
Former-commit-id: b72c2e4b04
Former-commit-id: 6d7445bf13f8b180941b8fd9b135ad41b909c4c8 [formerly b42395d6ea]
Former-commit-id: 8b23902cea
2013-01-10 12:26:59 -06:00
Ron Anderson
e7183ae0e3 Merge "Issue #1395 Fixed dynamic update of opacity." into development
Former-commit-id: d8dfa9bbe3 [formerly bbc314f50c] [formerly 9d3405dd68] [formerly 001bdc84b9 [formerly 9d3405dd68 [formerly f3a9eed298a3b776f8b2b83416e8f98981d92912]]]
Former-commit-id: 001bdc84b9
Former-commit-id: 795b0d31396f9a41839a015e5e8cc8e5ecf706db [formerly c0e80aa175]
Former-commit-id: cd33ded3e7
2013-01-10 11:40:43 -06:00
Richard Peter
d3c6e55c17 Merge "Issue #1420 - Rules Peer review comments" into development
Former-commit-id: 48355758a8 [formerly 206ffc0e15] [formerly 507a3d641c] [formerly c0e712f682 [formerly 507a3d641c [formerly eded38dc13847cc764bcc4cb71997b8abb685c89]]]
Former-commit-id: c0e712f682
Former-commit-id: 97734a3cd0f5afa0b7002ff04016137bde675235 [formerly 9543d23d23]
Former-commit-id: 9524f5a52b
2013-01-10 10:51:28 -06:00
Nate Jensen
cce4bebbe5 Merge "Issue #1467 - updated the memory settings for 64-bit GFE" into development
Former-commit-id: a9410160a8 [formerly d02e1ff0a7] [formerly a3e10f6dcd] [formerly 62f89e6189 [formerly a3e10f6dcd [formerly 5f262d2cb46ad8ff0ec355e64ee73b6deb7ed454]]]
Former-commit-id: 62f89e6189
Former-commit-id: d12f5df726ebd0677bc478849410246bfac0e228 [formerly 5733a44770]
Former-commit-id: ef3468acd4
2013-01-10 10:31:05 -06:00
Richard Peter
a4491237e5 Merge "Issue #1412 User Admin dialog should refresh with changes made to authentication data" into development
Former-commit-id: b91a1d35c9 [formerly e1547982b0] [formerly ee6513bad3] [formerly 2d1a6c4833 [formerly ee6513bad3 [formerly 5f26573ba4c0881e1ee6c7a4809f9465589164a1]]]
Former-commit-id: 2d1a6c4833
Former-commit-id: 6a4957abee715c7f29e3637d9ceac8248e81d07d [formerly 46faa0f68d]
Former-commit-id: 27a06e14b8
2013-01-10 10:18:39 -06:00
Ron Anderson
1b4acc66e9 Issue #1395 Fixed dynamic update of opacity.
Change-Id: Ic552a759c23035dfe2d830323d4dbe170e0d0187

Former-commit-id: 7b8eba7461 [formerly 37d6ed5232] [formerly 145665c496] [formerly 3df3cf7f7b [formerly 145665c496 [formerly cae505a088e959670f4cacb92e439a82f13559b9]]]
Former-commit-id: 3df3cf7f7b
Former-commit-id: 394db5ca0b53e186b2f8d6e2619a70bcb1da53e8 [formerly 1f298b87b5]
Former-commit-id: 2c364744bb
2013-01-10 10:00:56 -06:00
Richard Peter
a087382c29 Merge "Issue #1465 fix import derived parameter." into development
Former-commit-id: 9c8e6f4821 [formerly 856959f0d5] [formerly 9293a7e3f7] [formerly 86f5fec292 [formerly 9293a7e3f7 [formerly cfc04313c76c75db5a5bd7bc1bd32577a4615974]]]
Former-commit-id: 86f5fec292
Former-commit-id: b23d495cfd926780e9fd7dc20182c74bf12ff64a [formerly 68f8878d4f]
Former-commit-id: fa41b57e14
2013-01-10 09:35:16 -06:00
Richard Peter
177a54d19a Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]
Former-commit-id: 80bf1d7a28
2013-01-09 17:55:05 -06:00
Ron Anderson
bb30c11f3d Issue #1468 Make DataStoreResource update labels when magnification is changed.
Change-Id: I1337db46d620aba6cc8939f4f42b25322dc81a98

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

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

Former-commit-id: fc4fd81849 [formerly 6129a00225] [formerly 0645a9fe40] [formerly 73bdd66283 [formerly 0645a9fe40 [formerly 2d6bf1e42cb628a5b5af6a261202d01c7fa236fb]]]
Former-commit-id: 73bdd66283
Former-commit-id: 5758de40a9aee192d431736f923321adb98c10b9 [formerly e9dd794082]
Former-commit-id: 777b804edc
2013-01-09 13:03:38 -06:00
Ben Steffensmeier
208269a192 Issue #1465 fix import derived parameter.
Former-commit-id: 815e964ef6 [formerly c0ea76eb90] [formerly 6a2b73b816] [formerly a9ece85f9b [formerly 6a2b73b816 [formerly fb133aac1ba6013e826ff38a29f5f1720127aa53]]]
Former-commit-id: a9ece85f9b
Former-commit-id: caf03a468c5c8579b5784a20c4291c72fd68bb24 [formerly d7c2668b88]
Former-commit-id: 0df360a83a
2013-01-09 12:04:00 -06:00
Mike Duff
65dd6c6f60 Issue #1420 - Rules Peer review comments
Former-commit-id: 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 4c63333a96 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: 4e7421c22c8ae6fb0dd6d1566ea3fb164aec7691 [formerly 67486aa43b]
Former-commit-id: ed95eae2e3
2013-01-09 12:02:21 -06:00