Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 70691 invoked from network); 9 Apr 2007 11:15:24 -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:24 -0000 Received: (qmail 69614 invoked by uid 500); 9 Apr 2007 11:15:30 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 69565 invoked by uid 500); 9 Apr 2007 11:15:30 -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 69449 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 D66611A9844; Mon, 9 Apr 2007 04:14:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r526712 [3/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.D66611A9844@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Added: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorOutlinePage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorOutlinePage.java?view=auto&rev=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorOutlinePage.java (added) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorOutlinePage.java Mon Apr 9 04:14:46 2007 @@ -0,0 +1,509 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.directory.ldapstudio.browser.ui.editors.entry; + + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.apache.directory.ldapstudio.browser.core.model.IAttribute; +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.model.ldif.LdifFile; +import org.apache.directory.ldapstudio.browser.core.model.ldif.container.LdifChangeAddRecord; +import org.apache.directory.ldapstudio.browser.core.model.ldif.container.LdifChangeDeleteRecord; +import org.apache.directory.ldapstudio.browser.core.model.ldif.container.LdifChangeModDnRecord; +import org.apache.directory.ldapstudio.browser.core.model.ldif.container.LdifChangeModifyRecord; +import org.apache.directory.ldapstudio.browser.core.model.ldif.container.LdifContentRecord; +import org.apache.directory.ldapstudio.browser.core.model.ldif.container.LdifModSpec; +import org.apache.directory.ldapstudio.browser.core.model.ldif.container.LdifRecord; +import org.apache.directory.ldapstudio.browser.core.model.ldif.lines.LdifAttrValLine; +import org.apache.directory.ldapstudio.browser.core.model.ldif.parser.LdifParser; +import org.apache.directory.ldapstudio.browser.core.utils.Utils; +import org.apache.directory.ldapstudio.browser.ui.actions.CopyEntryAsLdifAction; +import org.apache.directory.ldapstudio.ldifeditor.LdifEditorActivator; +import org.apache.directory.ldapstudio.ldifeditor.LdifEditorConstants; +import org.eclipse.jface.viewers.DoubleClickEvent; +import org.eclipse.jface.viewers.IDoubleClickListener; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.views.contentoutline.ContentOutlinePage; + + +/** + * This class implements the Outline Page for the Entry Editor. + * It used to display LDAP entries. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class EntryEditorOutlinePage extends ContentOutlinePage +{ + /** The editor it is attached to */ + private EntryEditor entryEditor; + + + /** + * Creates a new instance of EntryEditorOutlinePage. + * + * @param entryEditor + * the editor the Outline page is attached to + */ + public EntryEditorOutlinePage( EntryEditor entryEditor ) + { + this.entryEditor = entryEditor; + } + + + /* (non-Javadoc) + * @see org.eclipse.ui.views.contentoutline.ContentOutlinePage#createControl(org.eclipse.swt.widgets.Composite) + */ + public void createControl( Composite parent ) + { + super.createControl( parent ); + + final TreeViewer treeViewer = getTreeViewer(); + treeViewer.setLabelProvider( new LdifLabelProvider() ); + treeViewer.setContentProvider( new LdifContentProvider() ); + // treeViewer.setAutoExpandLevel(1); + + treeViewer.addSelectionChangedListener( new ISelectionChangedListener() + { + public void selectionChanged( SelectionChangedEvent event ) + { + if ( !event.getSelection().isEmpty() && event.getSelection() instanceof IStructuredSelection ) + { + + Object o = entryEditor.getMainWidget().getViewer().getInput(); + if ( o != null && o instanceof IEntry ) + { + IEntry entry = ( IEntry ) o; + IAttribute[] attributes = entry.getAttributes(); + + List selectionList = new ArrayList(); + + Iterator it = ( ( IStructuredSelection ) event.getSelection() ).iterator(); + while ( it.hasNext() ) + { + Object element = it.next(); + + if ( element instanceof LdifAttrValLine ) + { + // select the value + LdifAttrValLine line = ( LdifAttrValLine ) element; + for ( int a = 0; a < attributes.length; a++ ) + { + IAttribute attribute = attributes[a]; + if ( attribute.getDescription().equals( line.getUnfoldedAttributeDescription() ) ) + { + IValue[] values = attribute.getValues(); + for ( int v = 0; v < values.length; v++ ) + { + IValue value = values[v]; + if ( value.getStringValue().equals( line.getValueAsString() ) ) + { + selectionList.add( value ); + } + } + } + } + } + else if ( element instanceof List ) + { + // select attribute and all values + List list = ( List ) element; + if ( !list.isEmpty() && list.get( 0 ) instanceof LdifAttrValLine ) + { + LdifAttrValLine line = ( LdifAttrValLine ) list.get( 0 ); + for ( int a = 0; a < attributes.length; a++ ) + { + IAttribute attribute = attributes[a]; + if ( attribute.getDescription().equals( + line.getUnfoldedAttributeDescription() ) ) + { + selectionList.add( attribute ); + selectionList.addAll( Arrays.asList( attribute.getValues() ) ); + } + } + } + } + else if ( element instanceof LdifRecord ) + { + for ( int a = 0; a < attributes.length; a++ ) + { + IAttribute attribute = attributes[a]; + selectionList.add( attribute ); + selectionList.addAll( Arrays.asList( attribute.getValues() ) ); + } + } + } + + IStructuredSelection selection = new StructuredSelection( selectionList ); + entryEditor.getMainWidget().getViewer().setSelection( selection ); + } + } + } + } ); + + treeViewer.addDoubleClickListener( new IDoubleClickListener() + { + public void doubleClick( DoubleClickEvent event ) + { + if ( event.getSelection() instanceof IStructuredSelection ) + { + Object obj = ( ( IStructuredSelection ) event.getSelection() ).getFirstElement(); + if ( treeViewer.getExpandedState( obj ) ) + treeViewer.collapseToLevel( obj, 1 ); + else if ( ( ( ITreeContentProvider ) treeViewer.getContentProvider() ).hasChildren( obj ) ) + treeViewer.expandToLevel( obj, 1 ); + } + } + } ); + + this.refresh(); + } + + + /** + * Refreshes this viewer starting with the given element. + * + * @param element + * the element + */ + public void refresh( Object element ) + { + final TreeViewer treeViewer = getTreeViewer(); + if ( treeViewer != null && treeViewer.getTree() != null && !treeViewer.getTree().isDisposed() ) + { + treeViewer.refresh( element ); + } + } + + + /** + * Refreshes this viewer completely with information freshly obtained from this viewer's model. + */ + public void refresh() + { + final TreeViewer treeViewer = getTreeViewer(); + + if ( treeViewer != null && treeViewer.getTree() != null && !treeViewer.getTree().isDisposed() ) + { + // ISelection selection = treeViewer.getSelection(); + // Object[] expandedElements = treeViewer.getExpandedElements(); + + if ( !treeViewer.getTree().isEnabled() ) + { + treeViewer.getTree().setEnabled( true ); + } + + if ( entryEditor != null ) + { + Object o = entryEditor.getMainWidget().getViewer().getInput(); + + if ( o == null ) + { + treeViewer.setInput( null ); + treeViewer.getTree().setEnabled( false ); + } + else + { + if ( o instanceof IEntry ) + { + StringBuffer sb = new StringBuffer(); + new CopyEntryAsLdifAction( CopyEntryAsLdifAction.MODE_INCLUDE_OPERATIONAL_ATTRIBUTES ) + .serialializeEntries( new IEntry[] + { ( IEntry ) o }, sb ); + LdifFile model = new LdifParser().parse( sb.toString() ); + treeViewer.setInput( model ); + treeViewer.expandToLevel( 2 ); + } + } + } + + treeViewer.refresh(); + + // treeViewer.setSelection(selection); + // treeViewer.setExpandedElements(expandedElements); + } + } + + + /* (non-Javadoc) + * @see org.eclipse.ui.part.Page#dispose() + */ + public void dispose() + { + super.dispose(); + if ( entryEditor != null ) + { + entryEditor = null; + } + } + + /** + * This class implements the ContentProvider used for the LDIF Outline View + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ + private static class LdifContentProvider implements ITreeContentProvider + { + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) + */ + public Object[] getChildren( Object element ) + { + // file --> records + if ( element instanceof LdifFile ) + { + LdifFile ldifFile = ( LdifFile ) element; + return ldifFile.getRecords(); + } + + // record --> Array of List of AttrValLine + else if ( element instanceof LdifContentRecord ) + { + LdifContentRecord record = ( LdifContentRecord ) element; + return getUniqueAttrValLineArray( record.getAttrVals() ); + } + else if ( element instanceof LdifChangeAddRecord ) + { + LdifChangeAddRecord record = ( LdifChangeAddRecord ) element; + return getUniqueAttrValLineArray( record.getAttrVals() ); + } + else if ( element instanceof LdifChangeModifyRecord ) + { + LdifChangeModifyRecord record = ( LdifChangeModifyRecord ) element; + return record.getModSpecs(); + } + else if ( element instanceof LdifChangeModDnRecord ) + { + return new Object[0]; + } + else if ( element instanceof LdifChangeDeleteRecord ) + { + return new Object[0]; + } + + // List of AttrValLine --> Array of AttrValLine + else if ( element instanceof List && ( ( List ) element ).get( 0 ) instanceof LdifAttrValLine ) + { + List list = ( List ) element; + return list.toArray(); + } + else if ( element instanceof LdifModSpec ) + { + LdifModSpec modSpec = ( LdifModSpec ) element; + return modSpec.getAttrVals(); + } + + else + { + return new Object[0]; + } + } + + + /** + * Returns a unique line of attribute values from an array of attribute value lines + * + * @param lines + * the attribute value lines + * @return + * a unique line of attribute values from an array of attribute values lines + */ + private Object[] getUniqueAttrValLineArray( LdifAttrValLine[] lines ) + { + Map uniqueAttrMap = new LinkedHashMap(); + for ( int i = 0; i < lines.length; i++ ) + { + if ( !uniqueAttrMap.containsKey( lines[i].getUnfoldedAttributeDescription() ) ) + { + uniqueAttrMap.put( lines[i].getUnfoldedAttributeDescription(), new ArrayList() ); + } + ( ( List ) uniqueAttrMap.get( lines[i].getUnfoldedAttributeDescription() ) ).add( lines[i] ); + } + return uniqueAttrMap.values().toArray(); + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) + */ + public Object getParent( Object element ) + { + return null; + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) + */ + public boolean hasChildren( Object element ) + { + return getChildren( element ) != null && getChildren( element ).length > 0; + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) + */ + public Object[] getElements( Object inputElement ) + { + return getChildren( inputElement ); + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.IContentProvider#dispose() + */ + public void dispose() + { + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) + */ + public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) + { + } + } + + /** + * This class implements the LabelProvider used for the LDIF Outline View + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ + private static class LdifLabelProvider extends LabelProvider + { + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) + */ + public String getText( Object element ) + { + // Record + if ( element instanceof LdifRecord ) + { + LdifRecord ldifRecord = ( LdifRecord ) element; + return ldifRecord.getDnLine().getValueAsString(); + } + + // List of AttrValLine + else if ( element instanceof List && ( ( List ) element ).get( 0 ) instanceof LdifAttrValLine ) + { + List list = ( List ) element; + return ( ( LdifAttrValLine ) list.get( 0 ) ).getUnfoldedAttributeDescription() + " (" + list.size() + + ")"; + } + else if ( element instanceof LdifModSpec ) + { + LdifModSpec modSpec = ( LdifModSpec ) element; + return modSpec.getModSpecType().getUnfoldedAttributeDescription() + " (" + modSpec.getAttrVals().length + + ")"; + } + + // AttrValLine + else if ( element instanceof LdifAttrValLine ) + { + LdifAttrValLine line = ( LdifAttrValLine ) element; + return Utils.getShortenedString( line.getValueAsString(), 20 ); + } + + else + { + return ""; + } + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) + */ + public Image getImage( Object element ) + { + // Record + if ( element instanceof LdifContentRecord ) + { + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_ENTRY ); + } + else if ( element instanceof LdifChangeAddRecord ) + { + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_ADD ); + } + else if ( element instanceof LdifChangeModifyRecord ) + { + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_MODIFY ); + } + else if ( element instanceof LdifChangeDeleteRecord ) + { + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_DELETE ); + } + else if ( element instanceof LdifChangeModDnRecord ) + { + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_RENAME ); + } + + // List of AttrValLine + else if ( element instanceof List && ( ( List ) element ).get( 0 ) instanceof LdifAttrValLine ) + { + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_ATTRIBUTE ); + } + else if ( element instanceof LdifModSpec ) + { + LdifModSpec modSpec = ( LdifModSpec ) element; + if ( modSpec.isAdd() ) + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_MOD_ADD ); + else if ( modSpec.isReplace() ) + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_MOD_REPLACE ); + else if ( modSpec.isDelete() ) + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_MOD_DELETE ); + else + return null; + } + + // AttrValLine + else if ( element instanceof LdifAttrValLine ) + { + return LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_VALUE ); + } + + else + { + return null; + } + } + } +} Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorUniversalListener.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorUniversalListener.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/EntryEditorUniversalListener.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorUniversalListener.java Mon Apr 9 04:14:46 2007 @@ -21,14 +21,13 @@ package org.apache.directory.ldapstudio.browser.ui.editors.entry; +import org.apache.directory.ldapstudio.browser.common.actions.SelectionUtils; +import org.apache.directory.ldapstudio.browser.common.widgets.entryeditor.EntryEditorWidgetUniversalListener; import org.apache.directory.ldapstudio.browser.core.events.EntryModificationEvent; 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.ISearchResult; -import org.apache.directory.ldapstudio.browser.ui.actions.SelectionUtils; -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.EntryEditorWidgetUniversalListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.INullSelectionListener; import org.eclipse.ui.IPartListener2; @@ -252,7 +251,7 @@ { super.entryUpdated( event ); - LdifOutlinePage outlinePage = ( LdifOutlinePage ) entryEditor.getAdapter( IContentOutlinePage.class ); + EntryEditorOutlinePage outlinePage = ( EntryEditorOutlinePage ) entryEditor.getAdapter( IContentOutlinePage.class ); if ( outlinePage != null ) { outlinePage.refresh(); Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/ShowOperationalAttributesAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/ShowOperationalAttributesAction.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/ShowOperationalAttributesAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/ShowOperationalAttributesAction.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.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; import org.eclipse.jface.action.Action; @@ -43,8 +43,8 @@ super( "Show Operational Attributes", AS_CHECK_BOX ); setToolTipText( getText() ); setEnabled( true ); - setChecked( BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( - BrowserUIConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ) ); + setChecked( BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( + BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ) ); } @@ -53,8 +53,8 @@ */ public void run() { - BrowserUIPlugin.getDefault().getPreferenceStore().setValue( - BrowserUIConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES, super.isChecked() ); + BrowserCommonActivator.getDefault().getPreferenceStore().setValue( + BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES, super.isChecked() ); } } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/schemabrowser/ConnectionComboContributionItem.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/schemabrowser/ConnectionComboContributionItem.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/schemabrowser/ConnectionComboContributionItem.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/schemabrowser/ConnectionComboContributionItem.java Mon Apr 9 04:14:46 2007 @@ -21,13 +21,13 @@ package org.apache.directory.ldapstudio.browser.ui.editors.schemabrowser; +import org.apache.directory.ldapstudio.browser.common.widgets.connection.ConnectionContentProvider; +import org.apache.directory.ldapstudio.browser.common.widgets.connection.ConnectionLabelProvider; import org.apache.directory.ldapstudio.browser.core.BrowserCorePlugin; import org.apache.directory.ldapstudio.browser.core.events.ConnectionUpdateEvent; import org.apache.directory.ldapstudio.browser.core.events.ConnectionUpdateListener; import org.apache.directory.ldapstudio.browser.core.events.EventRegistry; import org.apache.directory.ldapstudio.browser.core.model.IConnection; -import org.apache.directory.ldapstudio.browser.ui.widgets.connection.ConnectionContentProvider; -import org.apache.directory.ldapstudio.browser.ui.widgets.connection.ConnectionLabelProvider; import org.eclipse.jface.action.ContributionItem; import org.eclipse.jface.util.Assert; import org.eclipse.jface.viewers.ComboViewer; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractOpenEditorAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractOpenEditorAction.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/searchresult/AbstractOpenEditorAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractOpenEditorAction.java Mon Apr 9 04:14:46 2007 @@ -21,7 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager; +import org.apache.directory.ldapstudio.valueeditors.ValueEditorManager; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractSearchResultListenerAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractSearchResultListenerAction.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/searchresult/AbstractSearchResultListenerAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractSearchResultListenerAction.java Mon Apr 9 04:14:46 2007 @@ -21,13 +21,13 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; +import org.apache.directory.ldapstudio.browser.common.actions.SelectionUtils; import org.apache.directory.ldapstudio.browser.core.events.EntryModificationEvent; import org.apache.directory.ldapstudio.browser.core.events.EntryUpdateListener; import org.apache.directory.ldapstudio.browser.core.events.EventRegistry; import org.apache.directory.ldapstudio.browser.core.model.AttributeHierarchy; import org.apache.directory.ldapstudio.browser.core.model.ISearch; import org.apache.directory.ldapstudio.browser.core.model.ISearchResult; -import org.apache.directory.ldapstudio.browser.ui.actions.SelectionUtils; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenBestEditorAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenBestEditorAction.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/searchresult/OpenBestEditorAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenBestEditorAction.java Mon Apr 9 04:14:46 2007 @@ -21,8 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.IValueEditor; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager; +import org.apache.directory.ldapstudio.valueeditors.IValueEditor; +import org.apache.directory.ldapstudio.valueeditors.ValueEditorManager; import org.eclipse.jface.viewers.TableViewer; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenDefaultEditorAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenDefaultEditorAction.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/searchresult/OpenDefaultEditorAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenDefaultEditorAction.java Mon Apr 9 04:14:46 2007 @@ -21,7 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; public class OpenDefaultEditorAction extends AbstractSearchResultListenerAction @@ -32,7 +32,7 @@ public OpenDefaultEditorAction( OpenBestEditorAction proxy ) { - super( proxy.selectionProvider, "Edit Value", null, BrowserUIConstants.ACTION_ID_EDIT_VALUE ); + super( proxy.selectionProvider, "Edit Value", null, BrowserCommonConstants.ACTION_ID_EDIT_VALUE ); this.proxy = proxy; } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenEditorAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenEditorAction.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/searchresult/OpenEditorAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenEditorAction.java Mon Apr 9 04:14:46 2007 @@ -23,8 +23,8 @@ import java.util.Arrays; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.IValueEditor; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager; +import org.apache.directory.ldapstudio.valueeditors.IValueEditor; +import org.apache.directory.ldapstudio.valueeditors.ValueEditorManager; import org.eclipse.jface.viewers.TableViewer; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenMultiValuedEditorAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenMultiValuedEditorAction.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/searchresult/OpenMultiValuedEditorAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/OpenMultiValuedEditorAction.java Mon Apr 9 04:14:46 2007 @@ -21,9 +21,9 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; +import org.apache.directory.ldapstudio.valueeditors.ValueEditorManager; import org.eclipse.jface.viewers.TableViewer; @@ -37,8 +37,8 @@ this.cellEditor = this.valueEditorManager.getMultiValuedValueEditor().getCellEditor(); this.setText( "Multivalued Editor" ); this.setToolTipText( "Multivalued Editor" ); - this.setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor( - BrowserUIConstants.IMG_MULTIVALUEDEDITOR ) ); + this.setImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor( + BrowserCommonConstants.IMG_MULTIVALUEDEDITOR ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultDeleteAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultDeleteAction.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/searchresult/SearchResultDeleteAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultDeleteAction.java Mon Apr 9 04:14:46 2007 @@ -21,8 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; +import org.apache.directory.ldapstudio.browser.common.actions.DeleteAction; import org.apache.directory.ldapstudio.browser.core.model.IEntry; -import org.apache.directory.ldapstudio.browser.ui.actions.DeleteAction; public class SearchResultDeleteAction extends DeleteAction Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorActionGroup.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorActionGroup.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/searchresult/SearchResultEditorActionGroup.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorActionGroup.java Mon Apr 9 04:14:46 2007 @@ -26,9 +26,6 @@ import java.util.Map; import org.apache.directory.ldapstudio.browser.core.model.ISearch; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.actions.CopyAction; 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.CopyEntryAsCsvAction; @@ -38,17 +35,19 @@ import org.apache.directory.ldapstudio.browser.ui.actions.LocateDnInDitAction; 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.NewValueAction; import org.apache.directory.ldapstudio.browser.ui.actions.OpenSchemaBrowserAction; import org.apache.directory.ldapstudio.browser.ui.actions.OpenSearchResultAction; -import org.apache.directory.ldapstudio.browser.ui.actions.PropertiesAction; -import org.apache.directory.ldapstudio.browser.ui.actions.RefreshAction; -import org.apache.directory.ldapstudio.browser.ui.actions.ShowRawValuesAction; -import org.apache.directory.ldapstudio.browser.ui.actions.ValueEditorPreferencesAction; -import org.apache.directory.ldapstudio.browser.ui.actions.proxy.BrowserActionProxy; import org.apache.directory.ldapstudio.browser.ui.actions.proxy.SearchResultEditorActionProxy; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.IValueEditor; - +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; +import org.apache.directory.ldapstudio.browser.common.actions.CopyAction; +import org.apache.directory.ldapstudio.browser.common.actions.NewValueAction; +import org.apache.directory.ldapstudio.browser.common.actions.PropertiesAction; +import org.apache.directory.ldapstudio.browser.common.actions.RefreshAction; +import org.apache.directory.ldapstudio.browser.common.actions.ShowRawValuesAction; +import org.apache.directory.ldapstudio.browser.common.actions.ValueEditorPreferencesAction; +import org.apache.directory.ldapstudio.browser.common.actions.proxy.BrowserActionProxy; +import org.apache.directory.ldapstudio.valueeditors.IValueEditor; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; @@ -315,8 +314,8 @@ { public void menuAboutToShow( IMenuManager manager ) { - showRawValuesAction.setChecked( BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( - BrowserUIConstants.PREFERENCE_SHOW_RAW_VALUES ) ); + showRawValuesAction.setChecked( BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( + BrowserCommonConstants.PREFERENCE_SHOW_RAW_VALUES ) ); } } ); menuManager.update( true ); Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorCellModifier.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorCellModifier.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/searchresult/SearchResultEditorCellModifier.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorCellModifier.java Mon Apr 9 04:14:46 2007 @@ -30,7 +30,7 @@ import org.apache.directory.ldapstudio.browser.core.model.ModelModificationException; import org.apache.directory.ldapstudio.browser.core.model.schema.SchemaUtils; import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager; +import org.apache.directory.ldapstudio.valueeditors.ValueEditorManager; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ICellModifier; import org.eclipse.jface.viewers.TableViewer; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorConfiguration.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorConfiguration.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/searchresult/SearchResultEditorConfiguration.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorConfiguration.java Mon Apr 9 04:14:46 2007 @@ -21,7 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager; +import org.apache.directory.ldapstudio.valueeditors.ValueEditorManager; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.TableViewer; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorContentProvider.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorContentProvider.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/searchresult/SearchResultEditorContentProvider.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorContentProvider.java Mon Apr 9 04:14:46 2007 @@ -21,10 +21,10 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; +import org.apache.directory.ldapstudio.browser.common.jobs.RunnableContextJobAdapter; import org.apache.directory.ldapstudio.browser.core.model.ISearch; 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.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.viewers.ILazyContentProvider; import org.eclipse.jface.viewers.TableViewer; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorLabelProvider.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorLabelProvider.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/searchresult/SearchResultEditorLabelProvider.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorLabelProvider.java Mon Apr 9 04:14:46 2007 @@ -26,10 +26,10 @@ import org.apache.directory.ldapstudio.browser.core.model.ISearch; 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.valueeditors.IValueEditor; -import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager; - +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; +import org.apache.directory.ldapstudio.valueeditors.IValueEditor; +import org.apache.directory.ldapstudio.valueeditors.ValueEditorManager; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.viewers.ITableColorProvider; import org.eclipse.jface.viewers.ITableFontProvider; @@ -177,27 +177,27 @@ IAttribute attribute = ah.getAttributes()[i]; if ( attribute.isObjectClassAttribute() ) { - FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserUIPlugin.getDefault() - .getPreferenceStore(), BrowserUIConstants.PREFERENCE_OBJECTCLASS_FONT ); - return BrowserUIPlugin.getDefault().getFont( fontData ); + FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault() + .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_OBJECTCLASS_FONT ); + return BrowserCommonActivator.getDefault().getFont( fontData ); } else if ( attribute.isMustAttribute() ) { - FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserUIPlugin.getDefault() - .getPreferenceStore(), BrowserUIConstants.PREFERENCE_MUSTATTRIBUTE_FONT ); - return BrowserUIPlugin.getDefault().getFont( fontData ); + FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault() + .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_MUSTATTRIBUTE_FONT ); + return BrowserCommonActivator.getDefault().getFont( fontData ); } else if ( attribute.isOperationalAttribute() ) { - FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserUIPlugin.getDefault() - .getPreferenceStore(), BrowserUIConstants.PREFERENCE_OPERATIONALATTRIBUTE_FONT ); - return BrowserUIPlugin.getDefault().getFont( fontData ); + FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault() + .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_OPERATIONALATTRIBUTE_FONT ); + return BrowserCommonActivator.getDefault().getFont( fontData ); } else { - FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserUIPlugin.getDefault() - .getPreferenceStore(), BrowserUIConstants.PREFERENCE_MAYATTRIBUTE_FONT ); - return BrowserUIPlugin.getDefault().getFont( fontData ); + FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault() + .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_MAYATTRIBUTE_FONT ); + return BrowserCommonActivator.getDefault().getFont( fontData ); } } } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorPasteAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorPasteAction.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/searchresult/SearchResultEditorPasteAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorPasteAction.java Mon Apr 9 04:14:46 2007 @@ -21,11 +21,11 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; +import org.apache.directory.ldapstudio.browser.common.actions.PasteAction; +import org.apache.directory.ldapstudio.browser.common.dnd.ValuesTransfer; import org.apache.directory.ldapstudio.browser.core.jobs.CreateValuesJob; 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.actions.PasteAction; -import org.apache.directory.ldapstudio.browser.ui.dnd.ValuesTransfer; /** Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.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/searchresult/SearchResultEditorQuickFilterWidget.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java Mon Apr 9 04:14:46 2007 @@ -21,9 +21,9 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; -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.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; +import org.apache.directory.ldapstudio.browser.common.widgets.BaseWidgetUtils; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -91,17 +91,17 @@ clearQuickFilterButton.setEnabled( !"".equals( quickFilterValueText.getText() ) ); if ( !"".equals( quickFilterValueText.getText() ) ) { - RGB fgRgb = PreferenceConverter.getColor( BrowserUIPlugin.getDefault().getPreferenceStore(), - BrowserUIConstants.PREFERENCE_QUICKFILTER_FOREGROUND_COLOR ); - RGB bgRgb = PreferenceConverter.getColor( BrowserUIPlugin.getDefault().getPreferenceStore(), - BrowserUIConstants.PREFERENCE_QUICKFILTER_BACKGROUND_COLOR ); - Color fgColor = BrowserUIPlugin.getDefault().getColor( fgRgb ); - Color bgColor = BrowserUIPlugin.getDefault().getColor( bgRgb ); + RGB fgRgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(), + BrowserCommonConstants.PREFERENCE_QUICKFILTER_FOREGROUND_COLOR ); + RGB bgRgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(), + BrowserCommonConstants.PREFERENCE_QUICKFILTER_BACKGROUND_COLOR ); + Color fgColor = BrowserCommonActivator.getDefault().getColor( fgRgb ); + Color bgColor = BrowserCommonActivator.getDefault().getColor( bgRgb ); quickFilterValueText.setForeground( fgColor ); quickFilterValueText.setBackground( bgColor ); - FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserUIPlugin.getDefault() - .getPreferenceStore(), BrowserUIConstants.PREFERENCE_QUICKFILTER_FONT ); - Font font = BrowserUIPlugin.getDefault().getFont( fontData ); + FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault() + .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_QUICKFILTER_FONT ); + Font font = BrowserCommonActivator.getDefault().getFont( fontData ); quickFilterValueText.setFont( font ); } else @@ -113,7 +113,7 @@ this.clearQuickFilterButton = new Button( innerComposite, SWT.PUSH ); this.clearQuickFilterButton.setToolTipText( "Clear Quick Filter" ); - this.clearQuickFilterButton.setImage( BrowserUIPlugin.getDefault().getImage( BrowserUIConstants.IMG_CLEAR ) ); + this.clearQuickFilterButton.setImage( BrowserCommonActivator.getDefault().getImage( BrowserCommonConstants.IMG_CLEAR ) ); this.clearQuickFilterButton.setEnabled( false ); this.clearQuickFilterButton.addSelectionListener( new SelectionAdapter() { Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorSorter.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorSorter.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/searchresult/SearchResultEditorSorter.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorSorter.java Mon Apr 9 04:14:46 2007 @@ -31,8 +31,8 @@ import org.apache.directory.ldapstudio.browser.core.model.ISearch; 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.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.swt.events.SelectionEvent; @@ -43,12 +43,6 @@ public class SearchResultEditorSorter extends ViewerSorter implements SelectionListener { - protected static final int SORT_ORDER_NONE = 0; - - protected static final int SORT_ORDER_ASCENDING = 1; - - protected static final int SORT_ORDER_DESCENDING = 2; - protected SearchResultEditorContentProvider contentProvider; private ISearch search; @@ -74,7 +68,7 @@ this.contentProvider = contentProvider; this.sortBy = 0; - this.sortOrder = SORT_ORDER_NONE; + this.sortOrder = BrowserCoreConstants.SORT_ORDER_NONE; this.columns = this.contentProvider.getViewer().getTable().getColumns(); for ( int i = 0; i < this.columns.length; i++ ) @@ -146,14 +140,15 @@ if ( this.sortBy == index ) { // toggle sort order - this.sortOrder = this.sortOrder == SORT_ORDER_ASCENDING ? SORT_ORDER_DESCENDING - : this.sortOrder == SORT_ORDER_DESCENDING ? SORT_ORDER_NONE : SORT_ORDER_ASCENDING; + this.sortOrder = this.sortOrder == BrowserCoreConstants.SORT_ORDER_ASCENDING ? BrowserCoreConstants.SORT_ORDER_DESCENDING + : this.sortOrder == BrowserCoreConstants.SORT_ORDER_DESCENDING ? BrowserCoreConstants.SORT_ORDER_NONE + : BrowserCoreConstants.SORT_ORDER_ASCENDING; } else { // set new sort by this.sortBy = index; - this.sortOrder = SORT_ORDER_ASCENDING; + this.sortOrder = BrowserCoreConstants.SORT_ORDER_ASCENDING; } if ( this.sortOrder == BrowserCoreConstants.SORT_ORDER_NONE ) { @@ -166,15 +161,15 @@ columns[i].setImage( null ); } - if ( this.sortOrder == SORT_ORDER_ASCENDING ) + if ( this.sortOrder == BrowserCoreConstants.SORT_ORDER_ASCENDING ) { - ( columns[index] ) - .setImage( BrowserUIPlugin.getDefault().getImage( BrowserUIConstants.IMG_SORT_ASCENDING ) ); + ( columns[index] ).setImage( BrowserCommonActivator.getDefault().getImage( + BrowserCommonConstants.IMG_SORT_ASCENDING ) ); } - else if ( this.sortOrder == SORT_ORDER_DESCENDING ) + else if ( this.sortOrder == BrowserCoreConstants.SORT_ORDER_DESCENDING ) { - ( columns[index] ) - .setImage( BrowserUIPlugin.getDefault().getImage( BrowserUIConstants.IMG_SORT_DESCENDING ) ); + ( columns[index] ).setImage( BrowserCommonActivator.getDefault().getImage( + BrowserCommonConstants.IMG_SORT_DESCENDING ) ); } else { @@ -311,7 +306,7 @@ private int lessThan() { - return this.sortOrder == SORT_ORDER_ASCENDING ? -1 : 1; + return this.sortOrder == BrowserCoreConstants.SORT_ORDER_ASCENDING ? -1 : 1; } @@ -323,13 +318,14 @@ private int greaterThan() { - return this.sortOrder == SORT_ORDER_ASCENDING ? 1 : -1; + return this.sortOrder == BrowserCoreConstants.SORT_ORDER_ASCENDING ? 1 : -1; } private int compare( String s1, String s2 ) { - return this.sortOrder == SORT_ORDER_ASCENDING ? s1.compareToIgnoreCase( s2 ) : s2.compareToIgnoreCase( s1 ); + return this.sortOrder == BrowserCoreConstants.SORT_ORDER_ASCENDING ? s1.compareToIgnoreCase( s2 ) : s2 + .compareToIgnoreCase( s1 ); } } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorUniversalListener.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorUniversalListener.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/searchresult/SearchResultEditorUniversalListener.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorUniversalListener.java Mon Apr 9 04:14:46 2007 @@ -27,6 +27,7 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ +import org.apache.directory.ldapstudio.browser.common.actions.SelectionUtils; import org.apache.directory.ldapstudio.browser.core.events.EmptyValueAddedEvent; import org.apache.directory.ldapstudio.browser.core.events.EntryModificationEvent; import org.apache.directory.ldapstudio.browser.core.events.EntryUpdateListener; @@ -40,7 +41,6 @@ import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; import org.apache.directory.ldapstudio.browser.ui.actions.OpenSearchResultAction; -import org.apache.directory.ldapstudio.browser.ui.actions.SelectionUtils; import org.apache.directory.ldapstudio.browser.ui.views.browser.BrowserView; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ISelection; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorWidget.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorWidget.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/searchresult/SearchResultEditorWidget.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorWidget.java Mon Apr 9 04:14:46 2007 @@ -21,7 +21,7 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; -import org.apache.directory.ldapstudio.browser.ui.widgets.ViewFormWidget; +import org.apache.directory.ldapstudio.browser.common.widgets.ViewFormWidget; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/ShowQuickFilterAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/ShowQuickFilterAction.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/searchresult/ShowQuickFilterAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/ShowQuickFilterAction.java Mon Apr 9 04:14:46 2007 @@ -21,8 +21,9 @@ package org.apache.directory.ldapstudio.browser.ui.editors.searchresult; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; import org.eclipse.jface.action.Action; import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds; @@ -40,7 +41,7 @@ { super( "Show Quick Filter", AS_CHECK_BOX ); super.setToolTipText( "Show Quick Filter" ); - super.setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_FILTER ) ); + super.setImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor( BrowserCommonConstants.IMG_FILTER ) ); super.setActionDefinitionId( IWorkbenchActionDefinitionIds.FIND_REPLACE ); super.setEnabled( true ); Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/perspective/BrowserPerspective.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/perspective/BrowserPerspective.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/perspective/BrowserPerspective.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/perspective/BrowserPerspective.java Mon Apr 9 04:14:46 2007 @@ -21,16 +21,16 @@ package org.apache.directory.ldapstudio.browser.ui.perspective; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; import org.apache.directory.ldapstudio.browser.ui.views.browser.BrowserView; import org.apache.directory.ldapstudio.browser.ui.views.connection.ConnectionView; import org.apache.directory.ldapstudio.browser.ui.views.modificationlogs.ModificationLogsView; import org.apache.directory.ldapstudio.browser.ui.wizards.BatchOperationWizard; import org.apache.directory.ldapstudio.browser.ui.wizards.NewBookmarkWizard; -import org.apache.directory.ldapstudio.browser.ui.wizards.NewConnectionWizard; import org.apache.directory.ldapstudio.browser.ui.wizards.NewEntryWizard; -import org.apache.directory.ldapstudio.browser.ui.wizards.NewLdifFileWizard; import org.apache.directory.ldapstudio.browser.ui.wizards.NewSearchWizard; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.wizards.NewConnectionWizard; +import org.apache.directory.ldapstudio.ldifeditor.wizards.NewLdifFileWizard; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; @@ -131,7 +131,7 @@ logFolder.addPlaceholder( "*" ); // non-closable? - boolean isIDE = BrowserUIPlugin.isIDEEnvironment(); + boolean isIDE = BrowserCommonActivator.isIDEEnvironment(); if ( !isIDE ) { layout.getViewLayout( BrowserView.getId() ).setCloseable( false ); Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/SearchPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/SearchPage.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/SearchPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/SearchPage.java Mon Apr 9 04:14:46 2007 @@ -21,13 +21,13 @@ package org.apache.directory.ldapstudio.browser.ui.search; +import org.apache.directory.ldapstudio.browser.common.actions.SelectionUtils; +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.model.ISearch; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.actions.SelectionUtils; -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.jface.dialogs.DialogPage; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.resource.ImageDescriptor; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserView.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserView.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserView.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserView.java Mon Apr 9 04:14:46 2007 @@ -24,6 +24,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.directory.ldapstudio.browser.common.widgets.browser.BrowserConfiguration; +import org.apache.directory.ldapstudio.browser.common.widgets.browser.BrowserWidget; import org.apache.directory.ldapstudio.browser.core.model.IAttribute; import org.apache.directory.ldapstudio.browser.core.model.IBookmark; import org.apache.directory.ldapstudio.browser.core.model.IEntry; @@ -31,8 +33,6 @@ import org.apache.directory.ldapstudio.browser.core.model.ISearchResult; import org.apache.directory.ldapstudio.browser.core.model.IValue; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.widgets.browser.BrowserConfiguration; -import org.apache.directory.ldapstudio.browser.ui.widgets.browser.BrowserWidget; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewActionGroup.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewActionGroup.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewActionGroup.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewActionGroup.java Mon Apr 9 04:14:46 2007 @@ -21,12 +21,17 @@ package org.apache.directory.ldapstudio.browser.ui.views.browser; -import org.apache.directory.ldapstudio.browser.ui.actions.CopyAction; +import org.apache.directory.ldapstudio.browser.common.actions.CopyAction; +import org.apache.directory.ldapstudio.browser.common.actions.DeleteAction; +import org.apache.directory.ldapstudio.browser.common.actions.PasteAction; +import org.apache.directory.ldapstudio.browser.common.actions.RenameAction; +import org.apache.directory.ldapstudio.browser.common.actions.proxy.BrowserActionProxy; +import org.apache.directory.ldapstudio.browser.common.actions.proxy.BrowserViewActionProxy; +import org.apache.directory.ldapstudio.browser.common.widgets.browser.BrowserActionGroup; import org.apache.directory.ldapstudio.browser.ui.actions.CopyDnAction; import org.apache.directory.ldapstudio.browser.ui.actions.CopyEntryAsCsvAction; import org.apache.directory.ldapstudio.browser.ui.actions.CopyEntryAsLdifAction; import org.apache.directory.ldapstudio.browser.ui.actions.CopyUrlAction; -import org.apache.directory.ldapstudio.browser.ui.actions.DeleteAction; import org.apache.directory.ldapstudio.browser.ui.actions.ImportExportAction; import org.apache.directory.ldapstudio.browser.ui.actions.LocateEntryInDitAction; import org.apache.directory.ldapstudio.browser.ui.actions.MoveAction; @@ -34,11 +39,6 @@ import org.apache.directory.ldapstudio.browser.ui.actions.NewBookmarkAction; import org.apache.directory.ldapstudio.browser.ui.actions.NewEntryAction; import org.apache.directory.ldapstudio.browser.ui.actions.NewSearchAction; -import org.apache.directory.ldapstudio.browser.ui.actions.PasteAction; -import org.apache.directory.ldapstudio.browser.ui.actions.RenameAction; -import org.apache.directory.ldapstudio.browser.ui.actions.proxy.BrowserActionProxy; -import org.apache.directory.ldapstudio.browser.ui.actions.proxy.BrowserViewActionProxy; -import org.apache.directory.ldapstudio.browser.ui.widgets.browser.BrowserActionGroup; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewUniversalListener.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewUniversalListener.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewUniversalListener.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewUniversalListener.java Mon Apr 9 04:14:46 2007 @@ -25,6 +25,8 @@ import java.util.HashMap; import java.util.Map; +import org.apache.directory.ldapstudio.browser.common.actions.SelectionUtils; +import org.apache.directory.ldapstudio.browser.common.widgets.browser.BrowserUniversalListener; import org.apache.directory.ldapstudio.browser.core.events.AttributesInitializedEvent; import org.apache.directory.ldapstudio.browser.core.events.BookmarkUpdateEvent; import org.apache.directory.ldapstudio.browser.core.events.BookmarkUpdateListener; @@ -43,13 +45,11 @@ import org.apache.directory.ldapstudio.browser.core.model.IRootDSE; import org.apache.directory.ldapstudio.browser.core.model.ISearch; import org.apache.directory.ldapstudio.browser.core.model.ISearchResult; -import org.apache.directory.ldapstudio.browser.ui.actions.SelectionUtils; import org.apache.directory.ldapstudio.browser.ui.editors.entry.EntryEditor; import org.apache.directory.ldapstudio.browser.ui.editors.entry.EntryEditorInput; import org.apache.directory.ldapstudio.browser.ui.editors.searchresult.SearchResultEditor; import org.apache.directory.ldapstudio.browser.ui.editors.searchresult.SearchResultEditorInput; import org.apache.directory.ldapstudio.browser.ui.views.connection.ConnectionView; -import org.apache.directory.ldapstudio.browser.ui.widgets.browser.BrowserUniversalListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ITreeContentProvider; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowBookmarksAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowBookmarksAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowBookmarksAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowBookmarksAction.java Mon Apr 9 04:14:46 2007 @@ -21,8 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.views.browser; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -44,8 +44,8 @@ { super( "Show Bookmarks", IAction.AS_CHECK_BOX ); setEnabled( true ); - setChecked( BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( - BrowserUIConstants.PREFERENCE_BROWSER_SHOW_BOOKMARKS ) ); + setChecked( BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( + BrowserCommonConstants.PREFERENCE_BROWSER_SHOW_BOOKMARKS ) ); } @@ -54,8 +54,8 @@ */ public void run() { - BrowserUIPlugin.getDefault().getPreferenceStore().setValue( - BrowserUIConstants.PREFERENCE_BROWSER_SHOW_BOOKMARKS, isChecked() ); + BrowserCommonActivator.getDefault().getPreferenceStore().setValue( + BrowserCommonConstants.PREFERENCE_BROWSER_SHOW_BOOKMARKS, isChecked() ); } } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowDITAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowDITAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowDITAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowDITAction.java Mon Apr 9 04:14:46 2007 @@ -21,8 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.views.browser; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -44,8 +44,8 @@ { super( "Show DIT", IAction.AS_CHECK_BOX ); setEnabled( true ); - setChecked( BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( - BrowserUIConstants.PREFERENCE_BROWSER_SHOW_DIT ) ); + setChecked( BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( + BrowserCommonConstants.PREFERENCE_BROWSER_SHOW_DIT ) ); } @@ -54,8 +54,8 @@ */ public void run() { - BrowserUIPlugin.getDefault().getPreferenceStore().setValue( BrowserUIConstants.PREFERENCE_BROWSER_SHOW_DIT, - isChecked() ); + BrowserCommonActivator.getDefault().getPreferenceStore().setValue( + BrowserCommonConstants.PREFERENCE_BROWSER_SHOW_DIT, isChecked() ); } } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowDirectoryMetadataEntriesAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowDirectoryMetadataEntriesAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowDirectoryMetadataEntriesAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowDirectoryMetadataEntriesAction.java Mon Apr 9 04:14:46 2007 @@ -21,8 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.views.browser; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -44,8 +44,8 @@ { super( "Show Directory Metadata", IAction.AS_CHECK_BOX ); setEnabled( true ); - setChecked( BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( - BrowserUIConstants.PREFERENCE_BROWSER_SHOW_DIRECTORY_META_ENTRIES ) ); + setChecked( BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( + BrowserCommonConstants.PREFERENCE_BROWSER_SHOW_DIRECTORY_META_ENTRIES ) ); } @@ -54,8 +54,8 @@ */ public void run() { - BrowserUIPlugin.getDefault().getPreferenceStore().setValue( - BrowserUIConstants.PREFERENCE_BROWSER_SHOW_DIRECTORY_META_ENTRIES, isChecked() ); + BrowserCommonActivator.getDefault().getPreferenceStore().setValue( + BrowserCommonConstants.PREFERENCE_BROWSER_SHOW_DIRECTORY_META_ENTRIES, isChecked() ); } } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowSearchesAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowSearchesAction.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowSearchesAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/ShowSearchesAction.java Mon Apr 9 04:14:46 2007 @@ -21,8 +21,8 @@ package org.apache.directory.ldapstudio.browser.ui.views.browser; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants; -import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonActivator; +import org.apache.directory.ldapstudio.browser.common.BrowserCommonConstants; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -44,8 +44,8 @@ { super( "Show Searches", IAction.AS_CHECK_BOX ); setEnabled( true ); - setChecked( BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( - BrowserUIConstants.PREFERENCE_BROWSER_SHOW_SEARCHES ) ); + setChecked( BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( + BrowserCommonConstants.PREFERENCE_BROWSER_SHOW_SEARCHES ) ); } @@ -54,8 +54,8 @@ */ public void run() { - BrowserUIPlugin.getDefault().getPreferenceStore().setValue( - BrowserUIConstants.PREFERENCE_BROWSER_SHOW_SEARCHES, isChecked() ); + BrowserCommonActivator.getDefault().getPreferenceStore().setValue( + BrowserCommonConstants.PREFERENCE_BROWSER_SHOW_SEARCHES, isChecked() ); } } Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionView.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionView.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionView.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionView.java Mon Apr 9 04:14:46 2007 @@ -21,11 +21,11 @@ package org.apache.directory.ldapstudio.browser.ui.views.connection; +import org.apache.directory.ldapstudio.browser.common.widgets.connection.ConnectionConfiguration; +import org.apache.directory.ldapstudio.browser.common.widgets.connection.ConnectionWidget; import org.apache.directory.ldapstudio.browser.core.BrowserCorePlugin; import org.apache.directory.ldapstudio.browser.core.model.IConnection; import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin; -import org.apache.directory.ldapstudio.browser.ui.widgets.connection.ConnectionConfiguration; -import org.apache.directory.ldapstudio.browser.ui.widgets.connection.ConnectionWidget; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionViewActionGroup.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionViewActionGroup.java?view=diff&rev=526712&r1=526711&r2=526712 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionViewActionGroup.java (original) +++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionViewActionGroup.java Mon Apr 9 04:14:46 2007 @@ -21,13 +21,13 @@ package org.apache.directory.ldapstudio.browser.ui.views.connection; +import org.apache.directory.ldapstudio.browser.common.actions.SelectAllAction; +import org.apache.directory.ldapstudio.browser.common.actions.proxy.ConnectionViewActionProxy; +import org.apache.directory.ldapstudio.browser.common.dnd.ConnectionTransfer; +import org.apache.directory.ldapstudio.browser.common.dnd.SearchTransfer; +import org.apache.directory.ldapstudio.browser.common.widgets.connection.ConnectionActionGroup; import org.apache.directory.ldapstudio.browser.ui.actions.ImportExportAction; import org.apache.directory.ldapstudio.browser.ui.actions.OpenSchemaBrowserAction; -import org.apache.directory.ldapstudio.browser.ui.actions.SelectAllAction; -import org.apache.directory.ldapstudio.browser.ui.actions.proxy.ConnectionViewActionProxy; -import org.apache.directory.ldapstudio.browser.ui.dnd.ConnectionTransfer; -import org.apache.directory.ldapstudio.browser.ui.dnd.SearchTransfer; -import org.apache.directory.ldapstudio.browser.ui.widgets.connection.ConnectionActionGroup; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager;