Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java?view=diff&rev=555662&r1=555661&r2=555662 ============================================================================== --- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java (original) +++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java Thu Jul 12 08:33:37 2007 @@ -21,6 +21,7 @@ import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; +import java.util.Map; import org.apache.felix.ipojo.InstanceManager; import org.apache.felix.ipojo.util.Logger; @@ -201,8 +202,8 @@ * Build the map [service object, service reference] of used services. * @return the used service. */ - public HashMap getUsedServices() { - HashMap hm = new HashMap(); + public Map getUsedServices() { + Map hm = new HashMap(); if (m_isAggregate) { for (int i = 0; i < m_ref.length; i++) { if (i < m_services.length) {
Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java?view=diff&rev=555662&r1=555661&r2=555662 ============================================================================== --- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java (original) +++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java Thu Jul 12 08:33:37 2007 @@ -19,6 +19,7 @@ package org.apache.felix.ipojo.handlers.dependency; import java.util.HashMap; +import java.util.Map; import org.osgi.framework.ServiceReference; @@ -54,25 +55,15 @@ private String m_filter; /** - * Hashmap [Instance reference, service reference] of the used service. + * Map [Instance reference, service reference] of the used service. */ - private HashMap m_usedServices = new HashMap(); + private Map m_usedServices = new HashMap(); /** * The list of service reference. */ private ServiceReference[] m_serviceReferences; - public boolean isMultiple() { return m_multiple; } - - public boolean isOptional() { return m_optional; } - - public String getFilter() { return m_filter; } - - public String getInterface() { return m_interface; } - - public int getState() { return m_state; } - /** * Constructor. * @param itf : the needed itf @@ -91,6 +82,16 @@ m_serviceReferences = new ServiceReference[0]; } + public boolean isMultiple() { return m_multiple; } + + public boolean isOptional() { return m_optional; } + + public String getFilter() { return m_filter; } + + public String getInterface() { return m_interface; } + + public int getState() { return m_state; } + /** * Get the service refrence array. * @return the array of service reference (only if the cardinality could be n). @@ -111,15 +112,15 @@ /** * Get the used service map. - * @return the hashmap [object reference, service reference] containing the used services + * @return the map [object reference, service reference] containing the used services */ - public HashMap getUsedServices() { return m_usedServices; } + public Map getUsedServices() { return m_usedServices; } /** * Set the usedServices. * @param hm : the new usedService */ - public void setUsedServices(HashMap hm) { + public void setUsedServices(Map hm) { m_usedServices = hm; } Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java?view=diff&rev=555662&r1=555661&r2=555662 ============================================================================== --- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java (original) +++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java Thu Jul 12 08:33:37 2007 @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Attribute; @@ -48,9 +49,9 @@ private String[] m_itfs = new String[0]; /** - * Field hashmap [field name, type] discovered in the component class. + * Field map [field name, type] discovered in the component class. */ - private HashMap m_fields = new HashMap(); + private Map m_fields = new HashMap(); /** * Method List of method descriptor discovered in the component class. @@ -206,9 +207,9 @@ /** * Get collected fields. - * @return the field hashmap [field_name, type]. + * @return the field map [field_name, type]. */ - public HashMap getFields() { + public Map getFields() { return m_fields; } Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java?view=diff&rev=555662&r1=555661&r2=555662 ============================================================================== --- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java (original) +++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java Thu Jul 12 08:33:37 2007 @@ -42,6 +42,36 @@ public static final int SEVERE = 2; /** + * Activator internal package name. + */ + protected static final String IPOJO_INTERNAL_PACKAGE_NAME = "org/apache/felix/ipojo/"; + + /** + * Ipojo internal package name for internal descriptor. + */ + protected static final String IPOJO_INTERNAL_DESCRIPTOR = "L" + IPOJO_INTERNAL_PACKAGE_NAME; + + /** + * iPOJO Package name. + */ + protected static final String IPOJO_PACKAGE_NAME = "org.apache.felix.ipojo"; + + /** + * Helper array for bytecode manipulation of primitive type. + */ + protected static final String[][] PRIMITIVE_BOXING_INFORMATION = new String[][] { + { "V", "ILLEGAL", "ILLEGAL" }, + { "Z", "java/lang/Boolean", "booleanValue" }, + { "C", "java/lang/Character", "charValue" }, + { "B", "java/lang/Byte", "byteValue" }, + { "S", "java/lang/Short", "shortValue" }, + { "I", "java/lang/Integer", "intValue" }, + { "F", "java/lang/Float", "floatValue" }, + { "J", "java/lang/Long", "longValue" }, + { "D", "java/lang/Double", "doubleValue" } + }; + + /** * Internal logger implementation. */ protected static class Logger { @@ -62,6 +92,9 @@ case SEVERE: System.err.println("[SEVERE] " + message); break; + default: + System.err.println("[SEVERE] " + message); + break; } } } @@ -76,6 +109,7 @@ * Default logger level. */ private static int m_logLevel = WARNING; + /** * Get the manipulator logger. @@ -87,34 +121,4 @@ } return m_logger; } - - /** - * iPOJO Package name. - */ - protected static final String IPOJO_PACKAGE_NAME = "org.apache.felix.ipojo"; - - /** - * Activator internal package name. - */ - protected static final String IPOJO_INTERNAL_PACKAGE_NAME = "org/apache/felix/ipojo/"; - - /** - * Ipojo internal package name for internal descriptor. - */ - protected static final String IPOJO_INTERNAL_DESCRIPTOR = "L" + IPOJO_INTERNAL_PACKAGE_NAME; - - /** - * Helper array for bytecode manipulation of primitive type. - */ - protected static final String[][] PRIMITIVE_BOXING_INFORMATION = new String[][] { { "V", "ILLEGAL", "ILLEGAL" }, // Void type [0] - { "Z", "java/lang/Boolean", "booleanValue" }, // boolean [1] - { "C", "java/lang/Character", "charValue" }, // char [2] - { "B", "java/lang/Byte", "byteValue" }, // byte [3] - { "S", "java/lang/Short", "shortValue" }, // short [4] - { "I", "java/lang/Integer", "intValue" }, // int [5] - { "F", "java/lang/Float", "floatValue" }, // float [6] - { "J", "java/lang/Long", "longValue" }, // long [7] - { "D", "java/lang/Double", "doubleValue" } // double [8] - }; - } Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java?view=diff&rev=555662&r1=555661&r2=555662 ============================================================================== --- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java (original) +++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java Thu Jul 12 08:33:37 2007 @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import org.apache.felix.ipojo.metadata.Attribute; import org.apache.felix.ipojo.metadata.Element; @@ -43,7 +44,7 @@ /** * Store the visited fields : [name fo the field, type of the field]. */ - private HashMap m_fields = new HashMap(); + private Map m_fields = new HashMap(); /** * Store the interface implemented by the class. @@ -95,7 +96,7 @@ // Get interface and remove POJO interface is presents String[] its = ck.getInterfaces(); - ArrayList l = new ArrayList(); + List l = new ArrayList(); for (int i = 0; i < its.length; i++) { l.add(its[i]); } @@ -168,7 +169,7 @@ // Get interface and remove POJO interface is presents String[] its = ck.getInterfaces(); - ArrayList l = new ArrayList(); + List l = new ArrayList(); for (int i = 0; i < its.length; i++) { l.add(its[i]); } Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/PojoAdapter.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/PojoAdapter.java?view=diff&rev=555662&r1=555661&r2=555662 ============================================================================== --- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/PojoAdapter.java (original) +++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/PojoAdapter.java Thu Jul 12 08:33:37 2007 @@ -60,7 +60,7 @@ /** * Getter/Setter methods creator. */ - FieldAdapter m_getterSetterCreator = new FieldAdapter(cv); + private FieldAdapter m_getterSetterCreator = new FieldAdapter(cv); /** * Constructor. Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java?view=diff&rev=555662&r1=555661&r2=555662 ============================================================================== --- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java (original) +++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java Thu Jul 12 08:33:37 2007 @@ -76,10 +76,10 @@ /** * Class map (jar entry, byte[]). */ - private HashMap m_classes = new HashMap(); + private Map m_classes = new HashMap(); /** - * Referendec packages by the composite. + * Referenced packages by the composite. */ private List m_referredPackages;
