Fix warnings in o.e.e.p2.updatesite

Generification and deprecated usages.
eclipse-equinox · Oct 22, 2024 · 65348d6 · 65348d6
1 parent 3af8373
commit 65348d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...e.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java b/...e.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/.../eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepositoryFactory.java b/.../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);
 	}
 }