[Javaprofiler-commits] CVS: jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime TypeR.java,NONE,1.

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime
In directory usw-pr-cvs1:/tmp/cvs-serv19073

Modified Files:
	AllocThreadMethodR.java AllocThreadTraceR.java 
	AllocTraceR.java AllocTypeMethodR.java 
	AllocTypeThreadMethodR.java AllocTypeThreadR.java 
	AllocTypeThreadTraceR.java AllocTypeTraceR.java ClassR.java 
	CPUThreadMethodR.java CPUThreadTraceR.java CPUTraceR.java 
	DataR.java ImageR.java MethodR.java MonThreadMethodR.java 
	MonThreadTraceR.java MonTraceR.java ThreadGroupR.java 
	ThreadR.java 
Added Files:
	TypeR.java 
Log Message:
rename AllocTypeR -> TypeR

--- NEW FILE: TypeR.java ---
/*
 *                         Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License
 * Version 1.0 (the "License"); you may not use this file except
 * in compliance with the License. A copy of the License is available
 * at http://www.sun.com/
 *
 * The Original Code is the Java Profiler module.  The Initial Developers
 * of the Original Code are Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
 * Lukas Petru and Marek Przeczek.
 *
 * Portions created by Jan Stola are Copyright (C) 2000-2001.
 * All Rights Reserved.
 *
 * Portions created by Pavel Vacha are Copyright (C) 2000-2001.
 * All Rights Reserved.
 *
 * Portions created by Michal Pise are Copyright (C) 2000-2001.
 * All Rights Reserved.
 *
 * Portions created by Petr Luner are Copyright (C) 2000-2001.
 * All Rights Reserved.
 *
 * Portions created by Lukas Petru are Copyright (C) 2000-2001.
 * All Rights Reserved.
 *
 * Portions created by Marek Przeczek are Copyright (C) 2000-2001.
 * All Rights Reserved.
 *
 * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
 *               Lukas Petru and Marek Przeczek.
 */

package net.sourceforge.javaprofiler.jpiimpl.realtime;

import java.util.*;
import javax.swing.event.EventListenerList;
import net.sourceforge.javaprofiler.jpi.*;
import net.sourceforge.javaprofiler.jpiimpl.commun.IProf;
import net.sourceforge.javaprofiler.jpiimpl.commun.IProfException;

/** Implementation of API AllocType
 *  @author Lukas Petru
 */
public class TypeR extends DataR implements TypeRef {
    /** Tells if any data was loaded from profiled VM about this Type. */
    private boolean isReady;
    /** VM Image that constructed this object. */
    private ImageR image;

    /** Object identification. */
    private Integer objId;

    // private data accessible via getter methods
    private String name;
    private boolean isArray;
    private boolean isPrimitiveArray;
    private ClassR componentClass;

    // memory info
    private long numLiveInstances;
    private long numTotalInstances;
    private long sizeLiveInstances;
    private long sizeTotalInstances;

    // lists for children
    private final List allocTypeMethods=new ArrayList(0);
    private final List allocTypeTraces=new ArrayList(0);
    private final List allocTypeThreads=new ArrayList(0);

    // unmodifiable variants of lists for children
    private final List roAllocTypeMethods=Collections.unmodifiableList(
        allocTypeMethods);
    private final List roAllocTypeTraces=Collections.unmodifiableList(
        allocTypeTraces);
    private final List roAllocTypeThreads=Collections.unmodifiableList(
        allocTypeThreads);

    /** A list of event listeners for this component. */
    protected EventListenerList listenerList = new EventListenerList();
    protected transient AllocStatEvent allocEvent; 
    private Map listenersMap=new HashMap(1);

    /** This constructor will find it's component class on its own through
     *  RtImage.
     *  @param sid Object with data from communication layer.
     *  @param RtImage <code>VirtualMachineImage</code> object to which this
     *         object shall belong
     */
    TypeR(IProf.sID sid, ImageR RtImage) {
        image = RtImage;
        objId =  new Integer(sid.objId);
        construct((IProf.sObjectInfo) sid.info);
    }

    /** Creates object with only Id and no data.
     *  @param oId Identification of object as assigned by communication layer.
     *  @param RtImage <code>VirtualMachineImage</code> object to which this
     *         object shall belong
     */
    TypeR(Integer oId, ImageR RtImage) {
        objId = oId;
        image = RtImage;
    }

    // info getter methods

