<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#copied {background-color:#ccccff;}
tr.alt #copied {background-color:#bbbbf7;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="5">Commit in <b><tt>wsdl2as/trunk/src/main/java/uk/co/badgersinfoil/wsdl2as</tt></b></td></tr>
<tr><td><tt><a href="#file1">ASXSDTypeMappingStrategy.java</a></tt> </td><td></td><td align="right" id="added">+19</td><td align="right" id="removed">-33</td><td nowrap="nowrap" align="center">66 -> 67</td></tr>
<tr class="alt"><td><tt><a href="#file2">ActionScript3Builder.java</a></tt> </td><td></td><td align="right" id="added">+4</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center">66 -> 67</td></tr>
<tr><td><tt><a href="#file3">BindingStubClassBuilder.java</a></tt> </td><td></td><td align="right" id="added">+12</td><td align="right" id="removed">-12</td><td nowrap="nowrap" align="center">66 -> 67</td></tr>
<tr class="alt"><td><tt><a href="#file4">Main.java</a></tt> </td><td></td><td align="right" id="added">+5</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center">66 -> 67</td></tr>
<tr><td><tt><a href="#file5">NoTypeMappingStrategy.java</a></tt> </td><td></td><td align="right" id="added">+8</td><td align="right" id="removed">-8</td><td nowrap="nowrap" align="center">66 -> 67</td></tr>
<tr class="alt"><td><tt><a href="#file6">TypeMappingStrategy.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">66 -> 67</td></tr>
<tr><td></td><td></td><td align="right" id="added">+50</td><td align="right" id="removed">-65</td><td></td></tr>
</table>
<small id="info">6 modified files</small><br />
<pre class="comment">
sync with asxsd API changes
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">wsdl2as/trunk/src/main/java/uk/co/badgersinfoil/wsdl2as</span><br />
<div class="fileheader"><big><b>ASXSDTypeMappingStrategy.java</b></big> <small id="info">66 -> 67</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/ASXSDTypeMappingStrategy.java 2007-07-12 23:41:50 UTC (rev 66)
+++ trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/ASXSDTypeMappingStrategy.java 2007-11-11 18:04:39 UTC (rev 67)
@@ -4,16 +4,16 @@
</small></pre><pre class="diff" id="context">
package uk.co.badgersinfoil.wsdl2as;
</pre><pre class="diff" id="added">+import org.eclipse.xsd.XSDConcreteComponent;
</pre><pre class="diff" id="context"> import org.eclipse.xsd.XSDElementDeclaration;
import org.eclipse.xsd.XSDParticle;
import org.eclipse.xsd.XSDSchema;
import org.eclipse.xsd.XSDTypeDefinition;
import uk.co.badgersinfoil.asxsd.MappingCodeGenerator;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.asxsd.TypeBuilder;
-import uk.co.badgersinfoil.asxsd.MarshalBuilder;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.asxsd.MappingFunction;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.TypeDescriptor;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.asxsd.UnmarshalBuilder;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.VariableNameGenerator;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.ActionScriptFactory;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.ActionScriptProject;
</pre><pre class="diff"><small id="info">@@ -21,57 +21,42 @@
</small></pre><pre class="diff" id="context">
private MappingCodeGenerator mappingGen;
</pre><pre class="diff" id="removed">- public ASXSDTypeMappingStrategy(ActionScriptProject project) {
- mappingGen = new MappingCodeGenerator(project);
</pre><pre class="diff" id="added">+ public ASXSDTypeMappingStrategy(ActionScriptFactory factory, ActionScriptProject project) {
+ mappingGen = new MappingCodeGenerator(factory, project);
</pre><pre class="diff" id="context"> }
public String convertExprFromXML(String expr,
XSDElementDeclaration elementDecl)
{
</pre><pre class="diff" id="removed">- UnmarshalBuilder unmarshalerBuilder = mappingGen.getUnmarshalerBuilder();
- String qualifiedMethodName = unmarshalerBuilder.conversionMethodFor(elementDecl);
- return qualifiedMethodName+"("+expr+")";
</pre><pre class="diff" id="added">+ MappingFunction fn = mappingGen.unmarshalMethodFor(elementDecl);
+ return fn.appliedTo(expr);
</pre><pre class="diff" id="context"> }
public String convertExprFromXML(String expr,
XSDTypeDefinition typeDef)
{
</pre><pre class="diff" id="removed">- UnmarshalBuilder unmarshalerBuilder = mappingGen.getUnmarshalerBuilder();
- String qualifiedMethodName = unmarshalerBuilder.conversionMethodFor(typeDef);
- return qualifiedMethodName+"("+expr+")";
</pre><pre class="diff" id="added">+ MappingFunction fn = mappingGen.unmarshalMethodFor(typeDef);
+ return fn.appliedTo(expr);
</pre><pre class="diff" id="context"> }
public String convertExprToXML(String expr,
XSDElementDeclaration elementDecl)
{
</pre><pre class="diff" id="removed">- MarshalBuilder marshalerBuilder = mappingGen.getMarshalerBuilder();
- String qualifiedMethodName = marshalerBuilder.conversionMethodFor(elementDecl);
- return qualifiedMethodName+"("+expr+")";
</pre><pre class="diff" id="added">+ MappingFunction fn = mappingGen.marshalMethodFor(elementDecl);
+ return fn.appliedTo(expr);
</pre><pre class="diff" id="context"> }
public String convertExprToXML(String expr,
XSDTypeDefinition typeDef)
{
</pre><pre class="diff" id="removed">- MarshalBuilder marshalerBuilder = mappingGen.getMarshalerBuilder();
- String qualifiedMethodName = marshalerBuilder.conversionMethodFor(typeDef);
- return qualifiedMethodName+"("+expr+")";
</pre><pre class="diff" id="added">+ MappingFunction fn = mappingGen.marshalMethodFor(typeDef);
+ return fn.appliedTo(expr);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="removed">- public String typeNameForElement(XSDElementDeclaration elementDecl) {
- TypeBuilder typeBuilder = mappingGen.getTypeBuilder();
- return typeBuilder.typeNameFor(elementDecl);
</pre><pre class="diff" id="added">+ public TypeDescriptor typeFor(XSDConcreteComponent component) {
+ return mappingGen.typeDescriptorFor(component);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="removed">- public String typeNameForType(XSDTypeDefinition typeDef) {
- TypeBuilder typeBuilder = mappingGen.getTypeBuilder();
- return typeBuilder.typeNameFor(typeDef);
- }
-
- public TypeDescriptor typeNameForElementDecl(XSDParticle particle, XSDElementDeclaration elementDecl) {
- TypeBuilder typeBuilder = mappingGen.getTypeBuilder();
- return typeBuilder.typeDescriptorForElementDecl(particle, elementDecl);
- }
-
</pre><pre class="diff" id="context"> public void processSchema(XSDSchema schema) {
// we'll only process the types actually used
}
</pre><pre class="diff"><small id="info">@@ -86,12 +71,13 @@
</small></pre><pre class="diff" id="context"> }
public String wrapperInit(XSDElementDeclaration decl) {
</pre><pre class="diff" id="removed">- return "new " + typeNameForElement(decl) + "()";
</pre><pre class="diff" id="added">+ TypeDescriptor typeDesc = typeFor(decl);
+ return "new " + typeDesc.getTypeName() + "()";
</pre><pre class="diff" id="context"> }
public String accessWrapppedResponse(String converted, XSDElementDeclaration responseElementDecl, XSDElementDeclaration wrappedElementDecl) {
</pre><pre class="diff" id="removed">- String asTypeName = typeNameForElement(responseElementDecl);
- if (asTypeName.equals("Array")) {
</pre><pre class="diff" id="added">+ TypeDescriptor typeDesc = typeFor(responseElementDecl);
+ if (typeDesc.getTypeName().equals("Array")) {
</pre><pre class="diff" id="context"> // assume the array-handling case kicked-in; no
// unwrapping really needed,
return converted;
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">wsdl2as/trunk/src/main/java/uk/co/badgersinfoil/wsdl2as</span><br />
<div class="fileheader"><big><b>ActionScript3Builder.java</b></big> <small id="info">66 -> 67</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/ActionScript3Builder.java 2007-07-12 23:41:50 UTC (rev 66)
+++ trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/ActionScript3Builder.java 2007-11-11 18:04:39 UTC (rev 67)
@@ -13,23 +13,23 @@
</small></pre><pre class="diff" id="context"> import org.eclipse.wst.wsdl.Service;
import org.eclipse.wst.wsdl.Types;
import org.eclipse.xsd.XSDSchema;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.ActionScriptFactory;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.ActionScriptProject;
// TODO: the WST framework provides SOAP extension classes, but I don't know
// how to get WSDL to use them, rather than UnknownExtensionElement
</pre><pre class="diff" id="removed">-// TODO: support 'wrapped'-style return values
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="context"> public class ActionScript3Builder {
private TypeNamer namer = new TypeNamer();
</pre><pre class="diff" id="removed">- private TypeMappingStrategy typeMappingStrategy = new NoTypeMappingStrategy();
</pre><pre class="diff" id="added">+ private TypeMappingStrategy typeMappingStrategy;
</pre><pre class="diff" id="context"> private ActionScriptProject project;
</pre><pre class="diff" id="removed">- public ActionScript3Builder(ActionScriptProject project) {
</pre><pre class="diff" id="added">+ public ActionScript3Builder(ActionScript<span id="addedchars">Factory factory, ActionScript</span>Project project) {
</pre><pre class="diff" id="context"> this.project = project;
</pre><pre class="diff" id="added">+ typeMappingStrategy = new NoTypeMappingStrategy(factory);
</pre><pre class="diff" id="context"> }
public void setTypeMappingStrategy(TypeMappingStrategy typeMappingStrategy) {
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">wsdl2as/trunk/src/main/java/uk/co/badgersinfoil/wsdl2as</span><br />
<div class="fileheader"><big><b>BindingStubClassBuilder.java</b></big> <small id="info">66 -> 67</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/BindingStubClassBuilder.java 2007-07-12 23:41:50 UTC (rev 66)
+++ trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/BindingStubClassBuilder.java 2007-11-11 18:04:39 UTC (rev 67)
@@ -120,20 +120,20 @@
</small></pre><pre class="diff" id="context"> Part parameters = findOutputParametersPart(portOperation);
String methodName = TypeNamer.sanitize(bindingOperation.getName())+"_ResponseHandler";
</pre><pre class="diff" id="removed">- String asTypeName;
</pre><pre class="diff" id="added">+ TypeDescriptor asType;
</pre><pre class="diff" id="context"> String returnExpr;
if (parameters.getElementName() != null) {
if (canUseWrappedResponse(parameters, portOperation)) {
ASMethod meth = buildWrappedResponseHandling(bindingClass, methodName, parameters);
return meth==null ? null : meth.getName();
}
</pre><pre class="diff" id="removed">- asTypeName = typeMappingStrategy.typeNameForElement(parameters.getElementDeclaration());
</pre><pre class="diff" id="added">+ asType = typeMappingStrategy.typeFor(parameters.getElementDeclaration());
</pre><pre class="diff" id="context"> returnExpr = typeMappingStrategy.convertExprFromXML("response", parameters.getElementDeclaration());
} else {
</pre><pre class="diff" id="removed">- asTypeName = typeMappingStrategy.typeNameForType(parameters.getTypeDefinition());
</pre><pre class="diff" id="added">+ asType = typeMappingStrategy.typeFor(parameters.getTypeDefinition());
</pre><pre class="diff" id="context"> returnExpr = typeMappingStrategy.convertExprFromXML("response", parameters.getTypeDefinition());
}
</pre><pre class="diff" id="removed">- ASMethod meth = bindingClass.newMethod(methodName, Visibility.PRIVATE, asType<span id="removedchars">Name</span>);
</pre><pre class="diff" id="added">+ ASMethod meth = bindingClass.newMethod(methodName, Visibility.PRIVATE, asType<span id="addedchars">.getTypeName()</span>);
</pre><pre class="diff" id="context"> meth.addParam("response", "XML");
meth.addStmt("return "+returnExpr);
</pre><pre class="diff"><small id="info">@@ -171,7 +171,7 @@
</small></pre><pre class="diff" id="context"> throw new IllegalArgumentException("Was expecting type "+decl.getQName()+" used by part "+parameters.getName()+" to have a sequence of elements only; other values in the sequence aren't handled, sorry");
}
XSDElementDeclaration wrappedElementDecl = (XSDElementDeclaration)partContent;
</pre><pre class="diff" id="removed">- TypeDescriptor typeDesc = typeMappingStrategy.typeNameForElementDecl(part, wrappedElementDecl);
</pre><pre class="diff" id="added">+ TypeDescriptor typeDesc = typeMappingStrategy.typeFor(part);
</pre><pre class="diff" id="context">
ASMethod meth = bindingClass.newMethod(methodName, Visibility.PRIVATE, typeDesc.getTypeName());
if (typeDesc.getDocumentation() != null) {
</pre><pre class="diff"><small id="info">@@ -196,7 +196,7 @@
</small></pre><pre class="diff" id="context"> meth.addStmt("var parameters:XML = null");
return;
}
</pre><pre class="diff" id="removed">- String asTypeName;
</pre><pre class="diff" id="added">+ TypeDescriptor asType;
</pre><pre class="diff" id="context"> String paramName;
String converted;
if (parameters.getElementName() != null) {
</pre><pre class="diff"><small id="info">@@ -204,15 +204,15 @@
</small></pre><pre class="diff" id="context"> buildWrappedParameterHandling(meth, parameters);
return;
}
</pre><pre class="diff" id="removed">- asTypeName = typeMappingStrategy.typeNameForElement(parameters.getElementDeclaration());
</pre><pre class="diff" id="added">+ asType = typeMappingStrategy.typeFor(parameters.getElementDeclaration());
</pre><pre class="diff" id="context"> paramName = TypeNamer.sanitize(parameters.getElementName().getLocalPart());
converted = typeMappingStrategy.convertExprToXML(paramName, parameters.getElementDeclaration());
} else {
</pre><pre class="diff" id="removed">- asTypeName = typeMappingStrategy.typeNameForType(parameters.getTypeDefinition());
</pre><pre class="diff" id="added">+ asType = typeMappingStrategy.typeFor(parameters.getTypeDefinition());
</pre><pre class="diff" id="context"> paramName = TypeNamer.sanitize(parameters.getTypeName().getLocalPart());
converted = typeMappingStrategy.convertExprToXML(paramName, parameters.getTypeDefinition());
}
</pre><pre class="diff" id="removed">- meth.addParam(paramName, asType<span id="removedchars">Name</span>);
</pre><pre class="diff" id="added">+ meth.addParam(paramName, asType<span id="addedchars">.getTypeName()</span>);
</pre><pre class="diff" id="context"> // TODO: marshaling of parameter
meth.addStmt("var parameters:XML = " + converted);
}
</pre><pre class="diff"><small id="info">@@ -243,9 +243,9 @@
</small></pre><pre class="diff" id="context"> private void buildWrappedParameterHandling(ASMethod meth, Part parameters) {
XSDElementDeclaration decl = parameters.getElementDeclaration();
meth.addComment(" wrapped-style parameter handling");
</pre><pre class="diff" id="removed">- String wrapperTypeName = typeMappingStrategy.typeNameForElement(decl);
</pre><pre class="diff" id="added">+ TypeDescriptor wrapperType = typeMappingStrategy.typeFor(decl);
</pre><pre class="diff" id="context"> String wrapperInit = typeMappingStrategy.wrapperInit(decl);
</pre><pre class="diff" id="removed">- meth.addStmt("var _tmp:" + wrapperType<span id="removedchars">Name</span> + " = " + wrapperInit);
</pre><pre class="diff" id="added">+ meth.addStmt("var _tmp:" + wrapperType<span id="addedchars">.getTypeName()</span> + " = " + wrapperInit);
</pre><pre class="diff" id="context"> XSDTypeDefinition typeDef = decl.getTypeDefinition();
if (!(typeDef instanceof XSDComplexTypeDefinition) ){
throw new IllegalArgumentException("Was expecting type "+decl.getQName()+" used by part "+parameters.getName()+" to have complexType content; I don't handle other types, sorry ("+typeDef.getClass().getName()+")");
</pre><pre class="diff"><small id="info">@@ -280,7 +280,7 @@
</small></pre><pre class="diff" id="context"> paramElementLocalName = paramElementDecl.getName();
}
String paramName = names.uniqueVariationOn(paramElementLocalName);
</pre><pre class="diff" id="removed">- TypeDescriptor typeDesc = typeMappingStrategy.typeNameForElementDecl(part, paramElementDecl);
</pre><pre class="diff" id="added">+ TypeDescriptor typeDesc = typeMappingStrategy.typeFor(part);
</pre><pre class="diff" id="context"> XSDAnnotation anno = paramElementDecl.getAnnotation();
ASArg arg = meth.addParam(paramName, typeDesc.getTypeName());
if (anno != null) {
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">wsdl2as/trunk/src/main/java/uk/co/badgersinfoil/wsdl2as</span><br />
<div class="fileheader"><big><b>Main.java</b></big> <small id="info">66 -> 67</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/Main.java 2007-07-12 23:41:50 UTC (rev 66)
+++ trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/Main.java 2007-11-11 18:04:39 UTC (rev 67)
@@ -71,12 +71,12 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="removed">- private static TypeMappingStrategy createStrategy(String strategyName, ActionScriptProject project) {
</pre><pre class="diff" id="added">+ private static TypeMappingStrategy createStrategy(String strategyName, ActionScript<span id="addedchars">Factory factory, ActionScript</span>Project project) {
</pre><pre class="diff" id="context"> if (strategyName == null || strategyName.equals("none")) {
</pre><pre class="diff" id="removed">- return new NoTypeMappingStrategy();
</pre><pre class="diff" id="added">+ return new NoTypeMappingStrategy(<span id="addedchars">factory</span>);
</pre><pre class="diff" id="context"> }
if (strategyName.equals("asxsd")) {
</pre><pre class="diff" id="removed">- return new ASXSDTypeMappingStrategy(project);
</pre><pre class="diff" id="added">+ return new ASXSDTypeMappingStrategy(<span id="addedchars">factory, </span>project);
</pre><pre class="diff" id="context"> }
throw new IllegalArgumentException("Invalid type mapping strategy: "+strategyName);
}
</pre><pre class="diff"><small id="info">@@ -101,8 +101,8 @@
</small></pre><pre class="diff" id="context"> project.addClasspathEntry(classpathElements[i]);
}
}
</pre><pre class="diff" id="removed">- ActionScript3Builder builder = new ActionScript3Builder(project);
- TypeMappingStrategy typeMappingStrategy = createStrategy(strategyName, project);
</pre><pre class="diff" id="added">+ ActionScript3Builder builder = new ActionScript3Builder(factory, project);
+ TypeMappingStrategy typeMappingStrategy = createStrategy(strategyName, factory, project);
</pre><pre class="diff" id="context"> builder.setTypeMappingStrategy(typeMappingStrategy);
builder.build(resource.getDefinition());
typeMappingStrategy.commit();
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname">wsdl2as/trunk/src/main/java/uk/co/badgersinfoil/wsdl2as</span><br />
<div class="fileheader"><big><b>NoTypeMappingStrategy.java</b></big> <small id="info">66 -> 67</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/NoTypeMappingStrategy.java 2007-07-12 23:41:50 UTC (rev 66)
+++ trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/NoTypeMappingStrategy.java 2007-11-11 18:04:39 UTC (rev 67)
@@ -4,11 +4,13 @@
</small></pre><pre class="diff" id="context">
package uk.co.badgersinfoil.wsdl2as;
</pre><pre class="diff" id="added">+import org.eclipse.xsd.XSDConcreteComponent;
</pre><pre class="diff" id="context"> import org.eclipse.xsd.XSDElementDeclaration;
import org.eclipse.xsd.XSDParticle;
import org.eclipse.xsd.XSDSchema;
import org.eclipse.xsd.XSDTypeDefinition;
import uk.co.badgersinfoil.asxsd.TypeDescriptor;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.ActionScriptFactory;
</pre><pre class="diff" id="context">
/**
</pre><pre class="diff"><small id="info">@@ -16,13 +18,15 @@
</small></pre><pre class="diff" id="context"> * XML objects to be passed around unchanged.
*/
public class NoTypeMappingStrategy implements TypeMappingStrategy {
</pre><pre class="diff" id="added">+
+ private ActionScriptFactory factory;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- public String typeNameForElement(XSDElementDeclaration elementDecl) {
- return "XML";
</pre><pre class="diff" id="added">+ public NoTypeMappingStrategy(ActionScriptFactory factory) {
+ this.factory = factory;
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="removed">- public String typeNameForType(XSDTypeDefinition typeDef) {
- return "XML";
</pre><pre class="diff" id="added">+ public TypeDescriptor typeFor(XSDConcreteComponent component) {
+ return new TypeDescriptor("XML", false, null, component);
</pre><pre class="diff" id="context"> }
public String convertExprFromXML(String expr, XSDElementDeclaration elementDeclaration) {
</pre><pre class="diff"><small id="info">@@ -49,10 +53,6 @@
</small></pre><pre class="diff" id="context"> // ignored
}
</pre><pre class="diff" id="removed">- public TypeDescriptor typeNameForElementDecl(XSDParticle part, XSDElementDeclaration wrappedElementDecl) {
- return new TypeDescriptor("XML", false, null);
- }
-
</pre><pre class="diff" id="context"> public String genAddChildPart(XSDParticle part, XSDElementDeclaration paramElementDecl, String paramName) {
return "_tmp.appendChild("+paramName+")";
}
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname">wsdl2as/trunk/src/main/java/uk/co/badgersinfoil/wsdl2as</span><br />
<div class="fileheader"><big><b>TypeMappingStrategy.java</b></big> <small id="info">66 -> 67</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/TypeMappingStrategy.java 2007-07-12 23:41:50 UTC (rev 66)
+++ trunk/src/main/java/uk/co/badgersinfoil/wsdl2as/TypeMappingStrategy.java 2007-11-11 18:04:39 UTC (rev 67)
@@ -4,6 +4,7 @@
</small></pre><pre class="diff" id="context">
package uk.co.badgersinfoil.wsdl2as;
</pre><pre class="diff" id="added">+import org.eclipse.xsd.XSDConcreteComponent;
</pre><pre class="diff" id="context"> import org.eclipse.xsd.XSDElementDeclaration;
import org.eclipse.xsd.XSDParticle;
import org.eclipse.xsd.XSDSchema;
</pre><pre class="diff"><small id="info">@@ -12,15 +13,13 @@
</small></pre><pre class="diff" id="context">
public interface TypeMappingStrategy {
</pre><pre class="diff" id="removed">- String typeNameForElement(XSDElementDeclaration elementDecl);
- String typeNameForType(XSDTypeDefinition typeDef);
</pre><pre class="diff" id="added">+ TypeDescriptor typeFor(XSDConcreteComponent typeDef);
</pre><pre class="diff" id="context"> String convertExprFromXML(String expr, XSDElementDeclaration elementDeclaration);
String convertExprFromXML(String expr, XSDTypeDefinition typeDefinition);
String convertExprToXML(String expr, XSDElementDeclaration elementDeclaration);
String convertExprToXML(String expr, XSDTypeDefinition typeDefinition);
void processSchema(XSDSchema schema);
void commit();
</pre><pre class="diff" id="removed">- TypeDescriptor typeNameForElementDecl(XSDParticle part, XSDElementDeclaration wrappedElementDecl);
</pre><pre class="diff" id="context"> String genAddChildPart(XSDParticle part, XSDElementDeclaration paramElementDecl, String paramName);
String wrapperInit(XSDElementDeclaration decl);
String accessWrapppedResponse(String converted, XSDElementDeclaration responseElementDecl, XSDElementDeclaration wrappedElementDecl);
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.12</small></center>
</body></html>