Author: cziegeler
Date: Wed Dec 19 07:17:17 2007
New Revision: 605574
URL: http://svn.apache.org/viewvc?rev=605574&view=rev
Log:
Use generics and fix javadocs
Modified:
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/BundleRepositoryAdmin.java
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/Installer.java
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/InstallerService.java
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyActivator.java
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyManager.java
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/BundleRepositoryAdminImpl.java
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/InstallerImpl.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingHttpContext.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingManager.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java
Modified:
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/BundleRepositoryAdmin.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/BundleRepositoryAdmin.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/BundleRepositoryAdmin.java
(original)
+++
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/BundleRepositoryAdmin.java
Wed Dec 19 07:17:17 2007
@@ -28,13 +28,13 @@
void refreshRepositories();
// Iterator of Repository instances
- Iterator getRepositories();
+ Iterator<Repository> getRepositories();
void addRepository(URL url);
void removeRepository(URL url);
// Iterator of Resource instances
- Iterator getResources();
+ Iterator<Resource> getResources();
}
Modified:
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/Installer.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/Installer.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/Installer.java
(original)
+++
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/Installer.java
Wed Dec 19 07:17:17 2007
@@ -117,7 +117,7 @@
/**
* Install the bundles added to this installer via the
* [EMAIL PROTECTED] #addBundle(String, InputStream, int)} and
- * [EMAIL PROTECTED] #addBundle(String, String, int)} methods. Bundles from
+ * [EMAIL PROTECTED] #addBundle(String, URL, int)} methods. Bundles from
* InputStreams are installed before bundles retrieved from an OSGi Bundle
* Repository. For each bundle installed, the respective start level is set
* and the bundles are started (or persistently marked started if the
@@ -129,7 +129,7 @@
* @retrun An array of bundles installed. This is the complete list of
* bundles installed, which may exceed the bundles added through
the
* [EMAIL PROTECTED] #addBundle(String, InputStream, int)} and
- * [EMAIL PROTECTED] #addBundle(String, String, int)} method as
some bundles
+ * [EMAIL PROTECTED] #addBundle(String, URL, int)} method as some
bundles
* might have been added to resolve dependencies. If no bundles
have
* been added, this method returns <code>null</code>.
* @throws InstallerException
Modified:
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/InstallerService.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/InstallerService.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/InstallerService.java
(original)
+++
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/installer/InstallerService.java
Wed Dec 19 07:17:17 2007
@@ -32,7 +32,7 @@
* <p>
* Each call to this method returns a new installer instance.
*
- * @return
+ * @return An installer.
*/
Installer getInstaller();
Modified:
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyActivator.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyActivator.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyActivator.java
(original)
+++
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyActivator.java
Wed Dec 19 07:17:17 2007
@@ -64,7 +64,7 @@
InstallerService installerService = new InstallerServiceImpl(context);
// register myself as the factory for the installer service
- Dictionary props = new Hashtable();
+ Dictionary<String, String> props = new Hashtable<String, String>();
props.put(Constants.SERVICE_DESCRIPTION,
"Project Sling Bundle Installler Service");
context.registerService(InstallerService.class.getName(),
Modified:
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyManager.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyManager.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyManager.java
(original)
+++
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/AssemblyManager.java
Wed Dec 19 07:17:17 2007
@@ -81,20 +81,20 @@
* The queue of bundle events posted by the [EMAIL PROTECTED]
#put(BundleEvent)} method
* and retrieved from by the [EMAIL PROTECTED] #take()} method.
*/
- private LinkedList queue = new LinkedList();
+ private LinkedList<BundleEvent> queue = new LinkedList<BundleEvent>();
/**
* The map of [EMAIL PROTECTED] Assembly} instances indexed by the bundle
location of
* the respective Assembly Bundle.
*/
- private Map assemblies = new HashMap();
+ private Map<String, Assembly> assemblies = new HashMap<String, Assembly>();
/**
* The map of [EMAIL PROTECTED] InstalledBundle} instances indexed by the
bundle
* specification common location. This map contains all installed bundles
* installed by all assemblies.
*/
- private Map installedBundles = new HashMap();
+ private Map<String, InstalledBundle> installedBundles = new
HashMap<String, InstalledBundle>();
/**
* The service tracker keeping the <code>StartLevel</code> service.
@@ -270,7 +270,7 @@
}
}
- return (BundleEvent) this.queue.removeFirst();
+ return this.queue.removeFirst();
}
}
@@ -309,15 +309,15 @@
// ---------- InstalledBundle registry
-------------------------------------
InstalledBundle putInstalledBundle(String key, InstalledBundle bundle) {
- return (InstalledBundle) this.installedBundles.put(key, bundle);
+ return this.installedBundles.put(key, bundle);
}
InstalledBundle getInstalledBundle(String key) {
- return (InstalledBundle) this.installedBundles.get(key);
+ return this.installedBundles.get(key);
}
InstalledBundle removeInstalledBundle(String key) {
- return (InstalledBundle) this.installedBundles.remove(key);
+ return this.installedBundles.remove(key);
}
// ---------- internal helpers
---------------------------------------------
@@ -355,7 +355,7 @@
// ---------- internal helpers
---------------------------------------------
private Assembly getOrCreateAssembly(Bundle bundle) {
- Assembly assembly = (Assembly)
this.assemblies.get(bundle.getLocation());
+ Assembly assembly = this.assemblies.get(bundle.getLocation());
if (assembly == null) {
assembly = new Assembly(this, bundle);
this.assemblies.put(bundle.getLocation(), assembly);
Modified:
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/BundleRepositoryAdminImpl.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/BundleRepositoryAdminImpl.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/BundleRepositoryAdminImpl.java
(original)
+++
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/BundleRepositoryAdminImpl.java
Wed Dec 19 07:17:17 2007
@@ -23,8 +23,8 @@
import java.util.TreeSet;
import org.apache.sling.osgi.assembly.installer.BundleRepositoryAdmin;
+import org.apache.sling.osgi.assembly.installer.Repository;
import org.osgi.framework.Version;
-import org.osgi.service.obr.Repository;
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Resource;
@@ -61,15 +61,15 @@
*
* @see
org.apache.sling.core.assembly.installer.BundleRepositoryAdmin#getRepositories()
*/
- public Iterator getRepositories() {
+ public Iterator<Repository> getRepositories() {
Object lock = this.installerService.acquireLock(0);
try {
- Repository[] repos = this.getRepositoryAdmin().listRepositories();
+ org.osgi.service.obr.Repository[] repos =
this.getRepositoryAdmin().listRepositories();
if (repos == null || repos.length == 0) {
return Collections.EMPTY_LIST.iterator();
}
- SortedSet urlSet = new TreeSet();
+ SortedSet<Repository> urlSet = new TreeSet<Repository>();
for (int i = 0; i < repos.length; i++) {
urlSet.add(new RepositoryImpl(repos[i]));
}
@@ -87,7 +87,7 @@
public Iterator<org.apache.sling.osgi.assembly.installer.Resource>
getResources() {
Object lock = this.installerService.acquireLock(0);
try {
- Repository[] repos = this.getRepositoryAdmin().listRepositories();
+ org.osgi.service.obr.Repository[] repos =
this.getRepositoryAdmin().listRepositories();
if (repos == null || repos.length == 0) {
return Collections.EMPTY_LIST.iterator();
}
@@ -116,7 +116,7 @@
// note: refreshing is implemented by re-adding the repositories
Object lock = this.installerService.acquireLock(0);
try {
- Repository[] repos = this.getRepositoryAdmin().listRepositories();
+ org.osgi.service.obr.Repository[] repos =
this.getRepositoryAdmin().listRepositories();
for (int i = 0; repos != null && i < repos.length; i++) {
this.addRepository(repos[i].getURL());
}
@@ -148,7 +148,7 @@
// ---------- internal classes
---------------------------------------------
private static class ResourceImpl implements
- org.apache.sling.osgi.assembly.installer.Resource, Comparable {
+ org.apache.sling.osgi.assembly.installer.Resource,
Comparable<ResourceImpl> {
private final Resource delegatee;
@@ -174,14 +174,11 @@
// ---------- Comparable
-----------------------------------------------
- public int compareTo(Object obj) {
- if (this == obj) {
+ public int compareTo(ResourceImpl other) {
+ if (this == other) {
return 0;
}
- // ClassCastException is allowed to be thrown here
- ResourceImpl other = (ResourceImpl) obj;
-
if (this.getSymbolicName().equals(other.getSymbolicName())) {
return this.getVersion().compareTo(other.getVersion());
}
@@ -212,11 +209,11 @@
}
private static class RepositoryImpl implements
- org.apache.sling.osgi.assembly.installer.Repository, Comparable {
+ Repository, Comparable<RepositoryImpl> {
- private final Repository delegatee;
+ private final org.osgi.service.obr.Repository delegatee;
- RepositoryImpl(Repository delegatee) {
+ RepositoryImpl(org.osgi.service.obr.Repository delegatee) {
this.delegatee = delegatee;
}
@@ -234,13 +231,10 @@
// ---------- Comparable
-----------------------------------------------
- public int compareTo(Object obj) {
- if (this == obj) {
+ public int compareTo(RepositoryImpl other) {
+ if (this == other) {
return 0;
}
-
- // ClassCastException is allowed to be thrown here
- RepositoryImpl other = (RepositoryImpl) obj;
if (this.getName().equals(other.getName())) {
return
this.getURL().toString().compareTo(other.getURL().toString());
Modified:
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/InstallerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/InstallerImpl.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/InstallerImpl.java
(original)
+++
incubator/sling/trunk/osgi/assembly/src/main/java/org/apache/sling/osgi/assembly/internal/InstallerImpl.java
Wed Dec 19 07:17:17 2007
@@ -74,7 +74,7 @@
}
/**
- * @see
org.apache.sling.core.assembly.installer.Installer#addBundle(java.lang.String,
java.io.InputStream, int)
+ * @see
org.apache.sling.osgi.assembly.installer.Installer#addBundle(java.lang.String,
java.io.InputStream, int)
*/
public void addBundle(String location, InputStream source, int startLevel)
{
this.addBundleDescriptor(new LocalBundleDescriptor(location, source,
@@ -82,7 +82,7 @@
}
/**
- * @see
org.apache.sling.core.assembly.installer.Installer#addBundle(java.lang.String,
org.apache.sling.core.assembly.installer.VersionRange, int)
+ * @see
org.apache.sling.osgi.assembly.installer.Installer#addBundle(java.lang.String,
org.apache.sling.osgi.assembly.installer.VersionRange, int)
*/
public void addBundle(String symbolicName, VersionRange versionRange,
int startLevel) {
@@ -91,7 +91,7 @@
}
/**
- * @see
org.apache.sling.core.assembly.installer.Installer#addTemporaryRepository(java.net.URL)
+ * @see
org.apache.sling.osgi.assembly.installer.Installer#addTemporaryRepository(java.net.URL)
*/
public void addTemporaryRepository(URL url) {
if (this.repositoryURLs == null) {
@@ -102,7 +102,7 @@
}
/**
- * @see org.apache.sling.core.assembly.installer.Installer#dispose()
+ * @see org.apache.sling.osgi.assembly.installer.Installer#dispose()
*/
public void dispose() {
if (this.lock != null) {
@@ -124,7 +124,7 @@
}
/**
- * @see org.apache.sling.core.assembly.installer.Installer#install(boolean)
+ * @see org.apache.sling.osgi.assembly.installer.Installer#install(boolean)
*/
public Bundle[] install(boolean start) throws InstallerException {
@@ -214,7 +214,7 @@
}
/**
- * @see
org.apache.sling.core.assembly.installer.Installer#setDefaultStartLevel(int)
+ * @see
org.apache.sling.osgi.assembly.installer.Installer#setDefaultStartLevel(int)
*/
public void setDefaultStartLevel(int startLevel) {
// TODO Auto-generated method stub
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingHttpContext.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingHttpContext.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingHttpContext.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingHttpContext.java
Wed Dec 19 07:17:17 2007
@@ -85,8 +85,6 @@
* if authentication is required but not satisfied.
* @return <code>true</code> if authentication is required and not
* satisfied by the request.
- * @throws IOException If an IO error occurrs while trying to request
- * authentication.
*/
public boolean handleSecurity(HttpServletRequest request,
HttpServletResponse response) {
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingManager.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingManager.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingManager.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/SlingManager.java
Wed Dec 19 07:17:17 2007
@@ -20,7 +20,6 @@
import java.io.PrintWriter;
import java.util.Dictionary;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
@@ -68,7 +67,7 @@
* may be used by programmatic action submissions.
*/
public static final String PARAM_NO_REDIRECT_AFTER_ACTION = "_noredir_";
-
+
/**
* @scr.property value="/sling"
*/
@@ -93,7 +92,7 @@
* @scr.property value="admin"
*/
private static final String PROP_PASSWORD = "password";
-
+
private ComponentContext componentContext;
/**
@@ -169,7 +168,7 @@
} catch (ServletException se) {
this.log(se.getMessage(), se.getRootCause());
}
-
+
// maybe overwrite redirect
if (PARAM_NO_REDIRECT_AFTER_ACTION.equals(getParameter(req,
PARAM_NO_REDIRECT_AFTER_ACTION))) {
resp.setStatus(HttpServletResponse.SC_OK);
@@ -177,7 +176,7 @@
resp.getWriter().println("Ok");
return true;
}
-
+
if (redirect) {
String uri = req.getRequestURI();
// Object pars =
@@ -221,6 +220,7 @@
}
// check, whether we alread have the parameters
+ @SuppressWarnings("unchecked")
Map<String, FileItem[]> params = (Map<String, FileItem[]>)
request.getAttribute(Util.ATTR_FILEUPLOAD);
if (params == null) {
// parameters not read yet, read now
@@ -235,9 +235,9 @@
// Parse the request
params = new HashMap<String, FileItem[]>();
try {
- List /* FileItem */items = upload.parseRequest(request);
- for (Iterator ii = items.iterator(); ii.hasNext();) {
- FileItem fi = (FileItem) ii.next();
+ @SuppressWarnings("unchecked")
+ List<FileItem> items = upload.parseRequest(request);
+ for (FileItem fi : items) {
FileItem[] current = params.get(fi.getFieldName());
if (current == null) {
current = new FileItem[] { fi };
@@ -274,7 +274,8 @@
protected void activate(ComponentContext context) {
this.componentContext = context;
- Dictionary config = this.componentContext.getProperties();
+ @SuppressWarnings("unchecked")
+ Dictionary<String, Object> config =
this.componentContext.getProperties();
this.defaultRenderName = (String) config.get(PROP_DEFAULT_RENDER);
if ( this.renders.get(this.defaultRenderName ) != null ) {
@@ -361,7 +362,7 @@
* @return The value of the named property as a string or <code>def</code>
* if the property does not exist
*/
- private String getProperty(Dictionary config, String name, String def) {
+ private String getProperty(Dictionary<String, Object> config, String name,
String def) {
Object value = config.get(name);
if (value instanceof String) {
return (String) value;
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java?rev=605574&r1=605573&r2=605574&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java
Wed Dec 19 07:17:17 2007
@@ -50,12 +50,12 @@
protected Bundle[] getBundles() {
Bundle[] bundles = this.getBundleContext().getBundles();
- List assList = new ArrayList();
+ List<Bundle> assList = new ArrayList<Bundle>();
for (int i=0; i < bundles.length; i++) {
if (bundles[i].getHeaders().get("Assembly-Bundles") != null) {
assList.add(bundles[i]);
}
}
- return (Bundle[]) assList.toArray(new Bundle[assList.size()]);
+ return assList.toArray(new Bundle[assList.size()]);
}
}
