Attachment #145938 for bug #281787

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




import org.eclipse.rwt.internal.lifecycle.HtmlResponseWriter;
import org.eclipse.rwt.internal.lifecycle.LifeCycleAdapterUtil;
import org.eclipse.rwt.internal.resources.ResourceManager;
import org.eclipse.rwt.internal.resources.ResourceManagerImpl;
import org.eclipse.rwt.internal.service.ContextProvider;
import org.eclipse.rwt.internal.service.IServiceStateInfo;
import org.eclipse.rwt.internal.theme.css.*;

  };

  /** Where to load the default non-themeable images from */
  private static final String WIDGET_RESOURCES_SRC = "resource/widget/rap/";

  /** Destination path for theme resources */
  private static final String THEME_RESOURCE_DEST = "themes";
  private static final String THEME_PREFIX = "org.eclipse.swt.theme.";

  private static final String PREDEFINED_THEME_ID = THEME_PREFIX + "Default";

    log( " == register non-themeable images for theme " + themeId );
    for( int i = 0; i < WIDGET_NOTHEME_RESOURCES.length; i++ ) {
      String imagePath = WIDGET_NOTHEME_RESOURCES[ i ];
      String res = WIDGET_RESOURCES_SRC + imagePath;
      InputStream inputStream = classLoader.getResourceAsStream( res );
      if( inputStream == null ) {
        String mesg = "Resource not found: " + res;

    }
    QxTheme qxTheme = new QxTheme( jsId, theme.getName(), type, base );
    if( type == QxTheme.WIDGET || type == QxTheme.ICON ) {
      // TODO [rh] remove hard-coded resource-manager-path-prefix 
      String uri 
        = ResourceManagerImpl.RESOURCES 
        + "/" 
        + getWidgetDestPath( jsId );
      qxTheme.appendUri( uri );
    } else if( type == QxTheme.APPEARANCE ) {
      Iterator iterator = customAppearances.iterator();
      while( iterator.hasNext() ) {




 *     Innoopract Informationssysteme GmbH - initial API and implementation
 *     EclipseSource - ongoing development
 ******************************************************************************/

package org.eclipse.rwt.internal.theme;

import java.io.IOException;


  private static final String NONE_INPUT = "none";

  public static final QxImage NONE
    = new QxImage( true, null, null, null, null );

  public final boolean none;

  public final String path;

  public final ResourceLoader loader;

  public final String[] gradientColors;

  public final float[] gradientPercents;

  public final int width;

  public final int height;

  /**

    }
  }

  public static QxImage valueOf( final String input, 
                                 final ResourceLoader loader )
  {
    QxImage result;
    if( NONE_INPUT.equals( input ) ) {

Lines 37-42 Link Here

(-)src/org/eclipse/rwt/internal/resources/ResourceManagerImpl.java (+6 lines)
37	implements IResourceManager, Adaptable	37	implements IResourceManager, Adaptable
38	{	38	{
39		39
		40	public static final String RESOURCES = "resources";
		41
40	/** <p>The singleton instance of ResourceManager.</p> */	42	/** <p>The singleton instance of ResourceManager.</p> */
41	private static IResourceManager _instance;	43	private static IResourceManager _instance;
42		44
Lines 364-369 Link Here
364	StringBuffer url = new StringBuffer();	366	StringBuffer url = new StringBuffer();
365	url.append( URLHelper.getContextURLString() );	367	url.append( URLHelper.getContextURLString() );
366	url.append( "/" );	368	url.append( "/" );
		369	url.append( RESOURCES );
		370	url.append( "/" );
367	String escapedFilename = escapeFilename( newFileName );	371	String escapedFilename = escapeFilename( newFileName );
368	url.append( versionedResourceName( escapedFilename, version ) );	372	url.append( versionedResourceName( escapedFilename, version ) );
369	result = url.toString();	373	result = url.toString();
Lines 504-509 Link Here
504	StringBuffer filename = new StringBuffer();	508	StringBuffer filename = new StringBuffer();
505	filename.append( webAppRoot );	509	filename.append( webAppRoot );
506	filename.append( File.separator );	510	filename.append( File.separator );
		511	filename.append( RESOURCES );
		512	filename.append( File.separator );
507	filename.append( versionedResourceName( escapeFilename( name ), version ) );	513	filename.append( versionedResourceName( escapeFilename( name ), version ) );
508	return new File( filename.toString() );	514	return new File( filename.toString() );
509	}	515	}




/*******************************************************************************
 * Copyright (c) 2008, 2009 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

 *
 * Contributors:
 *     Innoopract Informationssysteme GmbH - initial API and implementation
 *     EclipseSource - ongoing development
 ******************************************************************************/
package org.eclipse.swt.internal.graphics;


import org.eclipse.swt.graphics.Image;


final class ImageDataCache {

  /** Maximum size of image data that is being cached */
  private static final int MAX_DATA_SIZE = 1024;

  /** Maximum number of elements to hold in the image data cache */
  private static final int MAX_FILL_SIZE = 100;

  private final Map cache;

  ImageDataCache() {
    cache = new HashMap( 25 );
  }

  /**

   * @return a secure copy of the cached image data, or <code>null</code> if
   *         no image data have been cached for the given image
   */
  ImageData getImageData( final Image image ) {
    if( image == null ) {
      throw new NullPointerException( "null argument" );
    }

   * @param image the image whose image data to store
   * @param imageData the image data to be stored
   */
  void putImageData( final Image image, final ImageData imageData ) {
                                         final ImageData imageData )
  {
    if( image == null || imageData == null ) {
      throw new NullPointerException( "null argument" );
    }
    if( imageData.data.length <= MAX_DATA_SIZE ) {
      // TODO [rst] Implement replacement strategy (LRU or LFU)
      synchronized( cache ) {
        if( cache.size() > MAX_FILL_SIZE ) {
          // TODO [rst] Implement replacement strategy (LRU or LFU)
//          cache.remove( key );
        }
        cache.put( image, imageData.clone() );
      }
    }




    return result;
  }

  public static String getImagePath( final Image image ) {
    String result = getImageName( image );
    if( result != null ) {
      result = ResourceManager.getInstance().getLocation( result );
    }
    return result;
  }
  
  private static synchronized String getImageName( final Image image ) {
    String result = null;
    Iterator it = images.entrySet().iterator();
    boolean found = false;
    while( !found && it.hasNext() ) {
      Map.Entry entry = ( Map.Entry )it.next();
      if( entry.getValue().equals( image ) ) {
        result = ( String )entry.getKey();
        found = true;
      }
    }
    return result;

    ImageData result = imageDataCache.getImageData( image );
    if( result == null ) {
      IResourceManager manager = ResourceManager.getInstance();
      String imagePath = getImageName( image );
      if( imagePath != null ) {
        try {
          InputStream inputStream = manager.getRegisteredContent( imagePath );

Lines 6-12 Link Here

(-)src/org/eclipse/rwt/internal/service/rwt-index.html (-1 / +1 lines)
6	${headers}	6	${headers}
7	</head>	7	</head>
8		8
9	<body background="resource/widget/rap/display/bg.gif">	9	<body background="resources/resource/widget/rap/display/bg.gif">
10		10
11	<!-- body of branding -->	11	<!-- body of branding -->
12	${body}	12	${body}

Lines 574-582 Link Here

(-)src/org/eclipse/rwt/lifecycle/ControlLCAUtil_Test.java (-1 / +2 lines)
574	RWTFixture.markInitialized( control );	574	RWTFixture.markInitialized( control );
575	control.setBackgroundImage( Graphics.getImage( RWTFixture.IMAGE1 ) );	575	control.setBackgroundImage( Graphics.getImage( RWTFixture.IMAGE1 ) );
576	ControlLCAUtil.writeBackgroundImage( control );	576	ControlLCAUtil.writeBackgroundImage( control );
		577	String imageLocation = "resources/" + RWTFixture.IMAGE1;
577	String expected = "var w = wm.findWidgetById( \"w2\" );"	578	String expected = "var w = wm.findWidgetById( \"w2\" );"
578	+ "w.setBackgroundImage( \""	579	+ "w.setBackgroundImage( \""
579	+ RWTFixture.IMAGE1	580	+ imageLocation
580	+ "\" );";	581	+ "\" );";
581	assertEquals( expected, Fixture.getAllMarkup() );	582	assertEquals( expected, Fixture.getAllMarkup() );
582		583

Lines 506-512 Link Here

(-)src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCA_Test.java (-1 / +2 lines)
506	lca.renderChanges( button );	506	lca.renderChanges( button );
507	String allMarkup = Fixture.getAllMarkup();	507	String allMarkup = Fixture.getAllMarkup();
508	assertTrue( allMarkup.indexOf( "w.setText( \"Test\" );" ) != -1 );	508	assertTrue( allMarkup.indexOf( "w.setText( \"Test\" );" ) != -1 );
509	String expected = "w.setImage( \"" + RWTFixture.IMAGE1 + "\", 58, 12 );";	509	String imageLocation = "resources/" + RWTFixture.IMAGE1;
		510	String expected = "w.setImage( \"" + imageLocation + "\", 58, 12 );";
510	assertTrue( allMarkup.indexOf( expected ) != -1 );	511	assertTrue( allMarkup.indexOf( expected ) != -1 );
511	Fixture.fakeResponseWriter();	512	Fixture.fakeResponseWriter();
512	lca.preserveValues( button );	513	lca.preserveValues( button );

Lines 78-84 Link Here

(-)src/org/eclipse/swt/RWTFixture.java (-1 / +1 lines)
78	}	78	}
79		79
80	public String getLocation( final String name ) {	80	public String getLocation( final String name ) {
81	return null;	81	return "resources/" + name;
82	}	82	}
83		83
84	public URL getResource( final String name ) {	84	public URL getResource( final String name ) {




      var result = values.images[ vkey ];
      this.__checkDefined( result, element, key );
      if( result != null ) {
        // TODO [rh] remove hard-coded path (first segment is defined by 
        //      resource-manager)
        result = "resources/themes/images/" + result[ 0 ];
      } else {
        // TODO [rst] Handle null values - currently, both null and the string
        // "undefined" lead to a js error for icon property


    getCssSizedImage : function( element, key ) {
      var vkey = this._store.getCssValue( element, this._states, key );
      var result = this._store.getThemeValues().images[ vkey ];
      var result = values.images[ vkey ];
      this.__checkDefined( result, element, key );
      // TODO [tb] : Revise hardcoded path
      return [ "resources/themes/images/" + result[ 0 ], 
               result[ 1 ], 
               result[ 2 ] ];
    },

    getCssGradient : function( element, key ) {

Lines 72-78 Link Here

(-)js/org/eclipse/swt/theme/AppearancesBase.js (-1 / +1 lines)
72	textColor : "black",	72	textColor : "black",
73	backgroundColor : "white",	73	backgroundColor : "white",
74	// TODO [rst] Eliminate absolute references	74	// TODO [rst] Eliminate absolute references
75	backgroundImage : "./resource/widget/rap/display/bg.gif"	75	backgroundImage : "./resources/resource/widget/rap/display/bg.gif"
76	};	76	};
77	}	77	}
78	},	78	},

Lines 145-151 Link Here

(-)src/org/eclipse/rwt/internal/lifecycle/JSConst.java (-1 lines)
145	public static final String QX_FIELD_FONT = "font";	145	public static final String QX_FIELD_FONT = "font";
146	public static final String QX_FIELD_COLOR = "textColor";	146	public static final String QX_FIELD_COLOR = "textColor";
147	public static final String QX_FIELD_BG_COLOR = "backgroundColor";	147	public static final String QX_FIELD_BG_COLOR = "backgroundColor";
148	public static final String QX_FIELD_BG_IMAGE = "backgroundImage";
149	public static final String QX_FIELD_ORIENTATION = "orientation";	148	public static final String QX_FIELD_ORIENTATION = "orientation";
150	public static final String QX_FIELD_CAPTION = "caption";	149	public static final String QX_FIELD_CAPTION = "caption";
151	public static final String QX_FIELD_ENABLED = "enabled";	150	public static final String QX_FIELD_ENABLED = "enabled";

Lines 431-439 Link Here

(-)src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java (-2 / +2 lines)
431	JSWriter writer = JSWriter.getWriterFor( control );	431	JSWriter writer = JSWriter.getWriterFor( control );
432	if( image != null ) {	432	if( image != null ) {
433	String imagePath = ResourceFactory.getImagePath( image );	433	String imagePath = ResourceFactory.getImagePath( image );
434	writer.set( JSConst.QX_FIELD_BG_IMAGE, imagePath );	434	writer.set( "backgroundImage", imagePath );
435	} else {	435	} else {
436	writer.reset( JSConst.QX_FIELD_BG_IMAGE );	436	writer.reset( "backgroundImage" );
437	}	437	}
438	}	438	}
439	}	439	}

