[jaxb~v2:3110f837] add additional untracked files

  • From: snajper@...
  • To: commits@...
  • Subject: [jaxb~v2:3110f837] add additional untracked files
  • Date: Thu, 11 Apr 2013 09:11:33 +0000

Project:    jaxb
Repository: v2
Revision:   3110f83786415fe5c62d8088aef260d1fd644a14
Author:     snajper
Date:       2013-04-11 09:05:56 UTC
Link:       

Log Message:
------------
Merge from trunk, fix for another 6940394 regression.
add additional untracked files


Revisions:
----------
9f8620a53b0db1bd4c33ee896f790a8d4b9fad51
3110f83786415fe5c62d8088aef260d1fd644a14


Modified Paths:
---------------
jaxb-ri/runtime/src/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java
.gitignore


Diffs:
------
diff --git 
a/jaxb-ri/runtime/src/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java 
b/jaxb-ri/runtime/src/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java
index 1126ab7..2b7f103 100644
--- 
a/jaxb-ri/runtime/src/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java
+++ 
b/jaxb-ri/runtime/src/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java
@@ -1132,6 +1132,11 @@ public final class XmlSchemaGenerator<T,C,F,M> {
             ClassInfo ci = null;
             QName targetTagName = null;
 
+            if(t.isNillable() || t.getDefaultValue()!=null) {
+                // can't put those attributes on <element ref>
+                return false;
+            }
+
             if (t.getTarget() instanceof Element) {
                 te = (Element) t.getTarget();
                 targetTagName = te.getElementName();
@@ -1152,11 +1157,6 @@ public final class XmlSchemaGenerator<T,C,F,M> {
                 }
             }
 
-            if(t.isNillable() || t.getDefaultValue()!=null) {
-                // can't put those attributes on <element ref>
-                return false;
-            }
-
             // we have the precise element defined already
             if (te != null) { // it is instanceof Element
                 return targetTagName!=null && targetTagName.equals(tn);
diff --git a/.gitignore b/.gitignore
index 1743e9c..728cdd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,14 @@
 /jaxb-ri/dist/
+/jaxb-ri/build/
 /jaxb-ri/apgen/build/
+/jaxb-ri/docs/
+/jaxb-ri/core/build/
+/jaxb-ri/jxc/build/
+/jaxb-ri/osgi/build/
 /jaxb-ri/runtime-fi/build/
 /jaxb-ri/runtime-staxex/build/
 /jaxb-ri/runtime-deprecated/build/
+/jaxb-ri/samples/
 /jaxb-ri/tools/jing-rnc-driver/build/
 /jaxb-ri/tools/pretty-printer/build/
 /jaxb-ri/tools/xmllint/build/
@@ -13,4 +19,6 @@
 /jaxb-ri/tools/lib/util/pretty-printer.jar
 /jaxb-ri/tools/lib/util/jing-rnc-driver.jar
 /jaxb-ri/*.zip
+/jaxb-ri/nbproject/private/
 *.class
+.DS_Store




[jaxb~v2:3110f837] add additional untracked files

snajper 04/11/2013
Terms of Use; Privacy Policy; Copyright ©2013-2016 (revision 20160708.bf2ac18)
 
 
Close
loading
Please Confirm
Close