[Squirrel-sql-commits] sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/completion MappingInfoProvider.java, 1.3, 1.4 HQLCompletionInfoCollection.java, 1.10, 1.11 HqlAliasParser.java, 1.3, 1.4

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/completion
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31411/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/completion

Modified Files:
	MappingInfoProvider.java HQLCompletionInfoCollection.java 
	HqlAliasParser.java 
Log Message:
Hibernate Plugin: Class names in completion list could change from fully qualified to simple
while scrolling through the completion list.

Index: HqlAliasParser.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlAliasParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HqlAliasParser.java	28 Oct 2007 12:19:27 -0000	1.3
--- HqlAliasParser.java	13 Nov 2007 19:59:10 -0000	1.4
***************
*** 37,41 ****
              else
              {
!                lastMappedClass = mappingInfoProvider.getMappedClassInfoFor(token, true);
              }
           }
--- 37,41 ----
              else
              {
!                lastMappedClass = mappingInfoProvider.getMappedClassInfoFor(token, true, true);
              }
           }

Index: HQLCompletionInfoCollection.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** HQLCompletionInfoCollection.java	28 Oct 2007 12:19:27 -0000	1.10
--- HQLCompletionInfoCollection.java	13 Nov 2007 19:59:10 -0000	1.11
***************
*** 106,110 ****
        for (MappedClassInfo mappedClassInfo : _mappedClassInfos)
        {
!          if(mappedClassInfo.matches(parser, false))
           {
              ciClasses.add(mappedClassInfo);
--- 106,110 ----
        for (MappedClassInfo mappedClassInfo : _mappedClassInfos)
        {
!          if(mappedClassInfo.matches(parser, false, false))
           {
              ciClasses.add(mappedClassInfo);
***************
*** 195,199 ****
     }
  
!    public MappedClassInfo getMappedClassInfoFor(String token, boolean matchNameExact)
     {
        // Example for this code:
--- 195,199 ----
     }
  
!    public MappedClassInfo getMappedClassInfoFor(String token, boolean matchNameExact, boolean stateless)
     {
        // Example for this code:
***************
*** 205,209 ****
        if(2 > cp.size())
        {
!          return getMappedClassInfoForNonAliasedToken(cp, matchNameExact);
        }
  
--- 205,209 ----
        if(2 > cp.size())
        {
!          return getMappedClassInfoForNonAliasedToken(cp, matchNameExact, stateless);
        }
  
***************
*** 230,241 ****
        }
  
!       return getMappedClassInfoForNonAliasedToken(cp, false);
     }
  
!    private MappedClassInfo getMappedClassInfoForNonAliasedToken(CompletionParser cp, boolean matchNameExact)
     {
        for (MappedClassInfo mappedClassInfo : _mappedClassInfos)
        {
!          if(mappedClassInfo.matches(cp, matchNameExact))
           {
              return mappedClassInfo;
--- 230,241 ----
        }
  
!       return getMappedClassInfoForNonAliasedToken(cp, false, stateless);
     }
  
!    private MappedClassInfo getMappedClassInfoForNonAliasedToken(CompletionParser cp, boolean matchNameExact, boolean stateless)
     {
        for (MappedClassInfo mappedClassInfo : _mappedClassInfos)
        {
!          if(mappedClassInfo.matches(cp, matchNameExact, stateless))
           {
              return mappedClassInfo;

Index: MappingInfoProvider.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/completion/MappingInfoProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MappingInfoProvider.java	28 Oct 2007 12:19:25 -0000	1.3
--- MappingInfoProvider.java	13 Nov 2007 19:59:10 -0000	1.4
***************
*** 6,10 ****
  {
     // Will be called asynchronously to the event dispatch thread
!    MappedClassInfo getMappedClassInfoFor(String token, boolean matchNameExact);
  
     boolean mayBeClassOrAliasName(String token);
--- 6,10 ----
  {
     // Will be called asynchronously to the event dispatch thread
!    MappedClassInfo getMappedClassInfoFor(String token, boolean matchNameExact, boolean stateless);
  
     boolean mayBeClassOrAliasName(String token);