Lines 95-102 Link Here

(-)js/org/eclipse/swt/Application.js (-2 / +2 lines)
95	qx.ui.basic.ScrollBar.EVENT_DELAY = 125;	95	qx.ui.basic.ScrollBar.EVENT_DELAY = 125;
96	// Overwrite the default mapping for internal images. This is necessary	96	// Overwrite the default mapping for internal images. This is necessary
97	// if the application is deployed under a root different from "/".	97	// if the application is deployed under a root different from "/".
98	qx.io.Alias.getInstance().add( "static", "./resource/static" );	98	qx.io.Alias.getInstance().add( "static", "./resources/resource/static" );
99	qx.io.Alias.getInstance().add( "org.eclipse.swt", "./resource" );	99	qx.io.Alias.getInstance().add( "org.eclipse.swt", "./resources/resource" );
100	// Observe window size	100	// Observe window size
101	var doc = qx.ui.core.ClientDocument.getInstance();	101	var doc = qx.ui.core.ClientDocument.getInstance();
102	doc.addEventListener( "windowresize",	102	doc.addEventListener( "windowresize",




/*******************************************************************************
 * Copyright (c) 2002, 2009 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

 *
 * Contributors:
 *     Innoopract Informationssysteme GmbH - initial API and implementation
 *     EclipseSource - ongoing development
 ******************************************************************************/

package org.eclipse.rwt.internal.resources;

import java.io.*;

  private static final int TEST_PORT = 4711;
  private static final String TEST_SERVER = "TestCase";
  private static final String TEST_SERVLET_PATH = "/W4TDelegate";
  private static final String TEST_REQUEST_URI
    = TEST_CONTEXT + "/W4TDelegate?anyParam=true";
  private static final String TEST_CONTEXT_URL
    =   "http://"

      + TEST_CONTEXT;
  private static final String TEST_LOCATION_DISK
    =   TEST_CONTEXT_URL
      + "/resources/"
      + TEST_RESOURCE_1;
  private static final String TEST_LOCATION_VERSIONED_DISK
    =   TEST_CONTEXT_URL
      + "/resources/"
      + TEST_RESOURCE_1_VERSIONED;
  private static final String TEST_LOCATION_SERVLET
    =   TEST_CONTEXT_URL

      + RequestParams.RESOURCE_VERSION
      + "="
      + "1895582734";

  /////////
  // fields
  private String webAppRoot;

  }

  public void testRegistrationServletTempDir() throws Exception {
    IResourceManager manager
      = getManager( ResourceBase.DELIVER_BY_SERVLET_AND_TEMP_DIR );
    clearTempFile();
    // register only existing resources

      // expected
    }
  }

  public void testGetRegisteredContent() throws Exception {
    IResourceManager manager = getManager( ResourceBase.DELIVER_FROM_DISK );
    InputStream is = openStream( TEST_RESOURCE_2 );

    content.close();
    assertNull( manager.getRegisteredContent( "not-there" ) );
  }

  /*
   * 280582: resource registration fails when using ImageDescriptor.createFromURL
   * https://bugs.eclipse.org/bugs/show_bug.cgi?id=280582

    manager.register( name, inputStream );
    inputStream.close();
    String location = manager.getLocation( name );
    String expected
      = "http://TestCase:4711/test/resources/http$1//host$1port/path$$1";
    assertEquals( expected, location );
  }

  ///////////////////
  // helping methods

  private static int[] read( final InputStream input ) throws IOException {
    int[] result = null;
    try {

  }

  private String getResourceCopyFile( final String resourceName ) {
    return   webAppRoot
           + File.separator
           + "resources"
           + File.separator
           + resourceName;
  }

  private String getResourceCopyInTempFile( final String resourceName ) {

      return null;
    }

    public long getDateHeader( final String arg0 ) {
      return 0;
    }

    public String getHeader( final String arg0 ) {
      return null;
    }

    public Enumeration getHeaders( final String arg0 ) {
      return null;
    }


      return null;
    }

    public int getIntHeader( final String arg0 ) {
      return 0;
    }


      return null;
    }

    public boolean isUserInRole( final String arg0 ) {
      return false;
    }


      return TEST_SERVLET_PATH;
    }

    public HttpSession getSession( final boolean arg0 ) {
      return null;
    }


      return false;
    }

    public Object getAttribute( final String arg0 ) {
      return null;
    }


      return null;
    }

    public void setCharacterEncoding( final String arg0 )
      throws UnsupportedEncodingException
    {
    }

      return null;
    }

    public String getParameter( final String arg0 ) {
      return null;
    }


      return null;
    }

    public String[] getParameterValues( final String arg0 ) {
      return null;
    }


      return null;
    }

    public void setAttribute( final String arg0, final Object arg1 ) {
    }

    public void removeAttribute( final String arg0 ) {
    }

    public Locale getLocale() {

      return false;
    }

    public RequestDispatcher getRequestDispatcher( final String arg0 ) {
      return null;
    }

    public String getRealPath( final String arg0 ) {
      return null;
    }


  }
  private class TestResponse implements HttpServletResponse {

    public void addCookie( final Cookie arg0 ) {
    }

    public boolean containsHeader( final String arg0 ) {
      return false;
    }

    public String encodeURL( final String arg0 ) {
      return arg0;
    }

    public String encodeRedirectURL( final String arg0 ) {
      return null;
    }

    public String encodeUrl( final String arg0 ) {
      return arg0;
    }

    public String encodeRedirectUrl( final String arg0 ) {
      return null;
    }

    public void sendError( final int arg0, final String arg1 ) throws IOException {
    }

    public void sendError( final int arg0 ) throws IOException {
    }

    public void sendRedirect( final String arg0 ) throws IOException {
    }

    public void setDateHeader( final String arg0, final long arg1 ) {
    }

    public void addDateHeader( final String arg0, final long arg1 ) {
    }

    public void setHeader( final String arg0, final String arg1 ) {
    }

    public void addHeader( final String arg0, final String arg1 ) {
    }

    public void setIntHeader( final String arg0, final int arg1 ) {
    }

    public void addIntHeader( final String arg0, final int arg1 ) {
    }

    public void setStatus( final int arg0 ) {
    }

    public void setStatus( final int arg0, final String arg1 ) {
    }

    public String getCharacterEncoding() {

      return null;
    }

    public void setContentLength( final int arg0 ) {
    }

    public void setContentType( final String arg0 ) {
    }

    public void setBufferSize( final int arg0 ) {
    }

    public int getBufferSize() {

    public void reset() {
    }

    public void setLocale( final Locale arg0 ) {
    }

    public Locale getLocale() {

      throw new UnsupportedOperationException();
    }

    public void setCharacterEncoding( final String charset ) {
      throw new UnsupportedOperationException();
    }
  }




/*******************************************************************************
 * Copyright (c) 2002, 2009 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

 *
 * Contributors:
 *     Innoopract Informationssysteme GmbH - initial API and implementation
 *     EclipseSource - ongoing development
 ******************************************************************************/

