Commit graph

1868 commits

Author SHA1 Message Date
Ben Steffensmeier
51559078de Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55

Former-commit-id: af51ecc7c9 [formerly 2d8e1e5e6c] [formerly a868d3d0b5] [formerly af51ecc7c9 [formerly 2d8e1e5e6c] [formerly a868d3d0b5] [formerly 53d969d0db [formerly a868d3d0b5 [formerly 3eaca3d7a18ab9c8ab601fc7ed9fb899eced1134]]]]
Former-commit-id: 53d969d0db
Former-commit-id: 679ef95297 [formerly b18f4bbe89] [formerly f9fb487f9e5019b31c24a98c3d01a0959d8527a4 [formerly dde0846fc3]]
Former-commit-id: 2c5f78ab0eb4866cb5826c16f9208561eabb617f [formerly 6804d5f9b3]
Former-commit-id: e7443b5ef6
2013-07-03 12:44:45 -05:00
Richard Peter
4423b133b1 Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: 2764b2edf4 [formerly f12b08401f] [formerly 37042f0b2a] [formerly 2764b2edf4 [formerly f12b08401f] [formerly 37042f0b2a] [formerly a3bd7b3e9c [formerly 37042f0b2a [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: 45070c3a98 [formerly aef289d287] [formerly 63a1c03ad480f03852b9a9486718f0c5cb33e35e [formerly 8e15d6aa0a]]
Former-commit-id: 488563ebe4e4e1a36b6d505d074d0811c7a48b51 [formerly f916bba7ad]
Former-commit-id: 06ed1bc66c
2013-07-02 10:30:51 -05:00
Nate Jensen
4f6c84f9bb Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]]
Former-commit-id: db6152e524
Former-commit-id: cce5d8e8ff [formerly 5a6b0f99cc] [formerly 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c]]
Former-commit-id: dedb130eb36dca918cdf2169d1ec2f249f45f829 [formerly efcf0c8519]
Former-commit-id: 86b096bc9b
2013-07-01 14:41:05 -05:00
Mike Duff
6a3af47bd8 Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog
Change-Id: I97ce5323002d6c1ae230c446de9837e541e02c86

Former-commit-id: 44e60899d3 [formerly 3fed839344] [formerly cd511c1a0c] [formerly 44e60899d3 [formerly 3fed839344] [formerly cd511c1a0c] [formerly 5c7fd77f98 [formerly cd511c1a0c [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 93bbabda66 [formerly 2250983ad8] [formerly 6861a04120f0e5954cbc5868c9ecf103bfd55a3d [formerly 053082cb80]]
Former-commit-id: 5f64883b2d48cc4b5ac676320fb89c1bc7a1cac6 [formerly 0f4b98626b]
Former-commit-id: 9eb197d124
2013-07-01 11:53:07 -05:00
Richard Peter
8396898d25 Merge branch 'omaha_13.5.1' (13.5.1-4) into development
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

Former-commit-id: 2368697938 [formerly edeb3e255b] [formerly 162261c395] [formerly 2368697938 [formerly edeb3e255b] [formerly 162261c395] [formerly 76bc31aa77 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]]
Former-commit-id: 76bc31aa77
Former-commit-id: 5bcfa6048d [formerly f8213c16bd] [formerly 86532f141a4385ff3262869d48ec5e99adacc4a2 [formerly d3017ca60f]]
Former-commit-id: 7e58477f239036376e80618fa5945526bec3a534 [formerly 3d6754337a]
Former-commit-id: cca3d4c19b
2013-07-01 00:04:43 -05:00
Richard Peter
6434a4025d 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 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 582f38bdd4 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 0da7509e6d [formerly 69f8807963] [formerly ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee]]
Former-commit-id: 1478532c079d144368b91a4562993c9aac0b7cd4 [formerly 7ceb1bb9ab]
Former-commit-id: da3eb1e75c
2013-06-30 23:46:32 -05:00
Steve Harris
9f5469bc6e 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Brad Gonzales
8e22010180 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 aca1486801 [formerly 65507d4424] [formerly c28d1e5d4d] [formerly f4bb78381c [formerly c28d1e5d4d [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]]
Former-commit-id: f4bb78381c
Former-commit-id: 1c6ca60919 [formerly 6e99019a25] [formerly 5f9272a26bf176a83743b4b654221c8613a071d6 [formerly d842d8d9d0]]
Former-commit-id: 41beba358fca549dca62c32eff3862ee1f765033 [formerly f51c74e2d4]
Former-commit-id: 33dc495040
2013-06-27 17:40:07 -05:00
Dave Hladky
9d07cc7cbe Issue #2096 First steps to getting CAVE to display MADIS data
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9

Former-commit-id: d5990cacc0 [formerly 083dff9e43] [formerly f5d3a5f012] [formerly d5990cacc0 [formerly 083dff9e43] [formerly f5d3a5f012] [formerly ee50b5c7be [formerly f5d3a5f012 [formerly 1f33631d527ecbcecef31c255ac963556f5e1a4e]]]]
Former-commit-id: ee50b5c7be
Former-commit-id: 9637e9c427 [formerly 08a81cdaaf] [formerly 88c29ca5236793d376facb832530516c7a151d13 [formerly 2b90920d8f]]
Former-commit-id: e00545cf7393b15dcab893693970aa05a4ddccac [formerly 2a57eea47f]
Former-commit-id: 1b6421d4c3
2013-06-27 11:07:27 -05:00
Roger Ferrel
667104c43e 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 713f39c429 [formerly 6f07f6f3bd] [formerly ee409c0819] [formerly f66681f62b [formerly ee409c0819 [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]]
Former-commit-id: f66681f62b
Former-commit-id: 79c0bbb140 [formerly 5f35643c2d] [formerly 91667b1a98b4d6dfebf3dbfd34ceea45670f8fe7 [formerly 45dcfe3ad8]]
Former-commit-id: d681469cf5de2614b883cebf316eab2fd929d808 [formerly bec6928ea9]
Former-commit-id: 6261e65829
2013-06-27 07:51:56 -05:00
Richard Peter
fa3b24f01c Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
Former-commit-id: 45956fdcaa [formerly e3886246fd] [formerly 3a3dc3d208] [formerly 45956fdcaa [formerly e3886246fd] [formerly 3a3dc3d208] [formerly 67d052307c [formerly 3a3dc3d208 [formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]]]
Former-commit-id: 67d052307c
Former-commit-id: 59789a3885 [formerly 1b00dd48ec] [formerly 705e64d8c7547f55a4b9ebb9c95b3b9faf82cc18 [formerly 208b01a167]]
Former-commit-id: 95025b5bae17b8047a17d9fcfad27a79cc831d65 [formerly 575405b14e]
Former-commit-id: 2952f2b56d
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
5c0ec55d70 Issue #1869 Fix plot sampling.
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 9e23a71d84 [formerly 570da6f0d5] [formerly 8c14a34f46] [formerly 9e23a71d84 [formerly 570da6f0d5] [formerly 8c14a34f46] [formerly 6db28c32a5 [formerly 8c14a34f46 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]]]
Former-commit-id: 6db28c32a5
Former-commit-id: 9906f30ff0 [formerly 2ce266f7e7] [formerly b33a1c795a47c684e688769e932048e39d11d241 [formerly f26a72afe9]]
Former-commit-id: cfbc87543d974e56cf4a0535842654c9970b1607 [formerly 0d2f556144]
Former-commit-id: 6cb77b1793
2013-06-26 13:24:13 -05:00
Nate Jensen
108c9173d2 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 9282a3be3b [formerly 8cc7eefd84] [formerly a60afe6640] [formerly 10baafed63 [formerly a60afe6640 [formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]]]]
Former-commit-id: 10baafed63
Former-commit-id: a56dc79f87 [formerly 9374463bac] [formerly 81b3d5ac13949746ea2fab31914ba17a9472bd55 [formerly 214fd8689c]]
Former-commit-id: 2caa259af186898c4d7b26d87c908e624f2ee4d1 [formerly b4c6a79741]
Former-commit-id: 586cb967aa
2013-06-26 11:14:03 -05:00
Jonathan Sanchez
bac226cd75 Issue #2139 Run async job for loading maps in warngen.
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a

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

Former-commit-id: 89d4d0e00f [formerly 1e5d68fa1b] [formerly 2cfff5c563] [formerly 89d4d0e00f [formerly 1e5d68fa1b] [formerly 2cfff5c563] [formerly c10f5c8d65 [formerly 2cfff5c563 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]]
Former-commit-id: c10f5c8d65
Former-commit-id: 4b10182a2e [formerly 318de198e5] [formerly d9addb5bf5fa26124cfaff35dda1e82f91b54f70 [formerly ee52f0281c]]
Former-commit-id: 1a640f5700b34cc1839d0294b48e0f419bc80aa2 [formerly b681d07346]
Former-commit-id: 3419cbaddd
2013-06-25 13:44:30 -05:00
Dustin Johnson
c9b74d06a1 Issue #2106 Fix transactional semantics
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits

Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9

Former-commit-id: fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly 69c09e530f [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]]]
Former-commit-id: 69c09e530f
Former-commit-id: 84ecc6dec4 [formerly da1ad3c8a0] [formerly 116120f9c8fe8a517e5ae2e8f6ca08adc0db5a75 [formerly f67d02a394]]
Former-commit-id: 99261465c72149de5291722572317482216a9d86 [formerly c2ed1495ad]
Former-commit-id: 9b42432838
2013-06-25 08:33:55 -05:00
Richard Peter
f6e6c3c531 Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]]
Former-commit-id: b007d4a302
Former-commit-id: bf6e4c1f71 [formerly e03283ad4a] [formerly e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb]]
Former-commit-id: 1de9b6af0b5cf07a5ce19b7ea696b742fc341cd8 [formerly 8f49eea08f]
Former-commit-id: ed15c2edcc
2013-06-24 18:51:56 -05:00
Richard Peter
7ef16a186e 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 f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]]
Former-commit-id: 37645245e5
Former-commit-id: 46ee2f5dd7 [formerly be094a1745] [formerly 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]]
Former-commit-id: cacc5fb146cf2c652dd6ad6ea3b7938c9d320b73 [formerly 4b582fef50]
Former-commit-id: 9acddf6eeb
2013-06-24 18:36:15 -05:00
Ron Anderson
9cfaeb51e2 Issue #2122 Fix the build
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a

Former-commit-id: 74750fa37b [formerly ce42bdead7] [formerly f75554f1f7] [formerly 74750fa37b [formerly ce42bdead7] [formerly f75554f1f7] [formerly f06a8baf2d [formerly f75554f1f7 [formerly bf3b00be422d690aa9646462556607335ef85fc0]]]]
Former-commit-id: f06a8baf2d
Former-commit-id: 384984d8a8 [formerly eedb35faed] [formerly 14fe49bdf1189dc5b03eb0cc16d702b0f272039f [formerly 6740c9e40f]]
Former-commit-id: 558c7c24c3b45f4e994b40d227edb59c1a0ae33f [formerly 740542cd56]
Former-commit-id: d7d227a83a
2013-06-24 18:03:52 -05:00
Max Schenkelberg
815ab796b9 Issue #2122 Refactored satellite to use tile set renderable. Deleted old code
Amend: Added fix for issue 2103
Amend: Added software history

Change-Id: I1e09bcbf28aaffbf602431a09af50da447e4cf2b

Former-commit-id: 78c0e1684e [formerly b4c0d1f715] [formerly 47b55981c8] [formerly 78c0e1684e [formerly b4c0d1f715] [formerly 47b55981c8] [formerly 2f03c38ca0 [formerly 47b55981c8 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]]]
Former-commit-id: 2f03c38ca0
Former-commit-id: 6b4982e8a3 [formerly c912e8e6c5] [formerly 81f10786b9755a530e3615de10b091e1f0022d78 [formerly bc4ebb4f08]]
Former-commit-id: d7196e32710e3cc8969f238de14a54ee542ee1fa [formerly 20caab72f9]
Former-commit-id: 539bbe2cb5
2013-06-24 15:48:37 -05:00
Nate Jensen
fd6ecf1273 Merge "Issue #2122 Cleaned up dependencies for satellite" into development
Former-commit-id: 8f7c1424db [formerly d5897c323b] [formerly 6541a89bf5] [formerly 8f7c1424db [formerly d5897c323b] [formerly 6541a89bf5] [formerly 0479cea2e6 [formerly 6541a89bf5 [formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]]]]
Former-commit-id: 0479cea2e6
Former-commit-id: b1f538f69a [formerly 1408ed3e1e] [formerly 3e82d8ce1477d01da11ffd5777d74864cdbaed97 [formerly a2c5c2a1a3]]
Former-commit-id: 8b3404e8eac76fc9d9c024676d5bff3f54562907 [formerly 3b22e752aa]
Former-commit-id: 25f4b15072
2013-06-24 09:12:12 -05:00
Steve Harris
d3517d7c1d 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0 [formerly deebdb874a] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00
Mike Duff
d1d92c033a Issue #2132 - Fix drawing lat/long box for madis point data
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96

Former-commit-id: 9d3c4ce704 [formerly 7b3d79edc9] [formerly f685e73bd2] [formerly 9d3c4ce704 [formerly 7b3d79edc9] [formerly f685e73bd2] [formerly 14bd577f6c [formerly f685e73bd2 [formerly 380b50d8a3d2a3f80e5a69dd1980e8e863985c2a]]]]
Former-commit-id: 14bd577f6c
Former-commit-id: c180323417 [formerly defc6a3080] [formerly f7a3f48b1fa32bf56ed18d0e266ac2ee25be2f81 [formerly 65faaadc7c]]
Former-commit-id: 36915698d722a49fcbd05f616829abbe23289698 [formerly a8a4393c82]
Former-commit-id: 0e36cab21f
2013-06-21 14:59:03 -05:00
David Gillingham
05e1c69b0f Issue #2111: Prevent possible NullPointerException in GridCanvas's mouse
handler when attempting to display context menu.

Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee

Former-commit-id: 30b2287996 [formerly 5490893942] [formerly 6b696c9e6a] [formerly 30b2287996 [formerly 5490893942] [formerly 6b696c9e6a] [formerly 4f6c293a7e [formerly 6b696c9e6a [formerly be9d6ed2d6c2a87afb5365abba0c9f09983550ec]]]]
Former-commit-id: 4f6c293a7e
Former-commit-id: c742708f76 [formerly 2e14d2fda4] [formerly e8aea9b56603cba076ff65c57ffbaf2151801218 [formerly 8b7a998bbf]]
Former-commit-id: c6a5e9febfd71b2c2b29748b230880a193976c0d [formerly 3a78e38ae5]
Former-commit-id: d88ca5e0c4
2013-06-20 16:31:43 -05:00
Dustin Johnson
147ef5ce3e Issue #2106 Fix setting of data size on gridded subscriptions
Change-Id: I5dea937a9ad9f4691e58fb08a97ad6770cd8f925

