Attachment 196522 Details for Bug 346198 – Proposed patch for 1.4 branch

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

[patch] Proposed patch for 1.4 branch

Bug-346198-v1.4.patch (text/plain), 3.76 KB, created by Ivan Furnadjiev

on 2011-05-25 05:37:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2011-05-25 05:37:42 EDT

Size: 3.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>Index: src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA.java,v
>retrieving revision 1.22
>diff -u -r1.22 BrowserLCA.java
>--- src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA.java	20 Apr 2011 12:32:50 -0000	1.22
>+++ src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA.java	25 May 2011 09:25:58 -0000
>@@ -18,7 +18,6 @@
> import org.eclipse.rwt.RWT;
> import org.eclipse.rwt.internal.engine.RWTFactory;
> import org.eclipse.rwt.internal.lifecycle.LifeCycleUtil;
>-import org.eclipse.rwt.internal.lifecycle.RWTLifeCycle;
> import org.eclipse.rwt.internal.service.ContextProvider;
> import org.eclipse.rwt.internal.service.IServiceStateInfo;
> import org.eclipse.rwt.internal.util.EncodingUtil;
>@@ -139,7 +138,7 @@
> 
>   static boolean hasUrlChanged( final Browser browser ) {
>     boolean initialized = WidgetUtil.getAdapter( browser ).isInitialized();
>-    return !initialized || getAdapter( browser ).getAndResetUrlChanged();
>+    return getAdapter( browser ).getAndResetUrlChanged() || !initialized;
>   }
> 
>   static String getUrl( final Browser browser ) throws IOException {
>#P org.eclipse.rap.rwt.q07.test
>Index: src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA_Test.java,v
>retrieving revision 1.12
>diff -u -r1.12 BrowserLCA_Test.java
>--- src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA_Test.java	18 Apr 2011 07:53:23 -0000	1.12
>+++ src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA_Test.java	25 May 2011 09:25:59 -0000
>@@ -21,6 +21,7 @@
> import org.eclipse.rwt.lifecycle.*;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.browser.*;
>+import org.eclipse.swt.internal.widgets.IBrowserAdapter;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Shell;
> 
>@@ -95,6 +96,35 @@
>     assertEquals( "http://eclipse.org/rip", BrowserLCA.getUrl( browser ) );
>   }
> 
>+  public void testResetUrlChanged_NotInitialized() throws IOException {
>+    Display display = new Display();
>+    Shell shell = new Shell( display );
>+    Fixture.markInitialized( display );
>+    Browser browser = new Browser( shell, SWT.NONE );
>+    browser.setUrl( "http://eclipse.org/rap" );
>+    Fixture.fakeResponseWriter();
>+
>+    BrowserLCA lca = new BrowserLCA();
>+    lca.renderChanges( browser );
>+
>+    assertFalse( getAdapter( browser).getAndResetUrlChanged() );
>+  }
>+
>+  public void testResetUrlChanged_Initialized() throws IOException {
>+    Display display = new Display();
>+    Shell shell = new Shell( display );
>+    Fixture.markInitialized( display );
>+    Browser browser = new Browser( shell, SWT.NONE );
>+    Fixture.markInitialized( browser );
>+    browser.setUrl( "http://eclipse.org/rap" );
>+    Fixture.fakeResponseWriter();
>+
>+    BrowserLCA lca = new BrowserLCA();
>+    lca.renderChanges( browser );
>+
>+    assertFalse( getAdapter( browser).getAndResetUrlChanged() );
>+  }
>+
>   public void testRenderUrl() throws IOException {
>     Display display = new Display();
>     Fixture.markInitialized( display );
>@@ -337,6 +367,10 @@
>     assertEquals( "completed", log.get( 1 ) );
>   }
> 
>+  private static IBrowserAdapter getAdapter( final Browser browser ) {
>+    return ( IBrowserAdapter )browser.getAdapter( IBrowserAdapter.class );
>+  }
>+
>   protected void setUp() throws Exception {
>     Fixture.setUp();
>   }

Flags:

tbuschto: review+

Actions: View | Diff

Attachments on bug 346198: 196433 | 196522