You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/08/20 19:07:23 UTC
svn commit: r987577 [1/10] - in
/directory/studio/branches/studio-rap/plugins:
common.ui/src/main/java/org/apache/directory/studio/common/ui/
connection.ui/src/main/java/org/apache/directory/studio/connection/ui/
connection.ui/src/main/java/org/apache/...
Author: pamarcelot
Date: Fri Aug 20 17:07:19 2010
New Revision: 987577
URL: http://svn.apache.org/viewvc?rev=987577&view=rev
Log:
Various modifications based on non existing classes/methods/members in the RAP implementation.
Removed:
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorDocumentProvider.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorNavigationLocation.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/MultiTabLdifEntryEditor.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/SingleTabLdifEntryEditor.java
Modified:
directory/studio/branches/studio-rap/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/StudioActionProxy.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateInfoDialog.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java
directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ExtendedContentAssistCommandAdapter.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/plugin.xml
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/PasteAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/PropertiesAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/SelectAllAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DeleteDialog.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/FilterDialog.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/ScopeDialog.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectEntryDialog.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/TextDialog.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributesPreferencePage.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterCharacterPairMatcher.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterDamagerRepairer.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterFormattingStrategy.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterReconcilingStrategy.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterSourceViewerConfiguration.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DialogContentAssistant.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileBrowserWidget.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ModWidget.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserPreferences.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/ShowQuickSearchAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/ShowQuickFilterAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidgetAutoEditStrategyAdapter.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/search/LdapSearchPageScoreComputer.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Bookmark.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/plugin.xml
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/NewSearchAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditor.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/AbstractOpenEditorAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCellModifier.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorConfiguration.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCursor.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorUniversalListener.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorWidget.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowQuickFilterAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/search/SearchPage.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsView.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewActionGroup.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewUniversalListener.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/NewerAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/NewerAction.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/SearchLogsView.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/SearchLogsViewActionGroup.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/SearchLogsViewUniversalListener.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java
directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewSearchWizard.java
directory/studio/branches/studio-rap/plugins/ldifeditor/plugin.xml
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorActivator.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorTemplatesPreferencePage.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentSetupParticipant.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditorContributor.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifSourceViewerConfiguration.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/NonExistingLdifEditorInput.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/PathEditorInput.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractLdifAction.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifRecordAction.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifDocumentAction.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifRecordAction.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifAnnotationUpdater.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifFoldingRegionUpdater.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifReconcilingStrategy.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifAnnotationHover.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifAutoEditStrategy.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDoubleClickStrategy.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifExternalAnnotationModel.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifPartitionScanner.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifRecordRule.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifTextHover.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifValueRule.java
directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java
directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressDialog.java
directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleDialog.java
directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateDialog.java
directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java
directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerDialog.java
directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassDialog.java
directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java
Modified: directory/studio/branches/studio-rap/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java (original)
+++ directory/studio/branches/studio-rap/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java Fri Aug 20 17:07:19 2010
@@ -56,7 +56,7 @@ public class CommonUIUtils
{
MessageDialog dialog = new MessageDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
title, null, message, MessageDialog.ERROR, new String[]
- { IDialogConstants.OK_LABEL }, MessageDialog.OK );
+ { "OK" }, MessageDialog.OK );
dialog.open();
}
@@ -85,7 +85,7 @@ public class CommonUIUtils
{
MessageDialog dialog = new MessageDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
title, null, message, MessageDialog.INFORMATION, new String[]
- { IDialogConstants.OK_LABEL }, MessageDialog.OK );
+ { "OK" }, MessageDialog.OK );
dialog.open();
}
@@ -114,7 +114,7 @@ public class CommonUIUtils
{
MessageDialog dialog = new MessageDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
title, null, message, MessageDialog.WARNING, new String[]
- { IDialogConstants.OK_LABEL }, MessageDialog.OK );
+ { "OK" }, MessageDialog.OK );
dialog.open();
}
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java Fri Aug 20 17:07:19 2010
@@ -53,7 +53,6 @@ public class ConnectionUIPlugin extends
/** The plugin properties */
private PropertyResourceBundle properties;
-
/**
* The constructor
*/
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UiThreadEventRunner.java Fri Aug 20 17:07:19 2010
@@ -19,30 +19,31 @@
*/
package org.apache.directory.studio.connection.ui;
-
import org.apache.directory.studio.connection.core.event.EventRunnable;
import org.apache.directory.studio.connection.core.event.EventRunner;
+import org.eclipse.rwt.lifecycle.UICallBack;
import org.eclipse.swt.widgets.Display;
-
+import org.eclipse.ui.PlatformUI;
/**
* Implementation of {@link EventRunner} that executes an {@link EventRunnable}
* withing the SWT UI thread.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory
+ * Project</a>
*/
-public class UiThreadEventRunner implements EventRunner
-{
+public class UiThreadEventRunner implements EventRunner {
- /**
- * {@inheritDoc}
- *
- * This implementation executes the given {@link EventRunnable} within
- * the SWT UI thread.
- */
- public void execute( EventRunnable runnable )
- {
- Display.getDefault().asyncExec( runnable );
- }
+ /**
+ * {@inheritDoc}
+ *
+ * This implementation executes the given {@link EventRunnable} within the
+ * SWT UI thread.
+ */
+ public void execute(EventRunnable runnable) {
+ Display.getDefault().asyncExec( runnable );
+// UICallBack.runNonUIThreadWithFakeContext(PlatformUI.getWorkbench()
+// .getDisplay(), runnable);
+ }
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java Fri Aug 20 17:07:19 2010
@@ -35,13 +35,10 @@ import org.apache.directory.studio.conne
import org.apache.directory.studio.connection.ui.ConnectionParameterPageManager;
import org.apache.directory.studio.connection.ui.dnd.ConnectionTransfer;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
/**
@@ -103,7 +100,7 @@ public class CopyAction extends StudioAc
*/
public String getCommandId()
{
- return IWorkbenchActionDefinitionIds.COPY;
+ return "";//IWorkbenchActionDefinitionIds.COPY;
}
@@ -155,17 +152,17 @@ public class CopyAction extends StudioAc
*/
public static void copyToClipboard( Object[] data, Transfer[] dataTypes )
{
- Clipboard clipboard = null;
- try
- {
- clipboard = new Clipboard( Display.getCurrent() );
- clipboard.setContents( data, dataTypes );
- }
- finally
- {
- if ( clipboard != null )
- clipboard.dispose();
- }
+// Clipboard clipboard = null;
+// try
+// {
+// clipboard = new Clipboard( Display.getCurrent() );
+// clipboard.setContents( data, dataTypes );
+// }
+// finally
+// {
+// if ( clipboard != null )
+// clipboard.dispose();
+// }
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/DeleteAction.java Fri Aug 20 17:07:19 2010
@@ -35,7 +35,6 @@ import org.eclipse.jface.dialogs.Message
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
/**
@@ -81,7 +80,7 @@ public class DeleteAction extends Studio
*/
public String getCommandId()
{
- return IWorkbenchActionDefinitionIds.DELETE;
+ return "";//IWorkbenchActionDefinitionIds.DELETE;
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java Fri Aug 20 17:07:19 2010
@@ -21,6 +21,7 @@
package org.apache.directory.studio.connection.ui.actions;
+import java.awt.datatransfer.Clipboard;
import java.util.ArrayList;
import java.util.List;
@@ -38,13 +39,11 @@ import org.apache.directory.studio.conne
import org.apache.directory.studio.connection.ui.ConnectionParameterPageManager;
import org.apache.directory.studio.connection.ui.dnd.ConnectionTransfer;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
/**
@@ -99,7 +98,7 @@ public class PasteAction extends StudioA
*/
public String getCommandId()
{
- return IWorkbenchActionDefinitionIds.PASTE;
+ return "";// IWorkbenchActionDefinitionIds.PASTE;
}
@@ -268,16 +267,17 @@ public class PasteAction extends StudioA
*/
protected Object getFromClipboard( Transfer dataType )
{
- Clipboard clipboard = null;
- try
- {
- clipboard = new Clipboard( Display.getCurrent() );
- return clipboard.getContents( dataType );
- }
- finally
- {
- if ( clipboard != null )
- clipboard.dispose();
- }
+// Clipboard clipboard = null;
+// try
+// {
+// clipboard = new Clipboard( Display.getCurrent() );
+// return clipboard.getContents( dataType );
+// }
+// finally
+// {
+// if ( clipboard != null )
+// clipboard.dispose();
+// }
+ return null;
}
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java Fri Aug 20 17:07:19 2010
@@ -20,7 +20,6 @@
package org.apache.directory.studio.connection.ui.actions;
-
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
import org.eclipse.core.runtime.IAdaptable;
@@ -28,88 +27,77 @@ import org.eclipse.jface.preference.Pref
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
/**
* This Action opens the Property Dialog for a given object.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory
+ * Project</a>
*/
-public class PropertiesAction extends StudioAction
-{
- /**
- * Creates a new instance of PropertiesAction.
- */
- public PropertiesAction()
- {
- super();
- }
-
-
- /**
- * {@inheritDoc}
- */
- public String getText()
- {
- return Messages.getString( "PropertiesAction.Properties" ); //$NON-NLS-1$
- }
-
-
- /**
- * {@inheritDoc}
- */
- public ImageDescriptor getImageDescriptor()
- {
- return null;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public String getCommandId()
- {
- return IWorkbenchActionDefinitionIds.PROPERTIES;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isEnabled()
- {
-
- return getSelectedConnections().length == 1;
-
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void run()
- {
- IAdaptable element = null;
- String pageId = null;
- String title = null;
-
- if ( getSelectedConnections().length == 1 )
- {
- element = ( IAdaptable ) getSelectedConnections()[0];
- pageId = ConnectionUIPlugin.getDefault().getPluginProperties().getString( "Prop_ConnectionPropertyPage_id" ); //$NON-NLS-1$
- title = getSelectedConnections()[0].getName();
- }
-
- if ( element != null )
- {
- PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn( getShell(), element, pageId, null, null );
- if ( dialog != null )
- title = Utils.shorten( title, 30 );
- dialog.getShell().setText(
- NLS.bind( Messages.getString( "PropertiesAction.PropertiesFor" ), new String[] { title } ) ); //$NON-NLS-1$
- dialog.open();
+public class PropertiesAction extends StudioAction {
+ /**
+ * Creates a new instance of PropertiesAction.
+ */
+ public PropertiesAction() {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getText() {
+ return Messages.getString("PropertiesAction.Properties"); //$NON-NLS-1$
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ImageDescriptor getImageDescriptor() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getCommandId() {
+ return "";// IWorkbenchActionDefinitionIds.PROPERTIES;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isEnabled() {
+
+ return getSelectedConnections().length == 1;
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void run() {
+ IAdaptable element = null;
+ String pageId = null;
+ String title = null;
+
+ if (getSelectedConnections().length == 1) {
+ element = (IAdaptable) getSelectedConnections()[0];
+ pageId = ConnectionUIPlugin.getDefault().getPluginProperties()
+ .getString("Prop_ConnectionPropertyPage_id"); //$NON-NLS-1$
+ title = getSelectedConnections()[0].getName();
+ }
+
+ if (element != null) {
+ PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn(
+ getShell(), element, pageId, null, null);
+ if (dialog != null)
+ title = Utils.shorten(title, 30);
+ dialog.getShell()
+ .setText(
+ NLS.bind(
+ Messages.getString("PropertiesAction.PropertiesFor"), new String[] { title })); //$NON-NLS-1$
+ dialog.open();
- }
- }
+ }
+ }
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/RenameAction.java Fri Aug 20 17:07:19 2010
@@ -20,180 +20,143 @@
package org.apache.directory.studio.connection.ui.actions;
-
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionFolder;
import org.eclipse.jface.dialogs.IInputValidator;
import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
/**
* This Action renames Connections, Entries, Searches, or Bookmarks.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory
+ * Project</a>
*/
-public class RenameAction extends StudioAction
-{
- /**
- * Creates a new instance of RenameAction.
- *
- */
- public RenameAction()
- {
- super();
- }
-
-
- /**
- * {@inheritDoc}
- */
- public String getText()
- {
- Connection[] connections = getSelectedConnections();
- ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
- if ( connections.length == 1 && connectionFolders.length == 0 )
- {
- return Messages.getString( "RenameAction.Connection" ); //$NON-NLS-1$
- }
- else if ( connectionFolders.length == 1 && connections.length == 0 )
- {
- return Messages.getString( "RenameAction.ConnectionFolder" ); //$NON-NLS-1$
- }
- else
- {
- return Messages.getString( "RenameAction.Rename" ); //$NON-NLS-1$
- }
- }
-
-
- /**
- * {@inheritDoc}
- */
- public ImageDescriptor getImageDescriptor()
- {
- return null;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public String getCommandId()
- {
- return IWorkbenchActionDefinitionIds.RENAME;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void run()
- {
- Connection[] connections = getSelectedConnections();
- ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
- if ( connections.length == 1 )
- {
- renameConnection( connections[0] );
- }
- else if ( connectionFolders.length == 1 )
- {
- renameConnectionFolder( connectionFolders[0] );
- }
- }
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isEnabled()
- {
- return getSelectedConnections().length + getSelectedConnectionFolders().length == 1;
- }
-
-
- /**
- * Renames a Connection.
- *
- * @param connection
- * the Connection to rename
- */
- private void renameConnection( final Connection connection )
- {
- IInputValidator validator = new IInputValidator()
- {
- public String isValid( String newName )
- {
- if ( connection.getName().equals( newName ) )
- {
- return null;
- }
- else if ( ConnectionCorePlugin.getDefault().getConnectionManager().getConnectionByName( newName ) != null )
- {
- return Messages.getString( "RenameAction.ConnectionAlreadyExists" ); //$NON-NLS-1$
- }
- else
- {
- return null;
- }
- }
- };
-
- InputDialog dialog = new InputDialog(
- getShell(),
- Messages.getString( "RenameAction.RenameConnection" ), Messages.getString( "RenameAction.NewNameConnection" ), connection.getName(), //$NON-NLS-1$ //$NON-NLS-2$
- validator );
-
- dialog.open();
- String newName = dialog.getValue();
- if ( newName != null )
- {
- connection.setName( newName );
- }
- }
-
-
- /**
- * Renames a ConnectionFolder.
- *
- * @param connectionFolder
- * the ConnectionFolder to rename
- */
- private void renameConnectionFolder( final ConnectionFolder connectionFolder )
- {
- IInputValidator validator = new IInputValidator()
- {
- public String isValid( String newName )
- {
- if ( connectionFolder.getName().equals( newName ) )
- {
- return null;
- }
- else if ( ConnectionCorePlugin.getDefault().getConnectionFolderManager().getConnectionFolderByName(
- newName ) != null )
- {
- return Messages.getString( "RenameAction.ConnectionFolderAlreadyExists" ); //$NON-NLS-1$
- }
- else
- {
- return null;
- }
- }
- };
-
- InputDialog dialog = new InputDialog(
- getShell(),
- Messages.getString( "RenameAction.RenameConnectionFolder" ), Messages.getString( "RenameAction.NewNameConnectionFolder" ), connectionFolder.getName(), //$NON-NLS-1$ //$NON-NLS-2$
- validator );
-
- dialog.open();
- String newName = dialog.getValue();
- if ( newName != null )
- {
- connectionFolder.setName( newName );
- }
- }
+public class RenameAction extends StudioAction {
+ /**
+ * Creates a new instance of RenameAction.
+ *
+ */
+ public RenameAction() {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getText() {
+ Connection[] connections = getSelectedConnections();
+ ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
+ if (connections.length == 1 && connectionFolders.length == 0) {
+ return Messages.getString("RenameAction.Connection"); //$NON-NLS-1$
+ } else if (connectionFolders.length == 1 && connections.length == 0) {
+ return Messages.getString("RenameAction.ConnectionFolder"); //$NON-NLS-1$
+ } else {
+ return Messages.getString("RenameAction.Rename"); //$NON-NLS-1$
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ImageDescriptor getImageDescriptor() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getCommandId() {
+ return "";// IWorkbenchActionDefinitionIds.RENAME;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void run() {
+ Connection[] connections = getSelectedConnections();
+ ConnectionFolder[] connectionFolders = getSelectedConnectionFolders();
+ if (connections.length == 1) {
+ renameConnection(connections[0]);
+ } else if (connectionFolders.length == 1) {
+ renameConnectionFolder(connectionFolders[0]);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isEnabled() {
+ return getSelectedConnections().length
+ + getSelectedConnectionFolders().length == 1;
+ }
+
+ /**
+ * Renames a Connection.
+ *
+ * @param connection
+ * the Connection to rename
+ */
+ private void renameConnection(final Connection connection) {
+ IInputValidator validator = new IInputValidator() {
+ public String isValid(String newName) {
+ if (connection.getName().equals(newName)) {
+ return null;
+ } else if (ConnectionCorePlugin.getDefault()
+ .getConnectionManager().getConnectionByName(newName) != null) {
+ return Messages
+ .getString("RenameAction.ConnectionAlreadyExists"); //$NON-NLS-1$
+ } else {
+ return null;
+ }
+ }
+ };
+
+ InputDialog dialog = new InputDialog(
+ getShell(),
+ Messages.getString("RenameAction.RenameConnection"), Messages.getString("RenameAction.NewNameConnection"), connection.getName(), //$NON-NLS-1$ //$NON-NLS-2$
+ validator);
+
+ dialog.open();
+ String newName = dialog.getValue();
+ if (newName != null) {
+ connection.setName(newName);
+ }
+ }
+
+ /**
+ * Renames a ConnectionFolder.
+ *
+ * @param connectionFolder
+ * the ConnectionFolder to rename
+ */
+ private void renameConnectionFolder(final ConnectionFolder connectionFolder) {
+ IInputValidator validator = new IInputValidator() {
+ public String isValid(String newName) {
+ if (connectionFolder.getName().equals(newName)) {
+ return null;
+ } else if (ConnectionCorePlugin.getDefault()
+ .getConnectionFolderManager()
+ .getConnectionFolderByName(newName) != null) {
+ return Messages
+ .getString("RenameAction.ConnectionFolderAlreadyExists"); //$NON-NLS-1$
+ } else {
+ return null;
+ }
+ }
+ };
+
+ InputDialog dialog = new InputDialog(
+ getShell(),
+ Messages.getString("RenameAction.RenameConnectionFolder"), Messages.getString("RenameAction.NewNameConnectionFolder"), connectionFolder.getName(), //$NON-NLS-1$ //$NON-NLS-2$
+ validator);
+
+ dialog.open();
+ String newName = dialog.getValue();
+ if (newName != null) {
+ connectionFolder.setName(newName);
+ }
+ }
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/StudioActionProxy.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/StudioActionProxy.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/StudioActionProxy.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/StudioActionProxy.java Fri Aug 20 17:07:19 2010
@@ -231,11 +231,11 @@ public abstract class StudioActionProxy
{
if ( !isDisposed() )
{
- setText( action.getText() );
- setToolTipText( action.getText() );
- setEnabled( action.isEnabled() );
- setImageDescriptor( action.getImageDescriptor() );
- setChecked( action.isChecked() );
+// setText( action.getText() );
+// setToolTipText( action.getText() );
+// setEnabled( action.isEnabled() );
+//// setImageDescriptor( action.getImageDescriptor() );
+// setChecked( action.isChecked() );
}
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateInfoDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateInfoDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateInfoDialog.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateInfoDialog.java Fri Aug 20 17:07:19 2010
@@ -73,7 +73,7 @@ public class CertificateInfoDialog exten
@Override
protected void createButtonsForButtonBar( Composite parent )
{
- createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CLOSE_LABEL, false );
+ createButton( parent, IDialogConstants.CANCEL_ID, "close"/*IDialogConstants.CLOSE_LABEL*/, false );
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java Fri Aug 20 17:07:19 2010
@@ -105,7 +105,7 @@ public class CertificateTrustDialog exte
{
createButton( parent, IDialogConstants.DETAILS_ID, Messages
.getString( "CertificateTrustDialog.ViewCertificate" ), false );
- createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, false );
+ createButton( parent, IDialogConstants.OK_ID, "OK"/*IDialogConstants.OK_LABEL*/, false );
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java Fri Aug 20 17:07:19 2010
@@ -134,9 +134,9 @@ public class SelectReferralConnectionDia
*/
protected void createButtonsForButtonBar( Composite parent )
{
- Button okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
+ Button okButton = createButton( parent, IDialogConstants.OK_ID, "OK" /*IDialogConstants.OK_LABEL*/, true );
okButton.setFocus();
- createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
+ createButton( parent, IDialogConstants.CANCEL_ID, "Cancel" /*IDialogConstants.CANCEL_LABEL*/, false );
validate();
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionActionGroup.java Fri Aug 20 17:07:19 2010
@@ -293,38 +293,38 @@ public class ConnectionActionGroup imple
*/
public void activateGlobalActionHandlers()
{
- if ( actionBars != null )
- {
- actionBars.setGlobalActionHandler( ActionFactory.COPY.getId(), ( IAction ) connectionActionMap
- .get( copyConnectionAction ) );
- actionBars.setGlobalActionHandler( ActionFactory.PASTE.getId(), ( IAction ) connectionActionMap
- .get( pasteConnectionAction ) );
- actionBars.setGlobalActionHandler( ActionFactory.DELETE.getId(), ( IAction ) connectionActionMap
- .get( deleteConnectionAction ) );
- actionBars.setGlobalActionHandler( ActionFactory.RENAME.getId(), ( IAction ) connectionActionMap
- .get( renameConnectionAction ) );
- actionBars.setGlobalActionHandler( ActionFactory.PROPERTIES.getId(), ( IAction ) connectionActionMap
- .get( propertyDialogAction ) );
- actionBars.updateActionBars();
- }
- else
- {
- IAction ca = ( IAction ) connectionActionMap.get( copyConnectionAction );
- ca.setActionDefinitionId( ConnectionUIConstants.CMD_COPY );
- ActionUtils.activateActionHandler( ca );
-
- IAction pa = ( IAction ) connectionActionMap.get( pasteConnectionAction );
- pa.setActionDefinitionId( ConnectionUIConstants.CMD_PASTE );
- ActionUtils.activateActionHandler( pa );
-
- IAction da = ( IAction ) connectionActionMap.get( deleteConnectionAction );
- da.setActionDefinitionId( ConnectionUIConstants.CMD_DELETE );
- ActionUtils.activateActionHandler( da );
-
- IAction pda = ( IAction ) connectionActionMap.get( propertyDialogAction );
- pda.setActionDefinitionId( ConnectionUIConstants.CMD_PROPERTIES );
- ActionUtils.activateActionHandler( pda );
- }
+// if ( actionBars != null )
+// {
+// actionBars.setGlobalActionHandler( ActionFactory.COPY.getId(), ( IAction ) connectionActionMap
+// .get( copyConnectionAction ) );
+// actionBars.setGlobalActionHandler( ActionFactory.PASTE.getId(), ( IAction ) connectionActionMap
+// .get( pasteConnectionAction ) );
+// actionBars.setGlobalActionHandler( ActionFactory.DELETE.getId(), ( IAction ) connectionActionMap
+// .get( deleteConnectionAction ) );
+// actionBars.setGlobalActionHandler( ActionFactory.RENAME.getId(), ( IAction ) connectionActionMap
+// .get( renameConnectionAction ) );
+// actionBars.setGlobalActionHandler( ActionFactory.PROPERTIES.getId(), ( IAction ) connectionActionMap
+// .get( propertyDialogAction ) );
+// actionBars.updateActionBars();
+// }
+// else
+// {
+// IAction ca = ( IAction ) connectionActionMap.get( copyConnectionAction );
+// ca.setActionDefinitionId( ConnectionUIConstants.CMD_COPY );
+// ActionUtils.activateActionHandler( ca );
+//
+// IAction pa = ( IAction ) connectionActionMap.get( pasteConnectionAction );
+// pa.setActionDefinitionId( ConnectionUIConstants.CMD_PASTE );
+// ActionUtils.activateActionHandler( pa );
+//
+// IAction da = ( IAction ) connectionActionMap.get( deleteConnectionAction );
+// da.setActionDefinitionId( ConnectionUIConstants.CMD_DELETE );
+// ActionUtils.activateActionHandler( da );
+//
+// IAction pda = ( IAction ) connectionActionMap.get( propertyDialogAction );
+// pda.setActionDefinitionId( ConnectionUIConstants.CMD_PROPERTIES );
+// ActionUtils.activateActionHandler( pda );
+// }
}
Modified: directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ExtendedContentAssistCommandAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ExtendedContentAssistCommandAdapter.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ExtendedContentAssistCommandAdapter.java (original)
+++ directory/studio/branches/studio-rap/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ExtendedContentAssistCommandAdapter.java Fri Aug 20 17:07:19 2010
@@ -20,11 +20,6 @@
package org.apache.directory.studio.connection.ui.widgets;
-import org.eclipse.jface.fieldassist.ContentProposalAdapter;
-import org.eclipse.jface.fieldassist.IContentProposalProvider;
-import org.eclipse.jface.fieldassist.IControlContentAdapter;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
/**
@@ -34,9 +29,8 @@ import org.eclipse.ui.fieldassist.Conten
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedContentAssistCommandAdapter extends ContentAssistCommandAdapter
+public class ExtendedContentAssistCommandAdapter /* extends ContentAssistCommandAdapter*/
{
-
/**
* Creates a new instance of ExtendedContentAssistCommandAdapter
* with the following settings:
@@ -54,7 +48,8 @@ public class ExtendedContentAssistComman
* @param autoActivationCharacters the auto activation characters
* @param installDecoration the install decoration
*/
- public ExtendedContentAssistCommandAdapter( Control control, IControlContentAdapter controlContentAdapter,
+
+ /* public ExtendedContentAssistCommandAdapter( Control control, IControlContentAdapter controlContentAdapter,
IContentProposalProvider proposalProvider, String commandId, char[] autoActivationCharacters,
boolean installDecoration )
{
@@ -79,5 +74,5 @@ public class ExtendedContentAssistComman
{
super.openProposalPopup();
}
-
+*/
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/plugin.xml?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/plugin.xml (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/plugin.xml Fri Aug 20 17:07:19 2010
@@ -111,14 +111,14 @@
</page>
</extension>
- <extension
+ <!--<extension
point="org.eclipse.ui.editors.templates">
<contextType
class="org.eclipse.jface.text.templates.TemplateContextType"
name="%CtxType_LdapFilter_Template_name"
id="%CtxType_LdapFilter_Template_id"/>
<include file="resources/templates/templates.xml"/>
- </extension>
+ </extension>-->
<extension
point="org.eclipse.ui.keywords">
@@ -136,7 +136,7 @@
label="%Keyword_LDIF_label"/>
</extension>
- <extension
+ <!--<extension
point="org.eclipse.ui.bindings">
<key
commandId="%Cmd_AddValue_id"
@@ -218,7 +218,7 @@
contextId="%Ctx_LdapBrowserDialogs_id"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="F7"/>
- </extension>
+ </extension>-->
<extension
point="org.eclipse.ui.commands">
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java Fri Aug 20 17:07:19 2010
@@ -36,16 +36,11 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.resource.FontRegistry;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.GlobalTemplateVariables;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.RGB;
-import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
-import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -67,11 +62,11 @@ public class BrowserCommonActivator exte
/** The value editor preferences */
private ValueEditorsPreferences valueEditorPreferences;
- /** The filter template store. */
- private ContributionTemplateStore filterTemplateStore;
-
- /** The filter template context type registry. */
- private ContributionContextTypeRegistry filterTemplateContextTypeRegistry;
+// /** The filter template store. */
+// private ContributionTemplateStore filterTemplateStore;
+//
+// /** The filter template context type registry. */
+// private ContributionContextTypeRegistry filterTemplateContextTypeRegistry;
/** The event runner. */
private EventRunner eventRunner;
@@ -101,39 +96,39 @@ public class BrowserCommonActivator exte
eventRunner = new UiThreadEventRunner();
}
- if ( fontRegistry == null )
- {
- fontRegistry = new FontRegistry( getWorkbench().getDisplay() );
- }
-
- if ( colorRegistry == null )
- {
- colorRegistry = new ColorRegistry( getWorkbench().getDisplay() );
- }
+// if ( fontRegistry == null )
+// {
+// fontRegistry = new FontRegistry( getWorkbench().getDisplay() );
+// }
+//
+// if ( colorRegistry == null )
+// {
+// colorRegistry = new ColorRegistry( getWorkbench().getDisplay() );
+// }
valueEditorPreferences = new ValueEditorsPreferences();
- if ( filterTemplateContextTypeRegistry == null )
- {
- filterTemplateContextTypeRegistry = new ContributionContextTypeRegistry();
- filterTemplateContextTypeRegistry.addContextType( BrowserCommonConstants.FILTER_TEMPLATE_ID );
- filterTemplateContextTypeRegistry.getContextType( BrowserCommonConstants.FILTER_TEMPLATE_ID ).addResolver(
- new GlobalTemplateVariables.Cursor() );
- }
-
- if ( filterTemplateStore == null )
- {
- filterTemplateStore = new ContributionTemplateStore( getFilterTemplateContextTypeRegistry(),
- getPreferenceStore(), "templates" ); //$NON-NLS-1$
- try
- {
- filterTemplateStore.load();
- }
- catch ( IOException e )
- {
- e.printStackTrace();
- }
- }
+// if ( filterTemplateContextTypeRegistry == null )
+// {
+// filterTemplateContextTypeRegistry = new ContributionContextTypeRegistry();
+// filterTemplateContextTypeRegistry.addContextType( BrowserCommonConstants.FILTER_TEMPLATE_ID );
+// filterTemplateContextTypeRegistry.getContextType( BrowserCommonConstants.FILTER_TEMPLATE_ID ).addResolver(
+// new GlobalTemplateVariables.Cursor() );
+// }
+//
+// if ( filterTemplateStore == null )
+// {
+// filterTemplateStore = new ContributionTemplateStore( getFilterTemplateContextTypeRegistry(),
+// getPreferenceStore(), "templates" ); //$NON-NLS-1$
+// try
+// {
+// filterTemplateStore.load();
+// }
+// catch ( IOException e )
+// {
+// e.printStackTrace();
+// }
+// }
}
@@ -160,23 +155,23 @@ public class BrowserCommonActivator exte
colorRegistry = null;
}
- if ( filterTemplateContextTypeRegistry != null )
- {
- filterTemplateContextTypeRegistry = null;
- }
-
- if ( filterTemplateStore != null )
- {
- try
- {
- filterTemplateStore.save();
- }
- catch ( IOException e )
- {
- e.printStackTrace();
- }
- filterTemplateStore = null;
- }
+// if ( filterTemplateContextTypeRegistry != null )
+// {
+// filterTemplateContextTypeRegistry = null;
+// }
+//
+// if ( filterTemplateStore != null )
+// {
+// try
+// {
+// filterTemplateStore.save();
+// }
+// catch ( IOException e )
+// {
+// e.printStackTrace();
+// }
+// filterTemplateStore = null;
+// }
}
@@ -301,24 +296,24 @@ public class BrowserCommonActivator exte
}
- /**
- *
- * @return The filter template store
- */
- public TemplateStore getFilterTemplateStore()
- {
- return filterTemplateStore;
- }
-
-
- /**
- *
- * @return The filter template context type registry
- */
- public ContextTypeRegistry getFilterTemplateContextTypeRegistry()
- {
- return filterTemplateContextTypeRegistry;
- }
+// /**
+// *
+// * @return The filter template store
+// */
+// public TemplateStore getFilterTemplateStore()
+// {
+// return filterTemplateStore;
+// }
+//
+//
+// /**
+// *
+// * @return The filter template context type registry
+// */
+// public ContextTypeRegistry getFilterTemplateContextTypeRegistry()
+// {
+// return filterTemplateContextTypeRegistry;
+// }
/**
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java Fri Aug 20 17:07:19 2010
@@ -21,6 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.actions;
+import java.awt.datatransfer.Clipboard;
import java.util.Arrays;
import java.util.LinkedHashSet;
@@ -40,13 +41,11 @@ import org.apache.directory.studio.ldifp
import org.apache.directory.studio.valueeditors.IValueEditor;
import org.apache.directory.studio.valueeditors.ValueEditorManager;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
/**
@@ -132,7 +131,7 @@ public class CopyAction extends BrowserA
*/
public String getCommandId()
{
- return IWorkbenchActionDefinitionIds.COPY;
+ return "copy";//IWorkbenchActionDefinitionIds.COPY;
}
@@ -244,17 +243,17 @@ public class CopyAction extends BrowserA
*/
public static void copyToClipboard( Object[] data, Transfer[] dataTypes )
{
- Clipboard clipboard = null;
- try
- {
- clipboard = new Clipboard( Display.getCurrent() );
- clipboard.setContents( data, dataTypes );
- }
- finally
- {
- if ( clipboard != null )
- clipboard.dispose();
- }
+// Clipboard clipboard = null;
+// try
+// {
+// clipboard = new Clipboard( Display.getCurrent() );
+// clipboard.setContents( data, dataTypes );
+// }
+// finally
+// {
+// if ( clipboard != null )
+// clipboard.dispose();
+// }
}