hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl ServiceMessages.java FactoryDefault.java DefaultsSymbolSource.java ServiceStrings.properties
Date Mon, 27 Sep 2004 14:36:53 GMT
hlship      2004/09/27 07:36:53

  Modified:    framework/src/java/org/apache/hivemind/service/impl
                        ServiceMessages.java FactoryDefault.java
                        DefaultsSymbolSource.java ServiceStrings.properties
  Log:
  HIVEMIND-58: Add visibility attribute to the <schema> element.
  
  Revision  Changes    Path
  1.13      +0 -5      jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/ServiceMessages.java
  
  Index: ServiceMessages.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/ServiceMessages.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ServiceMessages.java	18 Jul 2004 14:43:12 -0000	1.12
  +++ ServiceMessages.java	27 Sep 2004 14:36:50 -0000	1.13
  @@ -94,11 +94,6 @@
           return _formatter.format("unable-to-lookup", name, cause);
       }
   
  -    public static String duplicateSymbol(String symbol, Location priorLocation)
  -    {
  -        return _formatter.format("duplicate-symbol", symbol, priorLocation);
  -    }
  -
       public static String notCompatibleWithEvent(
           Object consumer,
           EventSetDescriptor set,
  
  
  
  1.3       +1 -2      jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/FactoryDefault.java
  
  Index: FactoryDefault.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/FactoryDefault.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FactoryDefault.java	25 Jun 2004 20:20:04 -0000	1.2
  +++ FactoryDefault.java	27 Sep 2004 14:36:50 -0000	1.3
  @@ -14,7 +14,6 @@
   
   package org.apache.hivemind.service.impl;
   
  -import org.apache.hivemind.impl.BaseLocatable;
   
   /**
    * Default symbol value defined by the 
  @@ -22,7 +21,7 @@
    *
    * @author Howard Lewis Ship
    */
  -public class FactoryDefault extends BaseLocatable
  +public class FactoryDefault
   {
   	private String _symbol;
   	private String _value;
  
  
  
  1.5       +7 -23     jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/DefaultsSymbolSource.java
  
  Index: DefaultsSymbolSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/DefaultsSymbolSource.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultsSymbolSource.java	10 Jun 2004 19:49:39 -0000	1.4
  +++ DefaultsSymbolSource.java	27 Sep 2004 14:36:50 -0000	1.5
  @@ -25,16 +25,18 @@
   import org.apache.hivemind.impl.BaseLocatable;
   
   /**
  - * Implementation of {@link org.apache.hivemind.SymbolSource} driven
  - * off of an extension point.
  - *
  + * Implementation of {@link org.apache.hivemind.SymbolSource}driven off of an extension
point.
  + * 
    * @author Howard Lewis Ship
    */
   public class DefaultsSymbolSource extends BaseLocatable implements SymbolSource
   {
       private Log _log;
  +
       private ErrorHandler _errorHandler;
  +
       private List _defaults;
  +
       private Map _symbols = new HashMap();
   
       public String valueForSymbol(String name)
  @@ -44,8 +46,6 @@
   
       public void initializeService()
       {
  -        Map symbolMap = new HashMap();
  -
           int count = _defaults.size();
           for (int i = 0; i < count; i++)
           {
  @@ -53,24 +53,8 @@
   
               String symbol = fd.getSymbol();
               String value = fd.getValue();
  -            Location location = fd.getLocation();
  -
  -            Location priorLocation = (Location) symbolMap.get(symbol);
  -
  -            if (priorLocation != null)
  -            {
  -                _errorHandler.error(
  -                    _log,
  -                    ServiceMessages.duplicateSymbol(symbol, priorLocation),
  -                    location,
  -                    null);
  -            }
  -            else
  -            {
  -                _symbols.put(symbol, value);
  -                symbolMap.put(symbol, location);
  -            }
   
  +            _symbols.put(symbol, value);
           }
       }
   
  @@ -89,4 +73,4 @@
           _errorHandler = handler;
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.9       +0 -1      jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/ServiceStrings.properties
  
  Index: ServiceStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/ServiceStrings.properties,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ServiceStrings.properties	18 Jul 2004 14:43:12 -0000	1.8
  +++ ServiceStrings.properties	27 Sep 2004 14:36:50 -0000	1.9
  @@ -22,7 +22,6 @@
   unable-to-create-class=Unable to create class {0} as subclass of {1}: {2}
   unable-to-lookup=Unable to lookup {0}: {1}
   unable-to-add-catch=Unable to add catch block for exception {0} to class {1}: {2}
  -duplicate-symbol=Default for symbol ''{0}'' duplicates prior value (at {1}) and has been
ignored.
   not-compatible-with-event={0} does not implement the {1} listener interface (for event
set ''{2}'' of {3}).
   no-such-event-set={0} does not implement an event set named ''{1}''.
   no-event-matches={0} does not implement any listener interfaces compatible with {1}.
  
  
  

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


Mime
View raw message