Former-commit-id: 2184e50ce1 [formerly 71da2985f7] [formerly b486e5f2fe] [formerly 2184e50ce1 [formerly 71da2985f7] [formerly b486e5f2fe] [formerly 554b43807e [formerly b486e5f2fe [formerly c9138bb9d844ed7c38df420734c2723321ad450b]]]]
Former-commit-id: 554b43807e
Former-commit-id: 288442cc56 [formerly 7887201ebf] [formerly f2fb463c4b87ba9647cb7461559ab4814fb6d249 [formerly eaa3e47877]]
Former-commit-id: 1cbb92b6fbbf26251035f705e4326db36916114d [formerly 6987235067]
Former-commit-id: 2fed4b0da0
2013-06-20 16:00:08 -05:00
Lee Venable
ca1558ac7e Merge "Issue #2119 Added check when no selected lid." into omaha_13.5.1
Former-commit-id: 670d9b5075 [formerly 3248909c85] [formerly 377bc28f63] [formerly 670d9b5075 [formerly 3248909c85] [formerly 377bc28f63] [formerly 8b92b564d5 [formerly 377bc28f63 [formerly 2d05f18781938f3f52b70fcdcf7f1bcad60fe09e]]]]
Former-commit-id: 8b92b564d5
Former-commit-id: cf1e74a595 [formerly 953ad96305] [formerly b4acc7f410ff3f6a737ded588bea0faa15fb5d0d [formerly 9b564bef6a]]
Former-commit-id: a8418de0d5c5a351fcb0ad3edcd3b8e1c1cb58d5 [formerly ae73cbab32]
Former-commit-id: 6a4d6fb933
2013-06-20 09:22:36 -05:00
Nate Jensen
c3fd1acd1d 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 b7595c5585 [formerly a029fa7e57] [formerly b7b2602271] [formerly ba5c49fa61 [formerly b7b2602271 [formerly de43ca9364a34a3ace5ef41da75c5a295c805339]]]]
Former-commit-id: ba5c49fa61
Former-commit-id: de165ee20d [formerly d1b3b0f000] [formerly 9f7706231284ee0f073c332e0ac7215f4fccabda [formerly 622e1298d2]]
Former-commit-id: 5d4a07f7fe937e4885f989edf51acfe3232a8552 [formerly 65157cd1de]
Former-commit-id: 9e333d9988
2013-06-19 17:45:41 -05:00
Max Schenkelberg
dae9c22139 Issue #2122 Cleaned up dependencies for satellite
Change-Id: I499946b9c5dceea6bf79bc272090e7109da6167e

Former-commit-id: 6e18f7331c [formerly ff96ed8a1a] [formerly 262d72b786] [formerly 6e18f7331c [formerly ff96ed8a1a] [formerly 262d72b786] [formerly c57439e5ef [formerly 262d72b786 [formerly 2e115bc9cf0252978a98f4e890429a0aaf3972fa]]]]
Former-commit-id: c57439e5ef
Former-commit-id: 257ea381f2 [formerly 992df9495e] [formerly 45b429a7354ee0273e55beb9753b9356b139eb33 [formerly 959639d118]]
Former-commit-id: 4094ad6aa4322ecabe3e22b888f7911b693dfb22 [formerly 11f0bc708f]
Former-commit-id: ab0a7c9040
2013-06-19 17:24:30 -05:00
Ben Steffensmeier
8f2c67ff5e Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective.
Former-commit-id: eead580673 [formerly f238131378] [formerly 0e6f3ff5e6] [formerly eead580673 [formerly f238131378] [formerly 0e6f3ff5e6] [formerly 6de9e86090 [formerly 0e6f3ff5e6 [formerly 7a73d0897230c0a33d4be153e9ebbf9477b3e829]]]]
Former-commit-id: 6de9e86090
Former-commit-id: 425b7fe5cf [formerly deacc7c250] [formerly 85486ff0e42f1d7272e505367f9cc70208606f83 [formerly accd308f8b]]
Former-commit-id: 264445e3ba0817e5d35af1eb98386e5ece0e3409 [formerly fa9d23798e]
Former-commit-id: c5567fa3d5
2013-06-19 16:35:41 -05:00
Roger Ferrel
2bcd240aa6 Issue #2119 Added check when no selected lid.
Change-Id: Ia85dbc8957353ba44e94f7aa7b28cab0787165ac

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

Former-commit-id: fdc6f689af [formerly 85d7e4aab9] [formerly 784a56f2ce] [formerly fdc6f689af [formerly 85d7e4aab9] [formerly 784a56f2ce] [formerly 67362de877 [formerly 784a56f2ce [formerly f6e51deb6cf7f50be7638b4670131cf39976944c]]]]
Former-commit-id: 67362de877
Former-commit-id: 4fdbc6ba95 [formerly 745c114b45] [formerly 195431f0a85b63a953d0d167b451e430eaaac44f [formerly 259a66ac85]]
Former-commit-id: 5f660b3f14296c3858875492bea0a6b30a8783bb [formerly 301fdd43ae]
Former-commit-id: d1a7d41ec7
2013-06-19 11:09:44 -05:00
Steve Harris
b34492b4e1 Merge branch 'omaha_13.5.1' into development
Former-commit-id: 61427728fe [formerly 0166f071d6] [formerly 1e5ef65d03] [formerly 61427728fe [formerly 0166f071d6] [formerly 1e5ef65d03] [formerly cb95c711fd [formerly 1e5ef65d03 [formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]]]
Former-commit-id: cb95c711fd
Former-commit-id: db134ca485 [formerly cf11c28c9f] [formerly 31d467e7a6f99e0bba292d2416450a09c0745a20 [formerly 33bbec83ea]]
Former-commit-id: 67b4328c205cbfa6aa074b8e857c5e2443672d15 [formerly 5343517c55]
Former-commit-id: e72ec1d8b6
2013-06-18 09:04:11 -05:00
Roger Ferrel
46dbde3b3d 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 9fd68957ab [formerly e16bfeee80] [formerly f175b19a93] [formerly c7c27c4cbb [formerly f175b19a93 [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]]]
Former-commit-id: c7c27c4cbb
Former-commit-id: 5153afecf9 [formerly 28342fdfed] [formerly d71c1b150fba58dabc2a498d16fe41be9f173bcf [formerly cc39af5044]]
Former-commit-id: 712d918bdb6f38e7adc7a9acffe6b62216ccd456 [formerly 2b36404b6c]
Former-commit-id: 0899652c38
2013-06-18 08:56:54 -05:00
Richard Peter
492da0baa1 Issue #1977: Fix merge, remove duplicate method alterProductParameters
Change-Id: I8ac066011f7ef2bfd6cd5941f38147e1127c19b2

Former-commit-id: 562c5668d4 [formerly 9d90349767] [formerly 9b8ef83ccb] [formerly 562c5668d4 [formerly 9d90349767] [formerly 9b8ef83ccb] [formerly 9f7739c7d5 [formerly 9b8ef83ccb [formerly 6a9a268de0fa84bc4b15ade022ba306d55508cf8]]]]
Former-commit-id: 9f7739c7d5
Former-commit-id: 2c40188746 [formerly 843cf307e8] [formerly 814dfc90273c6dcf86036dd288da3357cb7bdf37 [formerly 1d706b3b72]]
Former-commit-id: d04dc69e11ddb3947c29a97b0e31080a02df9d63 [formerly 95bf734600]
Former-commit-id: 92a9bf5677
2013-06-17 19:01:20 -05:00
Steve Harris
740f6fb8e0 Merge branch 'omaha_13.5.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly 532d41787b [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]]
Former-commit-id: 532d41787b
Former-commit-id: 324532d6ac [formerly 251b3c1a9e] [formerly 1097d923e604a9a76d2ffe48161cb8324d205346 [formerly cb3e34813f]]
Former-commit-id: 67413e3c272a714fa394b7a22d2e55375f160635 [formerly 316d2ec667]
Former-commit-id: 01dee712d5
2013-06-17 15:29:01 -05:00
Steve Harris
173bcd08e1 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 97631f9c62] [formerly dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]]
Former-commit-id: 40359c27c3
Former-commit-id: a5fb9b721d [formerly 0e4504c0fa] [formerly adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea]]
Former-commit-id: 1687a46a12349027ac3ffa219ac1d360a20b95bd [formerly 9c75ca8493]
Former-commit-id: c27136275f
2013-06-17 15:25:32 -05:00
Steve Harris
4d75e573f4 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]]
Former-commit-id: 3386330894
Former-commit-id: 0f83e19dab [formerly ccd66c0724] [formerly ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]]
Former-commit-id: 9e1fb182b15a5170eec651f5840744e66e08f619 [formerly 332a74c4de]
Former-commit-id: afc02d5731
2013-06-17 15:01:22 -04:00
Mike Duff
ee068723bf 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 9d7301a79b [formerly 66d564dc43] [formerly 2fa207f744] [formerly e51778ae88 [formerly 2fa207f744 [formerly ecd47da65e0d1c9483f8b66568e655e434a2e442]]]]
Former-commit-id: e51778ae88
Former-commit-id: 67bcce082e [formerly 365d4be785] [formerly cd6a8799b4b0cbd779a9fd3e000860daf3b3c1b9 [formerly 5c58b973ab]]
Former-commit-id: 308e6c152ed4cec8afcedfa75301926c70258711 [formerly 069d2134e2]
Former-commit-id: 1c50a0ecbf
2013-06-17 13:15:34 -05:00
Lee Venable
511189abf8 Merge "Issue #2079 add dispose method to ModeListener" into development
Former-commit-id: 34b6d1be04 [formerly 1482e7f6dd] [formerly 956a26aedc] [formerly 34b6d1be04 [formerly 1482e7f6dd] [formerly 956a26aedc] [formerly af0a542f2f [formerly 956a26aedc [formerly f3619f573f102fcffd0503e0c0359e941568550f]]]]
Former-commit-id: af0a542f2f
Former-commit-id: d6c1b38c30 [formerly 430c19d19b] [formerly 22991bb048f167bc529d180a7206cda6e4be1dbc [formerly 257de35a28]]
Former-commit-id: 38cd9ec849141a3529361d0984ab0e2dad111c94 [formerly 542de44fbd]
Former-commit-id: 0c297adabd
2013-06-17 11:19:34 -05:00
Ben Steffensmeier
ad14ddc014 Issue #2107 Enable sampling by default for several display types.
Former-commit-id: cc96f65afa [formerly 690c1f6756] [formerly 2f21ec16f4] [formerly cc96f65afa [formerly 690c1f6756] [formerly 2f21ec16f4] [formerly b9d7e52fb8 [formerly 2f21ec16f4 [formerly d8ede3a25fc352d12631a33b0a43f5e9ddf8fd27]]]]
Former-commit-id: b9d7e52fb8
Former-commit-id: ff56a67f32 [formerly ff7898b359] [formerly 040c6fa04699a9b097b189eda0533021119b59f5 [formerly b4e6c647a3]]
Former-commit-id: a194d7ebaf786a6141715614067378946b7bf531 [formerly 02f80f3de5]
Former-commit-id: 4c4c02e193
2013-06-17 10:35:28 -05:00
Mike Duff
ec8343f132 Issue #2108 - Refactor DataSizeUtils
Change-Id: I0e633fcd69edbbb25b930ac4797ae0934655bd0f

Former-commit-id: a90c9e25b0 [formerly 0411daa2b5] [formerly 532af54aae] [formerly a90c9e25b0 [formerly 0411daa2b5] [formerly 532af54aae] [formerly 9d66579fb9 [formerly 532af54aae [formerly b6fffb21340d210a5a63d5f060f1dfe97b4868fb]]]]
Former-commit-id: 9d66579fb9
Former-commit-id: d4dfd34da0 [formerly b790996fec] [formerly 6e58c059f2d008cb387068a9b1efd3ce8f57906e [formerly ed2ef22679]]
Former-commit-id: 167b66212b70b269c0d11e2c74a5e11a727a99e1 [formerly 4205a90084]
Former-commit-id: 6a36caa011
2013-06-14 12:30:11 -05:00
Richard Peter
b0eb3b7d5d 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 bee6ba6698] [formerly a8998ba493 [formerly 16201b8155] [formerly bee6ba6698] [formerly 8cdc6993d5 [formerly bee6ba6698 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]]]
Former-commit-id: 8cdc6993d5
Former-commit-id: dff4f07024 [formerly 7d773e02ca] [formerly 95a90dc36e9b9926ad08d6da254db469f03996fa [formerly 20b7af86f6]]
Former-commit-id: 639ca2c4c504591489deb97309e220c1d260993a [formerly 6851718b7e]
Former-commit-id: b6dc024e78
2013-06-14 10:06:34 -05:00
Dustin Johnson
b1daddb796 Issue #2106 Speed up Bandwidth Manager subscription scheduling
Change-Id: Iafceeb64a2b56c562ca737ba083ec3225524f7ba

Former-commit-id: 914646c73c [formerly 52eda5be34] [formerly 2574f5a25d] [formerly 914646c73c [formerly 52eda5be34] [formerly 2574f5a25d] [formerly 8500856bc1 [formerly 2574f5a25d [formerly 693bfd77ddc216e658f6e1e4a38f48a2df1fe3bf]]]]
Former-commit-id: 8500856bc1
Former-commit-id: 89ba054c7e [formerly 21df56fe4b] [formerly ebd97bec349f489f74ceb16d73ccf3407095667a [formerly b3cad4e40b]]
Former-commit-id: fdb09375286a4151c31608fbe7ad71eeb0ed15ec [formerly 4735212532]
Former-commit-id: e6dd41f2be
2013-06-14 09:25:48 -05:00
Nate Jensen
d045893591 Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

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

Former-commit-id: cbf8ad8f7b [formerly d2ac7bd433] [formerly 753f19b309] [formerly cbf8ad8f7b [formerly d2ac7bd433] [formerly 753f19b309] [formerly a405684c7b [formerly 753f19b309 [formerly a9dd52d07b3eb8fd616e24374f40197c4df9b105]]]]
Former-commit-id: a405684c7b
Former-commit-id: 0954bf6d54 [formerly ab93641992] [formerly 62d48cc824e8c115ac1613fb585e1323080737dd [formerly f64db73aef]]
Former-commit-id: 83b62dcf2e0f30e62ea132f1d213596d0ee89274 [formerly 09e36152db]
Former-commit-id: fa9c9258cd
2013-06-13 10:57:19 -05:00
Dustin Johnson
010458e6d2 Issue #2038 Correct required size estimations for subscription updates
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0

Former-commit-id: c22c156945 [formerly 757c711d2e] [formerly 9156ec8c2d] [formerly c22c156945 [formerly 757c711d2e] [formerly 9156ec8c2d] [formerly 94eeac2f7d [formerly 9156ec8c2d [formerly 2fb575c534a756a835cc072429ba78a417d3c445]]]]
Former-commit-id: 94eeac2f7d
Former-commit-id: 7a196095cb [formerly e383aa83e1] [formerly a02c9d52556a7097e15119b2711569548c47a69b [formerly c227436a3e]]
Former-commit-id: 9a2f0831aef2aea83818d7bca5ee9fc9cc5099df [formerly f6b7d97fd2]
Former-commit-id: 89b926e15e
2013-06-12 14:52:49 -05:00
Nate Jensen
58eabe7a78 Issue #2001 fix message priorities
Change-Id: I63b404133f081f7a373ca557adb25827033b1c6b

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

Former-commit-id: 03ef15d7b8 [formerly 5aabcd3001] [formerly a7f277c67b] [formerly 03ef15d7b8 [formerly 5aabcd3001] [formerly a7f277c67b] [formerly 0846f7c79a [formerly a7f277c67b [formerly 250fb3c4f8df45d396bc76734ad8b198dcf40a4e]]]]
Former-commit-id: 0846f7c79a
Former-commit-id: c1809b7e31 [formerly 1357c03113] [formerly 6a249650dbb1ffd6f61ae7e2b311375b44f5e9f4 [formerly ec08442f5d]]
Former-commit-id: e949f35dbaf830d281e453f8ca643b049840f8f2 [formerly 0912f5e85e]
Former-commit-id: ce60afe8db
2013-06-12 11:12:05 -05:00
Roger Ferrel
1655b4faec Issue #2088 Changes for non-blocking RiverGageDlg, RiverProFcstGrpPointsDlg, RiverProGenParamsDlg and StatesCountiesZonesDlg.
Change-Id: I5f11ffd383622c49dcfbeb91e08904bad3a508b3

Former-commit-id: 81cbee6142 [formerly 31ef6d5563] [formerly 0c3841b243] [formerly 81cbee6142 [formerly 31ef6d5563] [formerly 0c3841b243] [formerly b87c394598 [formerly 0c3841b243 [formerly 769bc48479c0f5d69c54bf1d541ff1f9c89b0330]]]]
Former-commit-id: b87c394598
Former-commit-id: 0104d0ed8f [formerly 57124228e6] [formerly 96bc1f87d540035551a934c11160119ee9da9740 [formerly 24094e19bc]]
Former-commit-id: 914f6955f2dc53f06a7928ca4a7f9b20e465d990 [formerly 17d5e0f572]
Former-commit-id: 5935035391
2013-06-12 08:26:14 -05:00
Mike Duff
2dd9c9dcbe Issue #2064 - Fix editing of subscriptions
Change-Id: I4d04e4c099c2f898a5a6b13304bcea80b2776637

Former-commit-id: 4039ea3d8e [formerly 1b4558f0cd] [formerly b76a638951] [formerly 4039ea3d8e [formerly 1b4558f0cd] [formerly b76a638951] [formerly 208d1439ac [formerly b76a638951 [formerly 7c6c6ce1e129393316784d1fc4a24ea5d452f77f]]]]
Former-commit-id: 208d1439ac
Former-commit-id: 5070b0bebe [formerly 31c80a63b2] [formerly b2eeab41eb4075b0afc93f110efe425393238c7b [formerly d2f6dbca49]]
Former-commit-id: cf46241a29f9a2e818cf0dc59b938ed1b26f2889 [formerly 11e11a3fc2]
Former-commit-id: 4a7e558605
2013-06-11 09:30:46 -05:00