Attachment 174951 Details for Bug 320607 – RAP 1.3 XHTML patch

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

RAP 1.3 XHTML patch

rap_1.3_xhtml_patch.txt (text/plain), 8.83 KB, created by Philipp Eichhorn

on 2010-07-22 06:20:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Eichhorn

Created: 2010-07-22 06:20:49 EDT

Size: 8.83 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/rwt/internal/lifecycle/DisplayUtil.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/lifecycle/DisplayUtil.java,v
>retrieving revision 1.4
>diff -u -r1.4 DisplayUtil.java
>--- src/org/eclipse/rwt/internal/lifecycle/DisplayUtil.java	29 Apr 2009 13:24:52 -0000	1.4
>+++ src/org/eclipse/rwt/internal/lifecycle/DisplayUtil.java	19 May 2010 15:58:52 -0000
>@@ -64,4 +64,8 @@
>   public static void writeLibraries() throws IOException {
>     DisplayLCAFacade.writeLibraries();
>   }
>+
>+  public static void writeStyle() throws IOException {
>+    DisplayLCAFacade.writeStyle();
>+  }
> }
>Index: src/org/eclipse/rwt/internal/service/RWTStartupPageConfigurer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/service/RWTStartupPageConfigurer.java,v
>retrieving revision 1.4
>diff -u -r1.4 RWTStartupPageConfigurer.java
>--- src/org/eclipse/rwt/internal/service/RWTStartupPageConfigurer.java	23 Mar 2010 19:11:26 -0000	1.4
>+++ src/org/eclipse/rwt/internal/service/RWTStartupPageConfigurer.java	19 May 2010 15:58:52 -0000
>@@ -54,6 +54,7 @@
>     readContent();
>     template.reset();
>     template.replace( StartupPageTemplateHolder.VAR_LIBRARIES, getLibraries() );
>+    template.replace( StartupPageTemplateHolder.VAR_STYLE, getStyle() );
>     template.replace( StartupPageTemplateHolder.VAR_APPSCRIPT, getAppScript() );
>     applyBranding();
>     return template;
>@@ -185,6 +186,16 @@
>     }
>   }
> 
>+  private static String getStyle() throws IOException {
>+    fakeWriter();
>+    try {
>+      DisplayUtil.writeStyle();
>+      return getContent( ContextProvider.getStateInfo().getResponseWriter() );
>+    } finally {
>+      restoreWriter();
>+    }
>+  }
>+
>   private static String getContent( final HtmlResponseWriter writer ) {
>     StringBuffer msg = new StringBuffer();
>     for( int i = 0; i < writer.getBodySize(); i ++ ) {
>Index: src/org/eclipse/rwt/internal/service/StartupPageTemplateHolder.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/service/StartupPageTemplateHolder.java,v
>retrieving revision 1.2
>diff -u -r1.2 StartupPageTemplateHolder.java
>--- src/org/eclipse/rwt/internal/service/StartupPageTemplateHolder.java	23 Mar 2010 19:11:26 -0000	1.2
>+++ src/org/eclipse/rwt/internal/service/StartupPageTemplateHolder.java	19 May 2010 15:58:52 -0000
>@@ -21,6 +21,7 @@
>   private static final int[] EMPTY_INDICES = new int[ 0 ];
>   private final static String TOKEN_BACKGROUND_IMAGE = "backgroundImage";
>   private final static String TOKEN_LIBRARIES = "libraries";
>+  private final static String TOKEN_STYLE = "style";
>   private final static String TOKEN_APPSCRIPT = "appScript";
>   private final static String TOKEN_SERVLET = "servlet";
>   private final static String TOKEN_ENTRY_POINT = "entrypoint";
>@@ -34,6 +35,8 @@
>     = new Variable( TOKEN_BACKGROUND_IMAGE );
>   public final static Variable VAR_LIBRARIES
>     = new Variable( TOKEN_LIBRARIES );
>+  public final static Variable VAR_STYLE
>+    = new Variable( TOKEN_STYLE );
>   public final static Variable VAR_APPSCRIPT
>     = new Variable( TOKEN_APPSCRIPT );
>   public final static Variable VAR_SERVLET
>@@ -103,6 +106,7 @@
>   private boolean isVariableToken( final String nextToken ) {
>     return    nextToken.equals( TOKEN_BACKGROUND_IMAGE.toString() )
>            || nextToken.equals( TOKEN_LIBRARIES.toString() )
>+           || nextToken.equals( TOKEN_STYLE.toString() )
>            || nextToken.equals( TOKEN_APPSCRIPT.toString() )
>            || nextToken.equals( TOKEN_SERVLET.toString() )
>            || nextToken.equals( TOKEN_ENTRY_POINT.toString() )
>Index: src/org/eclipse/rwt/internal/service/rwt-index.html
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/service/rwt-index.html,v
>retrieving revision 1.9
>diff -u -r1.9 rwt-index.html
>--- src/org/eclipse/rwt/internal/service/rwt-index.html	23 Mar 2010 19:11:26 -0000	1.9
>+++ src/org/eclipse/rwt/internal/service/rwt-index.html	19 May 2010 15:58:52 -0000
>@@ -1,12 +1,23 @@
>-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>-<html>
>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
>+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
>+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
>   <head>
>     <title>${title}</title>
>-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
>+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
>     ${headers}
>+    <style type="text/css">
>+	body { 
>+		background-image: 
>+		url('${backgroundImage}'); 
>+		background-repeat: repeat; 
>+	}
>+	</style>
>+	
>+    ${style}
>+    
>   </head>
> 
>-  <body background="${backgroundImage}">
>+  <body>
> 
>     <noscript>
>       <p style = "z-index:100000;background-color:white">
>@@ -23,7 +34,8 @@
>     
> 
>     
>-    <script type="text/javascript">
>+    <script type="text/javascript" language="javascript">
>+    //<![CDATA[
>       function discoverAjax() {
>         var result;
>         if( window.ActiveXObject ) {
>@@ -82,6 +94,7 @@
>           + "</p>";        
>         document.write( msg );
>       }
>+    //]]>
>     </script>
>   </body>
> </html>
>Index: src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacade.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacade.java,v
>retrieving revision 1.3
>diff -u -r1.3 DisplayLCAFacade.java
>--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacade.java	5 Dec 2008 10:57:28 -0000	1.3
>+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacade.java	19 May 2010 15:58:52 -0000
>@@ -36,6 +36,10 @@
>     FACADE_IMPL.writeLibrariesInternal();
>   }
> 
>+  public static void writeStyle() throws IOException {
>+    FACADE_IMPL.writeStyleInternal();
>+  }
>+
>   public static IDisplayLifeCycleAdapter getDisplayLCA() {
>     return FACADE_IMPL.getDisplayLCAInternal();
>   }
>@@ -48,6 +52,7 @@
> 
>   abstract void writeAppScriptInternal( String id ) throws IOException;
>   abstract void writeLibrariesInternal() throws IOException;
>+  abstract void writeStyleInternal() throws IOException;
>   abstract IDisplayLifeCycleAdapter getDisplayLCAInternal();
>   abstract void writeTestWidgetIdInternal( Widget widget, String id )
>     throws IOException;
>#P org.eclipse.rap.rwt.q07
>Index: src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java,v
>retrieving revision 1.30
>diff -u -r1.30 DisplayLCA.java
>--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java	13 May 2010 12:35:55 -0000	1.30
>+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java	19 May 2010 15:58:54 -0000
>@@ -296,10 +296,13 @@
>   public static void writeLibraries() throws IOException {
>     QooxdooResourcesUtil.registerResources();
>     ThemeManager.getInstance().registerResources();
>-    writeScrollBarStyle();
>     writeJSLibraries();
>   }
> 
>+  public static void writeStyle() throws IOException {
>+    writeScrollBarStyle();
>+  }
>+
>   private static void writeJSLibraries() throws IOException {
>     HtmlResponseWriter out = ContextProvider.getStateInfo().getResponseWriter();
>     IResource[] resources = ResourceRegistry.get();
>Index: src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacadeImpl.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacadeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 DisplayLCAFacadeImpl.java
>--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacadeImpl.java	5 Dec 2008 10:57:27 -0000	1.3
>+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacadeImpl.java	19 May 2010 15:58:54 -0000
>@@ -33,6 +33,10 @@
>     DisplayLCA.writeLibraries();
>   }
> 
>+  void writeStyleInternal() throws IOException {
>+    DisplayLCA.writeStyle();
>+  }
>+
>   void readBounds( final Display display ) {
>     DisplayLCA.readBounds( display );
>   }

Actions: View

Attachments on bug 320607: 174951