Improved particles definitions

Author: rmraya

src/com/maxprograms/xml/ContentParticle.java

@@ -19,6 +19,7 @@ public interface ContentParticle {
     public static final int CHOICE = 3;
 
     public int getType();
+    public void addParticle(ContentParticle particle);
     public void setCardinality(int cardinality);
     public int getCardinality();
     @Override

src/com/maxprograms/xml/DTDChoice.java

@@ -45,7 +45,27 @@ public void setCardinality(int cardinality) {
 
     @Override
     public String toString() {
-        // TODO Auto-generated method stub
-        return super.toString();
+        StringBuilder sb = new StringBuilder("(");
+        for (int i = 0; i < content.size(); i++) {
+            ContentParticle particle = content.get(i);
+            sb.append(particle.toString());
+            if (i < content.size() - 1) {
+                sb.append('|');
+            }
+        }
+        sb.append(')');
+        switch (cardinality) {
+            case ContentModel.NONE:
+                return sb.toString();
+            case ContentModel.OPTIONAL:
+                return sb + "?";
+            case ContentModel.ONEMANY:
+                return sb + "+";
+            case ContentModel.ZEROMANY:
+                return sb + "*";
+            default:
+                // ignore
+        }
+        return sb.toString();
     }
 }

src/com/maxprograms/xml/DTDName.java

@@ -31,6 +31,11 @@ public int getCardinality() {
         return cardinality;
     }
 
+    @Override
+    public void addParticle(ContentParticle particle) {
+        // do nothing
+    }
+
     @Override
     public String toString() {
         switch (cardinality) {

src/com/maxprograms/xml/DTDPCData.java

@@ -23,6 +23,11 @@ public void setCardinality(int cardinality) {
         // do nothing        
     }
 
+    @Override
+    public void addParticle(ContentParticle particle) {
+        // do nothing
+    }
+
     @Override
     public int getCardinality() {
         return ContentModel.NONE;

src/com/maxprograms/xml/DTDSecuence.java

@@ -45,7 +45,27 @@ public int getCardinality() {
 
     @Override
     public String toString() {
-        // TODO Auto-generated method stub
-        return super.toString();
+        StringBuilder sb = new StringBuilder("(");
+        for (int i = 0; i < content.size(); i++) {
+            ContentParticle particle = content.get(i);
+            sb.append(particle.toString());
+            if (i < content.size() - 1) {
+                sb.append(',');
+            }
+        }
+        sb.append(')');
+        switch (cardinality) {
+            case ContentModel.NONE:
+                return sb.toString();
+            case ContentModel.OPTIONAL:
+                return sb + "?";
+            case ContentModel.ONEMANY:
+                return sb + "+";
+            case ContentModel.ZEROMANY:
+                return sb + "*";
+            default:
+                // ignore
+        }
+        return sb.toString();
     }
 }