[dna-commits] DNA SVN: r487 - trunk/docs/examples/gettingstarted/dna-example-java-sequencer/src/main/resources.

Author: spagop Date: 2008-08-28 16:33:24 -0400 (Thu, 28 Aug 2008) New Revision: 487 Modified: trunk/docs/examples/gettingstarted/dna-example-java-sequencer/src/main/resources/java-source-artifact.cnd Log: more node types Modified: trunk/docs/examples/gettingstarted/dna-example-java-sequencer/src/main/resources/java-source-artifact.cnd =================================================================== --- trunk/docs/examples/gettingstarted/dna-example-java-sequencer/src/main/resources/java-source-artifact.cnd 2008-08-28 20:32:23 UTC (rev 486) +++ trunk/docs/examples/gettingstarted/dna-example-java-sequencer/src/main/resources/java-source-artifact.cnd 2008-08-28 20:33:24 UTC (rev 487) @@ -112,14 +112,14 @@ * Formal parameter */ [java:formalParameter] > nt:unstructured - + java:type (java:primitiveType, java:referenceType) mandatory multiple + + java:type (java:primitiveType, java:arrayType, java:simpleType, java:qualifiedType, java:wildcardType, java:parameterizedType) /** * Primitive type: * - Integral type ('byte', 'short', 'int', 'long', 'char') * - Floating point type ('float', 'double') * - Boolean type ('boolean') - * - No return type (''void') + * - No return type ('void') */ [java:primitiveType] > nt:unstructured - java:primitiveTypeDescription (string) @@ -128,21 +128,46 @@ + java:primitiveVariable (java:variable) = java:variable [java:variable] > nt:unstructured - - java:variableName (string) + - java:variableName (string) mandatory /** - * Reference type (TODO to enhance) + * java:arrayType */ -[java:referenceType] > nt:unstructured - - java:ReferenceDescription (string) - + java:modifier (java:modifierDeclaration) = java:modifierDeclaration - - java:referenceName (string) mandatory +[java:arrayType] > nt:unstructured + - java:arrayTypeDescription (string) + + java:arrayTypeModifier (java:modifierDeclaration) = java:modifierDeclaration + - java:arrayTypeName (string) mandatory + + java:arrayTypeVariable (java:variable) = java:variable +[java:simpleType] > nt:unstructured + - java:simpleTypeDescription (string) + + java:simpleTypeModifier (java:modifierDeclaration) = java:modifierDeclaration + - java:simpleTypeName (string) mandatory + + java:simpleTypeVariable (java:variable) = java:variable + +[java:qualifiedType] > nt:unstructured + - java:qualifiedTypeDescription (string) + + java:qualifiedTypeModifier (java:modifierDeclaration) = java:modifierDeclaration + - java:qualifiedTypeName (string) mandatory + + java:qualifiedTypeVariable (java:variable) = java:variable + +[java:wildcardType] > nt:unstructured + - java:wildcardTypeDescription (string) + + java:wildcardTypeModifier (java:modifierDeclaration) = java:modifierDeclaration + - java:wildcardTypeName (string) mandatory + + java:wildcardTypeVariable (java:variable) = java:variable + +[java:parameterizedType] > nt:unstructured + - java:parameterizedTypeDescription (string) + + java:parameterizedTypeModifier (java:modifierDeclaration) = java:modifierDeclaration + - java:parameterizedTypeName (string) mandatory + + java:parameterizedTypeVariable (java:variable) = java:variable + /** * Field type */ [java:fieldType] > nt:unstructured - + java:type (java:primitiveType, java:referenceType) mandatory multiple + + java:type (java:primitiveType, java:arrayType, java:simpleType, java:qualifiedType, java:wildcardType, java:parameterizedType) mandatory multiple /** * Method declaration @@ -150,7 +175,7 @@ [java:methodDeclaration] > nt:unstructured - java:methodDescription (string) + java:modifier (java:modifierDeclaration) = java:modifierDeclaration - + java:resultType (java:primitiveType, java:referenceType) mandatory + + java:resultType (java:primitiveType, java:arrayType, java:simpleType, java:qualifiedType, java:wildcardType, java:parameterizedType) mandatory - java:methodName (string) mandatory + java:parameter (java:formalParameter) multiple