Replace the usage of deprecated Graphics text size related methods with
the corresponding TextSizeUtil methods
diff --git a/bundles/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/internal/widgets/UploadPanel.java b/bundles/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/internal/widgets/UploadPanel.java
index aa3ef7e..aea9098 100644
--- a/bundles/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/internal/widgets/UploadPanel.java
+++ b/bundles/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/internal/widgets/UploadPanel.java
@@ -1,5 +1,5 @@
/*****************************************************************************************
- * Copyright (c) 2010, 2012 Texas Center for Applied Technology (TEES) (TAMUS) and others.
+ * Copyright (c) 2010, 2013 Texas Center for Applied Technology (TEES) (TAMUS) 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
@@ -14,6 +14,7 @@
import java.io.File;
import org.eclipse.rap.rwt.graphics.Graphics;
+import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.supplemental.fileupload.DiskFileUploadReceiver;
import org.eclipse.rap.rwt.supplemental.fileupload.FileUploadEvent;
import org.eclipse.rap.rwt.supplemental.fileupload.FileUploadHandler;
@@ -34,6 +35,7 @@
import org.eclipse.swt.widgets.ProgressBar;
import org.eclipse.swt.widgets.Text;
+@SuppressWarnings("restriction")
public class UploadPanel extends Composite implements FileUploadListener {
private static final long serialVersionUID = 1L;
@@ -202,7 +204,7 @@
progressLayoutData.widthHint = 128;
progressBar.setLayoutData( progressLayoutData );
GridData lblLayoutData = new GridData( SWT.FILL, SWT.FILL, false, false );
- float avgCharWidth = Graphics.getAvgCharWidth( progressLabel.getFont() );
+ float avgCharWidth = TextSizeUtil.getAvgCharWidth( progressLabel.getFont() );
lblLayoutData.minimumWidth = ( int )avgCharWidth * 6;
lblLayoutData.widthHint = ( int )avgCharWidth * 6;
progressLabel.setLayoutData( lblLayoutData );
@@ -221,7 +223,7 @@
progressLayoutData.horizontalSpan = 4;
progressBar.setLayoutData( progressLayoutData );
GridData lblLayoutData = new GridData( SWT.FILL, SWT.FILL, false, false );
- float avgCharWidth = Graphics.getAvgCharWidth( progressLabel.getFont() );
+ float avgCharWidth = TextSizeUtil.getAvgCharWidth( progressLabel.getFont() );
lblLayoutData.minimumWidth = ( int )avgCharWidth * 6;
lblLayoutData.widthHint = ( int )avgCharWidth * 6;
progressLabel.setLayoutData( lblLayoutData );
diff --git a/bundles/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/widgets/FileDialog.java
index 7b8c40e..a68c1a1 100644
--- a/bundles/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/widgets/FileDialog.java
+++ b/bundles/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/widgets/FileDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation 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
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import org.eclipse.rap.rwt.graphics.Graphics;
+import org.eclipse.rap.rwt.internal.textsize.TextSizeUtil;
import org.eclipse.rap.rwt.lifecycle.UICallBack;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
@@ -64,6 +65,7 @@
* @see <a href="http://www.eclipse.org/swt/">Sample code and further
* information</a>
*/
+@SuppressWarnings("restriction")
public class FileDialog extends Dialog {
private static final long serialVersionUID = 1L;
@@ -637,7 +639,7 @@
result.setText( text );
GridData data = new GridData( GridData.HORIZONTAL_ALIGN_FILL );
Font dialogFont = result.getFont();
- float charWidth = Graphics.getAvgCharWidth( dialogFont );
+ float charWidth = TextSizeUtil.getAvgCharWidth( dialogFont );
float width = charWidth * BUTTON_WIDTH + HORIZONTAL_DIALOG_UNIT_PER_CHAR / 2;
int widthHint = ( int )( width / HORIZONTAL_DIALOG_UNIT_PER_CHAR );
Point minSize = result.computeSize( SWT.DEFAULT, SWT.DEFAULT, true );
