Author: oshani
Date: Thu Sep 7 21:24:19 2006
New Revision: 441372
URL: http://svn.apache.org/viewvc?view=rev&rev=441372
Log:
Removed all Java1.5 specific code
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java?view=diff&rev=441372&r1=441371&r2=441372
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java
(original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java
Thu Sep 7 21:24:19 2006
@@ -52,7 +52,7 @@
/**
* @return a list of attributes associated with the XML element
*/
- public List getAttributes ();
+ public List getAllElementAttributes ();
/**
* Returns the value of an attribute of an element. Should return null
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java?view=diff&rev=441372&r1=441371&r2=441372
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
Thu Sep 7 21:24:19 2006
@@ -53,11 +53,11 @@
}
- public List getAttributes() {
+ public List getAllElementAttributes() {
String nodename, prefix;
if (fSource instanceof Element){
Element el = (Element)fSource;
- List<Node> attrs = new Vector<Node>();
+ List attrs = new Vector();
NamedNodeMap attrMap = el.getAttributes();
for(int i = 0; i < attrMap.getLength(); i++){
nodename = attrMap.item(i).getNodeName();
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java?view=diff&rev=441372&r1=441371&r2=441372
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
Thu Sep 7 21:24:19 2006
@@ -46,10 +46,10 @@
}
- public List getAttributes() {
+ public List getAllElementAttributes() {
if (fSource instanceof OMElement){
OMElement elem = (OMElement)fSource;
- List<Object> attrs = new Vector<Object>();
+ List attrs = new Vector();
Iterator iter = elem.getAllAttributes();
while (iter.hasNext()){
//No need to check for xmlns, since AXIOM knows that if it's
prefixed
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java?view=diff&rev=441372&r1=441371&r2=441372
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
Thu Sep 7 21:24:19 2006
@@ -677,7 +677,7 @@
String extendsAttr = OMUtils.getAttribute(interfaceEl,
Constants.ATTR_EXTENDS);
if(extendsAttr != null){
List stringList = StringUtils.parseNMTokens(extendsAttr);
- String qnString = null;
+ String qnString;
Iterator it = stringList.iterator();
while(it.hasNext()){
qnString = (String)it.next();
@@ -732,7 +732,7 @@
String style = OMUtils.getAttribute(operEl, Constants.ATTR_STYLE);
if(style != null){
List stringList = StringUtils.parseNMTokens(style);
- String uriString = null;
+ String uriString;
Iterator it = stringList.iterator();
while(it.hasNext()){
uriString = (String)it.next();
@@ -1226,26 +1226,15 @@
parseExtensionAttributes(featEl, FeatureElement.class, feature, desc);
/* Parse the child elements of the <feature> element.*/
- //TODO: first checking with the parent element and then going inwards.
- // Check if this step is necessary
- while (featEl != null) {
- if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, featEl)){
- feature.addDocumentationElement(parseDocumentation(featEl,
desc));
+ Iterator featElChildren = featEl.getChildElements();
+ while (featElChildren.hasNext()){
+ OMElement featElChild = (OMElement)featElChildren.next();
+ if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
featElChild)){
+
feature.addDocumentationElement(parseDocumentation(featElChild, desc));
}
else{
-
feature.addExtensionElement(parseExtensionElement(FeatureElement.class,
feature, featEl, desc) );
- }
-
- Iterator featElChildren = featEl.getChildElements();
- while (featElChildren.hasNext()){
- OMElement featElChild = (OMElement)featElChildren.next();
- if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
featElChild)){
-
feature.addDocumentationElement(parseDocumentation(featElChild, desc));
- }
- else{
- feature.addExtensionElement(parseExtensionElement(
- FeatureElement.class, feature, featElChild, desc)
);
- }
+ feature.addExtensionElement(parseExtensionElement(
+ FeatureElement.class, feature, featElChild, desc) );
}
}
return feature;
@@ -1438,9 +1427,9 @@
DescriptionElement desc,
Map wsdlModules)
throws WSDLException{
- DescriptionElement referencedDesc = null;
+ DescriptionElement referencedDesc;
OMElement docEl;
- URL locationURL = null;
+ URL locationURL;
URI contextURI = null;
try{
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java?view=diff&rev=441372&r1=441371&r2=441372
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java
Thu Sep 7 21:24:19 2006
@@ -133,9 +133,9 @@
Direction[] directions = new Direction[] { Direction.IN,
Direction.INOUT, Direction.OUT,
Direction.RETURN };
- for (Direction direction : directions) {
- if (directionStr.equals(direction.toString())) {
- return direction;
+ for (int i = 0; i < directions.length; i++) {
+ if (directionStr.equals(directions[i].toString())) {
+ return directions[i];
}
}
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java?view=diff&rev=441372&r1=441371&r2=441372
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java
Thu Sep 7 21:24:19 2006
@@ -117,7 +117,7 @@
Iterator i = qnStrings.iterator();
String qnString;
QName qname;
- List<QName> qnames = new Vector<QName>();
+ List qnames = new Vector();
while(i.hasNext())
{
Modified:
incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java?view=diff&rev=441372&r1=441371&r2=441372
==============================================================================
---
incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java
(original)
+++
incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java
Thu Sep 7 21:24:19 2006
@@ -83,7 +83,7 @@
while (tempEl != null){
if (DOMQNameUtils.matches(Constants.Q_ELEM_BINDING, tempEl)){
domElementSource.setSource(tempEl);
- assertNotNull(domElementSource.getAttributes());
+ assertNotNull(domElementSource.getAllElementAttributes());
}
tempEl = DOMUtils.getNextSiblingElement(tempEl);
}
Modified:
incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java?view=diff&rev=441372&r1=441371&r2=441372
==============================================================================
---
incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java
(original)
+++
incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java
Thu Sep 7 21:24:19 2006
@@ -73,7 +73,7 @@
OMElement childEl = (OMElement) childEls.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_BINDING, childEl)){
omElementSource.setSource(childEl);
- assertNotNull(omElementSource.getAttributes());
+ assertNotNull(omElementSource.getAllElementAttributes());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
