[jboss-cvs] jbosside/netbeans/hibernate-console/src/org/hibernate/netbeans/console/editor ...

[Leon Chiver]

  User: leonceeo
  Date: 06/09/19 15:29:05

  Modified:    netbeans/hibernate-console/src/org/hibernate/netbeans/console/editor 
                        Tag: v_0_5_alpha1 EditorContentHelper.java
  Log:
  merged changes from trunk (as they were meant for the 0.5 release)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.4.1   +7 -42     jbosside/netbeans/hibernate-console/src/org/hibernate/netbeans/console/editor/EditorContentHelper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EditorContentHelper.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/netbeans/hibernate-console/src/org/hibernate/netbeans/console/editor/EditorContentHelper.java,v
  retrieving revision 1.4
  retrieving revision 1.4.4.1
  diff -u -b -r1.4 -r1.4.4.1
  --- EditorContentHelper.java	20 May 2006 18:17:13 -0000	1.4
  +++ EditorContentHelper.java	19 Sep 2006 19:29:05 -0000	1.4.4.1
  @@ -228,7 +228,10 @@
               int numId = token.getNumericID();
               String img = query.substring(tof, tof + tl);
               if (numId == HqlTokenContext.WHITESPACE_ID) {
  -                int lastChar = sb.charAt(sb.length() - 1);
  +                int lastChar = -1;
  +                if (sb.length() > 0) {
  +                    lastChar = sb.charAt(sb.length() - 1);
  +                }
                   if (lastChar == ' ' || lastChar == '\n' || lastChar == '(') {
                       // Remove trailing whitespace
                       img = img.replaceAll("^ +", "");
  @@ -246,47 +249,9 @@
           query = sb.toString().replaceAll(" $", "");
           // Now we have an despaceified string, but we still need to replace
           // the .class.getName() stuff
  -        sb = new StringBuilder();
  -        syntax.load(null, query.toCharArray(), 0, query.length(), true, query.length());
  -        boolean wasClassGetName = false;
  -        StringBuilder parens = null;
  -        do {
  -            token = syntax.nextToken();
  -            int tof = syntax.getTokenOffset();
  -            int tl = syntax.getTokenLength();
  -            if (token == null) {
  -                break;
  -            }
  -            int numId = token.getNumericID();
  -            String img = query.substring(tof, tof + tl);
  -            if (numId == HqlTokenContext.WHITESPACE_ID) {
  -                if (!(wasClassGetName && parens != null && parens.toString().equals("("))) {
  -                    sb.append(img);
  -                }
  -            } else if (numId == HqlTokenContext.LEFT_PAREN_ID) {
  -                if (wasClassGetName && parens == null) {
  -                    parens = new StringBuilder("(");
  -                } else {
  -                    wasClassGetName = false;
  -                    parens = null;
  -                    sb.append("(");
  -                }
  -            } else if (numId == HqlTokenContext.RIGHT_PAREN_ID) {
  -                wasClassGetName = false;
  -                parens = null;
  -                if (!(wasClassGetName && parens != null && parens.toString().equals("("))) {
  -                    if (parens != null) {
  -                        sb.append(parens);
  -                        sb.append(")");
  -                    }
  -                }
  -            } else {
  -                sb.append(img.replaceAll("(.*)\\.class\\.getName", "$1"));
  -                wasClassGetName = img.indexOf(".class.getName") != -1;
  -                parens = null;
  -            }
  -        } while (true);
  -        return sb.toString();
  +        String str = query.toString();
  +        str = str.replaceAll("\\s*\\.\\s*class\\s*\\.\\s*getName\\s*\\(\\s*\\s*\\)\\s*", "");
  +        return str;
       }