Browse Source

reduced visibility of the members not defined in super class of a private inner class

removed unnecessary casts


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277775 13f79535-47bb-0310-9956-ffa450edef68
master
Jacobus Martinus Kruithof 20 years ago
parent
commit
99903f49b5
1 changed files with 7 additions and 10 deletions
  1. +7
    -10
      src/main/org/apache/tools/ant/ComponentHelper.java

+ 7
- 10
src/main/org/apache/tools/ant/ComponentHelper.java View File

@@ -325,8 +325,7 @@ public class ComponentHelper {
for (Iterator i = antTypeTable.keySet().iterator(); for (Iterator i = antTypeTable.keySet().iterator();
i.hasNext();) { i.hasNext();) {
String name = (String) i.next(); String name = (String) i.next();
Class clazz =
(Class) antTypeTable.getExposedClass(name);
Class clazz = antTypeTable.getExposedClass(name);
if (clazz == null) { if (clazz == null) {
continue; continue;
} }
@@ -358,8 +357,7 @@ public class ComponentHelper {
for (Iterator i = antTypeTable.keySet().iterator(); for (Iterator i = antTypeTable.keySet().iterator();
i.hasNext();) { i.hasNext();) {
String name = (String) i.next(); String name = (String) i.next();
Class clazz =
(Class) antTypeTable.getExposedClass(name);
Class clazz = antTypeTable.getExposedClass(name);
if (clazz == null) { if (clazz == null) {
continue; continue;
} }
@@ -911,30 +909,29 @@ public class ComponentHelper {
private static class AntTypeTable extends Hashtable { private static class AntTypeTable extends Hashtable {
private Project project; private Project project;


public AntTypeTable(Project project) {
AntTypeTable(Project project) {
this.project = project; this.project = project;
} }


public AntTypeDefinition getDefinition(String key) {
AntTypeDefinition getDefinition(String key) {
return (AntTypeDefinition) (super.get(key)); return (AntTypeDefinition) (super.get(key));
} }


/** Equivalent to getTypeType */
public Object get(Object key) { public Object get(Object key) {
return getTypeClass((String) key); return getTypeClass((String) key);
} }


public Object create(String name) {
Object create(String name) {
AntTypeDefinition def = getDefinition(name); AntTypeDefinition def = getDefinition(name);
return (def == null) ? null : def.create(project); return (def == null) ? null : def.create(project);
} }


public Class getTypeClass(String name) {
Class getTypeClass(String name) {
AntTypeDefinition def = getDefinition(name); AntTypeDefinition def = getDefinition(name);
return (def == null) ? null : def.getTypeClass(project); return (def == null) ? null : def.getTypeClass(project);
} }


public Class getExposedClass(String name) {
Class getExposedClass(String name) {
AntTypeDefinition def = getDefinition(name); AntTypeDefinition def = getDefinition(name);
return (def == null) ? null : def.getExposedClass(project); return (def == null) ? null : def.getExposedClass(project);
} }


Loading…
Cancel
Save