You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/05/27 11:24:41 UTC
svn commit: r1681940 - in /directory/studio/trunk/plugins:
aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/
common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/
templateeditor/src/main/java/org/apache/directory/s...
Author: elecharny
Date: Wed May 27 09:24:41 2015
New Revision: 1681940
URL: http://svn.apache.org/r1681940
Log:
o dispose the GC instance into a finally {} clause, for safety.
Modified:
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/BaseWidgetUtils.java
directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorLabel.java
directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorTextField.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java?rev=1681940&r1=1681939&r2=1681940&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java Wed May 27 09:24:41 2015
@@ -201,12 +201,20 @@ public class Activator extends AbstractU
public static int getButtonWidth( Control control )
{
GC gc = new GC( control );
- gc.setFont( JFaceResources.getDialogFont() );
- FontMetrics fontMetrics = gc.getFontMetrics();
- gc.dispose();
+
+ try
+ {
+ gc.setFont( JFaceResources.getDialogFont() );
+ FontMetrics fontMetrics = gc.getFontMetrics();
+
+ int width = Dialog.convertHorizontalDLUsToPixels( fontMetrics, IDialogConstants.BUTTON_WIDTH );
- int width = Dialog.convertHorizontalDLUsToPixels( fontMetrics, IDialogConstants.BUTTON_WIDTH );
- return width;
+ return width;
+ }
+ finally
+ {
+ gc.dispose();
+ }
}
Modified: directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/BaseWidgetUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/BaseWidgetUtils.java?rev=1681940&r1=1681939&r2=1681940&view=diff
==============================================================================
--- directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/BaseWidgetUtils.java (original)
+++ directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/BaseWidgetUtils.java Wed May 27 09:24:41 2015
@@ -481,18 +481,25 @@ public class BaseWidgetUtils
public static Button createButton( Composite parent, String text, int span )
{
GC gc = new GC( parent );
- gc.setFont( JFaceResources.getDialogFont() );
- FontMetrics fontMetrics = gc.getFontMetrics();
- gc.dispose();
- Button button = new Button( parent, SWT.PUSH );
- GridData gridData = new GridData();
- gridData.widthHint = Dialog.convertHorizontalDLUsToPixels( fontMetrics, IDialogConstants.BUTTON_WIDTH );
- gridData.horizontalSpan = span;
- button.setLayoutData( gridData );
- button.setText( text );
-
- return button;
+ try
+ {
+ gc.setFont( JFaceResources.getDialogFont() );
+ FontMetrics fontMetrics = gc.getFontMetrics();
+ Button button = new Button( parent, SWT.PUSH );
+ GridData gridData = new GridData();
+ gridData.widthHint = Dialog.convertHorizontalDLUsToPixels( fontMetrics, IDialogConstants.BUTTON_WIDTH );
+ gridData.horizontalSpan = span;
+ button.setLayoutData( gridData );
+ button.setText( text );
+
+ return button;
+ }
+ finally
+ {
+ gc.dispose();
+ }
+
}
Modified: directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorLabel.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorLabel.java?rev=1681940&r1=1681939&r2=1681940&view=diff
==============================================================================
--- directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorLabel.java (original)
+++ directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorLabel.java Wed May 27 09:24:41 2015
@@ -100,10 +100,17 @@ public class EditorLabel extends EditorW
if ( numberOfRows != 1 )
{
GC gc = new GC( parent );
- gc.setFont( label.getFont() );
- FontMetrics fontMetrics = gc.getFontMetrics();
- gc.dispose();
- gd.heightHint = fontMetrics.getHeight() * numberOfRows;
+
+ try
+ {
+ gc.setFont( label.getFont() );
+ FontMetrics fontMetrics = gc.getFontMetrics();
+ gd.heightHint = fontMetrics.getHeight() * numberOfRows;
+ }
+ finally
+ {
+ gc.dispose();
+ }
}
return parent;
Modified: directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorTextField.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorTextField.java?rev=1681940&r1=1681939&r2=1681940&view=diff
==============================================================================
--- directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorTextField.java (original)
+++ directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/widgets/EditorTextField.java Wed May 27 09:24:41 2015
@@ -127,10 +127,17 @@ public class EditorTextField extends Edi
if ( numberOfRows != 1 )
{
GC gc = new GC( parent );
- gc.setFont( textfield.getFont() );
- FontMetrics fontMetrics = gc.getFontMetrics();
- gc.dispose();
- gd.heightHint = fontMetrics.getHeight() * numberOfRows;
+
+ try
+ {
+ gc.setFont( textfield.getFont() );
+ FontMetrics fontMetrics = gc.getFontMetrics();
+ gd.heightHint = fontMetrics.getHeight() * numberOfRows;
+ }
+ finally
+ {
+ gc.dispose();
+ }
}
textfield.pack();
Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java?rev=1681940&r1=1681939&r2=1681940&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java Wed May 27 09:24:41 2015
@@ -654,10 +654,17 @@ public class ImageDialog extends Dialog
Image resizedImage = new Image( Display.getDefault(), width, height );
GC gc = new GC( resizedImage );
- gc.setAntialias( SWT.ON );
- gc.setInterpolation( SWT.HIGH );
- gc.drawImage( image, 0, 0, image.getBounds().width, image.getBounds().height, 0, 0, width, height );
- gc.dispose();
+
+ try
+ {
+ gc.setAntialias( SWT.ON );
+ gc.setInterpolation( SWT.HIGH );
+ gc.drawImage( image, 0, 0, image.getBounds().width, image.getBounds().height, 0, 0, width, height );
+ }
+ finally
+ {
+ gc.dispose();
+ }
image.dispose();