Author: clement
Date: Fri Mar 8 09:39:15 2013
New Revision: 1454302
URL: http://svn.apache.org/r1454302
Log:
Revert: unintended commit on the manipulator test suite.
Removed:
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/switches/TestSwitches.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/switches/Color.java
felix/trunk/ipojo/manipulator/manipulator/src/test/java/test/switches/Switches.java
Modified:
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatedClassLoader.java
Modified:
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatedClassLoader.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatedClassLoader.java?rev=1454302&r1=1454301&r2=1454302&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatedClassLoader.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator/src/test/java/org/apache/felix/ipojo/manipulation/ManipulatedClassLoader.java
Fri Mar 8 09:39:15 2013
@@ -18,9 +18,6 @@
*/
package org.apache.felix.ipojo.manipulation;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* A classloader used to load manipulated classes.
*/
@@ -29,33 +26,19 @@ public class ManipulatedClassLoader exte
private String name;
private byte[] clazz;
- private Map<String, byte[]> inners = new HashMap<String, byte[]>();
-
public ManipulatedClassLoader(String name, byte[] clazz) {
this.name = name;
this.clazz = clazz;
}
- public void addInnerClasses(Map<String, byte[]> inn) {
- inners = inn;
- }
-
public Class findClass(String name) throws ClassNotFoundException {
if (name.equals(this.name)) {
return defineClass(name, clazz, 0, clazz.length);
}
- if (inners.containsKey(name)) {
- return defineClass(name, inners.get(name), 0,
inners.get(name).length);
-
- }
return super.findClass(name);
}
public Class loadClass(String arg0) throws ClassNotFoundException {
- if (inners.containsKey(arg0)) {
- return defineClass(arg0, inners.get(arg0), 0,
inners.get(arg0).length);
-
- }
return super.loadClass(arg0);
}
}