Commit graph

1865 commits

Author SHA1 Message Date
Ron Anderson
776a8b1ec3 Merge "Issue #1842: Fix issue where start time of in progress VTEC events was being set to 991130T0000Z." into omaha_13.5.1
Former-commit-id: 2089070a96 [formerly ecf1cfe4ed] [formerly 02dbc313c8] [formerly 249e7b1aaa [formerly 02dbc313c8 [formerly 7e04107b602191703a8dbe19b7182ccb41a13eb1]]]
Former-commit-id: 249e7b1aaa
Former-commit-id: 78783370cdef4d5ebf4a1541cf82e7dd322db711 [formerly d62ba6c852]
Former-commit-id: 188ae55396
2013-07-22 09:47:09 -05:00
Greg Armendariz
4c26ff845a Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly d5ea12d97f [formerly a3b77f2623 [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]
Former-commit-id: d5ea12d97f
Former-commit-id: 6a070220b5d10249ff1b492f7b2e28dd9dd2b76e [formerly 3947baa02d]
Former-commit-id: c8c2a3d636
2013-07-19 14:15:24 -05:00
David Gillingham
61ef3ec108 Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: 2ad8bd7bcd [formerly 62d740b2ed] [formerly 1fc7c3197a] [formerly d0568ff347 [formerly 1fc7c3197a [formerly bf21f81dcad44880af5a3f988d15d4330b2b1d6b]]]
Former-commit-id: d0568ff347
Former-commit-id: 46fe96a6849444cf7e9aeddeda70aed4f091031e [formerly 4b9edbdcb4]
Former-commit-id: 988a705e81
2013-07-19 11:24:30 -05:00
Richard Peter
e46425cd8d Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]
Former-commit-id: cc7189fcb7
Former-commit-id: d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]
Former-commit-id: eefaf2c836
2013-07-18 21:46:25 -05:00
Steve Harris
0fe8173b7b 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]
Former-commit-id: cb50a0028d
2013-07-18 12:07:22 -04:00
Dustin Johnson
47b5f3aa73 Issue #2205 Fix cancelling adhoc queries
Change-Id: I81207fe9c68a111e9894a7a25b83d9f0b4c03317

Former-commit-id: ed50793d64 [formerly 584e427e81] [formerly 58ab4e5cfc] [formerly 9aadc61ea5 [formerly 58ab4e5cfc [formerly dd05e6c8f9c17ac331b137b9eb3d486c459144fb]]]
Former-commit-id: 9aadc61ea5
Former-commit-id: 34a268fe658d39e9111d17c052060bbb36bf86e0 [formerly 54ff2b87c6]
Former-commit-id: 520d539a44
2013-07-18 11:06:42 -05:00
Roger Ferrel
1f56a1179e Issue #1966 Relocation of configuration files and checks for bad configuration files.
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c

Former-commit-id: e5cd0e7599 [formerly e225bd674b] [formerly c002045a87] [formerly 91ee1d36bf [formerly c002045a87 [formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]]]
Former-commit-id: 91ee1d36bf
Former-commit-id: e674edd4dd9db03d4b9f31499b37657af33debd7 [formerly 95cb3439a4]
Former-commit-id: 97e4dc3633
2013-07-18 10:02:05 -05:00
Nate Jensen
afb7f93c21 Merge "Issue #2184 Removed all other HUCs other than ALL from storage" into omaha_13.5.1
Former-commit-id: c04357a0b6 [formerly 96ae856660] [formerly 09cae0cba3] [formerly 3649af1b71 [formerly 09cae0cba3 [formerly 7f9e83b42df42c1bec7946833e88a8916fc0c12d]]]
Former-commit-id: 3649af1b71
Former-commit-id: 171ed9b9a2486eb3a9ba6e19cecfe9daeced6126 [formerly cb9b26a380]
Former-commit-id: a9f0243e01
2013-07-17 16:34:25 -05:00
Dave Hladky
6f43853101 Issue #2184 Removed all other HUCs other than ALL from storage
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly bd03085f8d [formerly 84dae0a6b8 [formerly 251cf3cca7c6653300f115083aa860444fee0ea9]]]
Former-commit-id: bd03085f8d
Former-commit-id: a1bddfe6f6215adf6084c27a5107f0fcd314b75b [formerly 15738a4d30]
Former-commit-id: 4556798697
2013-07-17 15:18:49 -05:00
Ben Steffensmeier
f2777babaf Issue #2107 Fix sampling of grid vector arrows.
Change-Id: If663d487fa31cba43d18b82bf93fdfacbbc65721

