Attachment 149386 Details for Bug 288454 – Fix

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

[patch] Fix

clipboard.txt (text/plain), 13.54 KB, created by Rüdiger Herrmann

on 2009-10-12 14:49:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-10-12 14:49:28 EDT

Size: 13.54 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/swt/internal/widgets/WidgetAdapterFactory.java
>===================================================================
>RCS file: src/org/eclipse/swt/internal/widgets/WidgetAdapterFactory.java
>diff -N src/org/eclipse/swt/internal/widgets/WidgetAdapterFactory.java
>--- src/org/eclipse/swt/internal/widgets/WidgetAdapterFactory.java	12 Jun 2008 13:12:13 -0000	1.5
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,57 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2002, 2007 Innoopract Informationssysteme GmbH.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *     Innoopract Informationssysteme GmbH - initial API and implementation
>- ******************************************************************************/
>-
>-package org.eclipse.swt.internal.widgets;
>-
>-import java.util.HashMap;
>-import java.util.Map;
>-
>-import org.eclipse.rwt.AdapterFactory;
>-import org.eclipse.rwt.lifecycle.IWidgetAdapter;
>-import org.eclipse.swt.widgets.Display;
>-import org.eclipse.swt.widgets.Widget;
>-
>-
>-//TODO [rh] This class is currently not in use, see Display#getAdater() and 
>-//     Widget#getAdapter()
>-public final class WidgetAdapterFactory implements AdapterFactory {
>-
>-  private static final Class[] ADAPTER_LIST = new Class[] { 
>-    IWidgetAdapter.class 
>-  };
>-
>-  // Map keeping the association between extensions and a set of objects. 
>-  // Key: Object (adaptable), value: IWidgetAdapter (adapter).
>-  private final Map map = new HashMap();
>-
>-  public Object getAdapter( final Object adaptable, final Class adapter ) {
>-    // Note [fappel]: Since this code is performance critical, don't change
>-    //                anything without checking it against a profiler.
>-    Object result = null;
>-    if (   ( adaptable instanceof Display || adaptable instanceof Widget ) 
>-         && adapter == IWidgetAdapter.class ) 
>-    {
>-      // [fappel] We use a hash as key to avoid using WeakHashMap, which doesn't
>-      //          perform as well as a simple HashMap.
>-      Integer hash = new Integer( adaptable.hashCode() );
>-      result = map.get( hash );
>-      if( result == null ) {
>-        result = new WidgetAdapter( IdGenerator.getInstance().newId() );
>-        map.put( hash, result );
>-      }
>-    }
>-    return result;
>-  }
>-
>-  public Class[] getAdapterList() {
>-    return ADAPTER_LIST;
>-  }
>-}
>Index: src/org/eclipse/rwt/internal/engine/RWTServletContextListener.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/engine/RWTServletContextListener.java,v
>retrieving revision 1.15
>diff -u -r1.15 RWTServletContextListener.java
>--- src/org/eclipse/rwt/internal/engine/RWTServletContextListener.java	20 Apr 2009 10:44:33 -0000	1.15
>+++ src/org/eclipse/rwt/internal/engine/RWTServletContextListener.java	12 Oct 2009 18:52:16 -0000
>@@ -30,7 +30,6 @@
> import org.eclipse.rwt.resources.IResourceManagerFactory;
> import org.eclipse.rwt.service.ISettingStoreFactory;
> import org.eclipse.rwt.service.RWTFileSettingStoreFactory;
>-import org.eclipse.swt.internal.widgets.WidgetAdapterFactory;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Widget;
> 
>@@ -231,10 +230,6 @@
>                                   Widget.class );
>       AdapterFactoryRegistry.add( LifeCycleAdapterFactory.class,
>                                   Display.class );
>-      AdapterFactoryRegistry.add( WidgetAdapterFactory.class,
>-                                  Widget.class );
>-      AdapterFactoryRegistry.add( WidgetAdapterFactory.class,
>-                                  Display.class );
>     }
>   }
> 
>Index: src/org/eclipse/swt/widgets/Widget.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Widget.java,v
>retrieving revision 1.41
>diff -u -r1.41 Widget.java
>--- src/org/eclipse/swt/widgets/Widget.java	20 Aug 2009 10:05:24 -0000	1.41
>+++ src/org/eclipse/swt/widgets/Widget.java	12 Oct 2009 18:52:17 -0000
>@@ -149,20 +149,17 @@
>   public Object getAdapter( final Class adapter ) {
>     Object result;
>     if( adapter == IEventAdapter.class ) {
>-      // //////////////////////////////////////////////////////
>-      // Note: This is not implemented via the AdapterManager,
>-      // since the manager's mapping mechanism prevents
>-      // the component being released unless the session
>-      // is invalidated.
>+      // Note: This is not implemented via the AdapterManager, since the 
>+      // manager's mapping mechanism prevents the component being released 
>+      // unless the session is invalidated.
>       if( eventAdapter == null ) {
>         eventAdapter = new EventAdapter();
>       }
>       result = eventAdapter;
>     } else if( adapter == IWidgetAdapter.class ) {
>-      // TODO: [fappel] this is done for performance improvement and replaces
>-      //                the lookup in WidgetAdapterFactory. Since this is still
>-      //                a matter of investigation, WidgetAdapterFactory is not
>-      //                changed yet.
>+      // [fappel] Directly return the WidgetAdapter instead of consulting the
>+      // adapter factory. This is done for performance reasons and must not 
>+      // be changed without good reason.
>       if( widgetAdapter == null ) {
>         widgetAdapter = new WidgetAdapter();
>       }
>@@ -173,9 +170,7 @@
>       }
>       result = widgetGraphicsAdapter;
>     } else {
>-      // TODO: [fappel] buffer the adapterManager for performance improvement.
>-      //                Note: this is still a matter of investigation since
>-      //                we improve cpu time on cost of memory consumption.
>+      // [fappel] Buffer the adapterManager to improve performance
>       if( adapterManager == null ) {
>         adapterManager = AdapterManagerImpl.getInstance();
>       }
>#P org.eclipse.rap.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui/plugin.xml,v
>retrieving revision 1.23
>diff -u -r1.23 plugin.xml
>--- plugin.xml	30 Sep 2009 12:18:37 -0000	1.23
>+++ plugin.xml	12 Oct 2009 18:52:20 -0000
>@@ -2221,12 +2221,6 @@
>     <factory
>         factoryClass="org.eclipse.rwt.internal.lifecycle.LifeCycleAdapterFactory"
>         adaptableClass="org.eclipse.swt.widgets.Display"/>
>-    <factory
>-        factoryClass="org.eclipse.swt.internal.widgets.WidgetAdapterFactory"
>-        adaptableClass="org.eclipse.swt.widgets.Widget"/>
>-    <factory
>-        factoryClass="org.eclipse.swt.internal.widgets.WidgetAdapterFactory"
>-        adaptableClass="org.eclipse.swt.widgets.Display"/>
>   </extension>
> 
>   <extension
>#P org.eclipse.rap.rwt.q07.test
>Index: src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java,v
>retrieving revision 1.6
>diff -u -r1.6 PreserveWidgetsPhaseListener_Test.java
>--- src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java	7 Oct 2009 13:29:38 -0000	1.6
>+++ src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java	12 Oct 2009 18:52:22 -0000
>@@ -31,7 +31,6 @@
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.graphics.Device;
> import org.eclipse.swt.internal.widgets.Props;
>-import org.eclipse.swt.internal.widgets.WidgetAdapterFactory;
> import org.eclipse.swt.widgets.*;
> 
> public class PreserveWidgetsPhaseListener_Test extends TestCase {
>@@ -179,9 +178,6 @@
>     AdapterManager manager = AdapterManagerImpl.getInstance();
>     manager.registerAdapters( lifeCycleAdapterFactory, Display.class );
>     manager.registerAdapters( lifeCycleAdapterFactory, Widget.class );
>-    WidgetAdapterFactory widgetAdapterFactory = new WidgetAdapterFactory();
>-    manager.registerAdapters( widgetAdapterFactory, Display.class );
>-    manager.registerAdapters( widgetAdapterFactory, Widget.class );
>     RWTFixture.registerResourceManager();
>     // Create test widget hierarchy
>     Display display = new Display();
>Index: src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle2_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle2_Test.java,v
>retrieving revision 1.5
>diff -u -r1.5 RWTLifeCycle2_Test.java
>--- src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle2_Test.java	9 Oct 2009 14:36:09 -0000	1.5
>+++ src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle2_Test.java	12 Oct 2009 18:52:22 -0000
>@@ -32,7 +32,6 @@
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.*;
> import org.eclipse.swt.internal.graphics.ResourceFactory;
>-import org.eclipse.swt.internal.widgets.WidgetAdapterFactory;
> import org.eclipse.swt.layout.FillLayout;
> import org.eclipse.swt.widgets.*;
> 
>@@ -321,10 +320,6 @@
>                                 Widget.class );
>     AdapterFactoryRegistry.add( LifeCycleAdapterFactory.class,
>                                 Display.class );
>-    AdapterFactoryRegistry.add( WidgetAdapterFactory.class,
>-                                Widget.class );
>-    AdapterFactoryRegistry.add( WidgetAdapterFactory.class,
>-                                Display.class );
>     session = new TestSession();
>     ServletContext servletContext = session.getServletContext();
>     TestServletContext servletContextImpl
>Index: src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA_Test.java,v
>retrieving revision 1.8
>diff -u -r1.8 DisplayLCA_Test.java
>--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA_Test.java	7 Oct 2009 13:29:38 -0000	1.8
>+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA_Test.java	12 Oct 2009 18:52:22 -0000
>@@ -40,7 +40,6 @@
> public class DisplayLCA_Test extends TestCase {
> 
>   private AdapterFactory lifeCycleAdapterFactory;
>-  private WidgetAdapterFactory widgetAdapterFactory;
>   private final List log = new ArrayList();
>   private final List renderInitLog = new ArrayList();
>   private final List renderChangesLog = new ArrayList();
>@@ -447,9 +446,6 @@
>     };
>     manager.registerAdapters( lifeCycleAdapterFactory, Display.class );
>     manager.registerAdapters( lifeCycleAdapterFactory, Widget.class );
>-    widgetAdapterFactory = new WidgetAdapterFactory();
>-    manager.registerAdapters( widgetAdapterFactory, Display.class );
>-    manager.registerAdapters( widgetAdapterFactory, Widget.class );
>     clearLogs();
>     RWTFixture.registerResourceManager();
>     PhaseListenerRegistry.add( new CurrentPhase.Listener() );
>@@ -460,8 +456,6 @@
>     AdapterManager manager = AdapterManagerImpl.getInstance();
>     manager.deregisterAdapters( lifeCycleAdapterFactory, Display.class );
>     manager.deregisterAdapters( lifeCycleAdapterFactory, Widget.class );
>-    manager.deregisterAdapters( widgetAdapterFactory, Display.class );
>-    manager.deregisterAdapters( widgetAdapterFactory, Widget.class );
>     RWTFixture.deregisterResourceManager();
>     String[] entryPoints = EntryPointManager.getEntryPoints();
>     for( int i = 0; i < entryPoints.length; i++ ) {
>#P org.eclipse.rap.rwt.testfixture
>Index: src/org/eclipse/swt/RWTFixture.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.testfixture/src/org/eclipse/swt/RWTFixture.java,v
>retrieving revision 1.9
>diff -u -r1.9 RWTFixture.java
>--- src/org/eclipse/swt/RWTFixture.java	11 Sep 2009 10:32:42 -0000	1.9
>+++ src/org/eclipse/swt/RWTFixture.java	12 Oct 2009 18:52:24 -0000
>@@ -34,7 +34,6 @@
> import org.eclipse.rwt.service.ISessionStore;
> import org.eclipse.swt.internal.graphics.ResourceFactory;
> import org.eclipse.swt.internal.widgets.WidgetAdapter;
>-import org.eclipse.swt.internal.widgets.WidgetAdapterFactory;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Widget;
> 
>@@ -147,7 +146,6 @@
>   public static final String IMAGE_BLANK_PIXEL = "resources/images/blank.gif";
> 
>   private static LifeCycleAdapterFactory lifeCycleAdapterFactory;
>-  private static WidgetAdapterFactory widgetAdapterFactory;
>   private static PhaseListener currentPhaseListener
>     = new CurrentPhase.Listener();
> 
>@@ -217,15 +215,10 @@
>     lifeCycleAdapterFactory = new LifeCycleAdapterFactory();
>     manager.registerAdapters( lifeCycleAdapterFactory, Display.class );
>     manager.registerAdapters( lifeCycleAdapterFactory, Widget.class );
>-    widgetAdapterFactory = new WidgetAdapterFactory();
>-    manager.registerAdapters( widgetAdapterFactory, Display.class );
>-    manager.registerAdapters( widgetAdapterFactory, Widget.class );
>   }
> 
>   public static void deregisterAdapterFactories() {
>     AdapterManager manager = AdapterManagerImpl.getInstance();
>-    manager.deregisterAdapters( widgetAdapterFactory, Display.class );
>-    manager.deregisterAdapters( widgetAdapterFactory, Widget.class );
>     manager.deregisterAdapters( lifeCycleAdapterFactory, Display.class );
>     manager.deregisterAdapters( lifeCycleAdapterFactory, Widget.class );
>   }

Actions: View | Diff

Attachments on bug 288454: 149386