Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 70654 invoked from network); 9 Apr 2007 11:15:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Apr 2007 11:15:23 -0000 Received: (qmail 69498 invoked by uid 500); 9 Apr 2007 11:15:30 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 69397 invoked by uid 500); 9 Apr 2007 11:15:29 -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 69371 invoked by uid 99); 9 Apr 2007 11:15:29 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Apr 2007 04:15:29 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Apr 2007 04:15:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id CD1161A983E; Mon, 9 Apr 2007 04:14:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r526712 [2/4] - in /directory/ldapstudio/trunk: ./ ldapstudio-browser-ui/ ldapstudio-browser-ui/META-INF/ ldapstudio-browser-ui/icons/ ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/ ldapstudio-browser-ui/src... Date: Mon, 09 Apr 2007 11:14:54 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070409111457.CD1161A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIPlugin.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIPlugin.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIPlugin.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIPlugin.java Mon Apr 9 04:14:46 2007 @@ -21,31 +21,12 @@ package org.apache.directory.ldapstudio.browser.ui; -import java.io.IOException; import java.net.URL; -import java.util.MissingResourceException; -import java.util.ResourceBundle; import org.apache.directory.ldapstudio.browser.core.BrowserCorePlugin; -import org.apache.directory.ldapstudio.browser.core.events.EventRegistry; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -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; @@ -62,50 +43,13 @@ /** The shared instance */ private static BrowserUIPlugin plugin; - /** Resource bundle */ - private ResourceBundle resourceBundle; - - /** The event dispatcher */ - private ExceptionHandler exceptionHandler; - - /** The font registry */ - private FontRegistry fontRegistry; - - /** The color registry */ - private ColorRegistry colorRegistry; - - /** The template store */ - private ContributionTemplateStore ldifTemplateStore; - - private ContributionTemplateStore filterTemplateStore; - - /** The context type registry */ - private ContributionContextTypeRegistry ldifTemplateContextTypeRegistry; - - private ContributionContextTypeRegistry filterTemplateContextTypeRegistry; - - /** The event dispatcher */ - private EventDispatcherSync eventDispatcher; - - /** The preferences */ - private BrowserUIPreferences uiPreferences; - - + /** * The constructor. */ public BrowserUIPlugin() { plugin = this; - this.uiPreferences = new BrowserUIPreferences(); - try - { - resourceBundle = ResourceBundle.getBundle( "org.apache.directory.ldapstudio.browser.ui.browseruimessages" ); - } - catch ( MissingResourceException x ) - { - resourceBundle = null; - } } @@ -115,85 +59,6 @@ public void start( BundleContext context ) throws Exception { super.start( context ); - - if ( this.eventDispatcher == null ) - { - this.eventDispatcher = new EventDispatcherSync(); - this.eventDispatcher.startEventDispatcher(); - } - EventRegistry.init( this.eventDispatcher ); - - if ( this.exceptionHandler == null ) - { - this.exceptionHandler = new ExceptionHandler(); - } - - if ( this.fontRegistry == null ) - { - this.fontRegistry = new FontRegistry( this.getWorkbench().getDisplay() ); - } - if ( this.colorRegistry == null ) - { - this.colorRegistry = new ColorRegistry( this.getWorkbench().getDisplay() ); - } - if ( this.filterTemplateContextTypeRegistry == null ) - { - this.filterTemplateContextTypeRegistry = new ContributionContextTypeRegistry(); - this.filterTemplateContextTypeRegistry.addContextType( BrowserUIConstants.FILTER_TEMPLATE_ID ); - this.filterTemplateContextTypeRegistry.getContextType( BrowserUIConstants.FILTER_TEMPLATE_ID ).addResolver( - new GlobalTemplateVariables.Cursor() ); - } - if ( this.ldifTemplateContextTypeRegistry == null ) - { - this.ldifTemplateContextTypeRegistry = new ContributionContextTypeRegistry(); - - this.ldifTemplateContextTypeRegistry.addContextType( BrowserUIConstants.LDIF_FILE_TEMPLATE_ID ); - this.ldifTemplateContextTypeRegistry.getContextType( BrowserUIConstants.LDIF_FILE_TEMPLATE_ID ) - .addResolver( new GlobalTemplateVariables.Cursor() ); - - this.ldifTemplateContextTypeRegistry.addContextType( BrowserUIConstants.LDIF_ATTR_VAL_RECORD_TEMPLATE_ID ); - this.ldifTemplateContextTypeRegistry.getContextType( BrowserUIConstants.LDIF_ATTR_VAL_RECORD_TEMPLATE_ID ) - .addResolver( new GlobalTemplateVariables.Cursor() ); - - this.ldifTemplateContextTypeRegistry - .addContextType( BrowserUIConstants.LDIF_MODIFICATION_RECORD_TEMPLATE_ID ); - this.ldifTemplateContextTypeRegistry.getContextType( - BrowserUIConstants.LDIF_MODIFICATION_RECORD_TEMPLATE_ID ).addResolver( - new GlobalTemplateVariables.Cursor() ); - - this.ldifTemplateContextTypeRegistry.addContextType( BrowserUIConstants.LDIF_MODIFICATION_ITEM_TEMPLATE_ID ); - - this.ldifTemplateContextTypeRegistry.addContextType( BrowserUIConstants.LDIF_MODDN_RECORD_TEMPLATE_ID ); - } - if ( this.filterTemplateStore == null ) - { - this.filterTemplateStore = new ContributionTemplateStore( getFilterTemplateContextTypeRegistry(), - getPreferenceStore(), "templates" ); - try - { - this.filterTemplateStore.load(); - } - catch ( IOException e ) - { - e.printStackTrace(); - } - } - if ( this.ldifTemplateStore == null ) - { - this.ldifTemplateStore = new ContributionTemplateStore( getLdifTemplateContextTypeRegistry(), - getPreferenceStore(), "templates" ); - try - { - this.ldifTemplateStore.load(); - } - catch ( IOException e ) - { - e.printStackTrace(); - } - } - - BrowserCorePlugin.getDefault().setAuthHandler( new BrowserUIAuthHandler() ); - BrowserCorePlugin.getDefault().setReferralHandler( new BrowserUIReferralHandler() ); } @@ -203,58 +68,6 @@ public void stop( BundleContext context ) throws Exception { super.stop( context ); - - if ( this.eventDispatcher != null ) - { - this.eventDispatcher.stopEventDispatcher(); - this.eventDispatcher = null; - } - - if ( this.exceptionHandler != null ) - { - this.exceptionHandler = null; - } - - if ( this.fontRegistry != null ) - { - this.fontRegistry = null; - } - if ( this.colorRegistry != null ) - { - this.colorRegistry = null; - } - if ( this.filterTemplateContextTypeRegistry != null ) - { - this.filterTemplateContextTypeRegistry = null; - } - if ( this.ldifTemplateContextTypeRegistry != null ) - { - this.ldifTemplateContextTypeRegistry = null; - } - if ( this.filterTemplateStore != null ) - { - try - { - this.filterTemplateStore.save(); - } - catch ( IOException e ) - { - e.printStackTrace(); - } - this.filterTemplateStore = null; - } - if ( this.ldifTemplateStore != null ) - { - try - { - this.ldifTemplateStore.save(); - } - catch ( IOException e ) - { - e.printStackTrace(); - } - this.ldifTemplateStore = null; - } plugin = null; } @@ -268,34 +81,18 @@ } - public ResourceBundle getResourceBundle() - { - return resourceBundle; - } - - - public static String getResourceString( String key ) - { - ResourceBundle bundle = getDefault().getResourceBundle(); - try - { - return ( bundle != null ) ? bundle.getString( key ) : key; - } - catch ( MissingResourceException e ) - { - return key; - } - } - - - /** - * - * @return The exception handler - */ - public ExceptionHandler getExceptionHandler() - { - return this.exceptionHandler; - } +// public static String getResourceString( String key ) +// { +// ResourceBundle bundle = getDefault().getResourceBundle(); +// try +// { +// return ( bundle != null ) ? bundle.getString( key ) : key; +// } +// catch ( MissingResourceException e ) +// { +// return key; +// } +// } /** @@ -351,129 +148,4 @@ return image; } - - /** - * Use this method to get SWT fonts. A FontRegistry is used to manage - * the FontData[]->Font mapping. - *

