diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/core/adaptor')
15 files changed, 50 insertions, 50 deletions
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/BundleClassLoader.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/BundleClassLoader.java index 34c9602be..36ef39d7e 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/BundleClassLoader.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/BundleClassLoader.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2009 IBM Corporation and others. + * Copyright (c) 2004, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -55,7 +55,7 @@ public interface BundleClassLoader /*extends ClassLoader*/extends BundleReferenc * @return An Enumeration of all resources found or null if the resource. * does not exist. */ - public Enumeration findLocalResources(String resource); + public Enumeration<URL> findLocalResources(String resource); /** * Finds a local class in the BundleClassLoader without @@ -64,7 +64,7 @@ public interface BundleClassLoader /*extends ClassLoader*/extends BundleReferenc * @return The class object found. * @throws ClassNotFoundException if the classname does not exist locally. */ - public Class findLocalClass(String classname) throws ClassNotFoundException; + public Class<?> findLocalClass(String classname) throws ClassNotFoundException; /** * This method will first search the parent class loader for the resource; @@ -82,7 +82,7 @@ public interface BundleClassLoader /*extends ClassLoader*/extends BundleReferenc * @param name the resource path to get. * @return an Enumeration of URL objects for the resource or <code>null</code> if the resource is not found. */ - public Enumeration getResources(String name) throws IOException; + public Enumeration<URL> getResources(String name) throws IOException; /** * This method will first search the parent class loader for the class; @@ -92,7 +92,7 @@ public interface BundleClassLoader /*extends ClassLoader*/extends BundleReferenc * @return the Class. * @throws ClassNotFoundException */ - public Class loadClass(String name) throws ClassNotFoundException; + public Class<?> loadClass(String name) throws ClassNotFoundException; /** * Closes this class loader. After this method is called diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/BundleData.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/BundleData.java index ff33a0232..e556a44cc 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/BundleData.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/BundleData.java @@ -84,7 +84,7 @@ public interface BundleData { * @return An Enumeration of the entry paths or null if the specified path * does not exist. */ - public Enumeration getEntryPaths(String path); + public Enumeration<String> getEntryPaths(String path); /** * Returns the absolute path name of a native library. The BundleData @@ -123,7 +123,7 @@ public interface BundleData { * @throws BundleException if an error occurred while reading the * bundle manifest data. */ - public Dictionary getManifest() throws BundleException; + public Dictionary<String, String> getManifest() throws BundleException; /** * Get the BundleData bundle ID. This will be used as the bundle diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/ClassLoaderDelegate.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/ClassLoaderDelegate.java index 997cadc72..0e8c57bd0 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/ClassLoaderDelegate.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/ClassLoaderDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2009 IBM Corporation and others. + * Copyright (c) 2004, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -43,7 +43,7 @@ public interface ClassLoaderDelegate { * @return the Class. * @throws ClassNotFoundException if the class is not found. */ - public Class findClass(String classname) throws ClassNotFoundException; + public Class<?> findClass(String classname) throws ClassNotFoundException; /** * Finds a resource for a bundle that may be outside of the actual bundle @@ -72,7 +72,7 @@ public interface ClassLoaderDelegate { * @return the enumeration of resources found or null if the resource * does not exist. */ - public Enumeration findResources(String resource) throws IOException; + public Enumeration<URL> findResources(String resource) throws IOException; /** * Returns the absolute path name of a native library. The following is diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/ClassLoaderDelegateHook.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/ClassLoaderDelegateHook.java index e77e76d82..424feb98a 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/ClassLoaderDelegateHook.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/ClassLoaderDelegateHook.java @@ -36,7 +36,7 @@ public interface ClassLoaderDelegateHook { * @return the class found by this hook or null if normal delegation should continue * @throws ClassNotFoundException to terminate the delegation and throw an exception */ - public Class preFindClass(String name, BundleClassLoader classLoader, BundleData data) throws ClassNotFoundException; + public Class<?> preFindClass(String name, BundleClassLoader classLoader, BundleData data) throws ClassNotFoundException; /** * Called by a {@link ClassLoaderDelegate#findClass(String)} method after delegating to the resolved constraints and @@ -48,7 +48,7 @@ public interface ClassLoaderDelegateHook { * @return the class found by this hook or null if normal delegation should continue * @throws ClassNotFoundException to terminate the delegation and throw an exception */ - public Class postFindClass(String name, BundleClassLoader classLoader, BundleData data) throws ClassNotFoundException; + public Class<?> postFindClass(String name, BundleClassLoader classLoader, BundleData data) throws ClassNotFoundException; /** * Called by a {@link ClassLoaderDelegate #findResource(String)} before delegating to the resolved constraints and @@ -86,7 +86,7 @@ public interface ClassLoaderDelegateHook { * @return the resources found by this hook or null if normal delegation should continue * @throws FileNotFoundException to terminate the delegation */ - public Enumeration preFindResources(String name, BundleClassLoader classLoader, BundleData data) throws FileNotFoundException; + public Enumeration<URL> preFindResources(String name, BundleClassLoader classLoader, BundleData data) throws FileNotFoundException; /** * Called by a {@link ClassLoaderDelegate} after delegating to the resolved constraints and @@ -98,7 +98,7 @@ public interface ClassLoaderDelegateHook { * @return the resources found by this hook or null if normal delegation should continue * @throws FileNotFoundException to terminate the delegation */ - public Enumeration postFindResources(String name, BundleClassLoader classLoader, BundleData data) throws FileNotFoundException; + public Enumeration<URL> postFindResources(String name, BundleClassLoader classLoader, BundleData data) throws FileNotFoundException; /** * Called by a {@link ClassLoaderDelegate} before normal delegation. If this method returns diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/FilePath.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/FilePath.java index fbb69c103..55dd1d39c 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/FilePath.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/FilePath.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -137,7 +137,7 @@ public class FilePath { * @return an array containing all segments for this path */ public String[] getSegments() { - return (String[]) segments.clone(); + return segments.clone(); } /** diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/KeyedHashSet.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/KeyedHashSet.java index 17bd38bb0..0fc3f415f 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/KeyedHashSet.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/KeyedHashSet.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -450,11 +450,11 @@ public class KeyedHashSet { * Returns an iterator of elements in this set * @return an iterator of elements in this set */ - public Iterator iterator() { + public Iterator<KeyedElement> iterator() { return new EquinoxSetIterator(); } - class EquinoxSetIterator implements Iterator { + class EquinoxSetIterator implements Iterator<KeyedElement> { private int currentIndex = -1; private int found; @@ -462,7 +462,7 @@ public class KeyedHashSet { return found < elementCount; } - public Object next() { + public KeyedElement next() { if (!hasNext()) throw new NoSuchElementException(); while (++currentIndex < elements.length) diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/ObjectPool.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/ObjectPool.java index e80bd1ac6..45cb44c10 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/ObjectPool.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/ObjectPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,7 +21,7 @@ public class ObjectPool { private static String OPTION_DEBUG_OBJECTPOOL_DUPS = Debug.ECLIPSE_OSGI + "/debug/objectPool/dups"; //$NON-NLS-1$ private static final boolean DEBUG_OBJECTPOOL_ADDS; private static final boolean DEBUG_OBJECTPOOL_DUPS; - private static Map objectCache = new WeakHashMap(); + private static Map<Object, WeakReference<Object>> objectCache = new WeakHashMap<Object, WeakReference<Object>>(); static { FrameworkDebugOptions dbgOptions = FrameworkDebugOptions.getDefault(); if (dbgOptions != null) { @@ -35,7 +35,7 @@ public class ObjectPool { public static Object intern(Object obj) { synchronized (objectCache) { - WeakReference ref = (WeakReference) objectCache.get(obj); + WeakReference<Object> ref = objectCache.get(obj); if (ref != null) { Object refValue = ref.get(); if (refValue != null) { @@ -44,7 +44,7 @@ public class ObjectPool { Debug.println("[ObjectPool] Found duplicate object: " + getObjectString(obj)); //$NON-NLS-1$ } } else { - objectCache.put(obj, new WeakReference(obj)); + objectCache.put(obj, new WeakReference<Object>(obj)); if (DEBUG_OBJECTPOOL_ADDS) Debug.println("[ObjectPool] Added unique object to pool: " + getObjectString(obj) + " Pool size: " + objectCache.size()); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDelta.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDelta.java index 74e7931b2..f8b575eae 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDelta.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDelta.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,7 +20,7 @@ package org.eclipse.osgi.service.resolver; * @since 3.1 * @noimplement This interface is not intended to be implemented by clients. */ -public interface BundleDelta extends Comparable { +public interface BundleDelta extends Comparable<BundleDelta> { /** * Delta type constant (bit mask) indicating that the bundle has been added @@ -121,5 +121,5 @@ public interface BundleDelta extends Comparable { * if the argument can not be converted into something * comparable with the receiver. */ - public int compareTo(Object obj); + public int compareTo(BundleDelta obj); } diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ExportPackageDescription.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ExportPackageDescription.java index cb9a8397a..9aff1241b 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ExportPackageDescription.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ExportPackageDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -37,13 +37,13 @@ public interface ExportPackageDescription extends BaseDescription { * Returns the arbitrary attributes for this package. * @return the arbitrary attributes for this package */ - public Map getAttributes(); + public Map<String, String> getAttributes(); /** * Returns the directives for this package. * @return the directives for this package */ - public Map getDirectives(); + public Map<String, String> getDirectives(); /** * Returns the specified directive for this package. diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericDescription.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericDescription.java index eb255d32b..ea736060c 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericDescription.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericDescription.java @@ -28,7 +28,7 @@ public interface GenericDescription extends BaseDescription { * Returns the arbitrary attributes for this description * @return the arbitrary attributes for this description */ - public Dictionary getAttributes(); + public Dictionary<String, String> getAttributes(); /** * Returns the type of generic description capability diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java index 8e128464f..658944009 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -53,13 +53,13 @@ public interface ImportPackageSpecification extends VersionConstraint { * Returns the arbitrary attributes which this import package may be resolved to. * @return the arbitrary attributes which this import package may be resolved to. */ - public Map getAttributes(); + public Map<String, String> getAttributes(); /** * Returns the directives that control this import package. * @return the directives that control this import package. */ - public Map getDirectives(); + public Map<String, String> getDirectives(); /** * Returns the specified directive that control this import package. diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeDescription.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeDescription.java index c788a99d0..1cd159655 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeDescription.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 IBM Corporation and others. + * Copyright (c) 2007, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,7 +21,7 @@ import org.osgi.framework.Filter; * @since 3.4 * @noimplement This interface is not intended to be implemented by clients. */ -public interface NativeCodeDescription extends BaseDescription, Comparable { +public interface NativeCodeDescription extends BaseDescription, Comparable<NativeCodeDescription> { /** * Returns the paths to the native code libraries. * @return the paths to the native code libraries. @@ -72,7 +72,7 @@ public interface NativeCodeDescription extends BaseDescription, Comparable { * @return a negative integer, zero, or a positive integer as this natve * code description is less than, equal to, or greater than the specified object. */ - public int compareTo(Object other); + public int compareTo(NativeCodeDescription other); /** * Indicates if this native code description has invalid native code paths. Native diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/Resolver.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/Resolver.java index e24e85550..842a8ec1f 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/Resolver.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/Resolver.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -46,7 +46,7 @@ public interface Resolver { * against. A <tt>null</tt> value indicates that the system properties should * be used to match against */ - public void resolve(BundleDescription[] discard, Dictionary[] platformProperties); + public void resolve(BundleDescription[] discard, Dictionary<String, String>[] platformProperties); /** * Flushes this resolver of any stored/cached data it may be keeping to @@ -135,12 +135,12 @@ public interface Resolver { * @param selectionPolicy the selection policy for this resolver * @since 3.2 */ - public void setSelectionPolicy(Comparator selectionPolicy); + public void setSelectionPolicy(Comparator<BaseDescription> selectionPolicy); /** * Returns the selection policy for this resolver or null if it is not set * @return the selection policy for this resolver or null if it is not set * @since 3.2 */ - public Comparator getSelectionPolicy(); + public Comparator<BaseDescription> getSelectionPolicy(); } diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/State.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/State.java index ff7d0bf25..2602b886a 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/State.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/State.java @@ -459,7 +459,7 @@ public interface State { * supported properties already set. If any of the supported property values * are changed as a result of calling this method then true is returned. */ - public boolean setPlatformProperties(Dictionary platformProperties); + public boolean setPlatformProperties(Dictionary<String, String> platformProperties); /** * Sets the platform properties of the state to a list of platform properties. @@ -470,13 +470,13 @@ public interface State { * supported properties already set. If any of the supported property values * are changed as a result of calling this method then true is returned. */ - public boolean setPlatformProperties(Dictionary[] platformProperties); + public boolean setPlatformProperties(Dictionary<String, String>[] platformProperties); /** * Returns the list of platform properties currently set for this state. * @return the list of platform properties currently set for this state. */ - public Dictionary[] getPlatformProperties(); + public Dictionary<String, String>[] getPlatformProperties(); /** * Returns the list of system packages which are exported by the system bundle. diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateObjectFactory.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateObjectFactory.java index f3f6ba964..b87f571f7 100644 --- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateObjectFactory.java +++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateObjectFactory.java @@ -172,7 +172,7 @@ public interface StateObjectFactory { * @return a bundle description derived from the given information * @throws BundleException if an error occurs while reading the manifest */ - public BundleDescription createBundleDescription(State state, Dictionary manifest, String location, long id) throws BundleException; + public BundleDescription createBundleDescription(State state, Dictionary<String, String> manifest, String location, long id) throws BundleException; /** * Returns a bundle description based on the information in the supplied manifest dictionary. @@ -186,7 +186,7 @@ public interface StateObjectFactory { * @throws BundleException if an error occurs while reading the manifest * @deprecated use {@link #createBundleDescription(State, Dictionary, String, long)} */ - public BundleDescription createBundleDescription(Dictionary manifest, String location, long id) throws BundleException; + public BundleDescription createBundleDescription(Dictionary<String, String> manifest, String location, long id) throws BundleException; /** * Creates a bundle description that is a copy of the given description. @@ -246,7 +246,7 @@ public interface StateObjectFactory { * @param importer the importing bundle (may be <code>null</code>) * @return the created package specification */ - public ImportPackageSpecification createImportPackageSpecification(String packageName, VersionRange versionRange, String bundleSymbolicName, VersionRange bundleVersionRange, Map directives, Map attributes, BundleDescription importer); + public ImportPackageSpecification createImportPackageSpecification(String packageName, VersionRange versionRange, String bundleSymbolicName, VersionRange bundleVersionRange, Map<String, String> directives, Map<String, String> attributes, BundleDescription importer); /** * Creates an import package specification that is a copy of the given import package @@ -268,7 +268,7 @@ public interface StateObjectFactory { * @param exporter the exporter of the package (may be <code>null</code>) * @return the created package */ - public ExportPackageDescription createExportPackageDescription(String packageName, Version version, Map directives, Map attributes, boolean root, BundleDescription exporter); + public ExportPackageDescription createExportPackageDescription(String packageName, Version version, Map<String, String> directives, Map<String, String> attributes, boolean root, BundleDescription exporter); /** * Creates a generic description from the given parameters @@ -279,7 +279,7 @@ public interface StateObjectFactory { * @return the created generic description * @deprecated use {@link #createGenericDescription(String, String, Version, Map)} */ - public GenericDescription createGenericDescription(String name, String type, Version version, Map attributes); + public GenericDescription createGenericDescription(String name, String type, Version version, Map<String, String> attributes); /** * Creates a generic description from the given parameters @@ -290,7 +290,7 @@ public interface StateObjectFactory { * @return the created generic description * @since 3.7 */ - public GenericDescription createGenericDescription(String type, Map attributes, Map directives, BundleDescription supplier); + public GenericDescription createGenericDescription(String type, Map<String, String> attributes, Map<String, String> directives, BundleDescription supplier); /** * Creates a generic specification from the given parameters |