mjames-upc
|
c1cc34306d
|
adding archive menu back for CAVE
|
2016-04-13 13:38:08 -05:00 |
|
mjames-upc
|
e2d9ba9a4c
|
merge unidata_15.1.1 to unidata_16.1.4
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
|
2016-03-25 13:09:32 -05:00 |
|
mjames-upc
|
0bf1cca618
|
remove archive menu for 15.1.1 release
Former-commit-id: b654229d23
|
2016-01-20 14:44:57 -06:00 |
|
David Lovely
|
80dc4c85d9
|
Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
|
2015-05-19 10:23:35 -05:00 |
|
Nate Jensen
|
731cf6fdbe
|
Omaha #3549 remove dead code
Change-Id: I17d4d7536e86d022726fa5cee389dad67fca9ee8
Former-commit-id: b594cd797b675120634454ffffccbb785fd917ae
|
2014-12-01 15:23:48 -06:00 |
|
Nate Jensen
|
a4a3cc6deb
|
Omaha #3549 remove dead code
Change-Id: I17d4d7536e86d022726fa5cee389dad67fca9ee8
Former-commit-id: 731cf6fdbe [formerly b594cd797b675120634454ffffccbb785fd917ae]
Former-commit-id: faf88fc3cb
|
2014-12-01 15:23:48 -06:00 |
|
Roger Ferrel
|
78614a83b2
|
Omaha #3643 Archive menu entries consolidated under Archive.
Former-commit-id: 4eca2144b9d1109250dc9ceefe82701c66754980
|
2014-11-04 10:04:30 -06:00 |
|
Roger Ferrel
|
4877ec1cc6
|
Omaha #3643 Archive menu entries consolidated under Archive.
Former-commit-id: 78614a83b2 [formerly 4eca2144b9d1109250dc9ceefe82701c66754980]
Former-commit-id: 18ef2df48c
|
2014-11-04 10:04:30 -06:00 |
|
Steve Harris
|
4c56844e29
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.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.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
|
2014-09-19 10:28:57 -05:00 |
|
Steve Harris
|
da530db540
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.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.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]
Former-commit-id: 091555cf10
|
2014-09-19 10:28:57 -05:00 |
|
Roger Ferrel
|
a560d254f8
|
Omaha #3609 Correct same spelling as in 14.3.1-backports
Former-commit-id: 80c6046ef27f08bad8c7d11ddafcc6a1adaa6096
|
2014-09-17 11:31:01 -05:00 |
|
Roger Ferrel
|
88576d1bdf
|
Omaha #3609 Correct same spelling as in 14.3.1-backports
Former-commit-id: a560d254f8 [formerly 80c6046ef27f08bad8c7d11ddafcc6a1adaa6096]
Former-commit-id: 7e4c964863
|
2014-09-17 11:31:01 -05:00 |
|
Brian.Dyke
|
01dfe503f5
|
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: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
|
2014-09-09 11:44:30 -04:00 |
|
Brian.Dyke
|
fe85eb9f70
|
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: 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
|
2014-09-09 11:44:30 -04:00 |
|
Roger Ferrel
|
ef5dfb1f93
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: bcc9b0a6352151dfdf3ba75063bb87308cb162b4
|
2014-08-28 13:10:11 -05:00 |
|
Roger Ferrel
|
15c73be56c
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: ef5dfb1f93 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]
Former-commit-id: 6f8c6d6aa1
|
2014-08-28 13:10:11 -05:00 |
|
Roger Ferrel
|
4f946d4921
|
Issue #3507 Merge fixes for Archive Case Creation.
Former-commit-id: 2263bd75920d4fbaf2bfc3445e4b320291401c16
|
2014-08-07 14:17:24 -05:00 |
|
Roger Ferrel
|
c4655dbe88
|
Issue #3507 Merge fixes for Archive Case Creation.
Former-commit-id: 4f946d4921 [formerly 2263bd75920d4fbaf2bfc3445e4b320291401c16]
Former-commit-id: d7b2355016
|
2014-08-07 14:17:24 -05:00 |
|
Roger Ferrel
|
ef2e4d0c2f
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
(cherry picked from commit 825e2c1b19 [formerly 1249deb91b6463044a59ca564e26f82612f52d40])
Former-commit-id: e2be5e04fff2e0f2c4cd25ed94c0daae07933455
|
2014-08-05 08:49:24 -05:00 |
|
Roger Ferrel
|
5a014c90ec
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
(cherry picked from commit eebc5096b2 [formerly 44a23b4500 ] [formerly 825e2c1b19 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]])
Former-commit-id: ef2e4d0c2f [formerly e2be5e04fff2e0f2c4cd25ed94c0daae07933455]
Former-commit-id: f79496d029
|
2014-08-05 08:49:24 -05:00 |
|
Roger Ferrel
|
994adc2ad5
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
(cherry picked from commit cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf])
Former-commit-id: c1537561419604b05ec17c0aa01f272b3d4ed9f3
|
2014-08-05 08:46:08 -05:00 |
|
Roger Ferrel
|
0d458f4e3e
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
(cherry picked from commit 8eb4c91ab3 [formerly 3a2a6afaf1 ] [formerly cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]])
Former-commit-id: 994adc2ad5 [formerly c1537561419604b05ec17c0aa01f272b3d4ed9f3]
Former-commit-id: f29852d5bc
|
2014-08-05 08:46:08 -05:00 |
|
Roger Ferrel
|
b17b511e40
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
(cherry picked from commit 2a0a9b5334 [formerly 17a06743e41fe6bf15a895d9842bb51d99901602])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
Former-commit-id: 47a22d226ed36c07443d540bf800cbb2fc3e2a15
|
2014-08-05 08:45:33 -05:00 |
|
Roger Ferrel
|
0400202ab6
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
(cherry picked from commit 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: b17b511e40 [formerly 47a22d226ed36c07443d540bf800cbb2fc3e2a15]
Former-commit-id: 7e6a90c895
|
2014-08-05 08:45:33 -05:00 |
|
Roger Ferrel
|
0a09094ac0
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
(cherry picked from commit 3af564a653 [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
Former-commit-id: 14922cb75f4f37b0edfa930bf575eba7e3d55806
|
2014-08-05 08:43:23 -05:00 |
|
Roger Ferrel
|
a394ec6b59
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
(cherry picked from commit 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: 0a09094ac0 [formerly 14922cb75f4f37b0edfa930bf575eba7e3d55806]
Former-commit-id: 8171a30330
|
2014-08-05 08:43:23 -05:00 |
|
Lee Venable
|
05a17c05a8
|
Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
(cherry picked from commit ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0])
Former-commit-id: 553877dba98909270e492e090290b66bdb2fcc55
|
2014-08-05 08:39:55 -05:00 |
|
Lee Venable
|
10249c98f1
|
Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
(cherry picked from commit f4fb7b24f6 [formerly 7f068f164c ] [formerly ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]])
Former-commit-id: 05a17c05a8 [formerly 553877dba98909270e492e090290b66bdb2fcc55]
Former-commit-id: 5a5bab45ae
|
2014-08-05 08:39:55 -05:00 |
|
Roger Ferrel
|
a0e8aa94d8
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
(cherry picked from commit cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
Former-commit-id: e03e26e2e155df1cf9193fc6ecbd36b9c0bd9df5
|
2014-08-05 08:39:07 -05:00 |
|
Roger Ferrel
|
f079a85cf2
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
(cherry picked from commit 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: a0e8aa94d8 [formerly e03e26e2e155df1cf9193fc6ecbd36b9c0bd9df5]
Former-commit-id: 0e2dca458c
|
2014-08-05 08:39:07 -05:00 |
|
Roger Ferrel
|
8cbcbf7e12
|
Issue #2879 Code clean up.
(cherry picked from commit f6fe26d3de [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2])
Former-commit-id: adc6d643b12d8d934f56ed0d342dba521a4ad4d1
|
2014-08-05 08:27:28 -05:00 |
|
Roger Ferrel
|
455984c02f
|
Issue #2879 Code clean up.
(cherry picked from commit 4a306121bd [formerly dd09032119 ] [formerly f6fe26d3de [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]])
Former-commit-id: 8cbcbf7e12 [formerly adc6d643b12d8d934f56ed0d342dba521a4ad4d1]
Former-commit-id: 2fdae6c508
|
2014-08-05 08:27:28 -05:00 |
|
Roger Ferrel
|
2d20ab20d7
|
Issue #2879 Loading case no longer changes start/end time.
(cherry picked from commit b78a05658d [formerly 60275732b2abcecf671a8338c8f87334baad3702])
Former-commit-id: 022b3d53f874392b50ce81b87d179f853e180201
|
2014-08-05 08:27:13 -05:00 |
|
Roger Ferrel
|
ef7271abe9
|
Issue #2879 Loading case no longer changes start/end time.
(cherry picked from commit 6e2d462052 [formerly 2f9c62bd0c ] [formerly b78a05658d [formerly 60275732b2abcecf671a8338c8f87334baad3702]])
Former-commit-id: 2d20ab20d7 [formerly 022b3d53f874392b50ce81b87d179f853e180201]
Former-commit-id: a9890b8f31
|
2014-08-05 08:27:13 -05:00 |
|
Roger Ferrel
|
825e2c1b19
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
Former-commit-id: 1249deb91b6463044a59ca564e26f82612f52d40
|
2014-05-29 12:33:15 -05:00 |
|
Roger Ferrel
|
eebc5096b2
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
Former-commit-id: 825e2c1b19 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]
Former-commit-id: 44a23b4500
|
2014-05-29 12:33:15 -05:00 |
|
Richard Peter
|
32957285fc
|
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: 311c52426b3715d3a73c1fa79a8fd427a4b1b09d
|
2014-04-28 16:27:40 -05:00 |
|
Richard Peter
|
67683dd891
|
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: 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]
Former-commit-id: 44b1782461
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
3524838f9f
|
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: f54d2c639a915db14f01f56a7fcc5841b60e1509
|
2014-04-25 11:06:11 -04:00 |
|
Brian.Dyke
|
f0b8ea5822
|
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: 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]
Former-commit-id: fb1f5aa593
|
2014-04-25 11:06:11 -04:00 |
|
Roger Ferrel
|
cf6d1c8ca1
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: f00ce42d8e79ef47d9b14125dc61129fc60fc0cf
|
2014-04-24 16:25:01 -05:00 |
|
Roger Ferrel
|
8eb4c91ab3
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]
Former-commit-id: 3a2a6afaf1
|
2014-04-24 16:25:01 -05:00 |
|
Roger Ferrel
|
2a0a9b5334
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: 17a06743e41fe6bf15a895d9842bb51d99901602
|
2014-04-24 14:48:15 -05:00 |
|
Roger Ferrel
|
e2b03eb190
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: 2a0a9b5334 [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]
Former-commit-id: 9dad4c959b
|
2014-04-24 14:48:15 -05:00 |
|
Roger Ferrel
|
3af564a653
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
Former-commit-id: ce00327d4cd248efb65fd8b6e823d93c81c9a902
|
2014-04-17 08:57:15 -05:00 |
|
Roger Ferrel
|
dc25ece75f
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
Former-commit-id: 3af564a653 [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]
Former-commit-id: 8ce590c31c
|
2014-04-17 08:57:15 -05:00 |
|
Lee Venable
|
ff3b42468f
|
Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
Former-commit-id: 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0
|
2014-04-16 13:15:31 -05:00 |
|
Lee Venable
|
f4fb7b24f6
|
Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
Former-commit-id: ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]
Former-commit-id: 7f068f164c
|
2014-04-16 13:15:31 -05:00 |
|
Roger Ferrel
|
cfea0489d7
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
Former-commit-id: b10c78a4f3cb7abb265d8c383c6bc2912d166720
|
2014-04-11 16:07:58 -05:00 |
|
Roger Ferrel
|
16fab01b8b
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
Former-commit-id: cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]
Former-commit-id: 5570261d74
|
2014-04-11 16:07:58 -05:00 |
|