- * Note: Don't dispose the returned SWT Font. It is disposed - * automatically when the plugin is stopped. - * - * @param fontData - * the font data - * @return The SWT Font - */ - - public Font getFont( FontData[] fontData ) - { - if ( !this.fontRegistry.hasValueFor( fontData[0].toString() ) ) - this.fontRegistry.put( fontData[0].toString(), fontData ); - - return this.fontRegistry.get( fontData[0].toString() ); - } - - - /** - * Use this method to get SWT colors. A ColorRegistry is used to manage - * the RGB->Color mapping. - *

- * Note: Don't dispose the returned color. It is disposed automatically - * when the plugin is stopped. - * - * @param rgb - * the rgb color data - * @return The SWT Color - */ - public Color getColor( RGB rgb ) - { - if ( !this.colorRegistry.hasValueFor( rgb.toString() ) ) - this.colorRegistry.put( rgb.toString(), rgb ); - - return this.colorRegistry.get( rgb.toString() ); - } - - - /** - * - * @return The filter template store - */ - public TemplateStore getFilterTemplateStore() - { - return this.filterTemplateStore; - } - - - /** - * - * @return The LDIF template store - */ - public TemplateStore getLdifTemplateStore() - { - return this.ldifTemplateStore; - } - - - /** - * - * @return The filter template context type registry - */ - public ContextTypeRegistry getFilterTemplateContextTypeRegistry() - { - return this.filterTemplateContextTypeRegistry; - } - - - /** - * - * @return The LDIF template context type registry - */ - public ContextTypeRegistry getLdifTemplateContextTypeRegistry() - { - return this.ldifTemplateContextTypeRegistry; - } - - - public BrowserUIPreferences getUIPreferences() - { - return this.uiPreferences; - } - - - /** - * Checks, if this plugins runs in the Eclipse IDE or in RCP environment. - * This is done by looking for the Resource perspective extensions. - * - * @return true if this plugin runs in IDE environment - */ - public static boolean isIDEEnvironment() - { - IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint( - "org.eclipse.ui.perspectives" ); - if ( extensionPoint != null ) - { - IExtension[] extensions = extensionPoint.getExtensions(); - if ( extensions != null ) - { - for ( int i = 0; i < extensions.length; i++ ) - { - IExtension extension = extensions[i]; - IConfigurationElement[] elements = extension.getConfigurationElements(); - for ( int j = 0; j < elements.length; j++ ) - { - IConfigurationElement element = elements[j]; - if ( element.getName().equals( "perspective" ) ) - { - if ( "org.eclipse.ui.resourcePerspective".equals( element.getAttribute( "id" ) ) ) - { - return true; - } - } - } - } - } - } - - return false; - } - } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIPreferencesInitializer.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIPreferencesInitializer.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIPreferencesInitializer.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIPreferencesInitializer.java Mon Apr 9 04:14:46 2007 @@ -21,21 +21,9 @@ package org.apache.directory.ldapstudio.browser.ui; -import java.util.ArrayList; -import java.util.Collection; - import org.apache.directory.ldapstudio.browser.core.BrowserCoreConstants; -import org.apache.directory.ldapstudio.browser.core.model.schema.AttributeValueProviderRelation; -import org.apache.directory.ldapstudio.browser.core.model.schema.SyntaxValueProviderRelation; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager.ValueEditorExtension; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferenceConverter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.FontData; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.widgets.Display; /** @@ -54,165 +42,13 @@ IPreferenceStore store = BrowserUIPlugin.getDefault().getPreferenceStore(); - // Common - store.setDefault( BrowserUIConstants.PREFERENCE_COUNT_LIMIT, 1000 ); - store.setDefault( BrowserUIConstants.PREFERENCE_TIME_LIMIT, 0 ); - - // Colors and Fonts - RGB rgbBlack = Display.getDefault().getSystemColor( SWT.COLOR_BLACK ).getRGB(); - RGB rgbRed = Display.getDefault().getSystemColor( SWT.COLOR_RED ).getRGB(); - RGB rgbYellow = Display.getDefault().getSystemColor( SWT.COLOR_YELLOW ).getRGB(); - FontData[] fontData = Display.getDefault().getSystemFont().getFontData(); - FontData fontDataNormal = new FontData( fontData[0].getName(), fontData[0].getHeight(), SWT.NORMAL ); - FontData fontDataItalic = new FontData( fontData[0].getName(), fontData[0].getHeight(), SWT.ITALIC ); - FontData fontDataBold = new FontData( fontData[0].getName(), fontData[0].getHeight(), SWT.BOLD ); - FontData fontDataBoldItalic = new FontData( fontData[0].getName(), fontData[0].getHeight(), SWT.BOLD - | SWT.ITALIC ); - // Attributes colors and fonts - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_OBJECTCLASS_COLOR, rgbBlack ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_OBJECTCLASS_FONT, fontDataBoldItalic ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_MUSTATTRIBUTE_COLOR, rgbBlack ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_MUSTATTRIBUTE_FONT, fontDataBold ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_MAYATTRIBUTE_COLOR, rgbBlack ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_MAYATTRIBUTE_FONT, fontDataNormal ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_OPERATIONALATTRIBUTE_COLOR, rgbBlack ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_OPERATIONALATTRIBUTE_FONT, fontDataItalic ); - // Error/Warning colors and fonts - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_WARNING_FONT, fontDataBoldItalic ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_WARNING_COLOR, rgbYellow ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_ERROR_FONT, fontDataBoldItalic ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_ERROR_COLOR, rgbRed ); - // Quick filter background colors and fonts - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_QUICKFILTER_FONT, fontDataBold ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_QUICKFILTER_BACKGROUND_COLOR, rgbYellow ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_QUICKFILTER_FOREGROUND_COLOR, rgbBlack ); - - // Attributes - store.setDefault( BrowserUIConstants.PREFERENCE_SHOW_RAW_VALUES, false ); - - // Value Editors - Collection avprs = new ArrayList(); - Collection svprs = new ArrayList(); - Collection valueEditorProxys = ValueEditorManager.getValueEditorProxys(); - for ( ValueEditorExtension proxy : valueEditorProxys ) - { - for ( String attributeType : proxy.attributeTypes ) - { - AttributeValueProviderRelation avpr = new AttributeValueProviderRelation( attributeType, - proxy.className ); - avprs.add( avpr ); - } - for ( String syntaxOid : proxy.syntaxOids ) - { - SyntaxValueProviderRelation svpr = new SyntaxValueProviderRelation( syntaxOid, proxy.className ); - svprs.add( svpr ); - } - } - BrowserUIPlugin.getDefault().getUIPreferences().setDefaultAttributeValueProviderRelations( - avprs.toArray( new AttributeValueProviderRelation[0] ) ); - BrowserUIPlugin.getDefault().getUIPreferences().setDefaultSyntaxValueProviderRelations( - svprs.toArray( new SyntaxValueProviderRelation[0] ) ); - // Browser - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_EXPAND_BASE_ENTRIES, false ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_ENABLE_FOLDING, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_FOLDING_SIZE, 100 ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_ENTRY_LABEL, BrowserUIConstants.SHOW_RDN ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_ENTRY_ABBREVIATE, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_ENTRY_ABBREVIATE_MAX_LENGTH, 50 ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SEARCH_RESULT_LABEL, BrowserUIConstants.SHOW_DN ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SEARCH_RESULT_ABBREVIATE, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SEARCH_RESULT_ABBREVIATE_MAX_LENGTH, 50 ); store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_LINK_WITH_EDITOR, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SHOW_DIT, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SHOW_SEARCHES, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SHOW_BOOKMARKS, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SHOW_DIRECTORY_META_ENTRIES, false ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SORT_BY, BrowserCoreConstants.SORT_BY_RDN_VALUE ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SORT_ORDER, BrowserCoreConstants.SORT_ORDER_ASCENDING ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_SORT_LIMIT, 10000 ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_LEAF_ENTRIES_FIRST, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_BROWSER_META_ENTRIES_LAST, true ); - - // Entry Editor - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_ENABLE_FOLDING, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_FOLDING_THRESHOLD, 10 ); - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_SHOW_OBJECTCLASS_ATTRIBUTES, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_SHOW_MUST_ATTRIBUTES, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_SHOW_MAY_ATTRIBUTES, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES, false ); - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_OBJECTCLASS_AND_MUST_ATTRIBUTES_FIRST, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_OPERATIONAL_ATTRIBUTES_LAST, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_DEFAULT_SORT_BY, - BrowserCoreConstants.SORT_BY_ATTRIBUTE_DESCRIPTION ); - store.setDefault( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_DEFAULT_SORT_ORDER, - BrowserCoreConstants.SORT_ORDER_ASCENDING ); // Search Result Editor store.setDefault( BrowserUIConstants.PREFERENCE_SEARCHRESULTEDITOR_SHOW_DN, true ); store.setDefault( BrowserUIConstants.PREFERENCE_SEARCHRESULTEDITOR_SHOW_LINKS, true ); - // Text Format - store.setDefault( BrowserUIConstants.PREFERENCE_FORMAT_TABLE_ATTRIBUTEDELIMITER, "\t" ); - store.setDefault( BrowserUIConstants.PREFERENCE_FORMAT_TABLE_VALUEDELIMITER, "|" ); - store.setDefault( BrowserUIConstants.PREFERENCE_FORMAT_TABLE_QUOTECHARACTER, "\"" ); - store - .setDefault( BrowserUIConstants.PREFERENCE_FORMAT_TABLE_LINESEPARATOR, BrowserCoreConstants.LINE_SEPARATOR ); - store.setDefault( BrowserUIConstants.PREFERENCE_FORMAT_TABLE_BINARYENCODING, - BrowserCoreConstants.BINARYENCODING_IGNORE ); - - // LDIF Editor - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_FORMATTER_AUTOWRAP, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_FOLDING_ENABLE, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_FOLDING_INITIALLYFOLDCOMMENTS, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_FOLDING_INITIALLYFOLDRECORDS, false ); - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_FOLDING_INITIALLYFOLDWRAPPEDLINES, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_DOUBLECLICK_USELDIFDOUBLECLICK, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_INSERTSINGLEPROPOSALAUTO, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_ENABLEAUTOACTIVATION, true ); - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_AUTOACTIVATIONDELAY, 200 ); - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_SMARTINSERTATTRIBUTEINMODSPEC, true ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_COMMENT - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 63, 127, 95 ) );// green - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_COMMENT - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.NORMAL ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_KEYWORD - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 128, 128, 128 ) );// gray - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_KEYWORD - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.BOLD ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_DN - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 0, 0, 0 ) );// black - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_DN - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.BOLD ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_ATTRIBUTE - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 127, 0, 85 ) );// violett - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_ATTRIBUTE - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.BOLD ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_VALUETYPE - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 255, 0, 0 ) );// red - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_VALUETYPE - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.BOLD ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_VALUE - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 0, 0, 192 ) );// blue - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_VALUE - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.NORMAL ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEADD - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 123, 170, 91 ) );// green - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEADD - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.BOLD ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEMODIFY - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 214, 160, 100 ) );// yellow - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEMODIFY - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.BOLD ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEDELETE - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 242, 70, 86 ) );// red - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEDELETE - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.BOLD ); - PreferenceConverter.setDefault( store, BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEMODDN - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, new RGB( 127, 159, 191 ) );// bright - // blue - store.setDefault( BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEMODDN - + BrowserUIConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, SWT.BOLD ); } } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyAttributeDescriptionAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyAttributeDescriptionAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyAttributeDescriptionAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyAttributeDescriptionAction.java Mon Apr 9 04:14:46 2007 @@ -25,6 +25,8 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.actions.CopyAction; import org.apache.directory.ldapstudio.browser.core.BrowserCoreConstants; import org.apache.directory.ldapstudio.browser.core.model.IAttribute; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyDnAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyDnAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyDnAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyDnAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.actions.CopyAction; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; import org.eclipse.jface.resource.ImageDescriptor; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyEntryAsAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyEntryAsAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyEntryAsAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyEntryAsAction.java Mon Apr 9 04:14:46 2007 @@ -24,14 +24,14 @@ import java.util.ArrayList; import java.util.List; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.jobs.RunnableContextJobAdapter; import org.apache.directory.ldapstudio.browser.core.jobs.InitializeAttributesJob; import org.apache.directory.ldapstudio.browser.core.jobs.ReadEntryJob; import org.apache.directory.ldapstudio.browser.core.model.IEntry; import org.apache.directory.ldapstudio.browser.core.model.ISearchResult; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.jobs.RunnableContextJobAdapter; - import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; @@ -231,7 +231,7 @@ public boolean isEnabled() { boolean showOperational = BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( - BrowserUIConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ); + BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ); if ( getSelectedSearchResults().length > 0 && getSelectedEntries().length + getSelectedBookmarks().length + getSelectedSearches().length == 0 ) Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyEntryAsCsvAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyEntryAsCsvAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyEntryAsCsvAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyEntryAsCsvAction.java Mon Apr 9 04:14:46 2007 @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; import org.apache.directory.ldapstudio.browser.core.internal.model.AttributeComparator; import org.apache.directory.ldapstudio.browser.core.model.AttributeHierarchy; import org.apache.directory.ldapstudio.browser.core.model.IAttribute; @@ -38,7 +40,6 @@ import org.apache.directory.ldapstudio.browser.core.utils.LdifUtils; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; - import org.eclipse.jface.resource.ImageDescriptor; @@ -169,16 +170,16 @@ public void serialializeEntries( IEntry[] entries, StringBuffer text ) { - String attributeDelimiter = BrowserUIPlugin.getDefault().getPreferenceStore().getString( - BrowserUIConstants.PREFERENCE_FORMAT_TABLE_ATTRIBUTEDELIMITER ); - String valueDelimiter = BrowserUIPlugin.getDefault().getPreferenceStore().getString( - BrowserUIConstants.PREFERENCE_FORMAT_TABLE_VALUEDELIMITER ); - String quoteCharacter = BrowserUIPlugin.getDefault().getPreferenceStore().getString( - BrowserUIConstants.PREFERENCE_FORMAT_TABLE_QUOTECHARACTER ); - String lineSeparator = BrowserUIPlugin.getDefault().getPreferenceStore().getString( - BrowserUIConstants.PREFERENCE_FORMAT_TABLE_LINESEPARATOR ); - int binaryEncoding = BrowserUIPlugin.getDefault().getPreferenceStore().getInt( - BrowserUIConstants.PREFERENCE_FORMAT_TABLE_BINARYENCODING ); + String attributeDelimiter = BrowserCommonActivator.getDefault().getPreferenceStore().getString( + BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_ATTRIBUTEDELIMITER ); + String valueDelimiter = BrowserCommonActivator.getDefault().getPreferenceStore().getString( + BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_VALUEDELIMITER ); + String quoteCharacter = BrowserCommonActivator.getDefault().getPreferenceStore().getString( + BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_QUOTECHARACTER ); + String lineSeparator = BrowserCommonActivator.getDefault().getPreferenceStore().getString( + BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_LINESEPARATOR ); + int binaryEncoding = BrowserCommonActivator.getDefault().getPreferenceStore().getInt( + BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_BINARYENCODING ); String[] returningAttributes = null; if ( this.mode == MODE_DN_ONLY ) Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopySearchFilterAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopySearchFilterAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopySearchFilterAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopySearchFilterAction.java Mon Apr 9 04:14:46 2007 @@ -25,6 +25,8 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.actions.CopyAction; import org.apache.directory.ldapstudio.browser.core.model.IAttribute; import org.apache.directory.ldapstudio.browser.core.model.IValue; import org.apache.directory.ldapstudio.browser.core.utils.LdapFilterUtils; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyUrlAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyUrlAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyUrlAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyUrlAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.actions.CopyAction; import org.apache.directory.ldapstudio.browser.core.model.URL; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyValueAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyValueAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyValueAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/CopyValueAction.java Mon Apr 9 04:14:46 2007 @@ -26,6 +26,8 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.actions.CopyAction; import org.apache.directory.ldapstudio.browser.core.BrowserCoreConstants; import org.apache.directory.ldapstudio.browser.core.model.DN; import org.apache.directory.ldapstudio.browser.core.model.IAttribute; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/ImportExportAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/ImportExportAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/ImportExportAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/ImportExportAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; import org.apache.directory.ldapstudio.browser.core.model.IConnection; import org.apache.directory.ldapstudio.browser.core.model.IEntry; import org.apache.directory.ldapstudio.browser.core.model.ISearch; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/LocateInDitAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/LocateInDitAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/LocateInDitAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/LocateInDitAction.java Mon Apr 9 04:14:46 2007 @@ -21,11 +21,12 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.jobs.RunnableContextJobAdapter; import org.apache.directory.ldapstudio.browser.core.jobs.ReadEntryJob; import org.apache.directory.ldapstudio.browser.core.model.DN; import org.apache.directory.ldapstudio.browser.core.model.IConnection; import org.apache.directory.ldapstudio.browser.core.model.IEntry; -import org.apache.directory.ldapstudio.browser.ui.jobs.RunnableContextJobAdapter; import org.apache.directory.ldapstudio.browser.ui.views.browser.BrowserView; import org.eclipse.ui.IViewPart; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/MoveAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/MoveAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/MoveAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/MoveAction.java Mon Apr 9 04:14:46 2007 @@ -23,13 +23,14 @@ import java.util.LinkedHashSet; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.dialogs.MoveEntriesDialog; import org.apache.directory.ldapstudio.browser.core.internal.model.RootDSE; import org.apache.directory.ldapstudio.browser.core.jobs.MoveEntriesJob; import org.apache.directory.ldapstudio.browser.core.model.DN; import org.apache.directory.ldapstudio.browser.core.model.IBookmark; import org.apache.directory.ldapstudio.browser.core.model.IEntry; import org.apache.directory.ldapstudio.browser.core.model.ISearch; -import org.apache.directory.ldapstudio.browser.ui.dialogs.MoveEntriesDialog; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewBatchOperationAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewBatchOperationAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewBatchOperationAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewBatchOperationAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; import org.apache.directory.ldapstudio.browser.ui.wizards.BatchOperationWizard; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewBookmarkAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewBookmarkAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewBookmarkAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewBookmarkAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; import org.apache.directory.ldapstudio.browser.ui.wizards.NewBookmarkWizard; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewEntryAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewEntryAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewEntryAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewEntryAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; import org.apache.directory.ldapstudio.browser.ui.wizards.NewEntryWizard; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewLdifFileAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewLdifFileAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewLdifFileAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewLdifFileAction.java Mon Apr 9 04:14:46 2007 @@ -21,10 +21,11 @@ package org.apache.directory.ldapstudio.browser.ui.actions; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.editors.ldif.LdifEditor; -import org.apache.directory.ldapstudio.browser.ui.editors.ldif.NonExistingLdifEditorInput; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.ldifeditor.LdifEditorActivator; +import org.apache.directory.ldapstudio.ldifeditor.LdifEditorConstants; +import org.apache.directory.ldapstudio.ldifeditor.editor.LdifEditor; +import org.apache.directory.ldapstudio.ldifeditor.editor.NonExistingLdifEditorInput; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IWorkbenchPage; @@ -82,7 +83,7 @@ */ public ImageDescriptor getImageDescriptor() { - return BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_LDIFEDITOR_NEW ); + return LdifEditorActivator.getDefault().getImageDescriptor( LdifEditorConstants.IMG_LDIFEDITOR_NEW ); } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewSearchAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewSearchAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewSearchAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewSearchAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; import org.apache.directory.ldapstudio.browser.ui.search.SearchPage; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenEncoderDecoderDialogAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenEncoderDecoderDialogAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenEncoderDecoderDialogAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenEncoderDecoderDialogAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; import org.apache.directory.ldapstudio.browser.ui.dialogs.EncoderDecoderDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.PlatformUI; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenSchemaBrowserAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenSchemaBrowserAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenSchemaBrowserAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenSchemaBrowserAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; import org.apache.directory.ldapstudio.browser.core.model.IConnection; import org.apache.directory.ldapstudio.browser.core.model.schema.AttributeTypeDescription; import org.apache.directory.ldapstudio.browser.core.model.schema.LdapSyntaxDescription; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenSearchResultAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenSearchResultAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenSearchResultAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/OpenSearchResultAction.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.actions; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; import org.apache.directory.ldapstudio.browser.ui.views.browser.BrowserView; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/proxy/ModificationLogsViewActionProxy.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/proxy/ModificationLogsViewActionProxy.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/proxy/ModificationLogsViewActionProxy.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/proxy/ModificationLogsViewActionProxy.java Mon Apr 9 04:14:46 2007 @@ -21,7 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.actions.proxy; -import org.apache.directory.ldapstudio.browser.ui.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.actions.proxy.BrowserActionProxy; import org.eclipse.jface.viewers.Viewer; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/proxy/SearchResultEditorActionProxy.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/proxy/SearchResultEditorActionProxy.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/proxy/SearchResultEditorActionProxy.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/proxy/SearchResultEditorActionProxy.java Mon Apr 9 04:14:46 2007 @@ -21,7 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.actions.proxy; -import org.apache.directory.ldapstudio.browser.ui.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.actions.BrowserAction; +import org.apache.directory.ldapstudio.browser.common.actions.proxy.BrowserActionProxy; import org.apache.directory.ldapstudio.browser.ui.editors.searchresult.SearchResultEditorCursor; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/EncoderDecoderDialog.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/EncoderDecoderDialog.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/EncoderDecoderDialog.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/EncoderDecoderDialog.java Mon Apr 9 04:14:46 2007 @@ -21,10 +21,10 @@ package org.apache.directory.ldapstudio.browser.ui.dialogs; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; import org.apache.directory.ldapstudio.browser.core.utils.LdifUtils; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; @@ -70,7 +70,7 @@ { super.configureShell( shell ); shell.setText( DIALOG_TITLE ); - shell.setImage( BrowserUIPlugin.getDefault().getImage( BrowserUIConstants.IMG_IMAGEEDITOR ) ); + //shell.setImage( BrowserUIPlugin.getDefault().getImage( BrowserUIConstants.IMG_IMAGEEDITOR ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/preferences/SearchResultEditorPreferencePage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/preferences/SearchResultEditorPreferencePage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/preferences/SearchResultEditorPreferencePage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/preferences/SearchResultEditorPreferencePage.java Mon Apr 9 04:14:46 2007 @@ -21,11 +21,11 @@ package org.apache.directory.ldapstudio.browser.ui.dialogs.preferences; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; +import org.apache.directory.ldapstudio.browser.common.widgets.WidgetModifyEvent; +import org.apache.directory.ldapstudio.browser.common.widgets.WidgetModifyListener; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; -import org.apache.directory.ldapstudio.browser.ui.widgets.WidgetModifyEvent; -import org.apache.directory.ldapstudio.browser.ui.widgets.WidgetModifyListener; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/AttributePropertyPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/AttributePropertyPage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/AttributePropertyPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/AttributePropertyPage.java Mon Apr 9 04:14:46 2007 @@ -23,11 +23,11 @@ import java.util.Arrays; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; import org.apache.directory.ldapstudio.browser.core.model.IAttribute; import org.apache.directory.ldapstudio.browser.core.model.IValue; import org.apache.directory.ldapstudio.browser.core.model.schema.AttributeTypeDescription; import org.apache.directory.ldapstudio.browser.core.utils.Utils; -import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.swt.events.SelectionAdapter; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/BookmarkPropertyPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/BookmarkPropertyPage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/BookmarkPropertyPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/BookmarkPropertyPage.java Mon Apr 9 04:14:46 2007 @@ -21,12 +21,12 @@ package org.apache.directory.ldapstudio.browser.ui.dialogs.properties; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; +import org.apache.directory.ldapstudio.browser.common.widgets.WidgetModifyEvent; +import org.apache.directory.ldapstudio.browser.common.widgets.WidgetModifyListener; +import org.apache.directory.ldapstudio.browser.common.widgets.search.EntryWidget; import org.apache.directory.ldapstudio.browser.core.model.IBookmark; import org.apache.directory.ldapstudio.browser.core.utils.Utils; -import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; -import org.apache.directory.ldapstudio.browser.ui.widgets.WidgetModifyEvent; -import org.apache.directory.ldapstudio.browser.ui.widgets.WidgetModifyListener; -import org.apache.directory.ldapstudio.browser.ui.widgets.search.EntryWidget; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.swt.events.ModifyEvent; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/ConnectionPropertyPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/ConnectionPropertyPage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/ConnectionPropertyPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/ConnectionPropertyPage.java Mon Apr 9 04:14:46 2007 @@ -21,12 +21,12 @@ package org.apache.directory.ldapstudio.browser.ui.dialogs.properties; +import org.apache.directory.ldapstudio.browser.common.widgets.connection.ConnectionPageModifyListener; +import org.apache.directory.ldapstudio.browser.common.widgets.connection.ConnectionPageWrapper; import org.apache.directory.ldapstudio.browser.core.model.DN; import org.apache.directory.ldapstudio.browser.core.model.IConnection; import org.apache.directory.ldapstudio.browser.core.model.NameException; import org.apache.directory.ldapstudio.browser.core.utils.Utils; -import org.apache.directory.ldapstudio.browser.ui.widgets.connection.ConnectionPageModifyListener; -import org.apache.directory.ldapstudio.browser.ui.widgets.connection.ConnectionPageWrapper; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.swt.SWT; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/EntryPropertyPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/EntryPropertyPage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/EntryPropertyPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/EntryPropertyPage.java Mon Apr 9 04:14:46 2007 @@ -21,6 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.dialogs.properties; +import org.apache.directory.ldapstudio.browser.common.jobs.RunnableContextJobAdapter; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; import org.apache.directory.ldapstudio.browser.core.events.EntryModificationEvent; import org.apache.directory.ldapstudio.browser.core.jobs.InitializeAttributesJob; import org.apache.directory.ldapstudio.browser.core.jobs.InitializeChildrenJob; @@ -28,8 +30,6 @@ import org.apache.directory.ldapstudio.browser.core.model.IEntry; import org.apache.directory.ldapstudio.browser.core.model.IValue; import org.apache.directory.ldapstudio.browser.core.utils.Utils; -import org.apache.directory.ldapstudio.browser.ui.jobs.RunnableContextJobAdapter; -import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.swt.SWT; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/RootDSEPropertyPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/RootDSEPropertyPage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/RootDSEPropertyPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/RootDSEPropertyPage.java Mon Apr 9 04:14:46 2007 @@ -25,13 +25,13 @@ import java.util.Arrays; import java.util.List; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.EntryEditorWidgetTableMetadata; import org.apache.directory.ldapstudio.browser.core.internal.model.RootDSE; import org.apache.directory.ldapstudio.browser.core.model.IAttribute; import org.apache.directory.ldapstudio.browser.core.model.IConnection; import org.apache.directory.ldapstudio.browser.core.model.IEntry; import org.apache.directory.ldapstudio.browser.core.model.IValue; -import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; -import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EntryEditorWidgetTableMetadata; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.IStructuredContentProvider; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SchemaPropertyPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SchemaPropertyPage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SchemaPropertyPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SchemaPropertyPage.java Mon Apr 9 04:14:46 2007 @@ -25,13 +25,13 @@ import java.text.DateFormat; import java.util.Date; +import org.apache.directory.ldapstudio.browser.common.jobs.RunnableContextJobAdapter; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; import org.apache.directory.ldapstudio.browser.core.ConnectionManager; import org.apache.directory.ldapstudio.browser.core.jobs.ReloadSchemasJob; import org.apache.directory.ldapstudio.browser.core.model.IConnection; import org.apache.directory.ldapstudio.browser.core.model.schema.Schema; import org.apache.directory.ldapstudio.browser.core.utils.Utils; -import org.apache.directory.ldapstudio.browser.ui.jobs.RunnableContextJobAdapter; -import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SearchPropertyPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SearchPropertyPage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SearchPropertyPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SearchPropertyPage.java Mon Apr 9 04:14:46 2007 @@ -21,15 +21,15 @@ package org.apache.directory.ldapstudio.browser.ui.dialogs.properties; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; +import org.apache.directory.ldapstudio.browser.common.widgets.WidgetModifyEvent; +import org.apache.directory.ldapstudio.browser.common.widgets.WidgetModifyListener; +import org.apache.directory.ldapstudio.browser.common.widgets.search.SearchPageWrapper; import org.apache.directory.ldapstudio.browser.core.events.EventRegistry; import org.apache.directory.ldapstudio.browser.core.events.SearchUpdateEvent; import org.apache.directory.ldapstudio.browser.core.internal.model.Search; import org.apache.directory.ldapstudio.browser.core.model.ISearch; import org.apache.directory.ldapstudio.browser.core.utils.Utils; -import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; -import org.apache.directory.ldapstudio.browser.ui.widgets.WidgetModifyEvent; -import org.apache.directory.ldapstudio.browser.ui.widgets.WidgetModifyListener; -import org.apache.directory.ldapstudio.browser.ui.widgets.search.SearchPageWrapper; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/ValuePropertyPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/ValuePropertyPage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/ValuePropertyPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/ValuePropertyPage.java Mon Apr 9 04:14:46 2007 @@ -21,9 +21,9 @@ package org.apache.directory.ldapstudio.browser.ui.dialogs.properties; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; import org.apache.directory.ldapstudio.browser.core.model.IValue; import org.apache.directory.ldapstudio.browser.core.utils.Utils; -import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.dialogs.IDialogConstants; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditor.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditor.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditor.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditor.java Mon Apr 9 04:14:46 2007 @@ -21,11 +21,10 @@ package org.apache.directory.ldapstudio.browser.ui.editors.entry; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.EntryEditorWidget; import org.apache.directory.ldapstudio.browser.core.model.IEntry; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.editors.ldif.LdifOutlinePage; import org.apache.directory.ldapstudio.browser.ui.views.browser.BrowserView; -import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EntryEditorWidget; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -68,7 +67,7 @@ private EntryEditorUniversalListener universalListener; /** The outline page. */ - private LdifOutlinePage outlinePage; + private EntryEditorOutlinePage outlinePage; /** @@ -193,7 +192,7 @@ { if ( outlinePage == null || outlinePage.getControl() == null || outlinePage.getControl().isDisposed() ) { - outlinePage = new LdifOutlinePage( this ); + outlinePage = new EntryEditorOutlinePage( this ); } return outlinePage; } @@ -320,7 +319,7 @@ * * @return the outline page */ - public LdifOutlinePage getOutlinePage() + public EntryEditorOutlinePage getOutlinePage() { return outlinePage; } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorActionGroup.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorActionGroup.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorActionGroup.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorActionGroup.java Mon Apr 9 04:14:46 2007 @@ -24,26 +24,26 @@ import java.util.Iterator; import org.apache.directory.ldapstudio.browser.core.model.IEntry; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.actions.CollapseAllAction; import org.apache.directory.ldapstudio.browser.ui.actions.CopyAttributeDescriptionAction; import org.apache.directory.ldapstudio.browser.ui.actions.CopyDnAction; import org.apache.directory.ldapstudio.browser.ui.actions.CopySearchFilterAction; import org.apache.directory.ldapstudio.browser.ui.actions.CopyUrlAction; import org.apache.directory.ldapstudio.browser.ui.actions.CopyValueAction; -import org.apache.directory.ldapstudio.browser.ui.actions.DeleteAllValuesAction; import org.apache.directory.ldapstudio.browser.ui.actions.ExpandAllAction; import org.apache.directory.ldapstudio.browser.ui.actions.LocateDnInDitAction; -import org.apache.directory.ldapstudio.browser.ui.actions.NewAttributeAction; import org.apache.directory.ldapstudio.browser.ui.actions.NewBatchOperationAction; import org.apache.directory.ldapstudio.browser.ui.actions.NewSearchAction; import org.apache.directory.ldapstudio.browser.ui.actions.OpenSchemaBrowserAction; -import org.apache.directory.ldapstudio.browser.ui.actions.RefreshAction; -import org.apache.directory.ldapstudio.browser.ui.actions.proxy.EntryEditorActionProxy; -import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EditAttributeDescriptionAction; -import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EntryEditorWidgetActionGroup; -import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.OpenDefaultEditorAction; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; +import org.apache.directory.ldapstudio.browser.common.actions.CollapseAllAction; +import org.apache.directory.ldapstudio.browser.common.actions.DeleteAllValuesAction; +import org.apache.directory.ldapstudio.browser.common.actions.NewAttributeAction; +import org.apache.directory.ldapstudio.browser.common.actions.RefreshAction; +import org.apache.directory.ldapstudio.browser.common.actions.proxy.EntryEditorActionProxy; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.EditAttributeDescriptionAction; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.EntryEditorWidgetActionGroup; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.OpenDefaultEditorAction; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; @@ -283,10 +283,10 @@ { public void menuAboutToShow( IMenuManager manager ) { - showRawValuesAction.setChecked( BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( - BrowserUIConstants.PREFERENCE_SHOW_RAW_VALUES ) ); - showOperationalAttributesAction.setChecked( BrowserUIPlugin.getDefault().getPreferenceStore() - .getBoolean( BrowserUIConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ) ); + showRawValuesAction.setChecked( BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( + BrowserCommonConstants.PREFERENCE_SHOW_RAW_VALUES ) ); + showOperationalAttributesAction.setChecked( BrowserCommonActivator.getDefault().getPreferenceStore() + .getBoolean( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ) ); } } ); menuManager.update( true ); Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorConfiguration.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorConfiguration.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorConfiguration.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorConfiguration.java Mon Apr 9 04:14:46 2007 @@ -21,8 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.editors.entry; -import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EntryEditorWidgetConfiguration; -import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EntryEditorWidgetFilter; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.EntryEditorWidgetConfiguration; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.EntryEditorWidgetFilter; /** Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorFilter.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorFilter.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorFilter.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorFilter.java Mon Apr 9 04:14:46 2007 @@ -21,8 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.editors.entry; -import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EntryEditorWidgetFilter; -import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EntryEditorWidgetPreferences; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.EntryEditorWidgetFilter; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.EntryEditorWidgetPreferences; /**