dims 2003/01/16 10:43:06
Modified: java/src/org/apache/axis/wsdl/fromJava Types.java
Log:
Get rid of deprecated symbolTable.getTypes()
Revision Changes Path
1.70 +24 -28 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
Index: Types.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Types.java 6 Jan 2003 22:25:00 -0000 1.69
+++ Types.java 16 Jan 2003 18:43:06 -0000 1.70
@@ -71,8 +71,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.axis.wsdl.symbolTable.BaseTypeMapping;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
-import org.apache.axis.wsdl.symbolTable.Type;
-import org.apache.axis.wsdl.symbolTable.TypeEntry;
import org.apache.commons.logging.Log;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -93,9 +91,8 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
-import java.util.Vector;
import java.util.Iterator;
+import java.util.List;
/**
*
@@ -196,24 +193,34 @@
true, false, false);
symbolTable.populateTypes(new URL(inputSchema), doc);
- // Walk the type/element entries in the symbol table and
- // add each one to the list of processed types. This prevents
- // the types from being duplicated.
- Vector v = symbolTable.getTypes();
- for (int i=0; i < v.size(); i++) {
- TypeEntry te = (TypeEntry) v.elementAt(i);
- if (te instanceof org.apache.axis.wsdl.symbolTable.Element) {
- addToElementsList(te.getQName());
- } else if (te instanceof Type) {
- addToTypesList(te.getQName());
- }
- }
+ processSymTabEntries(symbolTable);
} else {
// If not, we'll just bail out... perhaps we should log a warning
// or throw an exception?
;
}
}
+
+ /**
+ * Walk the type/element entries in the symbol table and
+ * add each one to the list of processed types. This prevents
+ * the types from being duplicated.
+ *
+ * @param symbolTable
+ */
+ private void processSymTabEntries(SymbolTable symbolTable)
+ {
+ Iterator iterator = symbolTable.getElementIndex().keySet().iterator();
+ while(iterator.hasNext()) {
+ QName name = (QName) iterator.next();
+ addToElementsList(name);
+ }
+ iterator = symbolTable.getTypeIndex().keySet().iterator();
+ while(iterator.hasNext()) {
+ QName name = (QName) iterator.next();
+ addToTypesList(name);
+ }
+ }
/**
* Load the types from the input wsdl file.
@@ -271,18 +278,7 @@
true, false, false);
symbolTable.populate(null, doc);
- // Walk the type/element entries in the symbol table and
- // add each one to the list of processed types. This prevents
- // the types from being duplicated.
- Vector v = symbolTable.getTypes();
- for (int i=0; i < v.size(); i++) {
- TypeEntry te = (TypeEntry) v.elementAt(i);
- if (te instanceof org.apache.axis.wsdl.symbolTable.Element) {
- addToElementsList(te.getQName());
- } else if (te instanceof Type) {
- addToTypesList(te.getQName());
- }
- }
+ processSymTabEntries(symbolTable);
}
/**
