Return-Path: 
 <ant-dev-return-41193-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 93280 invoked from network); 14 Jan 2003 18:42:32 -0000
Received: from exchange.sun.com (192.18.33.10)
  by daedalus.apache.org with SMTP; 14 Jan 2003 18:42:32 -0000
Received: (qmail 10991 invoked by uid 97); 14 Jan 2003 18:43:52 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 10925 invoked by uid 97); 14 Jan 2003 18:43:51 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 10903 invoked by uid 97); 14 Jan 2003 18:43:49 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 14 Jan 2003 18:42:21 -0000
Message-ID: <20030114184221.81717.qmail@icarus.apache.org>
From: umagesh@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit:
 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n
 Translate.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

umagesh     2003/01/14 10:42:21

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/optional/i18n Tag:
                        ANT_15_BRANCH Translate.java
  Log:
  Translate not ignoring comment lines
  
  PR: 16042
  Submitted by: morpheus@smi.stanford.edu (Mark Woon)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.109 +1 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.108
  retrieving revision 1.263.2.109
  diff -u -r1.263.2.108 -r1.263.2.109
  --- WHATSNEW	13 Jan 2003 16:12:35 -0000	1.263.2.108
  +++ WHATSNEW	14 Jan 2003 18:42:20 -0000	1.263.2.109
  @@ -6,6 +6,7 @@
   
   Fixed bugs:
   -----------
  +* <translate> was not ignoring comment lines.
   
   * <manifest> wouldn't update an existing manifest if only an attribute
     of an existing section changed.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.4  +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  
  Index: Translate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
  retrieving revision 1.11.2.3
  retrieving revision 1.11.2.4
  diff -u -r1.11.2.3 -r1.11.2.4
  --- Translate.java	24 Jun 2002 01:40:18 -0000	1.11.2.3
  +++ Translate.java	14 Jan 2003 18:42:21 -0000	1.11.2.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -428,8 +428,7 @@
               String line = null;
               while ((line = in.readLine()) != null) {
                   //So long as the line isn't empty and isn't a comment...
  -                if (line.trim().length() > 1 &&
  -                   ('#' != line.charAt(0) || '!' != line.charAt(0))) {
  +                if (line.trim().length() > 1 && '#' != line.charAt(0) && '!' != line.charAt(0)) {
                       //Legal Key-Value separators are :, = and white space.
                       int sepIndex = line.indexOf('=');
                       if (-1 == sepIndex) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>