    /** Returns name of a type. */
    public String getName() {
        needConstructed();
        return name;
    }

    /** Returns component class of this type. */
    public ClassRef getComponentClass() {
        needConstructed();
        return componentClass;
    }

    /** Returns true, if this type is an array. */
    public boolean isArray() {
        needConstructed();
        return isArray;
    }

    /** Returns true, if this type is an array of primitive component type. */
    public boolean isArrayOfPrimitives() {
        needConstructed();
        return isPrimitiveArray;
    }

    // children lists getter methods

    public void refreshAllocTypeTraces() {
        if (! image.getAlwaysRefresh())
            refreshAllocTypeMethods();
        Iterator it=getAllocTypeMethods().iterator();
        while (it.hasNext()) {
            AllocTypeMethodR o=(AllocTypeMethodR) it.next();
            o.refreshAllocTypeTraces();
        }
    }

    public List getAllocTypeTraces() {
        if ( image.getAlwaysRefresh() )
            refreshAllocTypeTraces();
        return roAllocTypeTraces;
    }

    public void refreshAllocTypeMethods() {
        image.extractMultiRoot(this, IProf.ALLOC_OBJECT_METHODS,
            image.allocTypeMethodFactory);
    }

    public List getAllocTypeMethods() {
        if ( image.getAlwaysRefresh() )
            refreshAllocTypeMethods();
        return roAllocTypeMethods;
    }

    public void refreshAllocTypeThreads() {
        image.extractMultiRoot(this, IProf.ALLOC_OBJECT_THREADS,
            image.allocTypeThreadFactory);
    }

    public List getAllocTypeThreads() {
        if ( image.getAlwaysRefresh() )
            refreshAllocTypeThreads();
        return roAllocTypeThreads;
    }

    // image getter method

    public VirtualMachineImageRef getVirtualMachineImage () {
        return image;
    }

    // statistics getter methods

    public long getLiveInstancesCount() {
        conditionalRefresh();
        return numLiveInstances;
    }

    public long getTotalInstancesCount() {
        conditionalRefresh();
        return numTotalInstances;
    }

    public long getLiveInstancesSize() {
        conditionalRefresh();
        return sizeLiveInstances;
    }

    public long getTotalInstancesSize() {
        conditionalRefresh();
        return sizeTotalInstances;
    }

    // refresh

    /** Refreshes statistics.
    */
    public void refresh() {
        // method should synchronize on image to be thread-safe
        IProf.sData data;
        try {
            data = image.getIProf().getData(objId.intValue(),
                IProf.ALLOC_DATA);
        } catch (IProfException e) {
            // PENDING
            throw new RuntimeException(e.getMessage());
        }
        setData((IProf.sAllocStatData) data.statData);
    }

    // roots

    public TypeR getTypeR() {
        return this;
    }

    public ThreadR getThreadR() {
        return null;
    }

    public DataR getLocation() {
        return null;
    }

    // private / package

    void addAllocTypeMethod(AllocTypeMethodRef o) {
        allocTypeMethods.add(o);
        image.fireChildrenAdded(new ChildrenEvent(this, Constants.
            ALLOC_TYPE_METHOD, new Object[]{o}, new int[]{
            allocTypeMethods.size()-1}), listenersMap);
    }

    void addAllocTypeTrace(AllocTypeTraceRef o) {
        allocTypeTraces.add(o);
        image.fireChildrenAdded(new ChildrenEvent(this, Constants.
            ALLOC_TYPE_TRACE, new Object[]{o}, new int[]{
            allocTypeTraces.size()-1}), listenersMap);
    }

    void addAllocTypeThread(AllocTypeThreadRef o) {
        allocTypeThreads.add(o);
        image.fireChildrenAdded(new ChildrenEvent(this, Constants.
            ALLOC_TYPE_THREAD, new Object[]{o}, new int[]{
            allocTypeThreads.size()-1}), listenersMap);
    }

    /** Finishes object construction with info gained from profiled VM.
     *  @param sid Object info.
     */
    void construct(IProf.sID sid) {
        // method should be synchronized to be thread-safe (because of
        // isReady)
        if (!isReady)
            construct((IProf.sObjectInfo) sid.info);
    }

