Attachment 189598 Details for Bug 337974 – proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed patch

0001-337974-javascript-error-if-the-table-contains-unicod.patch (text/plain), 2.05 KB, created by Istvan Ballok

on 2011-02-23 09:19:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Istvan Ballok

Created: 2011-02-23 09:19:30 EST

Size: 2.05 KB

patch

obsolete

>From 969456d842666c4e1c56a034f9749f2ae807f969 Mon Sep 17 00:00:00 2001
>From: Istvan Ballok <Istvan.Ballok@cas.de>
>Date: Wed, 23 Feb 2011 15:13:03 +0100
>Subject: [PATCH] 337974 javascript error if the table contains unicode 2028
>
>resolution: escape the string before setting it on the table cell
>---
> .../widgets/tableitemkit/TableItemLCA.java         |   12 +-----------
> 1 files changed, 1 insertions(+), 11 deletions(-)
>
>diff --git a/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java b/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java
>index a53fd00..d8a8647 100644
>--- a/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java
>+++ b/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java
>@@ -174,9 +174,7 @@ public final class TableItemLCA extends AbstractWidgetLCA {
>     boolean result = WidgetLCAUtil.hasChanged( item, PROP_TEXTS, texts );
>     if( result ) {
>       for( int i = 0; i < texts.length; i++ ) {
>-        // TODO [rh] for some reason doesn't work with escapeText
>-//        texts[ i ] = WidgetLCAUtil.escapeText( item.getText( i ), false );
>-        texts[ i ] = encodeHTML( item.getText( i ) );
>+        texts[ i ] = WidgetLCAUtil.escapeText( texts[ i ], false );
>         texts[ i ] = EncodingUtil.replaceWhiteSpaces( texts[ i ] );
>       }
>       JSWriter writer = JSWriter.getWriterFor( item );
>@@ -355,14 +353,6 @@ public final class TableItemLCA extends AbstractWidgetLCA {
>     writer.call( "update", null );
>   }
> 
>-  private static String encodeHTML( final String text ) {
>-    String result = text.replaceAll( "&", "&#038;" );
>-    result = result.replaceAll( "\"", "&#034;" );
>-    result = result.replaceAll( ">", "&#062;" );
>-    result = result.replaceAll( "<", "&#060;" );
>-    return result;
>-  }
>-
>   private static String toCss( final Font font ) {
>     StringBuffer result = new StringBuffer();
>     FontData fontData = font.getFontData()[ 0 ];
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 337974: 189598