Oops, I was about to check in the finish work for this. Thanks, anyhow.
On Wed, Jan 7, 2009 at 2:51 PM, <[email protected]> wrote: > Author: dkulp > Date: Wed Jan 7 11:51:35 2009 > New Revision: 732447 > > URL: http://svn.apache.org/viewvc?rev=732447&view=rev > Log: > Fix eclipse setup > Workaround "bug" in command line javac (works fine in eclipse javac) > > Modified: > webservices/commons/trunk/modules/XmlSchema/etc/eclipse/addcheckstyle.xsl > > webservices/commons/trunk/modules/XmlSchema/etc/eclipse/template.checkstyle-config.xml > > webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-eclipse-checkstyle > > webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XmlSchemaRef.java > > Modified: > webservices/commons/trunk/modules/XmlSchema/etc/eclipse/addcheckstyle.xsl > URL: > http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/etc/eclipse/addcheckstyle.xsl?rev=732447&r1=732446&r2=732447&view=diff > ============================================================================== > --- webservices/commons/trunk/modules/XmlSchema/etc/eclipse/addcheckstyle.xsl > (original) > +++ webservices/commons/trunk/modules/XmlSchema/etc/eclipse/addcheckstyle.xsl > Wed Jan 7 11:51:35 2009 > @@ -23,7 +23,6 @@ > <xsl:strip-space elements="*"/> > > <xsl:param name="checkstyleconfig"/> > - <xsl:param name="checkstyleconfigcorba"/> > > <xsl:template match="*"> > <xsl:copy> > @@ -38,13 +37,10 @@ > <xsl:apply-templates/> > > <xsl:choose> > - <xsl:when test="not(check-configuration/@name='CXF CORBA > Checks')"> > - <check-configuration name="CXF Checks" type="external" > description=""> > + <xsl:when test="not(check-configuration/@name='XmlSchema > Checks')"> > + <check-configuration name="XmlSchema Checks" > type="external" description=""> > <xsl:attribute name="location"><xsl:value-of > select="$checkstyleconfig"/></xsl:attribute> > </check-configuration> > - <check-configuration name="CXF CORBA Checks" > type="external" description=""> > - <xsl:attribute name="location"><xsl:value-of > select="$checkstyleconfigcorba"/></xsl:attribute> > - </check-configuration> > </xsl:when> > </xsl:choose> > </xsl:copy> > > Modified: > webservices/commons/trunk/modules/XmlSchema/etc/eclipse/template.checkstyle-config.xml > URL: > http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/etc/eclipse/template.checkstyle-config.xml?rev=732447&r1=732446&r2=732447&view=diff > ============================================================================== > --- > webservices/commons/trunk/modules/XmlSchema/etc/eclipse/template.checkstyle-config.xml > (original) > +++ > webservices/commons/trunk/modules/XmlSchema/etc/eclipse/template.checkstyle-config.xml > Wed Jan 7 11:51:35 2009 > @@ -18,10 +18,5 @@ > under the License. > --> > <checkstyle-configurations file-format-version="5.0.0"> > - <check-configuration name="CXF Checks" > location="@CHECKSTYLE_CONFIG_FILE@" type="external" description=""> > - <property name="apache.header.file" value="@APACHE_HEADER_FILE@"/> > - </check-configuration> > - <check-configuration name="CXF CORBA Checks" > location="@CHECKSTYLE_CORBA_CONFIG_FILE@" type="external" description=""> > - <property name="apache.header.file" value="@APACHE_HEADER_FILE@"/> > - </check-configuration> > + <check-configuration name="XmlSchema Checks" > location="@CHECKSTYLE_CONFIG_FILE@" type="external" description=""/> > </checkstyle-configurations> > \ No newline at end of file > > Modified: > webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-eclipse-checkstyle > URL: > http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-eclipse-checkstyle?rev=732447&r1=732446&r2=732447&view=diff > ============================================================================== > --- > webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-eclipse-checkstyle > (original) > +++ > webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-eclipse-checkstyle > Wed Jan 7 11:51:35 2009 > @@ -18,7 +18,7 @@ > under the License. > --> > <fileset-config file-format-version="1.1.0" simple-config="false"> > - <fileset name="all" enabled="true" check-config-name="CXF Checks" > type="external" description=""> > + <fileset name="all" enabled="true" check-config-name="XmlSchema Checks" > type="external" description=""> > <file-match-pattern match-pattern="^src[/\\]." > include-pattern="true"/> > <file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]." > include-pattern="false"/> > <file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]." > include-pattern="false"/> > > Modified: > webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XmlSchemaRef.java > URL: > http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XmlSchemaRef.java?rev=732447&r1=732446&r2=732447&view=diff > ============================================================================== > --- > webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XmlSchemaRef.java > (original) > +++ > webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XmlSchemaRef.java > Wed Jan 7 11:51:35 2009 > @@ -34,7 +34,7 @@ > * Implementation for ref='QName', a common construct in the schema. > */ > public class XmlSchemaRef<T extends XmlSchemaNamed> { > - private Class<T> targetClass; > + private Class<? extends T> targetClass; > private XmlSchema parent; > private QName targetQName; > private T targetObject; > @@ -46,18 +46,19 @@ > > public T getTarget() { > if (targetObject == null) { > + Class<?> cls = targetClass; > XmlSchemaCollection parentCollection = parent.getParent(); > - if (targetClass == XmlSchemaElement.class) { > + if (cls == XmlSchemaElement.class) { > targetObject = > targetClass.cast(parentCollection.getElementByQName(targetQName)); > - } else if (targetClass == XmlSchemaAttribute.class) { > + } else if (cls == XmlSchemaAttribute.class) { > targetObject = > targetClass.cast(parentCollection.getAttributeByQName(targetQName)); > - } else if (targetClass == XmlSchemaType.class) { > + } else if (cls == XmlSchemaType.class) { > targetObject = > targetClass.cast(parentCollection.getTypeByQName(targetQName)); > - } else if (targetClass == XmlSchemaAttributeGroup.class) { > + } else if (cls == XmlSchemaAttributeGroup.class) { > targetObject = > targetClass.cast(parentCollection.getAttributeGroupByQName(targetQName)); > - } else if (targetClass == XmlSchemaGroup.class) { > + } else if (cls == XmlSchemaGroup.class) { > targetObject = > targetClass.cast(parentCollection.getGroupByQName(targetQName)); > - } else if (targetClass == XmlSchemaNotation.class) { > + } else if (cls == XmlSchemaNotation.class) { > targetObject = > targetClass.cast(parentCollection.getNotationByQName(targetQName)); > } > } > > >
