|
|
@ -80,6 +80,8 @@ public class PackageIdentifier extends Identifier { |
|
|
|
(bundle, this, subclazz, ClassInfo.forName(fullname)); |
|
|
|
(bundle, this, subclazz, ClassInfo.forName(fullname)); |
|
|
|
loadedClasses.put(subclazz, ident); |
|
|
|
loadedClasses.put(subclazz, ident); |
|
|
|
((ClassIdentifier) ident).initClass(); |
|
|
|
((ClassIdentifier) ident).initClass(); |
|
|
|
|
|
|
|
if (bundle.preserveRule != -1) |
|
|
|
|
|
|
|
ident.applyPreserveRule(bundle.preserveRule); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -88,8 +90,7 @@ public class PackageIdentifier extends Identifier { |
|
|
|
public Identifier getIdentifier(String name) { |
|
|
|
public Identifier getIdentifier(String name) { |
|
|
|
if (loadOnDemand) { |
|
|
|
if (loadOnDemand) { |
|
|
|
Identifier ident = loadClass(name); |
|
|
|
Identifier ident = loadClass(name); |
|
|
|
if (ident != null && bundle.preserveRule != -1) |
|
|
|
return ident; |
|
|
|
ident.applyPreserveRule(bundle.preserveRule); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
int index = name.indexOf('.'); |
|
|
|
int index = name.indexOf('.'); |
|
|
@ -121,6 +122,8 @@ public class PackageIdentifier extends Identifier { |
|
|
|
ClassInfo.forName(fullname)); |
|
|
|
ClassInfo.forName(fullname)); |
|
|
|
loadedClasses.put(name, ident); |
|
|
|
loadedClasses.put(name, ident); |
|
|
|
((ClassIdentifier) ident).initClass(); |
|
|
|
((ClassIdentifier) ident).initClass(); |
|
|
|
|
|
|
|
if (bundle.preserveRule != -1) |
|
|
|
|
|
|
|
ident.applyPreserveRule(bundle.preserveRule); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return ident; |
|
|
|
return ident; |
|
|
|