svn commit: r1175369 - in /felix/trunk/ipojo/manipulator: pom.xml src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java

[cl...@apache.org]

Author: clement
Date: Sun Sep 25 10:57:48 2011
New Revision: 1175369

URL: http://svn.apache.org/viewvc?rev=1175369&view=rev
Log:
Fixed FELIX-3131
Manipulation metadata are now returned using the discovery order.

Modified:
    felix/trunk/ipojo/manipulator/pom.xml
    felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java
    felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java

Modified: felix/trunk/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=1175369&r1=1175368&r2=1175369&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Sun Sep 25 10:57:48 2011
@@ -48,7 +48,7 @@
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.metadata</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>

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?rev=1175369&r1=1175368&r2=1175369&view=diff
==============================================================================
--- 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 Sun Sep 25 10:57:48 2011
@@ -19,9 +19,9 @@
 package org.apache.felix.ipojo.manipulation;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassVisitor;
@@ -51,7 +51,7 @@ public class ClassChecker extends EmptyV
     /**
      * Field map [field name, type] discovered in the component class.
      */
-    private Map<String, String> m_fields = new HashMap<String, String>();
+    private Map<String, String> m_fields = new TreeMap<String, String>();
 
     /**
      * Method List of method descriptor discovered in the component class.

Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java?rev=1175369&r1=1175368&r2=1175369&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java (original)
+++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/MetadataCollector.java Sun Sep 25 10:57:48 2011
@@ -23,8 +23,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -74,14 +76,14 @@ public class MetadataCollector extends E
      * Map of [element ids, element].
      * This map is used to easily get an already created element.
      */
-    private Map<String, Element> m_ids = new HashMap<String, Element>();
+    private Map<String, Element> m_ids = new TreeMap<String, Element>();
 
     /**
      * Map of [element, referto].
      * This map is used to recreate the element hierarchy.
      * Stored element are added under referred element.
      */
-    private Map<Element, String> m_elements = new HashMap<Element, String>();
+    private Map<Element, String> m_elements = new LinkedHashMap<Element, String>();
 
     /**
      * Instance declaration.
@@ -126,8 +128,8 @@ public class MetadataCollector extends E
      * @see org.objectweb.asm.ClassAdapter#visit(int, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String[])
      */
     public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        m_ids = new HashMap<String, Element>();
-        m_elements = new HashMap<Element, String>();
+        m_ids = new TreeMap<String, Element>();
+        m_elements = new LinkedHashMap<Element, String>();
         m_className = name;
     }