    /** Finishes object construction.
     *  @param info <code>sObjectInfo</code> object with data from communication layer.
     *  @param component <code>Class</code> object to which this objects links.
     */
    private void construct (IProf.sObjectInfo info, ClassR component)
    {
        isArray = true;
        isPrimitiveArray = component == null;
        componentClass = component;
        switch (info.isArray) {
            case IProf.JVMPI_NORMAL_OBJECT:
                name = component.getName();
                isArray = false;
                break;
            case IProf.JVMPI_CLASS:
                name = component.getName() + "[]";
                break;
            case IProf.JVMPI_BOOLEAN:
                name = "boolean[]"; //[Z
                break;
            case IProf.JVMPI_BYTE:
                name = "byte[]"; //[B
                break;
            case IProf.JVMPI_CHAR:
                name = "char[]"; //[C
                break;
            case IProf.JVMPI_SHORT:
                name = "short[]"; //[S
                break;
            case IProf.JVMPI_INT:
                name = "int[]"; //[I
                break;
            case IProf.JVMPI_LONG:
                name = "long[]";//[J
                break;
            case IProf.JVMPI_FLOAT:
                name = "float[]"; //[F
                break;
            case IProf.JVMPI_DOUBLE:
                name = "double[]"; //[D
                break;
            default:
                name = "";
        }
        isReady = true;
    }

    /** Finishes Type object construction. This method will find component
     *  class of object on its own through image.
     *  @param info <code>sObjectInfo</code> object with data from
     *    communication layer.
     */
    private void construct(IProf.sObjectInfo info)
    {
        // resolve component class
        ClassR component;
        Integer clId = new Integer(info.classObjId);
        if (clId.intValue() != 0)
            component = image.resolveClass(clId);
        else
            component = null;
        construct(info, component);
    }

    /** Tests if object needs to load its info and does, if so. */
    private void needConstructed() {
        // method should be synchronized to be thread-safe (because of
        // isReady)
        if (!isReady) {
            IProf.sObjectInfo info;
            try {
                info = (IProf.sObjectInfo) image.getIProf().
                    getInfo(objId.intValue(), IProf.OBJECT_INFO);
            } catch (IProfException e) {
                // PENDING
                throw new RuntimeException(e.getMessage());
            }
            construct(info);
        }
    }

    /** Determines whether refresh should be done and does, if so.
    */
    private void conditionalRefresh() {
        if (image.getAlwaysRefresh())
            refresh();
    }

    /** Fills object with data gained from profiled VM.
     *  @param data Data.
     */
    void setData(IProf.sAllocStatData allocData) {
        if (numLiveInstances!=allocData.allocNumInstancesLive ||
            numTotalInstances!=allocData.allocNumInstancesTotal ||
            sizeLiveInstances!=allocData.allocSizeInstancesLive ||
            sizeTotalInstances!=allocData.allocSizeInstancesTotal) {
            numLiveInstances=allocData.allocNumInstancesLive;
            numTotalInstances=allocData.allocNumInstancesTotal;
            sizeLiveInstances=allocData.allocSizeInstancesLive;
            sizeTotalInstances=allocData.allocSizeInstancesTotal;
            fireAllocStatChanged();
        }
    }

    /** Fills object with data gained from profiled VM.
     *  @param sid Object info and data.
     */
    void setData(IProf.sID sid) {
        setData(sid.alloc);
    }

    /** Returns number that identifies object for profiler library. */
    Integer getId() {
        return objId;
    }

    /** Returns specific element of AllocTypeTraces list. */
    public AllocTypeTraceRef getAllocTypeTrace(AllocTraceRef peer) {
        List o=getAllocTypeTraces();
        return (AllocTypeTraceRef) image.filterByLocation(o, (DataR)peer);
    }

    /** Returns specific element of AllocTypeMethods list. */
    public AllocTypeMethodRef getAllocTypeMethod(MethodRef peer) {
        List o=getAllocTypeMethods();
        return (AllocTypeMethodRef) image.filterByLocation(o, (DataR)peer);
    }

    /** Returns specific element of AllocTypeThreads list. */
    public AllocTypeThreadRef getAllocTypeThread(ThreadRef peer) {
        List o=getAllocTypeThreads();
        return (AllocTypeThreadRef) image.filterByThread(o, (DataR)peer);
    }

    public String toString () {
        return getName();
    }
    
    // ---------- listeners
    
