[Javaprofiler-commits] CVS: jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data ThreadData.java,1.11,1.12 MethodData.java,1.9,1.10 AllocTraceData.java,1.9,1.10 AllocThreadTraceData.java,1.8,1.9 AllocThreadMethodData.java,1.8,1.9

[Pavel V. <va...@us...>]

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

Modified Files:
	ThreadData.java MethodData.java AllocTraceData.java 
	AllocThreadTraceData.java AllocThreadMethodData.java 
Log Message:
addClass() modified
adding allocClassData insted fo classData

Index: ThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ThreadData.java	2002/01/11 22:22:16	1.11
--- ThreadData.java	2002/01/15 22:05:56	1.12
***************
*** 188,200 ****
      
      /**
!      * Adds class whose instances were allocated in this thread.
       *
!      * @param clazz class whose instances were allocated in this thread.
       */
!     void addClass(AllocThreadClassData clazz) {
!         //FIXME: classData may be null => throws null pointer exception
!         //temporary fix
!         if ( clazz.getClazz().getClassData() != null )
!             classes.put(new Integer(clazz.getClazz().getClassData().getID()), clazz);
      }
  
--- 188,199 ----
      
      /**
!      * Adds allocClass whose were allocated in this thread. AllocClass 
!      * can be instance of class its array. 
       *
!      * @param allocClass allocClass that were allocated in this thread.
       */
!     void addClass(AllocThreadClassData allocClass) {
!         //FIXME:
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
  
***************
*** 301,304 ****
--- 300,307 ----
  /*
   * $Log$
+  * Revision 1.12  2002/01/15 22:05:56  vachis
+  * addClass() modified
+  * adding allocClassData insted fo classData
+  *
   * Revision 1.11  2002/01/11 22:22:16  vachis
   * unnecessary test removed

Index: MethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MethodData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** MethodData.java	2002/01/11 22:22:16	1.9
--- MethodData.java	2002/01/15 22:05:56	1.10
***************
*** 293,306 ****
      
      /**
!      * Adds class whose instances were allocated in this method.
       *
!      * @param clazz class whose instances were allocated in this method.
       */
!     void addClass(AllocClassMethodData clazz) {   
!         //!!FIXME  in some cases, like array of int (it can be recognised from
!         // clazz.isArrary>1) instance clazz have null refernce to class
!         //temporary fix
!         if( clazz.getClazz().getClassData() != null )
!             classes.put(new Integer(clazz.getClazz().getClassData().getID()), clazz);
      }
      
--- 293,303 ----
      
      /**
!      * Adds allocClass whose were allocated in this method. AllocClass 
!      * can be instance of class its array. 
       *
!      * @param allocClass allocClass that were allocated in this method.
       */
!     void addClass(AllocClassMethodData allocClass) {   
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
      
***************
*** 534,537 ****
--- 531,538 ----
  /*
   * $Log$
+  * Revision 1.10  2002/01/15 22:05:56  vachis
+  * addClass() modified
+  * adding allocClassData insted fo classData
+  *
   * Revision 1.9  2002/01/11 22:22:16  vachis
   * unnecessary test removed

Index: AllocTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTraceData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocTraceData.java	2002/01/11 22:22:16	1.9
--- AllocTraceData.java	2002/01/15 22:05:56	1.10
***************
*** 107,119 ****
      
      /**
!      * Adds class whose instances were allocated in this trace.
       *
!      * @param clazz class whose instances were allocated in this trace.
       */
!     void addClass(AllocClassTraceData clazz) {
! //FIXMEE: classDaa may be null => it throws null pointer exception  
!         //temporary fix
!         if (clazz.getClassMethod().getClazz().getClassData() != null)
!             classes.put(new Integer(clazz.getClassMethod().getClazz().getClassData().getID()), clazz);
      }
      
--- 107,118 ----
      
      /**
!      * Adds allocClass whose were allocated in this trace. AllocClass 
!      * can be instance of class its array. 
       *
!      * @param allocClass allocClass that were allocated in this trace.
       */
!     void addClass(AllocClassTraceData allocClass) {
! //FIXMEE:
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
      
***************
*** 164,167 ****
--- 163,170 ----
  /*
   * $Log$
+  * Revision 1.10  2002/01/15 22:05:56  vachis
+  * addClass() modified
+  * adding allocClassData insted fo classData
+  *
   * Revision 1.9  2002/01/11 22:22:16  vachis
   * unnecessary test removed

Index: AllocThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocThreadTraceData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AllocThreadTraceData.java	2002/01/11 22:22:16	1.8
--- AllocThreadTraceData.java	2002/01/15 22:05:57	1.9
***************
*** 98,112 ****
  
      /**
!      * Adds class whose instances were allocated in the given trace
!      * and thread.
       *
!      * @param clazz class whose instances were allocated in the given trace
       * and thread.
       */
!     void addClass(AllocThreadClassTraceData clazz) {
! //       FIXME: classData may be null => it throws null pointer excepion
!         //temporary fix
!         if( clazz.getClassTrace().getClassMethod().getClazz().getClassData() != null )
!             classes.put(new Integer(clazz.getClassTrace().getClassMethod().getClazz().getClassData().getID()), clazz);
      }
      
--- 98,110 ----
  
      /**
!      * Adds allocClass whose were allocated in this given trace
!      * and thread. AllocClass can be instance of class its array. 
       *
!      * @param allocClass allocClass that were allocated in the given trace
       * and thread.
       */
!     void addClass(AllocThreadClassTraceData allocClass) {
! //       FIXME:
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
      
***************
*** 128,131 ****
--- 126,133 ----
  /*
   * $Log$
+  * Revision 1.9  2002/01/15 22:05:57  vachis
+  * addClass() modified
+  * adding allocClassData insted fo classData
+  *
   * Revision 1.8  2002/01/11 22:22:16  vachis
   * unnecessary test removed

Index: AllocThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocThreadMethodData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AllocThreadMethodData.java	2002/01/11 22:22:16	1.8
--- AllocThreadMethodData.java	2002/01/15 22:05:57	1.9
***************
*** 104,116 ****
      
      /**
!      * Adds class whose instances were allocated in this method and thread.
       *
!      * @param clazz class whose instances were allocated in this method and thread.
       */
!     void addClass(AllocThreadClassMethodData clazz) {
! //FIXME class classData maybe null => it throws null pointer exception
! //temporary fix
! 	if( clazz.getClassMethod().getClazz().getClassData() != null )		
!         classes.put(new Integer(clazz.getClassMethod().getClazz().getClassData().getID()), clazz);
      }
      
--- 104,115 ----
      
      /**
!      * Adds allocClass whose were allocated in this given method
!      * and thread. AllocClass can be instance of class its array. 
       *
!      * @param allocClass allocClass that were allocated in this method and thread.
       */
!     void addClass(AllocThreadClassMethodData allocClass) {
! //FIXME 
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
      
***************
*** 161,164 ****
--- 160,167 ----
  /*
   * $Log$
+  * Revision 1.9  2002/01/15 22:05:57  vachis
+  * addClass() modified
+  * adding allocClassData insted fo classData
+  *
   * Revision 1.8  2002/01/11 22:22:16  vachis
   * unnecessary test removed