Skip to content

Commit

Permalink
Minor renamings to make the code base easier to understand. Added a m…
Browse files Browse the repository at this point in the history
…issing javadoc.
  • Loading branch information
Rafael Winterhalter committed Aug 6, 2015
1 parent b8d02fb commit 4207d66
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
Expand Up @@ -281,6 +281,7 @@ public static class ChildFirst extends ByteArrayClassLoader {
* @param protectionDomain The protection domain to apply where {@code null} references an implicit
* protection domain.
* @param persistenceHandler The persistence handler of this class loader.
* @param packageDefiner The package definer to be queried for package definitions.
*/
public ChildFirst(ClassLoader parent,
Map<String, byte[]> typeDefinitions,
Expand Down
Expand Up @@ -428,15 +428,15 @@ class ManifestReading implements PackageDefiner {
/**
* A locator for a sealed package's URL.
*/
private final CodeSourceLocator codeSourceLocator;
private final SealBaseLocator sealBaseLocator;

/**
* Creates a new package definer that reads a class loader's manifest file.
*
* @param codeSourceLocator A locator for a sealed package's URL.
* @param sealBaseLocator A locator for a sealed package's URL.
*/
public ManifestReading(CodeSourceLocator codeSourceLocator) {
this.codeSourceLocator = codeSourceLocator;
public ManifestReading(SealBaseLocator sealBaseLocator) {
this.sealBaseLocator = sealBaseLocator;
}

@Override
Expand Down Expand Up @@ -468,7 +468,7 @@ public Definition define(String packageName, ClassLoader classLoader, String sim
values.get(Attributes.Name.IMPLEMENTATION_VERSION),
values.get(Attributes.Name.IMPLEMENTATION_VENDOR),
Boolean.parseBoolean(values.get(Attributes.Name.SEALED))
? codeSourceLocator.findSealBase(packageName, classLoader, simpleTypeName)
? sealBaseLocator.findSealBase(packageName, classLoader, simpleTypeName)
: NOT_SEALED);
} finally {
inputStream.close();
Expand All @@ -481,40 +481,40 @@ public Definition define(String packageName, ClassLoader classLoader, String sim
@Override
public boolean equals(Object other) {
return this == other || !(other == null || getClass() != other.getClass())
&& codeSourceLocator.equals(((ManifestReading) other).codeSourceLocator);
&& sealBaseLocator.equals(((ManifestReading) other).sealBaseLocator);
}

@Override
public int hashCode() {
return codeSourceLocator.hashCode();
return sealBaseLocator.hashCode();
}

@Override
public String toString() {
return "PackageDefiner.ManifestReading{" +
"sealBaseLocator=" + codeSourceLocator +
"sealBaseLocator=" + sealBaseLocator +
'}';
}

/**
* A locator for a seal base URL.
*/
public interface CodeSourceLocator {
public interface SealBaseLocator {

/**
* Locates the URL that should be used for sealing a package.
*
* @param packageName The name of the package.
* @param classLoader The class loader loading the package.
* @param simpleTypeName The simple name of the type being loaded when defining this package.
* @return The URL that is used for sealing a package or {@code null} if the package should not be sealed..
* @return The URL that is used for sealing a package or {@code null} if the package should not be sealed.
*/
URL findSealBase(String packageName, ClassLoader classLoader, String simpleTypeName);

/**
* A seal base locator that never seals a package.
*/
enum NonSealing implements CodeSourceLocator {
enum NonSealing implements SealBaseLocator {

/**
* The singleton instance.
Expand All @@ -535,7 +535,7 @@ public String toString() {
/**
* A seal base locator that seals all packages with a fixed URL.
*/
class ForFixedSource implements CodeSourceLocator {
class ForFixedValue implements SealBaseLocator {

/**
* The seal base URL.
Expand All @@ -547,7 +547,7 @@ class ForFixedSource implements CodeSourceLocator {
*
* @param sealBase The seal base URL.
*/
public ForFixedSource(URL sealBase) {
public ForFixedValue(URL sealBase) {
this.sealBase = sealBase;
}

Expand All @@ -559,7 +559,7 @@ public URL findSealBase(String packageName, ClassLoader classLoader, String simp
@Override
public boolean equals(Object other) {
return this == other || !(other == null || getClass() != other.getClass())
&& sealBase.equals(((ForFixedSource) other).sealBase);
&& sealBase.equals(((ForFixedValue) other).sealBase);
}

@Override
Expand All @@ -569,7 +569,7 @@ public int hashCode() {

@Override
public String toString() {
return "PackageDefiner.ManifestReading.CodeSourceLocator.ForFixedSource{" +
return "PackageDefiner.ManifestReading.CodeSourceLocator.ForFixedValue{" +
"sealBase=" + sealBase +
'}';
}
Expand Down

0 comments on commit 4207d66

Please sign in to comment.