forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r378991 - in /forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc: ant/doc/ java/src/ java/src/symtab/
Date Mon, 20 Feb 2006 00:56:36 GMT
Author: crossley
Date: Sun Feb 19 16:56:35 2006
New Revision: 378991

URL: http://svn.apache.org/viewcvs?rev=378991&view=rev
Log:
Fix 'enum' is a keyword.

Modified:
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizAttrStmt.java
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizPrinter.java
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizProjectLoaderImpl.java
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizTarget.java
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/Vizant.java
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/Pass1.java
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/JavaVector.java
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/PackageDef.java
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/ReferencePersistor.java
    forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/SymbolTable.java

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizAttrStmt.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizAttrStmt.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizAttrStmt.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizAttrStmt.java
Sun Feb 19 16:56:35 2006
@@ -57,9 +57,9 @@
      * add attribute.
      */
     public void addAttribute(VizAttr attr) {
-        Enumeration enum = attrs.elements();
-        while (enum.hasMoreElements()) {
-            VizAttr a = (VizAttr) enum.nextElement();
+        Enumeration enumList = attrs.elements();
+        while (enumList.hasMoreElements()) {
+            VizAttr a = (VizAttr) enumList.nextElement();
             if (a.getName().equals(attr.getName())) {
                 a.setValue(attr.getValue());
                 return;
@@ -87,9 +87,9 @@
     public void addAttribute(VizAttrStmt attrstmt) {
         if (!type.equals(attrstmt.getType()))
             return;
-        Enumeration enum = attrstmt.getAttributes();
-        while (enum.hasMoreElements()) {
-            addAttribute((VizAttr) enum.nextElement());
+        Enumeration enumList = attrstmt.getAttributes();
+        while (enumList.hasMoreElements()) {
+            addAttribute((VizAttr) enumList.nextElement());
         }
     }
 
@@ -108,9 +108,9 @@
     public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append(type).append(" [ ");
-        Enumeration enum = getAttributes();
-        while (enum.hasMoreElements()) {
-            buffer.append(enum.nextElement().toString()).append(" ");
+        Enumeration enumList = getAttributes();
+        while (enumList.hasMoreElements()) {
+            buffer.append(enumList.nextElement().toString()).append(" ");
         }
         buffer.append("]");
         return buffer.toString();

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizPrinter.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizPrinter.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizPrinter.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizPrinter.java
Sun Feb 19 16:56:35 2006
@@ -163,9 +163,9 @@
     }
 
     public void printAttrStmt(VizAttrStmt as) {
-        Enumeration enum = as.getAttributes();
-        while (enum.hasMoreElements()) {
-            VizAttr attr = (VizAttr) enum.nextElement();
+        Enumeration enumList = as.getAttributes();
+        while (enumList.hasMoreElements()) {
+            VizAttr attr = (VizAttr) enumList.nextElement();
 
             // The attribute value must be raw. DO NOT ESCAPE.
             // Some escape sequence exists: 
@@ -206,9 +206,9 @@
     }
 
     private void filterReferences(Vector targets) {
-        Enumeration enum = projects.elements();
-        while (enum.hasMoreElements()) {
-            Enumeration targetEnum = ((VizProject) enum.nextElement())
+        Enumeration enumList = projects.elements();
+        while (enumList.hasMoreElements()) {
+            Enumeration targetEnum = ((VizProject) enumList.nextElement())
                     .getOrderedTargets().elements();
             while (targetEnum.hasMoreElements()) {
                 VizTarget target = (VizTarget) targetEnum.nextElement();
@@ -219,9 +219,9 @@
 
     private void eraseNotContainsTargets(Vector targets) {
         Vector newProjects = new Vector();
-        Enumeration enum = projects.elements();
-        while (enum.hasMoreElements()) {
-            VizProject oldp = (VizProject) enum.nextElement();
+        Enumeration enumList = projects.elements();
+        while (enumList.hasMoreElements()) {
+            VizProject oldp = (VizProject) enumList.nextElement();
             VizProject newp = new VizProject();
             oldp.copyAttributes(newp);
             Enumeration targetEnum = oldp.getOrderedTargets().elements();
@@ -249,9 +249,9 @@
         } else {
             refs = target.getReferencesOut();
         }
-        Enumeration enum = refs.elements();
-        while (enum.hasMoreElements()) {
-            VizReference ref = (VizReference) enum.nextElement();
+        Enumeration enumList = refs.elements();
+        while (enumList.hasMoreElements()) {
+            VizReference ref = (VizReference) enumList.nextElement();
             VizTarget t = (backward) ? ref.getFrom() : ref.getTo();
             addReferredTargets(t, set, backward);
         }
@@ -295,9 +295,9 @@
         int subgraphNum = 0;
         Vector clusterRefs = new Vector();
 
-        Enumeration enum = projects.elements();
-        while (enum.hasMoreElements()) {
-            printProject((VizProject) enum.nextElement(),
+        Enumeration enumList = projects.elements();
+        while (enumList.hasMoreElements()) {
+            printProject((VizProject) enumList.nextElement(),
                     clusterRefs, subgraphNum);
             subgraphNum++;
         }
@@ -375,9 +375,9 @@
     }
 
     private void printClusterRefs(Vector clusterRefs) {
-        Enumeration enum = clusterRefs.elements();
-        while (enum.hasMoreElements()) {
-            VizReference ref = (VizReference) enum.nextElement();
+        Enumeration enumList = clusterRefs.elements();
+        while (enumList.hasMoreElements()) {
+            VizReference ref = (VizReference) enumList.nextElement();
             String from = idtable.getId(ref.getFrom());
             String to = idtable.getId(ref.getTo());
             print("<edge from=" + getQuotedId(from) + " to=" + getQuotedId(to) + " ");
@@ -428,9 +428,9 @@
             Hashtable result = new Hashtable();
             Vector idSet = new Vector();
 
-            Enumeration enum = projects.elements();
-            while (enum.hasMoreElements()) {
-                VizProject project = (VizProject) enum.nextElement();
+            Enumeration enumList = projects.elements();
+            while (enumList.hasMoreElements()) {
+                VizProject project = (VizProject) enumList.nextElement();
                 Vector targetlist = project.getOrderedTargets();
                 Enumeration targetEnum = targetlist.elements();
                 while (targetEnum.hasMoreElements()) {

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizProjectLoaderImpl.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizProjectLoaderImpl.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizProjectLoaderImpl.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizProjectLoaderImpl.java
Sun Feb 19 16:56:35 2006
@@ -274,11 +274,11 @@
 
         private VizProject getProject(String dir, String file) {
 
-            Enumeration enum = projects.elements();
+            Enumeration enumList = projects.elements();
 
-            while (enum.hasMoreElements()) {
+            while (enumList.hasMoreElements()) {
 
-                VizProject project = (VizProject) enum.nextElement();
+                VizProject project = (VizProject) enumList.nextElement();
 
                 if (dir.equals(project.getDir()) && file.equals(project.getFile()))
 

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizTarget.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizTarget.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizTarget.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/VizTarget.java
Sun Feb 19 16:56:35 2006
@@ -86,9 +86,9 @@
     private Vector filterReferences(Vector targets,
                                     Vector references) {
         Vector ret = new Vector();
-        Enumeration enum = references.elements();
-        while (enum.hasMoreElements()) {
-            VizReference r = (VizReference) enum.nextElement();
+        Enumeration enumList = references.elements();
+        while (enumList.hasMoreElements()) {
+            VizReference r = (VizReference) enumList.nextElement();
             if (targets.contains(r.getFrom()) &&
                     targets.contains(r.getTo())) {
                 ret.addElement(r);

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/Vizant.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/Vizant.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/Vizant.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/ant/doc/Vizant.java
Sun Feb 19 16:56:35 2006
@@ -123,9 +123,9 @@
     }
 
     protected void loadProjects() throws BuildException {
-        Enumeration enum = loader.getProjects().elements();
-        while (enum.hasMoreElements()) {
-            printer.addProject((VizProject) enum.nextElement());
+        Enumeration enumList = loader.getProjects().elements();
+        while (enumList.hasMoreElements()) {
+            printer.addProject((VizProject) enumList.nextElement());
         }
     }
 

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/Pass1.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/Pass1.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/Pass1.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/Pass1.java
Sun Feb 19 16:56:35 2006
@@ -198,13 +198,13 @@
                 pDef.generateTags(tagList);
 
                 Hashtable fileTable = tagList.getFileTable();
-                Enumeration enum = fileTable.keys();
+                Enumeration enumList = fileTable.keys();
                 Vector tempFileTags = new Vector();
 
-                while (enum.hasMoreElements()) {
+                while (enumList.hasMoreElements()) {
                     tempFileTags.clear();
 
-                    File f = (File) enum.nextElement();
+                    File f = (File) enumList.nextElement();
 
                     if (inputFiles.contains(f.getAbsolutePath())) {
                         Vector fileTags = (Vector) fileTable.get(f);

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/JavaVector.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/JavaVector.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/JavaVector.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/JavaVector.java
Sun Feb 19 16:56:35 2006
@@ -249,10 +249,10 @@
      */
     public void accept(Visitor visitor) {
 
-        Enumeration enum = elements();
+        Enumeration enumList = elements();
 
-        while (enum.hasMoreElements()) {
-            Definition def = (Definition) enum.nextElement();
+        while (enumList.hasMoreElements()) {
+            Definition def = (Definition) enumList.nextElement();
 
             def.accept(visitor);
         }

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/PackageDef.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/PackageDef.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/PackageDef.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/PackageDef.java
Sun Feb 19 16:56:35 2006
@@ -155,9 +155,9 @@
 
         accept(rp);
 
-        // Enumeration enum = getElements().elements();
-        // while (enum.hasMoreElements()) {
-        // ClassDef def = (ClassDef)enum.nextElement();
+        // Enumeration enumList = getElements().elements();
+        // while (enumList.hasMoreElements()) {
+        // ClassDef def = (ClassDef)enumList.nextElement();
         // String newPath = path + File.separatorChar + d.getPackagePath();
         // if (!(def instanceof DummyClass || def instanceof PrimitiveDef) ) {
         // String filename = newPath + File.separatorChar + def.getName() + ".ref";

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/ReferencePersistor.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/ReferencePersistor.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/ReferencePersistor.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/ReferencePersistor.java
Sun Feb 19 16:56:35 2006
@@ -227,10 +227,10 @@
         JavaVector refs = def.getReferences();
 
         if (refs != null) {
-            Enumeration enum = refs.elements();
+            Enumeration enumList = refs.elements();
 
-            while (enum.hasMoreElements()) {
-                Occurrence occ = (Occurrence) enum.nextElement();
+            while (enumList.hasMoreElements()) {
+                Occurrence occ = (Occurrence) enumList.nextElement();
 
                 // if (debugFlag) System.out.println("occ="+occ);
                 persist(referentFileClass, referentType, referentTag,

Modified: forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/SymbolTable.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/SymbolTable.java?rev=378991&r1=378990&r2=378991&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/SymbolTable.java
(original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java/org/apache/forrest/forrestdoc/java/src/symtab/SymbolTable.java
Sun Feb 19 16:56:35 2006
@@ -129,10 +129,10 @@
         Vector v = (Vector) _fileReferences.get(f);
 
         if (v != null) {
-            Enumeration enum = v.elements();
+            Enumeration enumList = v.elements();
 
-            while (enum.hasMoreElements()) {
-                Occurrence occ = (Occurrence) enum.nextElement();
+            while (enumList.hasMoreElements()) {
+                Occurrence occ = (Occurrence) enumList.nextElement();
                 HTMLTag occTag = occ.getOccurrenceTag();
 
                 if (occTag != null) {



Mime
View raw message