avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ne...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n AbstractBundle.java BundleSelector.java DefaultBundleLoader.java
Date Wed, 26 Dec 2001 21:26:05 GMT
neeme       01/12/26 13:26:05

  Modified:    src/scratchpad/org/apache/avalon/excalibur/i18n
                        AbstractBundle.java BundleSelector.java
                        DefaultBundleLoader.java
  Log:
  removed the deprecated Loggable interface support
  
  Revision  Changes    Path
  1.9       +2 -19     jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/AbstractBundle.java
  
  Index: AbstractBundle.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/AbstractBundle.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractBundle.java	2001/12/25 22:40:27	1.8
  +++ AbstractBundle.java	2001/12/26 21:26:05	1.9
  @@ -10,17 +10,11 @@
   import java.util.Map;
   import java.util.Locale;
   
  -import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.avalon.framework.logger.LogEnabled;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.component.Component;
   
  -public abstract class AbstractBundle implements Loggable, LogEnabled, Bundle, Component
{
  +public abstract class AbstractBundle extends AbstractLogEnabled implements Bundle, Component
{
   
  -    /** logger */
  -    private Logger logger;
  -    private org.apache.log.Logger oldLogger;
  -
       /** bundle info */
       private BundleInfo bundleInfo;
   
  @@ -157,15 +151,4 @@
           return result.toString();
       }
   
  -    public void setLogger(org.apache.log.Logger logger) {
  -        this.oldLogger = logger;
  -    }
  -
  -    public void enableLogging(Logger logger) {
  -        this.logger = logger;
  -    }
  -
  -    public Logger getLogger() {
  -        return logger;
  -    }
   }
  
  
  
  1.9       +1 -3      jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/BundleSelector.java
  
  Index: BundleSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/BundleSelector.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BundleSelector.java	2001/12/25 22:40:27	1.8
  +++ BundleSelector.java	2001/12/26 21:26:05	1.9
  @@ -21,7 +21,6 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.avalon.framework.logger.Loggable;
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.LogKitLogger;
   
  @@ -30,7 +29,7 @@
    *
    * @author <a href="mailto:neeme@one.lv">Neeme Praks</a>
    * @author <a href="mailto:mengelhart@earthtrip.com">Mike Engelhart</a>
  - * @version $Id: BundleSelector.java,v 1.8 2001/12/25 22:40:27 neeme Exp $
  + * @version $Id: BundleSelector.java,v 1.9 2001/12/26 21:26:05 neeme Exp $
    */
   
   public class BundleSelector
  @@ -71,7 +70,6 @@
           Configuration[] loaderConfs = configuration.getChild("loaders").getChildren("loader");
           for (int i = 0; i < loaderConfs.length; i++) {
               BundleLoader loader = (BundleLoader) getInstance(loaderConfs[i].getAttribute("class"));
  -            if (loader instanceof Loggable) ((Loggable)loader).setLogger(getLogger());
               if (loader instanceof LogEnabled) ((LogEnabled)loader).enableLogging(new LogKitLogger(getLogger()));
               try {
                   if (loader instanceof Composable) ((Composable)loader).compose(this.manager);
  
  
  
  1.7       +4 -7      jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/DefaultBundleLoader.java
  
  Index: DefaultBundleLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/DefaultBundleLoader.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultBundleLoader.java	2001/12/25 22:40:27	1.6
  +++ DefaultBundleLoader.java	2001/12/26 21:26:05	1.7
  @@ -9,10 +9,8 @@
   
   import java.util.Locale;
   
  -import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.logger.LogEnabled;
  -import org.apache.avalon.framework.logger.LogKitLogger;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -23,10 +21,10 @@
    * Used to map locale information to URI space, to find the relevant bundle.
    *
    * @author <a href="mailto:neeme@apache.org">Neeme Praks</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/12/25 22:40:27 $ $Author: neeme $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/12/26 21:26:05 $ $Author: neeme $
    */
   
  -public class DefaultBundleLoader extends AbstractLoggable implements BundleLoader, Composable
{
  +public class DefaultBundleLoader extends AbstractLogEnabled implements BundleLoader, Composable
{
   
       /** Constants for configuration keys */
       public static class ConfigurationKeys {
  @@ -176,8 +174,7 @@
               if (parentBundleInfo != null)
                   parentBundle = (Bundle) selector.select(parentBundleInfo);
               bundle = getBundleInstance();
  -            if (bundle instanceof Loggable) ((Loggable)bundle).setLogger(getLogger());
  -            if (bundle instanceof LogEnabled) ((LogEnabled)bundle).enableLogging(new LogKitLogger(getLogger()));
  +            if (bundle instanceof LogEnabled) ((LogEnabled)bundle).enableLogging(getLogger());
               bundle.setBundleInfo(bundleInfo);
               bundle.setParent(parentBundle);
               if (bundle instanceof Composable) ((Composable)bundle).compose(this.manager);
  
  
  

--
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