avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client InstrumentClientFrame.java InstrumentManagerConnection.java InstrumentManagerTreeModel.java
Date Fri, 23 Aug 2002 10:03:48 GMT
leif        2002/08/23 03:03:48

  Modified:    instrument-client/src/java/org/apache/excalibur/instrument/client
                        InstrumentClientFrame.java
                        InstrumentManagerConnection.java
                        InstrumentManagerTreeModel.java
  Log:
  Get rid of debug output from the console.
  
  Revision  Changes    Path
  1.3       +5 -7      jakarta-avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentClientFrame.java
  
  Index: InstrumentClientFrame.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentClientFrame.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InstrumentClientFrame.java	22 Aug 2002 16:50:38 -0000	1.2
  +++ InstrumentClientFrame.java	23 Aug 2002 10:03:48 -0000	1.3
  @@ -161,8 +161,7 @@
               catch( Throwable t )
               {
                   // Should not get here, but we want to make sure that this never happens.
  -                System.out.println( "Unexpected error caught in ProfilerFrame runner:"
);
  -                t.printStackTrace();
  +                getLogger().error( "Unexpected error caught in ProfilerFrame runner:",
t );
               }
           }
       }
  @@ -626,11 +625,11 @@
           {
               public void run()
               {
  -                System.out.println( "InstrumentClientFrame.shutdownHook start");
  +                getLogger().debug( "InstrumentClientFrame.shutdownHook start");
                   
                   shutdown();
                   
  -                System.out.println( "InstrumentClientFrame.shutdownHook end");
  +                getLogger().debug( "InstrumentClientFrame.shutdownHook end");
               }
           };
           Runtime.getRuntime().addShutdownHook( m_hook );
  @@ -677,7 +676,6 @@
       
       private void updateTitle()
       {
  -        System.out.println("InstrumentClientFrame.updateTitle()");
           if( m_desktopFile == null )
           {
               setTitle( m_title );
  @@ -858,7 +856,7 @@
        */
       private void shutdown()
       {
  -        System.out.println( "InstrumentClientFrame.shutdown()" );
  +        getLogger().debug( "InstrumentClientFrame.shutdown()" );
           boolean fallThrough = false;
           if ( m_hook != null )
           {
  
  
  
  1.4       +18 -10    jakarta-avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerConnection.java
  
  Index: InstrumentManagerConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerConnection.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InstrumentManagerConnection.java	23 Aug 2002 09:47:26 -0000	1.3
  +++ InstrumentManagerConnection.java	23 Aug 2002 10:03:48 -0000	1.4
  @@ -189,7 +189,15 @@
               }
               else
               {
  -                tabTitle = m_manager.getDescription();
  +                try
  +                {
  +                    tabTitle = m_manager.getDescription();
  +                }
  +                catch ( AltrmiInvocationException e )
  +                {
  +                    // Connection closed.  Ignore this here.
  +                    tabTitle = "[Not Connected]";
  +                }
               }
           }
           return tabTitle;
  @@ -259,12 +267,12 @@
               long now = System.currentTimeMillis();
               if ( now - m_lastLeaseRenewalTime > 60000 )
               {
  -                //System.out.println("Renew Leases:");
  +                //getLogger().debug("Renew Leases:");
                   MaintainedSampleLease[] leases = getMaintainedSampleLeaseArray();
                   for ( int i = 0; i < leases.length; i++ )
                   {
                       MaintainedSampleLease lease = leases[i];
  -                    //System.out.println(" lease: " + lease.getSampleName());
  +                    //getLogger().debug(" lease: " + lease.getSampleName());
                       
                       // Look for the Sample Descriptor in the Tree Model
                       DefaultMutableTreeNode sampleTreeNode =
  @@ -320,7 +328,7 @@
                           {
                               long newExpireTime =
                                   sampleDescriptor.extendLease( lease.getLeaseDuration()
);
  -                            //System.out.println("  Extended lease to: " + newExpireTime
);
  +                            //getLogger().debug("  Extended lease to: " + newExpireTime
);
                               
                               sampleNodeData.setLeaseExpireTime( newExpireTime );
                               
  @@ -558,21 +566,21 @@
        */
       private InstrumentSampleFrame getSampleFrame( String sampleName )
       {
  -        System.out.println("InstrumentManagerConnection.getSampleFrame(" + sampleName +
")");
  +        getLogger().debug("InstrumentManagerConnection.getSampleFrame(" + sampleName +
")");
           // Assumes "this" is synchronized.
           return (InstrumentSampleFrame)m_sampleFrames.get( sampleName );
       }
       
       private void addSampleFrame( String sampleName, InstrumentSampleFrame sampleFrame )
       {
  -        System.out.println("InstrumentManagerConnection.addSampleFrame(" + sampleName +
", frame)");
  +        getLogger().debug("InstrumentManagerConnection.addSampleFrame(" + sampleName +
", frame)");
           // Assumes "this" is synchronized.
           m_sampleFrames.put( sampleName, sampleFrame );
       }
   
       private void removeSampleFrame( String sampleName )
       {
  -        System.out.println("InstrumentManagerConnection.removeSampleFrame(" + sampleName
+ ")");
  +        getLogger().debug("InstrumentManagerConnection.removeSampleFrame(" + sampleName
+ ")");
           // Assumes "this" is synchronized.
           m_sampleFrames.remove( sampleName );
       }
  @@ -602,7 +610,7 @@
                   
                   if ( dialog.getAction() == CreateSampleDialog.BUTTON_OK )
                   {
  -                    System.out.println( "New Sample: desc=" + dialog.getSampleDescription()
+
  +                    getLogger().debug( "New Sample: desc=" + dialog.getSampleDescription()
+
                           ", interval=" + dialog.getInterval() + ", size=" + dialog.getSampleCount()
+
                           ", lease=" + dialog.getLeaseTime() + ", type=" + dialog.getSampleType()
);
                       
  @@ -875,7 +883,7 @@
               }
               catch ( AltrmiInvocationException e )
               {
  -                System.out.println( "Error executing GC on " + getHost() + ":" + 
  +                getLogger().warn( "Error executing GC on " + getHost() + ":" + 
                       getPort() + ": " + e.getMessage() );
               }
           }
  
  
  
  1.2       +10 -10    jakarta-avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerTreeModel.java
  
  Index: InstrumentManagerTreeModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerTreeModel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InstrumentManagerTreeModel.java	22 Aug 2002 16:50:38 -0000	1.1
  +++ InstrumentManagerTreeModel.java	23 Aug 2002 10:03:48 -0000	1.2
  @@ -63,7 +63,7 @@
        */
       public void opened( InstrumentManagerConnection connection )
       {
  -        System.out.println("InstrumentManagerTreeModel.opened(" + connection + ")");
  +        //System.out.println("InstrumentManagerTreeModel.opened(" + connection + ")");
           refreshModel();
       }
       
  @@ -75,7 +75,7 @@
        */
       public void closed( InstrumentManagerConnection connection )
       {
  -        System.out.println("InstrumentManagerTreeModel.closed(" + connection + ")");
  +        //System.out.println("InstrumentManagerTreeModel.closed(" + connection + ")");
           refreshModel();
       }
       
  @@ -86,7 +86,7 @@
        */
       public void deleted( InstrumentManagerConnection connection )
       {
  -        System.out.println("InstrumentManagerTreeModel.deleted(" + connection + ")");
  +        //System.out.println("InstrumentManagerTreeModel.deleted(" + connection + ")");
           refreshModel();
       }
       
  @@ -191,8 +191,8 @@
        */
       public void valueForPathChanged( TreePath path, Object newValue )
       {
  -        System.out.println( "InstrumentManagerTreeModel.valueForPathChanged(" + path +
  -            ", " + newValue + ")" );
  +        //System.out.println( "InstrumentManagerTreeModel.valueForPathChanged(" + path
+
  +        //	", " + newValue + ")" );
       }
       
       /**
  @@ -569,12 +569,12 @@
           // The latest Instrumentables will be in the correct order.
           InstrumentableDescriptor[] descriptors =
               instrumentableDescriptor.getChildInstrumentableDescriptors();
  -        System.out.println("Model.updateInstumentable() " + instrumentableDescriptor.getName()
+ " " + descriptors.length);
  +        //System.out.println("Model.updateInstumentable() " + instrumentableDescriptor.getName()
+ " " + descriptors.length);
           int i;
           for ( i = 0; i < descriptors.length; i++ )
           {
               InstrumentableDescriptor descriptor = descriptors[i];
  -            System.out.println("  " + descriptor.getName() );
  +            //System.out.println("  " + descriptor.getName() );
               DefaultMutableTreeNode newChild = null;
               int childCount = instrumentableTreeNode.getChildCount();
               if ( i < childCount )
  @@ -680,7 +680,7 @@
           for ( i = descriptors.length; i < instrumentDescriptors.length + descriptors.length;
i++ )
           {
               InstrumentDescriptor descriptor = instrumentDescriptors[i - descriptors.length];
  -            System.out.println("  " + descriptor.getName() );
  +            //System.out.println("  " + descriptor.getName() );
               DefaultMutableTreeNode newChild = null;
               int childCount = instrumentableTreeNode.getChildCount();
               if ( i < childCount )
  @@ -799,12 +799,12 @@
           // The latest Instrument Samples will be in the correct order.
           InstrumentSampleDescriptor[] descriptors =
               instrumentDescriptor.getInstrumentSampleDescriptors();
  -        System.out.println("Model.updateInstument() " + instrumentDescriptor.getName()
+ " " + descriptors.length);
  +        //System.out.println("Model.updateInstument() " + instrumentDescriptor.getName()
+ " " + descriptors.length);
           int i;
           for ( i = 0; i < descriptors.length; i++ )
           {
               InstrumentSampleDescriptor descriptor = descriptors[i];
  -            System.out.println("  " + descriptor.getName() );
  +            //System.out.println("  " + descriptor.getName() );
               DefaultMutableTreeNode newChild = null;
               int childCount = instrumentTreeNode.getChildCount();
               if ( i < childCount )
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message