FCL/sf/app/jrt: comparison javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/InstallerUiEswt.java

equal deleted inserted replaced

-:71ad690e91f5
+:d6dafc5d983f
 import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.internal.extension.DisplayExtension;
 import org.eclipse.swt.internal.qt.BaseCSSEngine;
 import org.eclipse.swt.widgets.Display;
 /** Certificate details view, owned by the view where it was opened. */
 private CertificateDetailsView iCertificateDetailsView = null;
 /** Hashtable for storing the loaded icons. */
 private static Hashtable iImageTable = null;
-/** Best size for application icon. */
-private static Point iBestImageSize = null;
 /** Default shell bounds. */
 private Rectangle iDefaultShellBounds = null;
 private Rectangle iDefaultShellClientBounds = null;
 // Prevent UI from being automatically disposed.
 //aEvent.doit = false;
 }
 });
-// Initialize best image size.
-iBestImageSize = new Point(
-DisplayExtension.getBestImageWidth(DisplayExtension.LIST_ELEMENT),
-DisplayExtension.getBestImageHeight(DisplayExtension.LIST_ELEMENT));
-log("Best image size: " + iBestImageSize);
 synchronized (iInitWaitObject)
 {
 // Notify that UI is now ready.
 iInitWaitObject.notify();
 }
 {
 String resourceDir = ResourceUtil.getResourceDir(0);
 for (int i = 1; iSecurityIcon == null && resourceDir != null; i++)
 {
 iSecurityIcon = loadImage(
-aDisplay, resourceDir + iconFilename, false);
+aDisplay, resourceDir + iconFilename, null);
 resourceDir = ResourceUtil.getResourceDir(i);
 }
 }
 catch (Throwable t)
 {
 }
 return iSecurityIcon;
 }
 /**
-* Loads image from specified InputStream. This method scales the image
+* Loads image from specified file.
-* to optimum size.
+*
+* @param aDisplay display to which the icon will be added
+* @param aImageFilename name of the image file to be loaded
+* @param aImageSize size to which the image should be scaled, can be null
+* @return image from file or null if image cannot be loaded
+*/
+protected static Image loadImage(
+Display aDisplay, String aImageFilename, Point aImageSize)
+{
+Image result = null;
+InputStream imageInputStream = null;
+try
+{
+FileUtility imageFile = new FileUtility(aImageFilename);
+if (imageFile.exists())
+{
+imageInputStream = imageFile.openInputStream();
+result = loadImage(aDisplay, imageInputStream,
+aImageFilename, aImageSize);
+}
+}
+catch (IOException ioe)
+{
+log("Can not get InputStream for " + aImageFilename + ": " + ioe);
+}
+finally
+{
+if (imageInputStream != null)
+{
+try
+{
+imageInputStream.close();
+imageInputStream = null;
+}
+catch (IOException ioe)
+{
+logError("Closing image InputStream failed", ioe);
+}
+}
+}
+return result;
+}
+/**
+* Loads image from specified InputStream.
 *
 * @param aDisplay display to which the icon will be added
 * @param aInputStream InputStream where the image is loaded
 * @param aImageName name of the image to be loaded
+* @param aImageSize size to which the image should be scaled, can be null
 * @return image from InputStream or null if image cannot be loaded
 */
 protected static Image loadImage(
-Display aDisplay, InputStream aInputStream, String aImageName)
-{
-return loadImage(aDisplay, aInputStream, aImageName, true);
-}
-/**
-* Loads image from specified file.
-*
-* @param aDisplay display to which the icon will be added
-* @param aImageFilename name of the image file to be loaded
-* @param aScaleImage flag telling if the loaded image should be scaled
-* @return image from file or null if image cannot be loaded
-*/
-private static Image loadImage(
-Display aDisplay, String aImageFilename, boolean aScaleImage)
-{
-Image result = null;
-InputStream imageInputStream = null;
-try
-{
-FileUtility imageFile = new FileUtility(aImageFilename);
-if (imageFile.exists())
-{
-imageInputStream = imageFile.openInputStream();
-result = loadImage(aDisplay, imageInputStream,
-aImageFilename, aScaleImage);
-}
-}
-catch (IOException ioe)
-{
-log("Can not get InputStream for " + aImageFilename + ": " + ioe);
-}
-finally
-{
-if (imageInputStream != null)
-{
-try
-{
-imageInputStream.close();
-imageInputStream = null;
-}
-catch (IOException ioe)
-{
-logError("Closing image InputStream failed", ioe);
-}
-}
-}
-return result;
-}
-/**
-* Loads image from specified InputStream.
-*
-* @param aDisplay display to which the icon will be added
-* @param aInputStream InputStream where the image is loaded
-* @param aImageName name of the image to be loaded
-* @param aScaleImage flag telling if the loaded image should be scaled
-* @return image from InputStream or null if image cannot be loaded
-*/
-private static Image loadImage(
 Display aDisplay, InputStream aInputStream,
-String aImageName, boolean aScaleImage)
+String aImageName, Point aImageSize)
 {
+String imageTableKey = aImageName + "," + aImageSize;
 Image result = null;
 if (aImageName != null)
 {
-result = (Image)iImageTable.get(aImageName);
+result = (Image)iImageTable.get(imageTableKey);
 }
 if (result != null)
 {
 log("Using already loaded image " + aImageName);
 return result;
 }
 try
 {
 long startTime = System.currentTimeMillis();
-aDisplay.setData("org.eclipse.swt.internal.image.loadSize",
+if (aImageSize != null)
-iBestImageSize);
+{
-Image image = new Image(aDisplay, aInputStream);
+aDisplay.setData("org.eclipse.swt.internal.image.loadSize",
-if (aScaleImage)
+aImageSize);
-{
+}
-ImageData imageData = image.getImageData();
+result = new Image(aDisplay, aInputStream);
-if (iBestImageSize.x != imageData.width ||
-iBestImageSize.y != imageData.height)
-{
-Point oldSize =
-new Point(imageData.width, imageData.height);
-imageData = imageData.scaledTo(iBestImageSize.x, iBestImageSize.y);
-log("Image " + aImageName + " scaled from " +
-oldSize.x + "x" + oldSize.y + " to " +
-iBestImageSize.x + "x" + iBestImageSize.y);
-image = new Image(aDisplay, imageData);
-}
-}
-result = image;
 long endTime = System.currentTimeMillis();
 log("Loaded image " + aImageName + " (load time " +
 (endTime - startTime) + " ms)");
-iImageTable.put(aImageName, result);
+iImageTable.put(imageTableKey, result);
 }
 catch (Throwable t)
 {
 log("Can not load image " + aImageName + ": " + t);
 //logError("Exception while loading image " + aImageName, t);

changeset 80	d6dafc5d983f
parent 78	71ad690e91f5