    /** 
     * Removes an <code>ChildrenListener</code> from this object. 
     * @param type Type of children to listen events for. Constants are defined
     *   in net.sourceforge.javaprofiler.jpi.Constants.
     * @param l the listener to be removed
     */ 
    public void removeChildrenListener(int type, ChildrenListener l) {
        image.removeChildrenListenerChecked(type, l, listenersMap,
            new int[] {Constants.ALLOC_TYPE_METHOD,
            Constants.ALLOC_TYPE_TRACE,
            Constants.ALLOC_TYPE_THREAD});
    }

    /** 
     * Adds an <code>ChildrenListener</code> to this object.
     * <strong>Warning:</strong> Events are not dispatched in the swing event-
     * dispatching thread, rather they are dispatched in the thread which 
     * caused new data to be loaded.
     * @param type Type of children to listen events for. Constants are defined
     *   in net.sourceforge.javaprofiler.jpi.Constants.
     * @param l the listener to be added 
     */ 
    public void addChildrenListener(int type, ChildrenListener l) {
        image.addChildrenListenerChecked(type, l, listenersMap,
            new int[] {Constants.ALLOC_TYPE_METHOD,
            Constants.ALLOC_TYPE_TRACE,
            Constants.ALLOC_TYPE_THREAD});
    }
    
    /** 
     * Removes an <code>AllocStatListener</code> from this object. 
     * @param l the listener to be removed
     */ 
    public void removeAllocStatListener(AllocStatListener l) {
        listenerList.remove(AllocStatListener.class, l);
    }
    
    /** 
     * Adds an <code>AllocStatListener</code> to this object. 
     * @param l the listener to be added 
     */ 
    public void addAllocStatListener(AllocStatListener l) {
        listenerList.add(AllocStatListener.class, l); 
    }
    
    /** 
     * Notifies all listeners that have registered interest for 
     * notification on this event type.  The event instance  
     * is lazily created. 
     */ 
    protected void fireAllocStatChanged() {
        // Guaranteed to return a non-null array 
        Object[] listeners = listenerList.getListenerList(); 
        // Process the listeners last to first, notifying 
        // those that are interested in this event 
        for (int i = listeners.length-2; i>=0; i-=2) { 
            if (listeners[i]==AllocStatListener.class) {  
                // Lazily create the event: 
                if (allocEvent == null) 
                    allocEvent = new AllocStatEvent(this); 
                ((AllocStatListener)listeners[i+1]).allocStatChanged(
                    allocEvent); 
            }
        }
    }
}
Index: AllocThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocThreadMethodR.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AllocThreadMethodR.java	18 Jul 2002 08:48:20 -0000	1.10
--- AllocThreadMethodR.java	22 Jul 2002 21:51:59 -0000	1.11
***************
*** 82,86 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 82,86 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 150,154 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 150,154 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: AllocThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocThreadTraceR.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AllocThreadTraceR.java	18 Jul 2002 08:48:20 -0000	1.8
--- AllocThreadTraceR.java	22 Jul 2002 21:51:59 -0000	1.9
***************
*** 80,84 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 80,84 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 142,146 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 142,146 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: AllocTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTraceR.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocTraceR.java	18 Jul 2002 08:48:20 -0000	1.9
--- AllocTraceR.java	22 Jul 2002 21:51:59 -0000	1.10
***************
*** 206,210 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 206,210 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: AllocTypeMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeMethodR.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocTypeMethodR.java	18 Jul 2002 08:48:20 -0000	1.9
--- AllocTypeMethodR.java	22 Jul 2002 21:51:59 -0000	1.10
***************
*** 55,59 ****
  
      // roots to which this object is linked
!     private AllocTypeR type;
      private MethodR location;
  
--- 55,59 ----
  
      // roots to which this object is linked
!     private TypeR type;
      private MethodR location;
  
***************
*** 80,84 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 80,84 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 124,128 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          needConstructed();
          return type;
--- 124,128 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          needConstructed();
          return type;

Index: AllocTypeThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadMethodR.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocTypeThreadMethodR.java	18 Jul 2002 08:48:20 -0000	1.9
--- AllocTypeThreadMethodR.java	22 Jul 2002 21:51:59 -0000	1.10
***************
*** 55,59 ****
  
      // roots to which this object is linked
!     private AllocTypeR type;
      private ThreadR thread;
      private MethodR location;
--- 55,59 ----
  
      // roots to which this object is linked
!     private TypeR type;
      private ThreadR thread;
      private MethodR location;
***************
*** 83,87 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 83,87 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 145,149 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          needConstructed();
          return type;
--- 145,149 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          needConstructed();
          return type;

