Brian.Dyke
|
0f9fe8301a
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: fe85eb9f70 [formerly 3d9a3de6e4] [formerly fe85eb9f70 [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 29364e2b9f [formerly c42733eb39]
Former-commit-id: a31d3d702e
|
2014-09-09 11:44:30 -04:00 |
|
Roger Ferrel
|
89f66db462
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: 15c73be56c [formerly 6f8c6d6aa1] [formerly 15c73be56c [formerly 6f8c6d6aa1] [formerly ef5dfb1f93 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]]
Former-commit-id: ef5dfb1f93
Former-commit-id: ffa95bce90 [formerly fe50853adb]
Former-commit-id: 86d4730538
|
2014-08-28 13:10:11 -05:00 |
|
Roger Ferrel
|
eaab491a42
|
Issue #3507 Merge fixes for Archive Case Creation.
Former-commit-id: c4655dbe88 [formerly d7b2355016] [formerly c4655dbe88 [formerly d7b2355016] [formerly 4f946d4921 [formerly 2263bd75920d4fbaf2bfc3445e4b320291401c16]]]
Former-commit-id: 4f946d4921
Former-commit-id: 5e5d95c8a1 [formerly 4891c9f540]
Former-commit-id: ec03ef31b6
|
2014-08-07 14:17:24 -05:00 |
|
Roger Ferrel
|
d38e6abd16
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
(cherry picked from commit 68b1dd7bca81df01df646d2b455383105e70b5bc [formerly 825e2c1b19] [formerly eebc5096b2 [formerly 44a23b4500] [formerly eebc5096b2 [formerly 44a23b4500] [formerly 825e2c1b19 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]]])
Former-commit-id: 5a014c90ec [formerly f79496d029] [formerly 5a014c90ec [formerly f79496d029] [formerly ef2e4d0c2f [formerly e2be5e04fff2e0f2c4cd25ed94c0daae07933455]]]
Former-commit-id: ef2e4d0c2f
Former-commit-id: 039a20efed [formerly 6894c12589]
Former-commit-id: fc2398dbab
|
2014-08-05 08:49:24 -05:00 |
|
Roger Ferrel
|
67810f6a2d
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
(cherry picked from commit 0b67be0d6ce4f75d97b1900c21edd34a69db88d4 [formerly cf6d1c8ca1] [formerly 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]])
Former-commit-id: 0d458f4e3e [formerly f29852d5bc] [formerly 0d458f4e3e [formerly f29852d5bc] [formerly 994adc2ad5 [formerly c1537561419604b05ec17c0aa01f272b3d4ed9f3]]]
Former-commit-id: 994adc2ad5
Former-commit-id: 3d50e30c4a [formerly 339ab4258a]
Former-commit-id: 90033b53ee
|
2014-08-05 08:46:08 -05:00 |
|
Roger Ferrel
|
c535700eb4
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
(cherry picked from commit a9df5defd6b8d72f5be9175f4a877ce89f7c3194 [formerly 2a0a9b5334] [formerly e2b03eb190 [formerly 9dad4c959b] [formerly e2b03eb190 [formerly 9dad4c959b] [formerly 2a0a9b5334 [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
Former-commit-id: 0400202ab6 [formerly 7e6a90c895] [formerly 0400202ab6 [formerly 7e6a90c895] [formerly b17b511e40 [formerly 47a22d226ed36c07443d540bf800cbb2fc3e2a15]]]
Former-commit-id: b17b511e40
Former-commit-id: 903e80dcba [formerly d8427d3d2b]
Former-commit-id: 55d49db34c
|
2014-08-05 08:45:33 -05:00 |
|
Roger Ferrel
|
97579e24da
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
(cherry picked from commit 034fd9ddf208942f5ef84e2c4383a0512874e8b9 [formerly 3af564a653] [formerly dc25ece75f [formerly 8ce590c31c] [formerly dc25ece75f [formerly 8ce590c31c] [formerly 3af564a653 [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
Former-commit-id: a394ec6b59 [formerly 8171a30330] [formerly a394ec6b59 [formerly 8171a30330] [formerly 0a09094ac0 [formerly 14922cb75f4f37b0edfa930bf575eba7e3d55806]]]
Former-commit-id: 0a09094ac0
Former-commit-id: 971a29b8c1 [formerly cb1b8bba84]
Former-commit-id: 7dfeadf032
|
2014-08-05 08:43:23 -05:00 |
|
Lee Venable
|
28423d7071
|
Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
(cherry picked from commit 5400c9bc5f35ed3547b5d51cae3d0cf0f0829b51 [formerly ff3b42468f] [formerly f4fb7b24f6 [formerly 7f068f164c] [formerly f4fb7b24f6 [formerly 7f068f164c] [formerly ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]])
Former-commit-id: 10249c98f1 [formerly 5a5bab45ae] [formerly 10249c98f1 [formerly 5a5bab45ae] [formerly 05a17c05a8 [formerly 553877dba98909270e492e090290b66bdb2fcc55]]]
Former-commit-id: 05a17c05a8
Former-commit-id: 38131e5b90 [formerly 1e2816e4ec]
Former-commit-id: 75ed3bcf24
|
2014-08-05 08:39:55 -05:00 |
|
Roger Ferrel
|
04360e9889
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
(cherry picked from commit 41c889ce01087a1848a114aa936c54e0767e65ad [formerly cfea0489d7] [formerly 16fab01b8b [formerly 5570261d74] [formerly 16fab01b8b [formerly 5570261d74] [formerly cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]]])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
Former-commit-id: f079a85cf2 [formerly 0e2dca458c] [formerly f079a85cf2 [formerly 0e2dca458c] [formerly a0e8aa94d8 [formerly e03e26e2e155df1cf9193fc6ecbd36b9c0bd9df5]]]
Former-commit-id: a0e8aa94d8
Former-commit-id: 2288276976 [formerly 7185b58ef3]
Former-commit-id: 36a1b87087
|
2014-08-05 08:39:07 -05:00 |
|
Roger Ferrel
|
88dc997abc
|
Issue #2879 Code clean up.
(cherry picked from commit e64acb0dec268edbcae84573f02958ed926e27a1 [formerly f6fe26d3de] [formerly 4a306121bd [formerly dd09032119] [formerly 4a306121bd [formerly dd09032119] [formerly f6fe26d3de [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]])
Former-commit-id: 455984c02f [formerly 2fdae6c508] [formerly 455984c02f [formerly 2fdae6c508] [formerly 8cbcbf7e12 [formerly adc6d643b12d8d934f56ed0d342dba521a4ad4d1]]]
Former-commit-id: 8cbcbf7e12
Former-commit-id: fe189104d8 [formerly c8e6b7507e]
Former-commit-id: 5612bd507f
|
2014-08-05 08:27:28 -05:00 |
|
Roger Ferrel
|
3c313363b6
|
Issue #2879 Loading case no longer changes start/end time.
(cherry picked from commit 37a1065de7ea675e61cb7a6b47bf239acfc74da5 [formerly b78a05658d] [formerly 6e2d462052 [formerly 2f9c62bd0c] [formerly 6e2d462052 [formerly 2f9c62bd0c] [formerly b78a05658d [formerly 60275732b2abcecf671a8338c8f87334baad3702]]]])
Former-commit-id: ef7271abe9 [formerly a9890b8f31] [formerly ef7271abe9 [formerly a9890b8f31] [formerly 2d20ab20d7 [formerly 022b3d53f874392b50ce81b87d179f853e180201]]]
Former-commit-id: 2d20ab20d7
Former-commit-id: 93dab5f3bb [formerly 6c4d7058b6]
Former-commit-id: 13dd333011
|
2014-08-05 08:27:13 -05:00 |
|
Richard Peter
|
938e39a0fc
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 67683dd891 [formerly 44b1782461] [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246 [formerly 80d4153878]
Former-commit-id: 24a3fe1466
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
f31d8cc8cf
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
|
2014-04-25 11:06:11 -04:00 |
|
Roger Ferrel
|
0ece281810
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: 555c8cf617 [formerly 0490023b2c]
Former-commit-id: 3d744452af
|
2014-04-24 16:25:01 -05:00 |
|
Roger Ferrel
|
5fda70501e
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: e2b03eb190 [formerly 9dad4c959b] [formerly e2b03eb190 [formerly 9dad4c959b] [formerly 2a0a9b5334 [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: ef81949dd1 [formerly d73f61c7e7]
Former-commit-id: ca30aa6b8a
|
2014-04-24 14:48:15 -05:00 |
|
Roger Ferrel
|
25c92e4b11
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
Former-commit-id: dc25ece75f [formerly 8ce590c31c] [formerly dc25ece75f [formerly 8ce590c31c] [formerly 3af564a653 [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]
Former-commit-id: 3af564a653
Former-commit-id: 56da257816 [formerly 1214aac2a2]
Former-commit-id: 2e98b24e91
|
2014-04-17 08:57:15 -05:00 |
|
Lee Venable
|
9b085066c0
|
Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
Former-commit-id: f4fb7b24f6 [formerly 7f068f164c] [formerly f4fb7b24f6 [formerly 7f068f164c] [formerly ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]
Former-commit-id: ff3b42468f
Former-commit-id: 885e17788d [formerly 4cdbf301f3]
Former-commit-id: 31c8e61cb6
|
2014-04-16 13:15:31 -05:00 |
|
Roger Ferrel
|
6f127a05e0
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
Former-commit-id: 16fab01b8b [formerly 5570261d74] [formerly 16fab01b8b [formerly 5570261d74] [formerly cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]]
Former-commit-id: cfea0489d7
Former-commit-id: c5de39c162 [formerly d66a346c65]
Former-commit-id: ac1946609e
|
2014-04-11 16:07:58 -05:00 |
|
Brian.Dyke
|
39b5e7fe67
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 17477e7db1 [formerly 6a28fcb156] [formerly 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]
Former-commit-id: dd98c213c7
Former-commit-id: 47d9095211 [formerly 9f37f61cf8]
Former-commit-id: be574897cc
|
2014-04-04 12:57:32 -04:00 |
|
Roger Ferrel
|
17fe559a70
|
Issue #2879 Code clean up.
Former-commit-id: 4a306121bd [formerly dd09032119] [formerly 4a306121bd [formerly dd09032119] [formerly f6fe26d3de [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]
Former-commit-id: f6fe26d3de
Former-commit-id: ba38afeeb9 [formerly 867d85e17d]
Former-commit-id: d44c677b5a
|
2014-03-27 16:17:02 -05:00 |
|
Roger Ferrel
|
c907b28a02
|
Issue #2879 Loading case no longer changes start/end time.
Former-commit-id: 6e2d462052 [formerly 2f9c62bd0c] [formerly 6e2d462052 [formerly 2f9c62bd0c] [formerly b78a05658d [formerly 60275732b2abcecf671a8338c8f87334baad3702]]]
Former-commit-id: b78a05658d
Former-commit-id: 394e8fcbcf [formerly 16ade55cb6]
Former-commit-id: 9c1dc3c8ab
|
2014-03-27 15:52:31 -05:00 |
|
Brian.Dyke
|
f47dd3ef59
|
14.1.1-18 baseline
Former-commit-id: f05a2220cd [formerly 575e328123] [formerly f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: d61ae6c5f4 [formerly c5857c30f2]
Former-commit-id: d1db845406
|
2014-02-11 15:52:50 -05:00 |
|
Steve Harris
|
5862555160
|
14.1.1-14 baseline
Former-commit-id: 6df7c67f95 [formerly f2ad9da4eb] [formerly 6df7c67f95 [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0989c17710 [formerly 43cc501e0d]
Former-commit-id: a2bdee5cc1
|
2014-01-06 14:02:30 -05:00 |
|
Steve Harris
|
ea65181d19
|
14.1.1-10 baseline
Former-commit-id: 8251107646 [formerly ca0f65bd9a] [formerly 8251107646 [formerly ca0f65bd9a] [formerly 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: e35ec60f7e [formerly ef6e0b0304]
Former-commit-id: 36d788890a
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
cfb3194426
|
14.1.1-7 baseline
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
da4589ec2b
|
14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
767b7fdb4d
|
13.5.1-8 baseline
Former-commit-id: 392faf86e7 [formerly 3bece5e5d0] [formerly 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: a7d4c6274e [formerly 2afb46f814]
Former-commit-id: 1a3197efdf
|
2013-07-26 09:02:34 -04:00 |
|
Greg Armendariz
|
b601345c9f
|
13.5.1-6 baseline
Former-commit-id: 5894853996 [formerly 7e09fa5a0b] [formerly 5894853996 [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 93b71934c0 [formerly 12a09f9aa7]
Former-commit-id: ec2637676d
|
2013-07-10 10:04:22 -04:00 |
|
Steve Harris
|
c05a6c8b50
|
13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
859965fc9d
|
13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
|
2013-06-10 15:17:17 -04:00 |
|