Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv2572
Modified Files:
SnapshotImpl.java
Log Message:
Changes to GetAllThruIterator()
Index: SnapshotImpl.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/SnapshotImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SnapshotImpl.java 2001/12/03 10:37:57 1.2
--- SnapshotImpl.java 2001/12/04 00:14:51 1.3
***************
*** 108,113 ****
extract( null, classes, IProf.CLASSES, IProf.NO_OPTIONAL_ARG, iprof );
//pending get class fields
! extract( classes, null, IProf.CLASS_FIELDS_STATICS, IProf.NO_OPTIONAL_ARG, iprof );
! extract( classes, null, IProf.CLASS_FIELDS_INSTANCES, IProf.NO_OPTIONAL_ARG, iprof );
//extract( classes, methods, IProf.CLASS_METHODS, IProf.NO_OPTIONAL_ARG, iprof );
extract( null, methods, IProf.METHODS, IProf.NO_OPTIONAL_ARG, iprof );
--- 108,113 ----
extract( null, classes, IProf.CLASSES, IProf.NO_OPTIONAL_ARG, iprof );
//pending get class fields
! // extract( classes, null, IProf.CLASS_FIELDS_STATICS, IProf.NO_OPTIONAL_ARG, iprof );
! // extract( classes, null, IProf.CLASS_FIELDS_INSTANCES, IProf.NO_OPTIONAL_ARG, iprof );
//extract( classes, methods, IProf.CLASS_METHODS, IProf.NO_OPTIONAL_ARG, iprof );
extract( null, methods, IProf.METHODS, IProf.NO_OPTIONAL_ARG, iprof );
***************
*** 361,368 ****
throws COMMUN_Exception { //throws
boolean pass = false;
! ListIterator iter, iterInner;
! IProf.sID sid;
! LinkedList listInner;
! IDObjectData obj, objInner, objOpposite;
if ( in == null ) {
--- 361,369 ----
throws COMMUN_Exception { //throws
boolean pass = false;
! ListIterator iter;
! Iterator iterInner;
! IProf.sID sid;
! LinkedList listInner;
! IDObjectData obj, objInner, objOpposite;
if ( in == null ) {
***************
*** 373,377 ****
iter = in.listIterator();
}
!
try {
//add hashtables for IDs (temporary)
--- 374,379 ----
iter = in.listIterator();
}
! //dbg
! int j=0;
try {
//add hashtables for IDs (temporary)
***************
*** 380,384 ****
//IProf.sInfo ci = (IProf.sClassInfo)iprof.getInfo( sid.infoId, IProf.CLASS_INFO);
if ( iter == null ) {
! listInner = iprof.getAll( 0, whatType,
IProf.isObjWithInfo( whatType), optArg );
pass = false;
--- 382,386 ----
//IProf.sInfo ci = (IProf.sClassInfo)iprof.getInfo( sid.infoId, IProf.CLASS_INFO);
if ( iter == null ) {
! iterInner = iprof.getAllThruIterator( 0, whatType, true,
IProf.isObjWithInfo( whatType), optArg );
pass = false;
***************
*** 387,398 ****
else{
obj = (IDObjectData) iter.next();
! listInner = iprof.getAll( obj.getID(), whatType,
! IProf.isObjWithInfo( whatType), optArg );
}
! //Prof.sInfo will be in IProf.sId
! //fill in the former calling, there will be special param
! iterInner = listInner.listIterator();
//dbg
int i=0;
try {
while( iterInner.hasNext() ) {
--- 389,399 ----
else{
obj = (IDObjectData) iter.next();
! iterInner = iprof.getAllThruIterator( obj.getID(), whatType,
! true, IProf.isObjWithInfo( whatType), optArg );
}
!
//dbg
int i=0;
+ j++;
try {
while( iterInner.hasNext() ) {
***************
*** 407,411 ****
}
//dbg
! }catch (Exception e) { System.out.print("zz");};
}
}
--- 408,416 ----
}
//dbg
! } catch (Exception e)
! { System.out.print("zz");};
!
! if ( iter == null ) //one pass
! break;
}
}
***************
*** 427,431 ****
}
catch ( Exception e ) {
! System.out.println( "Bad objID\n" );
}
--- 432,436 ----
}
catch ( Exception e ) {
! System.out.println( "Exception\n" );
}
***************
*** 784,787 ****
--- 789,793 ----
//TODO:
// write exception handling code properly
+ // write extraction of class fields
//write passing configuration
***************
*** 789,792 ****
--- 795,801 ----
/*
* $Log$
+ * Revision 1.3 2001/12/04 00:14:51 vachis
+ * Changes to GetAllThruIterator()
+ *
* Revision 1.2 2001/12/03 10:37:57 vachis
* chages to getAll() with info
|
