From 65348d689980d1e11708f934f1767f056e62907d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 22 Oct 2024 13:28:00 +0300 Subject: [PATCH] Fix warnings in o.e.e.p2.updatesite Generification and deprecated usages. --- .../equinox/internal/p2/updatesite/SiteXMLAction.java | 2 +- .../artifact/UpdateSiteArtifactRepositoryFactory.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java index 7323592c88..ef524d7c09 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2020 Code 9 and others. + * Copyright (c) 2008, 2024 Code 9 and others. * * This * program and the accompanying materials are made available under the terms of diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepositoryFactory.java index 7eb038d8b3..09ca1fe1f8 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepositoryFactory.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepositoryFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2017 IBM Corporation and others. + * Copyright (c) 2008, 2024 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -82,7 +82,7 @@ private static boolean isURL(URI location) { private void resetCache(IArtifactRepository repository) { repository.setProperty(PROP_SITE_CHECKSUM, "0"); //$NON-NLS-1$ - repository.removeAll(); + repository.removeAll(new NullProgressMonitor()); } public IArtifactRepository loadRepository(URI location, IProgressMonitor monitor) { @@ -110,7 +110,7 @@ public void initializeRepository(IArtifactRepository repository, URI location, I repository.setProperty(PROP_SITE_CHECKSUM, updateSite.getChecksum()); if (updateSite.getSite().getMirrorsURI() != null) repository.setProperty(IRepository.PROP_MIRRORS_URL, updateSite.getSite().getMirrorsURI()); - repository.removeAll(); + repository.removeAll(new NullProgressMonitor()); generateArtifactDescriptors(updateSite, repository, monitor); } @@ -151,6 +151,6 @@ private void generateArtifactDescriptors(UpdateSite updateSite, IArtifactReposit } } IArtifactDescriptor[] descriptors = allSiteArtifacts.toArray(new IArtifactDescriptor[allSiteArtifacts.size()]); - repository.addDescriptors(descriptors); + repository.addDescriptors(descriptors, monitor); } }