OSGi Boot: remove deprecated methods and adapt to Java 7

[lgpl/argeo-commons.git] / org.argeo.osgi.boot / src / org / argeo / osgi / boot / DistributionBundle.java

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 e6c04281fe39da724c22d5a6cdd26006d0547e4f..8dd4d812dca47071d36f6bb3cb43fe32f1078f15 100644 (file)
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java
@@ -50,7 +50,7 @@ public class DistributionBundle {
        /** can be null */
        private String relativeUrl;
 
-       private List/* <OsgiArtifact> */artifacts;
+       private List<OsgiArtifact> artifacts;
 
        private String separator = ",";
 
@@ -125,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));
@@ -155,17 +155,17 @@ public class DistributionBundle {
        }
 
        /**
-        * List full URLs of the bunmdles, based on base URL, usable directly for
+        * List full URLs of the bundles, based on base URL, usable directly for
         * download.
         */
-       public List/* <String> */listUrls() {
+       public List<String> listUrls() {
                if (baseUrl == null)
                        throw new OsgiBootException("Base URL is not set");
 
                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());