[Rubyeclipse-commit] org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder ResourceDeltaFormatter.java,NONE,1.1 RubyCompiler.java,1.2,1.3 RubyBuilder.java,1.14,1.15

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17009/src/org/rubypeople/rdt/internal/core/builder

Modified Files:
	RubyCompiler.java RubyBuilder.java 
Added Files:
	ResourceDeltaFormatter.java 
Log Message:
Minor clean up and analysis support.

Index: RubyBuilder.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyBuilder.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** RubyBuilder.java	13 Oct 2005 23:56:06 -0000	1.14
--- RubyBuilder.java	23 Oct 2005 00:03:16 -0000	1.15
***************
*** 26,29 ****
--- 26,30 ----
  
      private static final int TOTAL_WORK = 10000;
+     private static boolean verbose;
  
      private IProject currentProject;
***************
*** 36,40 ****
              return returnProjects;
  		
!         RubyCore.trace("Started " + buildType(kind) + " build of " + buildDescription()); //$NON-NLS-1$
  
          MarkerManager rubyMarkerManager = new MarkerManager();
--- 37,42 ----
              return returnProjects;
  		
!         if (verbose)
!             RubyCore.trace("Started " + buildType(kind) + " build of " + buildDescription()); //$NON-NLS-1$
  
          MarkerManager rubyMarkerManager = new MarkerManager();
***************
*** 68,70 ****
      protected void doCompile(List files, IProgressMonitor monitor) {
          new RubyCompiler(TOTAL_WORK/files.size()).compile(files, monitor);
! 	}}
--- 70,77 ----
      protected void doCompile(List files, IProgressMonitor monitor) {
          new RubyCompiler(TOTAL_WORK/files.size()).compile(files, monitor);
! 	}
!     
!     public static void setVerbose(boolean verbose) {
!         RubyBuilder.verbose = verbose;
!     }
! }

Index: RubyCompiler.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RubyCompiler.java	13 Oct 2005 23:56:06 -0000	1.2
--- RubyCompiler.java	23 Oct 2005 00:03:16 -0000	1.3
***************
*** 1,12 ****
  /*
! ?* Author: Chris, David Corbin
! ?*
! ?* Copyright (c) 2005 RubyPeople.
! ?*
! ?* This file is part of the Ruby Development Tools (RDT) plugin for eclipse. 
   * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use
   * RDT except in compliance with the License. For further information see 
   * org.rubypeople.rdt/rdt.license.
! ?*/
  
  package org.rubypeople.rdt.internal.core.builder;
--- 1,12 ----
  /*
!  * Author: Chris, David Corbin
!  *
!  * Copyright (c) 2005 RubyPeople.
!  *
!  * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. 
   * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use
   * RDT except in compliance with the License. For further information see 
   * org.rubypeople.rdt/rdt.license.
!  */
  
  package org.rubypeople.rdt.internal.core.builder;

--- NEW FILE: ResourceDeltaFormatter.java ---
package org.rubypeople.rdt.internal.core.builder;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.core.resources.IResourceDelta;

public class ResourceDeltaFormatter {

    public String format(IResourceDelta delta) {
        StringBuffer buffer = new StringBuffer();
        buffer.append(kindAsString(delta.getKind()));
        buffer.append(flagsAsString(delta.getFlags()));
        buffer.append(delta.getFullPath());
        buffer.append("\n");
        
        IResourceDelta[] affectedChildren = delta. getAffectedChildren();
        for (int i = 0; i < affectedChildren.length; i++) {
            IResourceDelta childDelta = affectedChildren[i];
            buffer.append(format(childDelta));
        }
        return buffer.toString();
    }
    
    private String flagsAsString(int flags) {
        StringBuffer buffer = new StringBuffer();
        for (Iterator iter = flagMap.keySet().iterator(); iter.hasNext();) {
            Integer flag = (Integer) iter.next();
            if ((flags & flag.intValue()) != 0)
                buffer.append(flagMap.get(flag)+ " ");
            
        }
        return buffer.toString();
    }

    private String kindAsString(int kind) {
        switch(kind) {
        case IResourceDelta.ADDED:
            return "Added  ";
        case IResourceDelta.REMOVED:
            return "Removed";
        case IResourceDelta.CHANGED:
            return "Changed";
        case IResourceDelta.ADDED_PHANTOM:
            return "AddedPh";
        case IResourceDelta.REMOVED_PHANTOM:
            return "RemovPh";
            
        }
        return String.valueOf(kind);
    }

    static Map flagMap = new HashMap();
    static {
        putFlag(IResourceDelta.CONTENT,     "Content");
        putFlag(IResourceDelta.ENCODING,    "Encoding");
        putFlag(IResourceDelta.DESCRIPTION, "Description");
        putFlag(IResourceDelta.OPEN,        "Open");
        putFlag(IResourceDelta.TYPE,        "Type");
        putFlag(IResourceDelta.SYNC,        "Sync");
        putFlag(IResourceDelta.MARKERS,     "Markers");
        putFlag(IResourceDelta.MOVED_FROM,  "Moved-from");
        putFlag(IResourceDelta.MOVED_TO,    "Moved-to");
    }
    private static void putFlag(int flag, String description) {
        flagMap.put(new Integer(flag), description);
    }
}