You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2009/10/26 10:32:46 UTC
svn commit: r829737 -
/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java
Author: felixk
Date: Mon Oct 26 09:32:45 2009
New Revision: 829737
URL: http://svn.apache.org/viewvc?rev=829737&view=rev
Log:
Fix for DIRSTUDIO-574 (It's not possible to cancel to process once you selected once you selected 'Paste Entry'.)
Modified:
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java?rev=829737&r1=829736&r2=829737&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java Mon Oct 26 09:32:45 2009
@@ -114,6 +114,29 @@
/**
+ * @see org.eclipse.jface.dialogs.Dialog#close()
+ */
+ @Override
+ public boolean close()
+ {
+ strategy = EntryExistsCopyStrategy.BREAK;
+
+ return super.close();
+ }
+
+
+ /**
+ * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()
+ */
+ protected void cancelPressed()
+ {
+ strategy = EntryExistsCopyStrategy.BREAK;
+
+ super.cancelPressed();
+ }
+
+
+ /**
* @see org.eclipse.jface.dialogs.Dialog#okPressed()
*/
protected void okPressed()
@@ -149,7 +172,7 @@
protected void createButtonsForButtonBar( Composite parent )
{
createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
- //createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
+ createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
}