unico       2004/07/05 09:45:55

  Modified:    src/stores/org/apache/slide/store/impl/rdbms/expression
                        RDBMSExpressionFactory.java
                        RDBMSMergeExpression.java
  Log:
  rename method
  
  Revision  Changes    Path
  1.4       +4 -4      
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java
  
  Index: RDBMSExpressionFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RDBMSExpressionFactory.java       4 Jul 2004 19:26:49 -0000       1.3
  +++ RDBMSExpressionFactory.java       5 Jul 2004 16:45:55 -0000       1.4
  @@ -90,7 +90,7 @@
           return expression;
       }
       
  -    IBasicExpression superCreateMergeExpression(String name, String namespace, 
Collection members) 
  +    IBasicExpression createStandardMergeExpression(String name, String namespace, 
Collection members) 
       throws BadQueryException {
           return super.createMergeExpression(name, namespace, members);
       }
  
  
  
  1.2       +5 -5      
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSMergeExpression.java
  
  Index: RDBMSMergeExpression.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSMergeExpression.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RDBMSMergeExpression.java 4 Jul 2004 18:57:35 -0000       1.1
  +++ RDBMSMergeExpression.java 5 Jul 2004 16:45:55 -0000       1.2
  @@ -50,10 +50,10 @@
           _namespace = namespace;
           _rdbmsExpressions = rdbmsExpressions;
           if (otherExpressions != null) {
  -            _merger = _factory.superCreateMergeExpression(_name, _namespace, 
otherExpressions);
  +            _merger = _factory.createStandardMergeExpression(_name, _namespace, 
otherExpressions);
           }
       }    
  -    
  +
       public IBasicResultSet execute() throws SearchException {
           return compile(null);
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to