cvs commit: uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer UwCalConnector.java

[Xavier Lawrence]

xlawrence    2005/01/26 11:24:15 CET

  Modified files:
    calClient/src/java/org/jahia/suite/calendar/calServer 
                                                          UwCalConnector.java 
  Log:
  Corrected iCalendar bug when building a calendar. Missing \r\n at the end of 
the END:VEVENT
  
  Revision  Changes    Path
  1.11      +8 -1      
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java.diff?r1=1.10&r2=1.11&f=h
  
  
  
  Index: UwCalConnector.java
  ===================================================================
  RCS file: 
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- UwCalConnector.java       25 Jan 2005 16:15:20 -0000      1.10
  +++ UwCalConnector.java       26 Jan 2005 10:24:14 -0000      1.11
  @@ -208,10 +208,17 @@
           buffer.append(Calendar.VCALENDAR);
           buffer.append(CRLF);
           buffer.append(eventString);
  -        if (!eventString.endsWith(CRLF)) buffer.append(CRLF);
  +        if (!eventString.endsWith(CRLF)) {
  +            if (buffer.toString().endsWith("\n") ||
  +                    buffer.toString().endsWith("\r")) {
  +                buffer.deleteCharAt(buffer.length()-1);
  +            }
  +            buffer.append(CRLF);        
  +        }
           buffer.append(Calendar.END);
           buffer.append(':');
           buffer.append(Calendar.VCALENDAR);
  +        buffer.append(CRLF);
           
           log.debug("Converted Event: "+buffer.toString());
           CalendarBuilder builder = new CalendarBuilder();