[Omegat-svn-changes] SF.net SVN: omegat:[1978] branches/release-1-8

[<did...@us...>]

Revision: 1978
          http://omegat.svn.sourceforge.net/omegat/?rev=1978&view=rev
Author:   didierbr
Date:     2009-01-29 17:52:57 +0000 (Thu, 29 Jan 2009)

Log Message:
-----------
[ 1988491 ] The content of external TMX level 2 tags is displayed

Modified Paths:
--------------
    branches/release-1-8/release/changes.txt
    branches/release-1-8/src/org/omegat/util/TMXReader.java

Modified: branches/release-1-8/release/changes.txt
===================================================================
--- branches/release-1-8/release/changes.txt	2009-01-29 07:59:15 UTC (rev 1977)
+++ branches/release-1-8/release/changes.txt	2009-01-29 17:52:57 UTC (rev 1978)
@@ -4,7 +4,7 @@
 1.8.1 update 2 vs. 1.8.1 update 1
 
    1 Enhancement
-   1 Bugfix
+   2 Bugfixes
 ----------------------------------------------------------------------
 1.8.1 update 2
 
@@ -17,6 +17,9 @@
   - PL "Create new project" too large on OSX
   http://sourceforge.net/support/tracker.php?aid=1895406
 
+  - The content of external TMX level 2 tags is displayed
+  http://sourceforge.net/support/tracker.php?aid=1988491 
+
 ----------------------------------------------------------------------
  OmegaT 1.8.1 update 1 Changes
 ----------------------------------------------------------------------

Modified: branches/release-1-8/src/org/omegat/util/TMXReader.java
===================================================================
--- branches/release-1-8/src/org/omegat/util/TMXReader.java	2009-01-29 07:59:15 UTC (rev 1977)
+++ branches/release-1-8/src/org/omegat/util/TMXReader.java	2009-01-29 17:52:57 UTC (rev 1978)
@@ -4,7 +4,8 @@
           glossaries, and translation leveraging into updated projects.
 
  Copyright (C) 2000-2006 Keith Godfrey, Maxym Mykhalchuk, and Henry Pijffers
-                Home page: http://www.omegat.org/omegat/omegat.html
+               2009 Didier Briel
+               Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
  This program is free software; you can redistribute it and/or modify
@@ -63,6 +64,7 @@
  * @author Keith Godfrey
  * @author Henry Pijffers (hen...@sa...)
  * @author Maxym Mykhalchuk
+ * @author Didier Briel
  */
 public class TMXReader extends org.xml.sax.helpers.DefaultHandler 
 {
@@ -653,9 +655,17 @@
                            int    length) throws SAXException 
     {
         // only read (sub)segments, properties, and inline codes (if required)
-        if (   inSegment
-            || inProperty
-            || (includeLevel2 && ((String)currentElement.peek()).equals(TMX_TAG_INLINE)))
+        if ( inProperty || // We are in a property or
+             ( inSegment && // we're inside a segment and
+               ( ( includeLevel2 && // we read level 2 and
+                                    // we're inside a tag  
+                   ( currentElement.peek()).equals(TMX_TAG_INLINE) )
+                 || // or
+                 // we're not inside a tag
+                 ( !(currentElement.peek()).equals(TMX_TAG_INLINE) )
+               )
+             )
+           )
         {
             // append the data to the current buffer
             ((StringBuffer)currentSub.peek()).append(ch, start, length);
@@ -670,10 +680,17 @@
                                     int    length) throws SAXException 
     {
         // only read (sub)segments, properties, and inline codes (if required)
-        if (   inSegment
-            || inProperty
-            || (includeLevel2 && ((String)currentElement.peek()).equals(TMX_TAG_INLINE)))
-        {
+        if ( inProperty || // We are in a property or
+             ( inSegment && // we're inside a segment and
+               ( ( includeLevel2 && // we read level 2 and
+                                    // we're inside a tag
+                   ( currentElement.peek()).equals(TMX_TAG_INLINE) )
+                 || // or
+                 // we're not inside a tag
+                 ( !(currentElement.peek()).equals(TMX_TAG_INLINE) )
+               )
+             )
+           )        {
             // append the data to the current buffer
             ((StringBuffer)currentSub.peek()).append(ch, start, length);
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.