Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 63586 invoked from network); 27 May 2009 22:53:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 May 2009 22:53:56 -0000 Received: (qmail 16240 invoked by uid 500); 27 May 2009 21:45:12 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 16213 invoked by uid 500); 27 May 2009 21:45:12 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 16204 invoked by uid 99); 27 May 2009 21:45:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2009 21:45:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2009 21:45:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 42AFD23888E8; Wed, 27 May 2009 21:44:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r779325 - /directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java Date: Wed, 27 May 2009 21:44:47 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090527214447.42AFD23888E8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Wed May 27 21:44:46 2009 New Revision: 779325 URL: http://svn.apache.org/viewvc?rev=779325&view=rev Log: Simplified file I/O by using FileUtils Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java?rev=779325&r1=779324&r2=779325&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java Wed May 27 21:44:46 2009 @@ -21,13 +21,10 @@ package org.apache.directory.studio.ldapbrowser.common.dialogs; -import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; +import org.apache.commons.io.FileUtils; import org.apache.directory.studio.connection.ui.ConnectionUIPlugin; import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator; import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; @@ -108,22 +105,13 @@ try { File file = new File( returnedFileName ); - FileOutputStream out = new FileOutputStream( file ); - out.write( currentData ); - out.flush(); - out.close(); - } - catch ( FileNotFoundException e ) - { - ConnectionUIPlugin.getDefault().getExceptionHandler().handleException( - new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, - Messages.getString("HexDialog.CantWriteToFile"), e ) ); //$NON-NLS-1$ + FileUtils.writeByteArrayToFile( file, currentData ); } catch ( IOException e ) { ConnectionUIPlugin.getDefault().getExceptionHandler().handleException( - new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, - Messages.getString("HexDialog.CantWriteToFile"), e ) ); //$NON-NLS-1$ + new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, Messages + .getString( "HexDialog.CantWriteToFile" ), e ) ); //$NON-NLS-1$ } } } @@ -137,30 +125,14 @@ try { File file = new File( returnedFileName ); - FileInputStream in = new FileInputStream( file ); - ByteArrayOutputStream out = new ByteArrayOutputStream( ( int ) file.length() ); - byte[] buf = new byte[4096]; - int len; - while ( ( len = in.read( buf ) ) > 0 ) - { - out.write( buf, 0, len ); - } - currentData = out.toByteArray(); + currentData = FileUtils.readFileToByteArray( file ); hexText.setText( toFormattedHex( currentData ) ); - out.close(); - in.close(); - } - catch ( FileNotFoundException e ) - { - ConnectionUIPlugin.getDefault().getExceptionHandler().handleException( - new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, Messages.getString("HexDialog.CantReadFile"), //$NON-NLS-1$ - e ) ); } catch ( IOException e ) { ConnectionUIPlugin.getDefault().getExceptionHandler().handleException( - new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, Messages.getString("HexDialog.CantReadFile"), //$NON-NLS-1$ - e ) ); + new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, Messages + .getString( "HexDialog.CantReadFile" ), e ) ); //$NON-NLS-1$ } } }