Index: AllocTypeThreadR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadR.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AllocTypeThreadR.java	18 Jul 2002 08:48:20 -0000	1.10
--- AllocTypeThreadR.java	22 Jul 2002 21:51:59 -0000	1.11
***************
*** 55,59 ****
  
      // roots to which this object is linked
!     private AllocTypeR type;
      private ThreadR thread;
  
--- 55,59 ----
  
      // roots to which this object is linked
!     private TypeR type;
      private ThreadR thread;
  
***************
*** 80,84 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 80,84 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 124,128 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          needConstructed();
          return type;
--- 124,128 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          needConstructed();
          return type;

Index: AllocTypeThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadTraceR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** AllocTypeThreadTraceR.java	11 Jul 2002 18:17:23 -0000	1.7
--- AllocTypeThreadTraceR.java	22 Jul 2002 21:51:59 -0000	1.8
***************
*** 55,59 ****
  
      // roots to which this object is linked
!     private AllocTypeR type;
      private ThreadR thread;
      private AllocTraceR location;
--- 55,59 ----
  
      // roots to which this object is linked
!     private TypeR type;
      private ThreadR thread;
      private AllocTraceR location;
***************
*** 76,80 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 76,80 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 132,136 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          needConstructed();
          return type;
--- 132,136 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          needConstructed();
          return type;

Index: AllocTypeTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeTraceR.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocTypeTraceR.java	18 Jul 2002 08:48:20 -0000	1.9
--- AllocTypeTraceR.java	22 Jul 2002 21:51:59 -0000	1.10
***************
*** 54,58 ****
  
      // roots to which this object is linked
!     private AllocTypeR type;
      private AllocTraceR location;
  
--- 54,58 ----
  
      // roots to which this object is linked
!     private TypeR type;
      private AllocTraceR location;
  
***************
*** 79,83 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 79,83 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 141,145 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          needConstructed();
          return type;
--- 141,145 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          needConstructed();
          return type;

Index: ClassR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ClassR.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ClassR.java	17 Jul 2002 12:25:36 -0000	1.6
--- ClassR.java	22 Jul 2002 21:51:59 -0000	1.7
***************
*** 166,170 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 166,170 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: CPUThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUThreadMethodR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** CPUThreadMethodR.java	18 Jul 2002 08:48:21 -0000	1.7
--- CPUThreadMethodR.java	22 Jul 2002 21:51:59 -0000	1.8
***************
*** 77,81 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 77,81 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 134,138 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 134,138 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: CPUThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUThreadTraceR.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** CPUThreadTraceR.java	11 Jul 2002 18:17:23 -0000	1.6
--- CPUThreadTraceR.java	22 Jul 2002 21:51:59 -0000	1.7
***************
*** 70,74 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 70,74 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 121,125 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 121,125 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: CPUTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUTraceR.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** CPUTraceR.java	18 Jul 2002 08:48:21 -0000	1.8
--- CPUTraceR.java	22 Jul 2002 21:51:59 -0000	1.9
***************
*** 163,167 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 163,167 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: DataR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/DataR.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DataR.java	12 Jun 2002 23:02:17 -0000	1.4
--- DataR.java	22 Jul 2002 21:51:59 -0000	1.5
***************
*** 58,62 ****
       *  </code> if this root is N / A.
       */
!     public abstract AllocTypeR getTypeR();
  
      /** Returns ThreadRef root of multi-rooted object. Returns <code>null
--- 58,62 ----
       *  </code> if this root is N / A.
       */
!     public abstract TypeR getTypeR();
  
      /** Returns ThreadRef root of multi-rooted object. Returns <code>null

Index: ImageR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ImageR.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ImageR.java	17 Jul 2002 22:11:14 -0000	1.11
--- ImageR.java	22 Jul 2002 21:51:59 -0000	1.12
***************
*** 151,155 ****
                  .getDeclaredConstructor(parameterTypes);
              typeFactory=java.lang.Class.forName(
!                 "net.sourceforge.javaprofiler.jpiimpl.realtime.AllocTypeR")
                  .getDeclaredConstructor(parameterTypes);
              classFactory=java.lang.Class.forName(
--- 151,155 ----
                  .getDeclaredConstructor(parameterTypes);
              typeFactory=java.lang.Class.forName(
!                 "net.sourceforge.javaprofiler.jpiimpl.realtime.TypeR")
                  .getDeclaredConstructor(parameterTypes);
              classFactory=java.lang.Class.forName(
***************
*** 180,184 ****
                  .getDeclaredConstructor(parameterTypes);
              typeIDFactory=java.lang.Class.forName(
!                 "net.sourceforge.javaprofiler.jpiimpl.realtime.AllocTypeR")
                  .getDeclaredConstructor(parameterTypes);
              classIDFactory=java.lang.Class.forName(
--- 180,184 ----
                  .getDeclaredConstructor(parameterTypes);
              typeIDFactory=java.lang.Class.forName(
!                 "net.sourceforge.javaprofiler.jpiimpl.realtime.TypeR")
                  .getDeclaredConstructor(parameterTypes);
              classIDFactory=java.lang.Class.forName(
***************
*** 768,775 ****
       *  has objId.
       */
