From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 25 Oct 2015 16:57:57 +0000 (+0000)
Subject: OSGi Boot: remove deprecated methods and adapt to Java 7
X-Git-Tag: argeo-commons-2.1.30~61
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=da9f22fc4c001e22b2f270abe6f1a27f279a96f0;p=lgpl%2Fargeo-commons.git

OSGi Boot: remove deprecated methods and adapt to Java 7

git-svn-id: https://svn.argeo.org/commons/trunk@8526 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java
index b9749033c..8dd4d812d 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java
@@ -36,7 +36,6 @@ import org.osgi.framework.Constants;
  * expected that it is. The root of the repository is computed based on the file
  * name of the URL and of the content of the index.
  */
-@SuppressWarnings({ "rawtypes", "unchecked" })
 public class DistributionBundle {
 	private final static String INDEX_FILE_NAME = "modularDistribution.csv";
 
@@ -51,7 +50,7 @@ public class DistributionBundle {
 	/** can be null */
 	private String relativeUrl;
 
-	private List/* <OsgiArtifact> */artifacts;
+	private List<OsgiArtifact> artifacts;
 
 	private String separator = ",";
 
@@ -126,8 +125,8 @@ public class DistributionBundle {
 		}
 	}
 
-	protected List/* <OsgiArtifact> */listArtifacts(InputStream in) {
-		List osgiArtifacts = new ArrayList();
+	protected List<OsgiArtifact> listArtifacts(InputStream in) {
+		List<OsgiArtifact> osgiArtifacts = new ArrayList<OsgiArtifact>();
 		BufferedReader reader = null;
 		try {
 			reader = new BufferedReader(new InputStreamReader(in));
@@ -166,7 +165,7 @@ public class DistributionBundle {
 		if (artifacts == null)
 			throw new OsgiBootException("Artifact list not initialized");
 
-		List/* <String> */urls = new ArrayList();
+		List<String> urls = new ArrayList<String>();
 		for (int i = 0; i < artifacts.size(); i++) {
 			OsgiArtifact osgiArtifact = (OsgiArtifact) artifacts.get(i);
 			urls.add(baseUrl + osgiArtifact.getRelativeUrl());