================================================================================
Merge Diffs: /ade/shanchen_toplink_main_temp/tldev/source/essentials/oracle/toplink/essentials/exceptions/EJBQLException.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/shanchen/shanchen_10_gf1166_2_061016/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.19
Report generated at Mon Oct 16 11:23:45 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/shanchen/shanchen_10_gf1166_2_061016/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.19	Mon Oct 16 10:56:35 2006
--- /ade/shanchen_toplink_main_temp/tldev/source/essentials/oracle/toplink/essentials/exceptions/EJBQLException.java	Mon Oct 16 11:23:45 2006
***************
*** 24,31 ****
  import java.util.*;
  import oracle.toplink.essentials.exceptions.i18n.*;
  
- import persistence.antlr.ANTLRException;
- 
  /**
   * <P><B>Purpose</B>: EJBQL parsing and resolution problems will raise this exception
   */
--- 24,29 ----
***************
*** 334,340 ****
          return exception;
      }
  
!     public static EJBQLException syntaxError(String query, ANTLRException ex) {
          Object[] args = { query };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 332,338 ----
          return exception;
      }
  
!     public static EJBQLException syntaxError(String query, Exception ex) {
          Object[] args = { query };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 344,350 ****
          return exception;
      }
  
!     public static EJBQLException syntaxErrorAt(String query, String token, ANTLRException ex) {
          Object[] args = { query, token };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 342,348 ----
          return exception;
      }
  
!     public static EJBQLException syntaxErrorAt(String query, String token, Exception ex) {
          Object[] args = { query, token };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 354,360 ****
          return exception;
      }
  
!     public static EJBQLException unexpectedToken(String query, String token, ANTLRException ex) {
          Object[] args = { query, token };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 352,358 ----
          return exception;
      }
  
!     public static EJBQLException unexpectedToken(String query, String token, Exception ex) {
          Object[] args = { query, token };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 364,370 ****
          return exception;
      }
  
!     public static EJBQLException unexpectedChar(String query, String unexpected, ANTLRException ex) {
          Object[] args = { query, unexpected };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 362,368 ----
          return exception;
      }
  
!     public static EJBQLException unexpectedChar(String query, String unexpected, Exception ex) {
          Object[] args = { query, unexpected };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 374,380 ****
          return exception;
      }
  
!     public static EJBQLException expectedCharFound(String query, String expected, String found, ANTLRException ex) {
          Object[] args = { query, expected, found };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 372,378 ----
          return exception;
      }
  
!     public static EJBQLException expectedCharFound(String query, String expected, String found, Exception ex) {
          Object[] args = { query, expected, found };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 384,390 ****
          return exception;
      }
  
!     public static EJBQLException unexpectedEOF(String query, ANTLRException ex) {
          Object[] args = { query };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 382,388 ----
          return exception;
      }
  
!     public static EJBQLException unexpectedEOF(String query, Exception ex) {
          Object[] args = { query };
  
          String message = ExceptionMessageGenerator.buildMessage(
================================================================================
Merge Diffs: /ade/shanchen_toplink_main_temp/tldev/source/essentials/oracle/toplink/essentials/exceptions/EJBQLException.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/shanchen/shanchen_10_gf1166_2_061016/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.19
Report generated at Mon Oct 16 11:24:15 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/shanchen/shanchen_10_gf1166_2_061016/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.19	Mon Oct 16 10:56:35 2006
--- /ade/shanchen_toplink_main_temp/tldev/source/essentials/oracle/toplink/essentials/exceptions/EJBQLException.java	Mon Oct 16 11:23:45 2006
***************
*** 24,31 ****
  import java.util.*;
  import oracle.toplink.essentials.exceptions.i18n.*;
  
- import persistence.antlr.ANTLRException;
- 
  /**
   * <P><B>Purpose</B>: EJBQL parsing and resolution problems will raise this exception
   */
--- 24,29 ----
***************
*** 334,340 ****
          return exception;
      }
  
!     public static EJBQLException syntaxError(String query, ANTLRException ex) {
          Object[] args = { query };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 332,338 ----
          return exception;
      }
  
!     public static EJBQLException syntaxError(String query, Exception ex) {
          Object[] args = { query };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 344,350 ****
          return exception;
      }
  
!     public static EJBQLException syntaxErrorAt(String query, String token, ANTLRException ex) {
          Object[] args = { query, token };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 342,348 ----
          return exception;
      }
  
!     public static EJBQLException syntaxErrorAt(String query, String token, Exception ex) {
          Object[] args = { query, token };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 354,360 ****
          return exception;
      }
  
!     public static EJBQLException unexpectedToken(String query, String token, ANTLRException ex) {
          Object[] args = { query, token };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 352,358 ----
          return exception;
      }
  
!     public static EJBQLException unexpectedToken(String query, String token, Exception ex) {
          Object[] args = { query, token };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 364,370 ****
          return exception;
      }
  
!     public static EJBQLException unexpectedChar(String query, String unexpected, ANTLRException ex) {
          Object[] args = { query, unexpected };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 362,368 ----
          return exception;
      }
  
!     public static EJBQLException unexpectedChar(String query, String unexpected, Exception ex) {
          Object[] args = { query, unexpected };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 374,380 ****
          return exception;
      }
  
!     public static EJBQLException expectedCharFound(String query, String expected, String found, ANTLRException ex) {
          Object[] args = { query, expected, found };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 372,378 ----
          return exception;
      }
  
!     public static EJBQLException expectedCharFound(String query, String expected, String found, Exception ex) {
          Object[] args = { query, expected, found };
  
          String message = ExceptionMessageGenerator.buildMessage(
***************
*** 384,390 ****
          return exception;
      }
  
!     public static EJBQLException unexpectedEOF(String query, ANTLRException ex) {
          Object[] args = { query };
  
          String message = ExceptionMessageGenerator.buildMessage(
--- 382,388 ----
          return exception;
      }
  
!     public static EJBQLException unexpectedEOF(String query, Exception ex) {
          Object[] args = { query };
  
          String message = ExceptionMessageGenerator.buildMessage(