avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/grid ConfigurableTableModel.java GridColumn.java
Date Wed, 05 Mar 2003 04:07:42 GMT
bloritsch    2003/03/04 20:07:41

  Modified:    phyre/src/java/org/apache/avalon/phyre/actions
                        LoadSubContextAction.java
               phyre/src/java/org/apache/avalon/phyre/panels
                        ButtonFactory.java ContextNavigationPanel.java
                        MBeanPanel.java
               phyre/src/java/org/apache/avalon/phyre/panels/grid
                        ConfigurableTableModel.java GridColumn.java
  Log:
  update all PropertyUtil useage to Phoenix version
  
  Revision  Changes    Path
  1.2       +1 -1      avalon-apps/phyre/src/java/org/apache/avalon/phyre/actions/LoadSubContextAction.java
  
  Index: LoadSubContextAction.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/actions/LoadSubContextAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LoadSubContextAction.java	31 Jul 2002 20:33:11 -0000	1.1
  +++ LoadSubContextAction.java	5 Mar 2003 04:07:40 -0000	1.2
  @@ -7,7 +7,7 @@
    */
   package org.apache.avalon.phyre.actions;
   
  -import org.apache.avalon.excalibur.property.PropertyUtil;
  +import org.apache.avalon.phoenix.components.util.PropertyUtil;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.service.ServiceManager;
  
  
  
  1.2       +2 -3      avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/ButtonFactory.java
  
  Index: ButtonFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/ButtonFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ButtonFactory.java	31 Jul 2002 20:43:04 -0000	1.1
  +++ ButtonFactory.java	5 Mar 2003 04:07:41 -0000	1.2
  @@ -13,8 +13,7 @@
   import javax.swing.JButton;
   import javax.swing.JOptionPane;
   
  -import org.apache.avalon.excalibur.property.PropertyException;
  -import org.apache.avalon.excalibur.property.PropertyUtil;
  +import org.apache.avalon.phoenix.components.util.PropertyUtil;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
  @@ -41,7 +40,7 @@
                                                                  context,
                                                                  false );
           }
  -        catch( PropertyException e )
  +        catch( Exception e )
           {
               throw new ConfigurationException( "Invalid property expansion in caption",
e );
           }
  
  
  
  1.2       +2 -3      avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/ContextNavigationPanel.java
  
  Index: ContextNavigationPanel.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/ContextNavigationPanel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContextNavigationPanel.java	31 Jul 2002 20:43:04 -0000	1.1
  +++ ContextNavigationPanel.java	5 Mar 2003 04:07:41 -0000	1.2
  @@ -16,8 +16,7 @@
   import javax.swing.JLabel;
   import javax.swing.JPanel;
   
  -import org.apache.avalon.excalibur.property.PropertyException;
  -import org.apache.avalon.excalibur.property.PropertyUtil;
  +import org.apache.avalon.phoenix.components.util.PropertyUtil;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -98,7 +97,7 @@
   
                       m_buttonPanel.add( new JLabel( caption ) );
                   }
  -                catch( PropertyException e )
  +                catch( Exception e )
                   {
                       throw new ConfigurationException( "Invalid property expansion in caption",
e );
                   }
  
  
  
  1.2       +2 -3      avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/MBeanPanel.java
  
  Index: MBeanPanel.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/MBeanPanel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MBeanPanel.java	31 Jul 2002 20:43:04 -0000	1.1
  +++ MBeanPanel.java	5 Mar 2003 04:07:41 -0000	1.2
  @@ -15,8 +15,7 @@
   import javax.swing.JLabel;
   import javax.swing.JPanel;
   
  -import org.apache.avalon.excalibur.property.PropertyException;
  -import org.apache.avalon.excalibur.property.PropertyUtil;
  +import org.apache.avalon.phoenix.components.util.PropertyUtil;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -152,7 +151,7 @@
       }
   
       private void addOperations( final JPanel panel )
  -        throws ConfigurationException, PropertyException
  +        throws ConfigurationException, Exception
       {
           for( int i = 0; i < m_operations.length; i++ )
           {
  
  
  
  1.2       +1 -1      avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/grid/ConfigurableTableModel.java
  
  Index: ConfigurableTableModel.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/grid/ConfigurableTableModel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigurableTableModel.java	31 Jul 2002 20:41:42 -0000	1.1
  +++ ConfigurableTableModel.java	5 Mar 2003 04:07:41 -0000	1.2
  @@ -9,7 +9,7 @@
   
   import javax.swing.table.AbstractTableModel;
   
  -import org.apache.avalon.excalibur.property.PropertyUtil;
  +import org.apache.avalon.phoenix.components.util.PropertyUtil;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  
  
  
  1.2       +3 -4      avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/grid/GridColumn.java
  
  Index: GridColumn.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/panels/grid/GridColumn.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GridColumn.java	31 Jul 2002 20:41:42 -0000	1.1
  +++ GridColumn.java	5 Mar 2003 04:07:41 -0000	1.2
  @@ -7,8 +7,7 @@
    */
   package org.apache.avalon.phyre.panels.grid;
   
  -import org.apache.avalon.excalibur.property.PropertyException;
  -import org.apache.avalon.excalibur.property.PropertyUtil;
  +import org.apache.avalon.phoenix.components.util.PropertyUtil;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -115,7 +114,7 @@
       }
   
       private MBeanAccessor[] getMBeans( final String objectName )
  -        throws ServiceException, PropertyException
  +        throws ServiceException, Exception
       {
           final MBeanAccessor[] accessors = new MBeanAccessor[m_rowKeys.length];
   
  @@ -174,7 +173,7 @@
           return sb.toString();
       }
   
  -    private Object[] createParameters( final int rowIndex ) throws PropertyException
  +    private Object[] createParameters( final int rowIndex ) throws Exception
       {
           final Object[] params = new Object[m_operationParameters.length];
           final Context ctx = createContext( rowIndex );
  
  
  

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


Mime
View raw message