!     AllocTypeR resolveAllocType(Integer oId) {
          List children=types;
          int old=children.size();
!         AllocTypeR res=(AllocTypeR) resolveRoot(oId, null, typeIDFactory, 
              children);
          int nw=children.size();
--- 768,775 ----
       *  has objId.
       */
!     TypeR resolveAllocType(Integer oId) {
          List children=types;
          int old=children.size();
!         TypeR res=(TypeR) resolveRoot(oId, null, typeIDFactory, 
              children);
          int nw=children.size();
***************
*** 786,794 ****
       *  <code>sid</code> passed in a parameter.
       */
!     AllocTypeR resolveAllocType(IProf.sID sid) {
          Integer oId = new Integer(sid.objId);
          List children=types;
          int old=children.size();
!         AllocTypeR res=(AllocTypeR) resolveRoot(oId, sid, typeFactory, types);
          int nw=children.size();
          if (old!=nw && typeListeners.getListenerCount()!=0) {
--- 786,794 ----
       *  <code>sid</code> passed in a parameter.
       */
!     TypeR resolveAllocType(IProf.sID sid) {
          Integer oId = new Integer(sid.objId);
          List children=types;
          int old=children.size();
!         TypeR res=(TypeR) resolveRoot(oId, sid, typeFactory, types);
          int nw=children.size();
          if (old!=nw && typeListeners.getListenerCount()!=0) {

Index: MethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MethodR.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** MethodR.java	18 Jul 2002 08:48:21 -0000	1.10
--- MethodR.java	22 Jul 2002 21:51:59 -0000	1.11
***************
*** 302,306 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 302,306 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: MonThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonThreadMethodR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** MonThreadMethodR.java	18 Jul 2002 08:48:21 -0000	1.7
--- MonThreadMethodR.java	22 Jul 2002 21:51:59 -0000	1.8
***************
*** 77,81 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 77,81 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>TypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 134,138 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 134,138 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: MonThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonThreadTraceR.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** MonThreadTraceR.java	11 Jul 2002 18:17:23 -0000	1.6
--- MonThreadTraceR.java	22 Jul 2002 21:51:59 -0000	1.7
***************
*** 70,74 ****
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>AllocTypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
--- 70,74 ----
  
      /** Constructs multi-rooted object
!      *  @param typeId Identification of <code>ATypeR</code> object. Should
       *      be null if N/A.
       *  @param threadId Identification of <code>ThreadR</code> object. Should
***************
*** 121,125 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 121,125 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: MonTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonTraceR.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** MonTraceR.java	18 Jul 2002 08:48:21 -0000	1.8
--- MonTraceR.java	22 Jul 2002 21:51:59 -0000	1.9
***************
*** 167,171 ****
      }
  
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 167,171 ----
      }
  
!     public TypeR getTypeR() {
          return null;
      }

Index: ThreadGroupR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ThreadGroupR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ThreadGroupR.java	18 Jul 2002 08:48:21 -0000	1.7
--- ThreadGroupR.java	22 Jul 2002 21:51:59 -0000	1.8
***************
*** 117,121 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 117,121 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }

Index: ThreadR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ThreadR.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ThreadR.java	18 Jul 2002 08:48:21 -0000	1.10
--- ThreadR.java	22 Jul 2002 21:51:59 -0000	1.11
***************
*** 317,321 ****
       *  </code> if this root is N / A.
       */
!     public AllocTypeR getTypeR() {
          return null;
      }
--- 317,321 ----
       *  </code> if this root is N / A.
       */
!     public TypeR getTypeR() {
          return null;
      }