Former-commit-id: b1cb837528 [formerly fb1a0a203a] [formerly 767915b318] [formerly 4a25b32919 [formerly 767915b318 [formerly eae0b3931a3f5888b32c49a8c7e5b97addb3201a]]]
Former-commit-id: 4a25b32919
Former-commit-id: 61ef9e737b64b455fe0c36337caebc3edabe3d2d [formerly abedf0f23a]
Former-commit-id: a82bb6e999
2013-07-15 15:51:41 -05:00
Greg Armendariz
f23d42e977 13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]
Former-commit-id: 93b71934c0
2013-07-10 10:04:22 -04:00
Ben Steffensmeier
be1edd618a Issue #1869 Fix goes sounding updates.
Change-Id: Ib974c8e88bea021e0e8505e6fb2974f4e108dc80

Former-commit-id: 4f6bd4efc3 [formerly 309624cb7b] [formerly dbe74b56e5] [formerly 21abe429ec [formerly dbe74b56e5 [formerly 127609cb0ced4b4554943ad78d4263cb70489a90]]]
Former-commit-id: 21abe429ec
Former-commit-id: e8ccecad63676e5cbd08522fca1e434bdfd7efdc [formerly e92d1e9cad]
Former-commit-id: 0b9c18aa23
2013-07-08 11:47:08 -05:00
Greg Armendariz
d5bea0fc06 13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]
Former-commit-id: d899faec3d
2013-07-03 12:20:27 -04:00
Roger Ferrel
56b1a0713c Issue #1964 clean up of features and manifest.
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 559a54ea8f [formerly 3c31d8c2ac] [formerly 41c46e14c0] [formerly 7d3362d2b5 [formerly 41c46e14c0 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]]
Former-commit-id: 7d3362d2b5
Former-commit-id: 8c2a8d0c95f2cee23027bf633469a1a45f0b1e94 [formerly 201e62a4ad]
Former-commit-id: b3437266d7
2013-07-02 11:14:56 -05:00
Nate Jensen
5784cf98aa Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1
Former-commit-id: 4918ff844f [formerly c68cf47883] [formerly e4955f094c] [formerly 01efa33cb9 [formerly e4955f094c [formerly 5865b5ff9909ff00d047f41174b7e89ca921bb8b]]]
Former-commit-id: 01efa33cb9
Former-commit-id: b78d9642086e4dba406ba61967972b761bb20b75 [formerly 150203f5cc]
Former-commit-id: 058e47192a
2013-07-02 11:07:59 -05:00
Jonathan Sanchez
767a7dd7d9 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: bbd2a9e5ab [formerly 58fcc4c896] [formerly f1fa0f3f388172b45f94e869ebbf2817c0829de8 [formerly a2328f0e06]] [formerly de24b8b431 [formerly a2328f0e06 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]]
Former-commit-id: de24b8b431
Former-commit-id: 092389edf48fb57d0afab52fb91a50a27f6e805d [formerly 4e1b0674e4]
Former-commit-id: ab2e2f9a17
2013-07-02 11:04:26 -05:00
Roger Ferrel
4983001f68 Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build.
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9

