[dna-commits] DNA SVN: r508 - in trunk/docs/examples/gettingstarted/dna-example-java-sequencer: workspace/project1/src/org/acme and 1 other directory.

[dna-commits at lists.jboss.org]

Author: spagop
Date: 2008-09-08 12:28:03 -0400 (Mon, 08 Sep 2008)
New Revision: 508

Modified:
   trunk/docs/examples/gettingstarted/dna-example-java-sequencer/src/main/java/org/jboss/dna/sequencer/java/JavaSequencingClient.java
   trunk/docs/examples/gettingstarted/dna-example-java-sequencer/workspace/project1/src/org/acme/MySource.java
Log:
enhancement of sequencer and meta data to support array type

Modified: trunk/docs/examples/gettingstarted/dna-example-java-sequencer/src/main/java/org/jboss/dna/sequencer/java/JavaSequencingClient.java
===================================================================
--- trunk/docs/examples/gettingstarted/dna-example-java-sequencer/src/main/java/org/jboss/dna/sequencer/java/JavaSequencingClient.java	2008-09-08 16:26:38 UTC (rev 507)
+++ trunk/docs/examples/gettingstarted/dna-example-java-sequencer/src/main/java/org/jboss/dna/sequencer/java/JavaSequencingClient.java	2008-09-08 16:28:03 UTC (rev 508)
@@ -345,7 +345,7 @@
                         try {
                             Node javaPackageDeclarationNode = javaCompilationUnit.getNode("java:package/java:packageDeclaration");
                             javaElements.add(extractInfo(javaPackageDeclarationNode));
-                            tree.put("Package", javaElements);
+                            tree.put("Class package", javaElements);
                         } catch (PathNotFoundException e) {
                             // do nothing
                         }
@@ -357,7 +357,7 @@
                                 Node javasingleTypeImportDeclarationNode = singleImportIterator.nextNode();
                                 javaElements.add(extractInfo(javasingleTypeImportDeclarationNode));
                             }
-                            tree.put("Single Imports", javaElements);
+                            tree.put("Class single Imports", javaElements);
                         } catch (PathNotFoundException e) {
                             // do nothing
                         }
@@ -368,7 +368,7 @@
                                 Node javaImportOnDemandtDeclarationNode = javaImportOnDemandIterator.nextNode();
                                 javaElements.add(extractInfo(javaImportOnDemandtDeclarationNode));
                             }
-                            tree.put("On demand imports", javaElements);
+                            tree.put("Class on demand imports", javaElements);
 
                         } catch (PathNotFoundException e) {
                             // do nothing
@@ -377,7 +377,7 @@
                         javaElements = new ArrayList<Properties>();
                         Node javaNormalDeclarationClassNode = javaCompilationUnit.getNode("java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration");
                         javaElements.add(extractInfo(javaNormalDeclarationClassNode));
-                        tree.put("class head information", javaElements);
+                        tree.put("Class head information", javaElements);
 
                         // field member informations
                         javaElements = new ArrayList<Properties>();
@@ -397,12 +397,29 @@
                                 Node javaParameterizedType = rootFieldTypeNode.getNode("java:parameterizedType");
                                 javaElements.add(extractInfo(javaParameterizedType));
                             }
+                            if(rootFieldTypeNode.hasNode("java:arrayType")) {
+                                Node javaArrayType = rootFieldTypeNode.getNode("java:arrayType[2]");
+                                javaElements.add(extractInfo(javaArrayType));
+                            }
                         }
                         tree.put("Class field members", javaElements);
 
                         // constructor informations
-
+                        javaElements = new ArrayList<Properties>();
+                        for (NodeIterator javaConstructorIterator = javaCompilationUnit.getNode("java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor").getNodes(); javaConstructorIterator.hasNext();) {
+                            Node javaConstructor = javaConstructorIterator.nextNode();
+                            javaElements.add(extractInfo(javaConstructor));
+                        }
+                        tree.put("Class constructors", javaElements);
+                        
                         // method informations
+                        javaElements = new ArrayList<Properties>();
+                        for (NodeIterator javaMethodIterator = javaCompilationUnit.getNode("java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method").getNodes(); javaMethodIterator.hasNext();) {
+                            Node javaMethod = javaMethodIterator.nextNode();
+                            javaElements.add(extractInfo(javaMethod));
+                        }
+                        tree.put("Class member functions", javaElements);
+                        
                         javaInfo = new JavaInfo(javaCompilationUnit.getPath(), javaCompilationUnit.getName(), "java source", tree);
                         javaInfos.add(javaInfo);
                     }

Modified: trunk/docs/examples/gettingstarted/dna-example-java-sequencer/workspace/project1/src/org/acme/MySource.java
===================================================================
--- trunk/docs/examples/gettingstarted/dna-example-java-sequencer/workspace/project1/src/org/acme/MySource.java	2008-09-08 16:26:38 UTC (rev 507)
+++ trunk/docs/examples/gettingstarted/dna-example-java-sequencer/workspace/project1/src/org/acme/MySource.java	2008-09-08 16:28:03 UTC (rev 508)
@@ -35,14 +35,19 @@
     private List<String> l;
     private A<Integer> o;
     private X x;
+    private int[] ia;
+    private Object[] oa;
+    private Collection[] ca;
 
     MySource() {
     }
-    public MySource(int i, int j, Object o) {
+
+    public MySource( int i,
+                     int j,
+                     Object o ) {
         this.i = i;
         this.j = j;
     }
-    
 
     public int getI() {
         return this.i;
@@ -56,11 +61,22 @@
         this.j = j;
     }
 
-    public void doSomething(int p1, double p2, Object o) {
+    public void doSomething( int p1,
+                             double p2,
+                             Object o ) {
         l = new ArrayList<String>();
         l.add("N1");
     }
 
+    private double doSomething2( Object[] oa,
+                                 int[] ia ) {
+        System.out.println("genial");
+    }
+
+    public Object doSomething3() {
+        return null;
+    }
+
     // nested class
     class A<E> {
         E e;
@@ -92,3 +108,4 @@
 
     }
 }
+    
\ No newline at end of file