Attachment 155960 Details for Bug 299468 – Proposed patch

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

[patch] Proposed patch

Bug-299468.patch (text/plain), 3.02 KB, created by Ivan Furnadjiev

on 2010-01-13 04:58:44 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2010-01-13 04:58:44 EST

Size: 3.02 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rwt.widgets.upload
>Index: src/org/eclipse/rwt/widgets/Upload.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/sandbox/org.eclipse.rwt.widgets.upload/src/org/eclipse/rwt/widgets/Upload.java,v
>retrieving revision 1.14
>diff -u -r1.14 Upload.java
>--- src/org/eclipse/rwt/widgets/Upload.java	9 Oct 2009 14:29:25 -0000	1.14
>+++ src/org/eclipse/rwt/widgets/Upload.java	13 Jan 2010 09:55:01 -0000
>@@ -11,9 +11,11 @@
> import java.io.File;
> 
> import org.eclipse.rwt.graphics.Graphics;
>+import org.eclipse.rwt.internal.theme.IThemeAdapter;
> import org.eclipse.rwt.internal.theme.ThemeManager;
> import org.eclipse.rwt.theme.IControlThemeAdapter;
> import org.eclipse.rwt.widgets.internal.uploadkit.IUploadAdapter;
>+import org.eclipse.rwt.widgets.internal.uploadkit.UploadThemeAdapter;
> import org.eclipse.rwt.widgets.upload.servlet.*;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.SWTException;
>@@ -361,10 +363,9 @@
>   }
> 
>   private int getButtonBorder() {
>-    final ThemeManager themeMgr = ThemeManager.getInstance();
>-    final IControlThemeAdapter buttonThemeAdapter = ( IControlThemeAdapter )themeMgr.getThemeAdapter( Button.class );
>-    final int border = buttonThemeAdapter.getBorderWidth( this );
>-    return border;
>+    UploadThemeAdapter themeAdapter
>+      = ( UploadThemeAdapter )getAdapter( IThemeAdapter.class );
>+    return themeAdapter.getButtonBorderWidth( this );
>   }
> 
>   private int computeBaseWidth() {
>Index: src/org/eclipse/rwt/widgets/internal/uploadkit/UploadThemeAdapter.java
>===================================================================
>RCS file: src/org/eclipse/rwt/widgets/internal/uploadkit/UploadThemeAdapter.java
>diff -N src/org/eclipse/rwt/widgets/internal/uploadkit/UploadThemeAdapter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/rwt/widgets/internal/uploadkit/UploadThemeAdapter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,25 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 EclipseSource and others. 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:
>+ *   EclipseSource - initial API and implementation
>+ ******************************************************************************/
>+
>+package org.eclipse.rwt.widgets.internal.uploadkit;
>+
>+import org.eclipse.rwt.internal.theme.*;
>+import org.eclipse.rwt.widgets.Upload;
>+import org.eclipse.swt.internal.widgets.controlkit.ControlThemeAdapter;
>+
>+public class UploadThemeAdapter extends ControlThemeAdapter {
>+
>+  public int getButtonBorderWidth( final Upload upload ) {
>+    SimpleSelector selector = new SimpleSelector( new String[] { "[PUSH" } );
>+    QxType cssValue
>+      = ThemeUtil.getCssValue( "Button", "border", selector, null );
>+    return ( ( QxBorder )cssValue ).width;
>+  }
>+}

Actions: View | Diff

Attachments on bug 299468: 155960