Former-commit-id: 50d0a74305 [formerly 82b1712714] [formerly c3ebc0cc1c] [formerly 68be9bd65f [formerly c3ebc0cc1c [formerly 01585ddb95a65686eada207aacbe6f12a512c7f3]]]
Former-commit-id: 68be9bd65f
Former-commit-id: 7f4689f8c48052cf1d41fa2ab3c0f6db2685a931 [formerly 933009605a]
Former-commit-id: ff84f293fd
2013-07-01 15:45:14 -05:00
Nate Jensen
c4edde79f5 Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1
Former-commit-id: 5b1d7fe401 [formerly b23dcab913] [formerly f7e743f388] [formerly 001fba449f [formerly f7e743f388 [formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]]]
Former-commit-id: 001fba449f
Former-commit-id: 27c725fc1f0951e0a75e945562aeea6cde35b4e0 [formerly 0cb9726554]
Former-commit-id: 47d3441930
2013-07-01 11:29:47 -05:00
Bryan Kowal
1862ecd1a4 Issue #2153 - fix merge issue for build
Former-commit-id: eea749f828 [formerly 756fb4be59] [formerly f052982f8e] [formerly 9c1aaa2bf5 [formerly f052982f8e [formerly 25560718fb861f13ff8701b9458a6b18adf523be]]]
Former-commit-id: 9c1aaa2bf5
Former-commit-id: e6a347b2367d1c71b4d63cde07a471e571140e2f [formerly 37a5eb6c69]
Former-commit-id: 08bb604ced
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
5794a0bc3f Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
This reverts commit b046ea220c79e69eec32fa15fca28a84b3cf419c [formerly e4c0188c14] [formerly 2d4a32ca64 [formerly ab8acf06e1] [formerly 81aad09d06] [formerly e4c0188c14 [formerly 81aad09d06 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]].


Former-commit-id: 772bf31dd0 [formerly 70ab67c3e5] [formerly c883b4e636] [formerly 7f74926bb4 [formerly c883b4e636 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]]
Former-commit-id: 7f74926bb4
Former-commit-id: 112930e6b78a31053cde5b486cd3ccabf8fe7fbb [formerly 41e94abee3]
Former-commit-id: fa0887429d
2013-07-01 10:40:48 -05:00
Richard Peter
0da7509e6d Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
	edexOsgi/com.raytheon.uf.common.archive/build.properties
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
	edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java

Former-commit-id: 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 582f38bdd4 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]
Former-commit-id: 582f38bdd4
Former-commit-id: ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee]
Former-commit-id: 69f8807963
2013-06-30 23:46:32 -05:00
Steve Harris
43bb696901 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]
Former-commit-id: 640b022e84
2013-06-28 09:46:25 -04:00
Brad Gonzales
1c6ca60919 Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive.
Amend: Added archive feature to the viz product build.
       Added archive feature to the viz developer product.

Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07

