[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/parser tolog.g,1.2,1.3

[Lars H. <lh...@us...>]

Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13043/src/org/tmapiutils/query/tolog/parser

Modified Files:
	tolog.g 
Log Message:
More TM4J -> TMAPI translations

Index: tolog.g
===================================================================
RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/parser/tolog.g,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tolog.g	8 Mar 2005 12:33:55 -0000	1.2
--- tolog.g	10 Mar 2005 13:32:22 -0000	1.3
***************
*** 1,5 ****
! header { package org.tmapiutils.query.tolog.parser; }
! 
! {
  /*
   * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer
--- 1,3 ----
! header {
  /*
   * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer
***************
*** 18,21 ****
--- 16,23 ----
   * limitations under the License.
   */
+ package org.tmapiutils.query.tolog.parser;
+ }
+ 
+ {
  
    import java.io.File;
***************
*** 33,43 ****
    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
!   org.tmapiutils.query.tolog.TologParserException;
!   org.tmapiutils.query.tolog.predicates.DynamicAssociationPredicate;
  
    import org.tmapiutils.utils.IndexUtils;
    // TMAPI
-   import org.tmapi.core.TopicMapObject;
    import org.tmapi.core.Locator;
    import org.tmapi.core.Topic;
    import org.tmapi.core.TopicMap;
--- 35,45 ----
    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
!   import org.tmapiutils.query.tolog.TologParserException;
!   import org.tmapiutils.query.tolog.predicates.DynamicAssociationPredicate;
  
    import org.tmapiutils.utils.IndexUtils;
    // TMAPI
    import org.tmapi.core.Locator;
+   import org.tmapi.core.TopicMapObject;
    import org.tmapi.core.Topic;
    import org.tmapi.core.TopicMap;
***************
*** 156,162 ****
        }
        return tmo;
!     } catch (LocatorResolutionException ex) {
!       throw new TologParserException("Invalid topic identifier " + ident + ". The identifier cannot be resolved to a URI fragment identifier.");
!     } catch (TMAPIException ex) {
        throw new TologParserException("Initializing of index failed", ex);
      }
--- 158,167 ----
        }
        return tmo;
!     }
!     // -- ToDo: better exception handling, more useful hints
!     //catch (LocatorResolutionException ex) {
!     //  throw new TologParserException("Invalid topic identifier " + ident + ". The identifier cannot be resolved to a URI fragment identifier.");
!     //}
!     catch (TMAPIException ex) {
        throw new TologParserException("Initializing of index failed", ex);
      }
***************
*** 254,261 ****
        }
        if (m_log.isDebugEnabled()) m_log.debug("END importModule " + modSrc + " as " + modPrefix);
!     } catch (LocatorFactoryException ex) {
!       throw new TologParserException("Unable to resolve module reference " + modSrc + " to a valid URL.", ex);
!     } catch (LocatorResolutionException ex) {
!       throw new TologParserException("Unable to resolve module reference " + modSrc + " to a valid URL.", ex);
      } catch (MalformedURLException ex) {
        throw new TologParserException("Unable to open module reference " + modSrc + ".", ex);
--- 259,266 ----
        }
        if (m_log.isDebugEnabled()) m_log.debug("END importModule " + modSrc + " as " + modPrefix);
!     //} catch (LocatorFactoryException ex) {
!     //  throw new TologParserException("Unable to resolve module reference " + modSrc + " to a valid URL.", ex);
!     //} catch (LocatorResolutionException ex) {
!     //  throw new TologParserException("Unable to resolve module reference " + modSrc + " to a valid URL.", ex);
      } catch (MalformedURLException ex) {
        throw new TologParserException("Unable to open module reference " + modSrc + ".", ex);