package org.eclipse.swt.graphics;

import java.io.*;

//    assertEquals( 0, Image.size() );
    Image image1 = Graphics.getImage( RWTFixture.IMAGE1 );
    assertTrue( manager.isRegistered( RWTFixture.IMAGE1 ) );
    String contextPath = Fixture.CONTEXT_DIR.getPath() + "/resources/";
    assertTrue( new File( contextPath + RWTFixture.IMAGE1 ).exists() );
//    assertEquals( 1, Image.size() );
    Image image2 = Graphics.getImage( RWTFixture.IMAGE1 );
    assertTrue( manager.isRegistered( RWTFixture.IMAGE1 ) );

Return to bug 281787

Lines 174-188 Link Here

(-)src/org/eclipse/swt/internal/graphics/ResourceFactory.java (-5 / +13 lines)
174	return result;	174	return result;
175	}	175	}
176		176
177	public static synchronized String getImagePath( final Image image ) {	177	public static String getImagePath( final Image image ) {
		178	String result = getImageName( image );
		179	if( result != null ) {
		180	result = ResourceManager.getInstance().getLocation( result );
		181	}
		182	return result;
		183	}
		184
		185	private static synchronized String getImageName( final Image image ) {
178	String result = null;	186	String result = null;
179	Iterator it = images.entrySet().iterator();	187	Iterator it = images.entrySet().iterator();
180	boolean next = true;	188	boolean found = false;
181	while( next && it.hasNext() ) {	189	while( !found && it.hasNext() ) {
182	Map.Entry entry = ( Map.Entry )it.next();	190	Map.Entry entry = ( Map.Entry )it.next();
183	if( entry.getValue().equals( image ) ) {	191	if( entry.getValue().equals( image ) ) {
184	result = ( String )entry.getKey();	192	result = ( String )entry.getKey();
185	next = false;	193	found = true;
186	}	194	}
187	}	195	}
188	return result;	196	return result;
Lines 192-198 Link Here
192	ImageData result = imageDataCache.getImageData( image );	200	ImageData result = imageDataCache.getImageData( image );
193	if( result == null ) {	201	if( result == null ) {
194	IResourceManager manager = ResourceManager.getInstance();	202	IResourceManager manager = ResourceManager.getInstance();
195	String imagePath = getImagePath( image );	203	String imagePath = getImageName( image );
196	if( imagePath != null ) {	204	if( imagePath != null ) {
197	try {	205	try {
198	InputStream inputStream = manager.getRegisteredContent( imagePath );	206	InputStream inputStream = manager.getRegisteredContent( imagePath );

Lines 108-114 Link Here

(-)js/org/eclipse/swt/theme/ThemeValues.js (-6 / +7 lines)
108	var result = values.images[ vkey ];	108	var result = values.images[ vkey ];
109	this.__checkDefined( result, element, key );	109	this.__checkDefined( result, element, key );
110	if( result != null ) {	110	if( result != null ) {
111	result = "resource/themes/images/" + result[ 0 ];	111	// TODO [rh] remove hard-coded path (first segment is defined by
		112	// resource-manager)
		113	result = "resources/themes/images/" + result[ 0 ];
112	} else {	114	} else {
113	// TODO [rst] Handle null values - currently, both null and the string	115	// TODO [rst] Handle null values - currently, both null and the string
114	// "undefined" lead to a js error for icon property	116	// "undefined" lead to a js error for icon property
Lines 119-131 Link Here
119		121
120	getCssSizedImage : function( element, key ) {	122	getCssSizedImage : function( element, key ) {
121	var vkey = this._store.getCssValue( element, this._states, key );	123	var vkey = this._store.getCssValue( element, this._states, key );
122	var values = this._store.getThemeValues();	124	var result = this._store.getThemeValues().images[ vkey ];
123	var result = values.images[ vkey ];
124	this.__checkDefined( result, element, key );	125	this.__checkDefined( result, element, key );
125	// TODO [tb] : Revise hardcoded path	126	// TODO [tb] : Revise hardcoded path
126	return result = [ "resource/themes/images/" + result[ 0 ],	127	return [ "resources/themes/images/" + result[ 0 ],
127	result[ 1 ],	128	result[ 1 ],
128	result[ 2 ] ];	129	result[ 2 ] ];
129	},	130	},
130		131
131	getCssGradient : function( element, key ) {	132	getCssGradient : function( element, key ) {

Lines 18-23 Link Here

(-)src/org/eclipse/rwt/internal/theme/ThemeManager.java (-4 / +10 lines)
18	import org.eclipse.rwt.internal.lifecycle.HtmlResponseWriter;	18	import org.eclipse.rwt.internal.lifecycle.HtmlResponseWriter;
19	import org.eclipse.rwt.internal.lifecycle.LifeCycleAdapterUtil;	19	import org.eclipse.rwt.internal.lifecycle.LifeCycleAdapterUtil;
20	import org.eclipse.rwt.internal.resources.ResourceManager;	20	import org.eclipse.rwt.internal.resources.ResourceManager;
		21	import org.eclipse.rwt.internal.resources.ResourceManagerImpl;
21	import org.eclipse.rwt.internal.service.ContextProvider;	22	import org.eclipse.rwt.internal.service.ContextProvider;
22	import org.eclipse.rwt.internal.service.IServiceStateInfo;	23	import org.eclipse.rwt.internal.service.IServiceStateInfo;
23	import org.eclipse.rwt.internal.theme.css.*;	24	import org.eclipse.rwt.internal.theme.css.*;
Lines 114-123 Link Here
114	};	115	};
115		116
116	/** Where to load the default non-themeable images from */	117	/** Where to load the default non-themeable images from */
117	private static final String WIDGET_RESOURCES_SRC = "resource/widget/rap";	118	private static final String WIDGET_RESOURCES_SRC = "resource/widget/rap/";
118		119
119	/** Destination path for theme resources */	120	/** Destination path for theme resources */
120	private static final String THEME_RESOURCE_DEST = "resource/themes";	121	private static final String THEME_RESOURCE_DEST = "themes";
121	private static final String THEME_PREFIX = "org.eclipse.swt.theme.";	122	private static final String THEME_PREFIX = "org.eclipse.swt.theme.";
122		123
123	private static final String PREDEFINED_THEME_ID = THEME_PREFIX + "Default";	124	private static final String PREDEFINED_THEME_ID = THEME_PREFIX + "Default";
Lines 643-649 Link Here
643	log( " == register non-themeable images for theme " + themeId );	644	log( " == register non-themeable images for theme " + themeId );
644	for( int i = 0; i < WIDGET_NOTHEME_RESOURCES.length; i++ ) {	645	for( int i = 0; i < WIDGET_NOTHEME_RESOURCES.length; i++ ) {
645	String imagePath = WIDGET_NOTHEME_RESOURCES[ i ];	646	String imagePath = WIDGET_NOTHEME_RESOURCES[ i ];
646	String res = WIDGET_RESOURCES_SRC + "/" + imagePath;	647	String res = WIDGET_RESOURCES_SRC + imagePath;
647	InputStream inputStream = classLoader.getResourceAsStream( res );	648	InputStream inputStream = classLoader.getResourceAsStream( res );
648	if( inputStream == null ) {	649	if( inputStream == null ) {
649	String mesg = "Resource not found: " + res;	650	String mesg = "Resource not found: " + res;
Lines 767-773 Link Here
767	}	768	}
768	QxTheme qxTheme = new QxTheme( jsId, theme.getName(), type, base );	769	QxTheme qxTheme = new QxTheme( jsId, theme.getName(), type, base );
769	if( type == QxTheme.WIDGET \|\| type == QxTheme.ICON ) {	770	if( type == QxTheme.WIDGET \|\| type == QxTheme.ICON ) {
770	qxTheme.appendUri( getWidgetDestPath( jsId ) );	771	// TODO [rh] remove hard-coded resource-manager-path-prefix
		772	String uri
		773	= ResourceManagerImpl.RESOURCES
		774	+ "/"
		775	+ getWidgetDestPath( jsId );
		776	qxTheme.appendUri( uri );
771	} else if( type == QxTheme.APPEARANCE ) {	777	} else if( type == QxTheme.APPEARANCE ) {
772	Iterator iterator = customAppearances.iterator();	778	Iterator iterator = customAppearances.iterator();
773	while( iterator.hasNext() ) {	779	while( iterator.hasNext() ) {

Lines 9-15 Link Here

(-)src/org/eclipse/rwt/internal/theme/QxImage.java (-9 / +4 lines)
9	* Innoopract Informationssysteme GmbH - initial API and implementation	9	* Innoopract Informationssysteme GmbH - initial API and implementation
10	* EclipseSource - ongoing development	10	* EclipseSource - ongoing development
11	******************************************************************************/	11	******************************************************************************/
12
13	package org.eclipse.rwt.internal.theme;	12	package org.eclipse.rwt.internal.theme;
14		13
15	import java.io.IOException;	14	import java.io.IOException;
Lines 23-42 Link Here
23		22
24	private static final String NONE_INPUT = "none";	23	private static final String NONE_INPUT = "none";
25		24
26	public static final QxImage NONE = new QxImage( true, null, null, null, null );	25	public static final QxImage NONE
		26	= new QxImage( true, null, null, null, null );
27		27
28	public final boolean none;	28	public final boolean none;
29
30	public final String path;	29	public final String path;
31
32	public final ResourceLoader loader;	30	public final ResourceLoader loader;
33
34	public final String[] gradientColors;	31	public final String[] gradientColors;
35
36	public final float[] gradientPercents;	32	public final float[] gradientPercents;
37
38	public final int width;	33	public final int width;
39
40	public final int height;	34	public final int height;
41		35
42	/**	36	/**
Lines 82-88 Link Here
82	}	76	}
83	}	77	}
84		78
85	public static QxImage valueOf( final String input, final ResourceLoader loader )	79	public static QxImage valueOf( final String input,
		80	final ResourceLoader loader )
86	{	81	{
87	QxImage result;	82	QxImage result;
88	if( NONE_INPUT.equals( input ) ) {	83	if( NONE_INPUT.equals( input ) ) {

Lines 1-5 Link Here

(-)src/org/eclipse/swt/internal/graphics/ImageDataCache.java (-15 / +8 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 Innoopract Informationssysteme GmbH.	2	* Copyright (c) 2008, 2009 Innoopract Informationssysteme GmbH.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Innoopract Informationssysteme GmbH - initial API and implementation	9	* Innoopract Informationssysteme GmbH - initial API and implementation
		10	* EclipseSource - ongoing development
10	******************************************************************************/	11	******************************************************************************/
11	package org.eclipse.swt.internal.graphics;	12	package org.eclipse.swt.internal.graphics;
12		13
Lines 16-33 Link Here
16	import org.eclipse.swt.graphics.Image;	17	import org.eclipse.swt.graphics.Image;
17		18
18		19
19	public class ImageDataCache {	20	final class ImageDataCache {
20		21
21	/** Maximum size of image data that is being cached */	22	/** Maximum size of image data that is being cached */
22	private static final int MAX_DATA_SIZE = 1024;	23	private static final int MAX_DATA_SIZE = 1024;
23		24
24	/** Maximum number of elements to hold in the image data cache */
25	private static final int MAX_FILL_SIZE = 100;
26
27	private final Map cache;	25	private final Map cache;
28		26
29	public ImageDataCache() {	27	ImageDataCache() {
30	cache = new HashMap( MAX_FILL_SIZE / 4 );	28	cache = new HashMap( 25 );
31	}	29	}
32		30
33	/**	31	/**
Lines 37-43 Link Here
37	* @return a secure copy of the cached image data, or <code>null</code> if	35	* @return a secure copy of the cached image data, or <code>null</code> if
38	* no image data have been cached for the given image	36	* no image data have been cached for the given image
39	*/	37	*/
40	public ImageData getImageData( final Image image ) {	38	ImageData getImageData( final Image image ) {
41	if( image == null ) {	39	if( image == null ) {
42	throw new NullPointerException( "null argument" );	40	throw new NullPointerException( "null argument" );
43	}	41	}
Lines 54-71 Link Here
54	* @param image the image whose image data to store	52	* @param image the image whose image data to store
55	* @param imageData the image data to be stored	53	* @param imageData the image data to be stored
56	*/	54	*/
57	public synchronized void putImageData( final Image image,	55	void putImageData( final Image image, final ImageData imageData ) {
58	final ImageData imageData )
59	{
60	if( image == null \|\| imageData == null ) {	56	if( image == null \|\| imageData == null ) {
61	throw new NullPointerException( "null argument" );	57	throw new NullPointerException( "null argument" );
62	}	58	}
63	if( imageData.data.length <= MAX_DATA_SIZE ) {	59	if( imageData.data.length <= MAX_DATA_SIZE ) {
		60	// TODO [rst] Implement replacement strategy (LRU or LFU)
64	synchronized( cache ) {	61	synchronized( cache ) {
65	if( cache.size() > MAX_FILL_SIZE ) {
66	// TODO [rst] Implement replacement strategy (LRU or LFU)
67	// cache.remove( key );
68	}
69	cache.put( image, imageData.clone() );	62	cache.put( image, imageData.clone() );
70	}	63	}
71	}	64	}

Lines 1-5 Link Here

(-)src/org/eclipse/swt/graphics/Image_Test.java (-4 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2007 Innoopract Informationssysteme GmbH.	2	* Copyright (c) 2002, 2009 Innoopract Informationssysteme GmbH.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-14 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Innoopract Informationssysteme GmbH - initial API and implementation	9	* Innoopract Informationssysteme GmbH - initial API and implementation
		10	* EclipseSource - ongoing development
10	******************************************************************************/	11	******************************************************************************/
11
12	package org.eclipse.swt.graphics;	12	package org.eclipse.swt.graphics;
13		13
14	import java.io.*;	14	import java.io.*;
Lines 37-44 Link Here
37	// assertEquals( 0, Image.size() );	37	// assertEquals( 0, Image.size() );
38	Image image1 = Graphics.getImage( RWTFixture.IMAGE1 );	38	Image image1 = Graphics.getImage( RWTFixture.IMAGE1 );
39	assertTrue( manager.isRegistered( RWTFixture.IMAGE1 ) );	39	assertTrue( manager.isRegistered( RWTFixture.IMAGE1 ) );
40	String contextPath = Fixture.CONTEXT_DIR.getPath();	40	String contextPath = Fixture.CONTEXT_DIR.getPath() + "/resources/";
41	assertTrue( new File( contextPath + "/" + RWTFixture.IMAGE1 ).exists() );	41	assertTrue( new File( contextPath + RWTFixture.IMAGE1 ).exists() );
42	// assertEquals( 1, Image.size() );	42	// assertEquals( 1, Image.size() );
43	Image image2 = Graphics.getImage( RWTFixture.IMAGE1 );	43	Image image2 = Graphics.getImage( RWTFixture.IMAGE1 );
44	assertTrue( manager.isRegistered( RWTFixture.IMAGE1 ) );	44	assertTrue( manager.isRegistered( RWTFixture.IMAGE1 ) );