[Andromda-cvs] CVS update: translation-libraries/andromda-query/src/java/org/andromda/translation/query QueryTranslator.java

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 05/01/08 12:04:47

  Modified:    src/java/org/andromda/core/translation Expression.java
               andromda-query/src/java/org/andromda/translation/query
                        QueryTranslator.java
  Log:
  improve pattern replacement within the expression
  
  Revision  Changes    Path
  1.3       +6 -7      andromda/src/java/org/andromda/core/translation/Expression.java
  
  Index: Expression.java
  ===================================================================
  RCS file: /cvsroot/andromda/andromda/src/java/org/andromda/core/translation/Expression.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- Expression.java	12 Aug 2004 23:38:53 -0000	1.2
  +++ Expression.java	8 Jan 2005 20:04:47 -0000	1.3
  @@ -75,17 +75,16 @@
       }
   
       /**
  -     * Replaces the pattern with the replacement within the translated
  -     * expression buffer.
  +     * Replaces the regular expressoin <code>pattern</code> with the
  +     * replacement within the translated expression buffer.
        * 
  -     * @param pattern the pattern to search for.
  -     * @param replacement the replacement.
  +     * @param pattern the regular expression pattern to replace
  +     * @param replacement the replacement string.
        */
       public void replaceInTranslatedExpression(String pattern, String replacement)
       {
  -        this.translatedExpression = new StringBuffer(TranslationUtils
  -            .replacePattern(
  -                this.getTranslatedExpression(),
  +        this.translatedExpression = new StringBuffer(this
  +            .getTranslatedExpression().toString().replaceAll(
                   pattern,
                   replacement));
       }
  
  
  
  1.10      +2 -2      translation-libraries/andromda-query/src/java/org/andromda/translation/query/QueryTranslator.java
  
  Index: QueryTranslator.java
  ===================================================================
  RCS file: /cvsroot/andromda/translation-libraries/andromda-query/src/java/org/andromda/translation/query/QueryTranslator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- QueryTranslator.java	8 Jan 2005 20:00:31 -0000	1.9
  +++ QueryTranslator.java	8 Jan 2005 20:04:47 -0000	1.10
  @@ -262,8 +262,8 @@
               selectClause.toString());
   
           // remove any extra space from parenthesis
  -        this.getExpression().replaceInTranslatedExpression("\\(\\s*", "\\(");
  -        this.getExpression().replaceInTranslatedExpression("\\s*\\)", "\\)");
  +        this.getExpression().replaceInTranslatedExpression("\\(\\s*", "(");
  +        this.getExpression().replaceInTranslatedExpression("\\s*\\)", ")");
       }
   
       /*------------------------- Handler methods ---------------------------------------*/