Former-commit-id: aca1486801 [formerly 65507d4424] [formerly c28d1e5d4d] [formerly f4bb78381c [formerly c28d1e5d4d [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]
Former-commit-id: f4bb78381c
Former-commit-id: 5f9272a26bf176a83743b4b654221c8613a071d6 [formerly d842d8d9d0]
Former-commit-id: 6e99019a25
2013-06-27 17:40:07 -05:00
Roger Ferrel
79c0bbb140 Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up.
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3

Former-commit-id: 713f39c429 [formerly 6f07f6f3bd] [formerly ee409c0819] [formerly f66681f62b [formerly ee409c0819 [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]
Former-commit-id: f66681f62b
Former-commit-id: 91667b1a98b4d6dfebf3dbfd34ceea45670f8fe7 [formerly 45dcfe3ad8]
Former-commit-id: 5f35643c2d
2013-06-27 07:51:56 -05:00
Richard Peter
59789a3885 Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
Former-commit-id: 45956fdcaa [formerly e3886246fd] [formerly 3a3dc3d208] [formerly 67d052307c [formerly 3a3dc3d208 [formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]]
Former-commit-id: 67d052307c
Former-commit-id: 705e64d8c7547f55a4b9ebb9c95b3b9faf82cc18 [formerly 208b01a167]
Former-commit-id: 1b00dd48ec
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
9906f30ff0 Issue #1869 Fix plot sampling.
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 9e23a71d84 [formerly 570da6f0d5] [formerly 8c14a34f46] [formerly 6db28c32a5 [formerly 8c14a34f46 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]]
Former-commit-id: 6db28c32a5
Former-commit-id: b33a1c795a47c684e688769e932048e39d11d241 [formerly f26a72afe9]
Former-commit-id: 2ce266f7e7
2013-06-26 13:24:13 -05:00
Nate Jensen
a56dc79f87 Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1
Former-commit-id: 9282a3be3b [formerly 8cc7eefd84] [formerly a60afe6640] [formerly 10baafed63 [formerly a60afe6640 [formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]]]
Former-commit-id: 10baafed63
Former-commit-id: 81b3d5ac13949746ea2fab31914ba17a9472bd55 [formerly 214fd8689c]
Former-commit-id: 9374463bac
2013-06-26 11:14:03 -05:00
Jonathan Sanchez
7ed0d5d135 Issue #2139 Run async job for loading maps in warngen.
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a

Former-commit-id: 2d4a32ca64 [formerly ab8acf06e1] [formerly 81aad09d06] [formerly e4c0188c14 [formerly 81aad09d06 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]
Former-commit-id: e4c0188c14
Former-commit-id: a650d8102fed57108c8af5d7126de91df9a6a09e [formerly 47505aa013]
Former-commit-id: d1b63b5a25
2013-06-25 15:29:08 -05:00
Roger Ferrel
4b10182a2e Issue #1966 Initial Base configuration files for Dale Morris to test.
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1

Former-commit-id: 89d4d0e00f [formerly 1e5d68fa1b] [formerly 2cfff5c563] [formerly c10f5c8d65 [formerly 2cfff5c563 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]
Former-commit-id: c10f5c8d65
Former-commit-id: d9addb5bf5fa26124cfaff35dda1e82f91b54f70 [formerly ee52f0281c]
Former-commit-id: 318de198e5
2013-06-25 13:44:30 -05:00
Richard Peter
46ee2f5dd7 Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]
Former-commit-id: be094a1745
2013-06-24 18:36:15 -05:00
Steve Harris
e1a5587dd0 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]
Former-commit-id: deebdb874a
2013-06-24 09:29:43 -04:00
Lee Venable
cf1e74a595 Merge "Issue #2119 Added check when no selected lid." into omaha_13.5.1
Former-commit-id: 670d9b5075 [formerly 3248909c85] [formerly 377bc28f63] [formerly 8b92b564d5 [formerly 377bc28f63 [formerly 2d05f18781938f3f52b70fcdcf7f1bcad60fe09e]]]
Former-commit-id: 8b92b564d5
Former-commit-id: b4acc7f410ff3f6a737ded588bea0faa15fb5d0d [formerly 9b564bef6a]
Former-commit-id: 953ad96305
2013-06-20 09:22:36 -05:00
Nate Jensen
de165ee20d Merge "Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective." into omaha_13.5.1
Former-commit-id: b7595c5585 [formerly a029fa7e57] [formerly b7b2602271] [formerly ba5c49fa61 [formerly b7b2602271 [formerly de43ca9364a34a3ace5ef41da75c5a295c805339]]]
Former-commit-id: ba5c49fa61
Former-commit-id: 9f7706231284ee0f073c332e0ac7215f4fccabda [formerly 622e1298d2]
Former-commit-id: d1b3b0f000
2013-06-19 17:45:41 -05:00
Ben Steffensmeier
425b7fe5cf Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective.
Former-commit-id: eead580673 [formerly f238131378] [formerly 0e6f3ff5e6] [formerly 6de9e86090 [formerly 0e6f3ff5e6 [formerly 7a73d0897230c0a33d4be153e9ebbf9477b3e829]]]
Former-commit-id: 6de9e86090
Former-commit-id: 85486ff0e42f1d7272e505367f9cc70208606f83 [formerly accd308f8b]
Former-commit-id: deacc7c250
2013-06-19 16:35:41 -05:00
Roger Ferrel
cf93642522 Issue #2119 Added check when no selected lid.
Change-Id: Ia85dbc8957353ba44e94f7aa7b28cab0787165ac

Former-commit-id: d51a814661 [formerly 541b7fbc93] [formerly dc5059f06b] [formerly e7dc1184b1 [formerly dc5059f06b [formerly 4a64a5b44a05a1c91b9a3d878ea0806e68c6d788]]]
Former-commit-id: e7dc1184b1
Former-commit-id: 380574ff84e4b34490a9b8f156b0d737799375d7 [formerly 440ea0fc25]
Former-commit-id: dc0e31fcdd
2013-06-19 16:25:01 -05:00
Roger Ferrel
4fdbc6ba95 Issue #1966 Check for modifications on close.
Change-Id: I88b17fb6406fd41ede46085a7a6b40149a387e83

Former-commit-id: fdc6f689af [formerly 85d7e4aab9] [formerly ff9a5b381ec46120627fcc01b161048878ee7116 [formerly 784a56f2ce]] [formerly 67362de877 [formerly 784a56f2ce [formerly f6e51deb6cf7f50be7638b4670131cf39976944c]]]
Former-commit-id: 67362de877
Former-commit-id: 195431f0a85b63a953d0d167b451e430eaaac44f [formerly 259a66ac85]
Former-commit-id: 745c114b45
2013-06-19 11:09:44 -05:00
Roger Ferrel
5153afecf9 Issue #1966 Column sort added; bug fixes to size estimates and saving files.
Change-Id: Idbce325b98281732312205d093ca09bd5313bcaa

Former-commit-id: 9fd68957ab [formerly e16bfeee80] [formerly f175b19a93] [formerly c7c27c4cbb [formerly f175b19a93 [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]]
Former-commit-id: c7c27c4cbb
Former-commit-id: d71c1b150fba58dabc2a498d16fe41be9f173bcf [formerly cc39af5044]
Former-commit-id: 28342fdfed
2013-06-18 08:56:54 -05:00
Richard Peter
2c40188746 Issue #1977: Fix merge, remove duplicate method alterProductParameters
Change-Id: I8ac066011f7ef2bfd6cd5941f38147e1127c19b2

Former-commit-id: 562c5668d4 [formerly 9d90349767] [formerly e927ac843727896ef39a733bcced9e6dd3804d15 [formerly 9b8ef83ccb]] [formerly 9f7739c7d5 [formerly 9b8ef83ccb [formerly 6a9a268de0fa84bc4b15ade022ba306d55508cf8]]]
Former-commit-id: 9f7739c7d5
Former-commit-id: 814dfc90273c6dcf86036dd288da3357cb7bdf37 [formerly 1d706b3b72]
Former-commit-id: 843cf307e8
2013-06-17 19:01:20 -05:00
Steve Harris
a5fb9b721d Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts (self-resolved with kdiff3):
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java


Former-commit-id: dadf03acaf [formerly 41748175b6] [formerly 8a27d96b844873d84abafe2421e8bfc28bd9b9a6 [formerly 97631f9c62]] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]
Former-commit-id: 40359c27c3
Former-commit-id: adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea]
Former-commit-id: 0e4504c0fa
2013-06-17 15:25:32 -05:00
Steve Harris
0f83e19dab 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]
Former-commit-id: ccd66c0724
2013-06-17 15:01:22 -04:00
Mike Duff
67bcce082e Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp
Former-commit-id: 9d7301a79b [formerly 66d564dc43] [formerly 2fa207f744] [formerly e51778ae88 [formerly 2fa207f744 [formerly ecd47da65e0d1c9483f8b66568e655e434a2e442]]]
Former-commit-id: e51778ae88
Former-commit-id: cd6a8799b4b0cbd779a9fd3e000860daf3b3c1b9 [formerly 5c58b973ab]
Former-commit-id: 365d4be785
2013-06-17 13:15:34 -05:00
Ben Steffensmeier
ff56a67f32 Issue #2107 Enable sampling by default for several display types.
Former-commit-id: cc96f65afa [formerly 690c1f6756] [formerly 2f21ec16f4] [formerly b9d7e52fb8 [formerly 2f21ec16f4 [formerly d8ede3a25fc352d12631a33b0a43f5e9ddf8fd27]]]
Former-commit-id: b9d7e52fb8
Former-commit-id: 040c6fa04699a9b097b189eda0533021119b59f5 [formerly b4e6c647a3]
Former-commit-id: ff7898b359
2013-06-17 10:35:28 -05:00
Richard Peter
dff4f07024 Merge "Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg." into omaha_13.5.1
Former-commit-id: a8998ba493 [formerly 16201b8155] [formerly e03c8216ad1b651d464b8d3b42777ad897030bd0 [formerly bee6ba6698]] [formerly 8cdc6993d5 [formerly bee6ba6698 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]]
Former-commit-id: 8cdc6993d5
Former-commit-id: 95a90dc36e9b9926ad08d6da254db469f03996fa [formerly 20b7af86f6]
Former-commit-id: 7d773e02ca
2013-06-14 10:06:34 -05:00
Nate Jensen
f173cc29e1 Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded]
Former-commit-id: 4a39d586d2
2013-06-13 11:39:30 -05:00
Roger Ferrel
0954bf6d54 Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg.
Change-Id: If485480b6d8727d830620464741c2e748f2209dd

Former-commit-id: cbf8ad8f7b [formerly d2ac7bd433] [formerly 753f19b309] [formerly a405684c7b [formerly 753f19b309 [formerly a9dd52d07b3eb8fd616e24374f40197c4df9b105]]]
Former-commit-id: a405684c7b
Former-commit-id: 62d48cc824e8c115ac1613fb585e1323080737dd [formerly f64db73aef]
Former-commit-id: ab93641992
2013-06-13 10:57:19 -05:00
Dustin Johnson
7a196095cb Issue #2038 Correct required size estimations for subscription updates
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0

Former-commit-id: c22c156945 [formerly 757c711d2e] [formerly 9156ec8c2d] [formerly 94eeac2f7d [formerly 9156ec8c2d [formerly 2fb575c534a756a835cc072429ba78a417d3c445]]]
Former-commit-id: 94eeac2f7d
Former-commit-id: a02c9d52556a7097e15119b2711569548c47a69b [formerly c227436a3e]
Former-commit-id: e383aa83e1
2013-06-12 14:52:49 -05:00
Nate Jensen
31c34e3f48 Issue #2001 fix message priorities
Change-Id: I63b404133f081f7a373ca557adb25827033b1c6b

Former-commit-id: 00611d547d [formerly 5be268682a] [formerly af5b5d4f9a4da88af459082a85377963353c3027 [formerly 4184cd436a]] [formerly a31dd6af4c [formerly 4184cd436a [formerly 10ec050edeea997c50d132dce12d2a78e723ea15]]]
Former-commit-id: a31dd6af4c
Former-commit-id: 3e3a57bb6479eec8f207c38a48653146a320f1d4 [formerly e91f05b0d3]
Former-commit-id: 4f65ea412d
2013-06-12 12:07:34 -05:00
Mike Duff
c1809b7e31 Issue #2064 - Corrected Time object storage on subscriptions
Change-Id: I7cb4f53fd8dcdb2fc93ffd15c3a0c72e7eeb57d0

Former-commit-id: 03ef15d7b8 [formerly 5aabcd3001] [formerly a7f277c67b] [formerly 0846f7c79a [formerly a7f277c67b [formerly 250fb3c4f8df45d396bc76734ad8b198dcf40a4e]]]
Former-commit-id: 0846f7c79a
Former-commit-id: 6a249650dbb1ffd6f61ae7e2b311375b44f5e9f4 [formerly ec08442f5d]
Former-commit-id: 1357c03113
2013-06-12 11:12:05 -05:00
Mike Duff
5070b0bebe Issue #2064 - Fix editing of subscriptions
Change-Id: I4d04e4c099c2f898a5a6b13304bcea80b2776637

Former-commit-id: 4039ea3d8e [formerly 1b4558f0cd] [formerly b76a638951] [formerly 208d1439ac [formerly b76a638951 [formerly 7c6c6ce1e129393316784d1fc4a24ea5d452f77f]]]
Former-commit-id: 208d1439ac
Former-commit-id: b2eeab41eb4075b0afc93f110efe425393238c7b [formerly d2f6dbca49]
Former-commit-id: 31c80a63b2
2013-06-11 09:30:46 -05:00
Ben Steffensmeier
6259088101 Issue #2041 Fix derived parameter record names.
Former-commit-id: 41a91534f2 [formerly 3c82b86f78] [formerly 29d8f65dc1] [formerly bf0f61c08a [formerly 29d8f65dc1 [formerly 4bf73f41a59ca45db5eb7dd6440e12f44969e29c]]]
Former-commit-id: bf0f61c08a
Former-commit-id: c010c2dd498464aec3cc612183347b9c4e89b76d [formerly a950b35dc0]
Former-commit-id: 5a024637ea
2013-06-10 16:34:12 -05:00