You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/08/20 19:07:23 UTC
svn commit: r987577 [5/10] - in
/directory/studio/branches/studio-rap/plugins:
common.ui/src/main/java/org/apache/directory/studio/common/ui/
connection.ui/src/main/java/org/apache/directory/studio/connection/ui/
connection.ui/src/main/java/org/apache/...
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserPreferences.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserPreferences.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserPreferences.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserPreferences.java Fri Aug 20 17:07:19 2010
@@ -192,8 +192,8 @@ public class BrowserPreferences implemen
*/
public int getFoldingSize()
{
- return BrowserCommonActivator.getDefault().getPreferenceStore().getInt(
- BrowserCommonConstants.PREFERENCE_BROWSER_FOLDING_SIZE );
+ return 100;//BrowserCommonActivator.getDefault().getPreferenceStore().getInt(
+ //BrowserCommonConstants.PREFERENCE_BROWSER_FOLDING_SIZE );
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java Fri Aug 20 17:07:19 2010
@@ -192,8 +192,8 @@ public class BrowserQuickSearchWidget
String[] attributes = HistoryUtils.load( ATTRIBUTE_HISTORY_DIALOGSETTING_KEY );
quickSearchAttributeCombo = BaseWidgetUtils.createCombo( innerComposite, attributes, -1, 1 );
quickSearchAttributePP = new ListContentProposalProvider( attributes );
- new ExtendedContentAssistCommandAdapter( quickSearchAttributeCombo, new ComboContentAdapter(),
- quickSearchAttributePP, null, null, true );
+// new ExtendedContentAssistCommandAdapter( quickSearchAttributeCombo, new ComboContentAdapter(),
+// quickSearchAttributePP, null, null, true );
quickSearchAttributeCombo.addModifyListener( new ModifyListener()
{
public void modifyText( ModifyEvent e )
@@ -221,8 +221,8 @@ public class BrowserQuickSearchWidget
String[] values = HistoryUtils.load( VALUE_HISTORY_DIALOGSETTING_KEY );
quickSearchValueCombo = BaseWidgetUtils.createCombo( innerComposite, values, -1, 1 );
quickSearchValuePP = new ListContentProposalProvider( values );
- new ExtendedContentAssistCommandAdapter( quickSearchValueCombo, new ComboContentAdapter(), quickSearchValuePP,
- null, null, true );
+// new ExtendedContentAssistCommandAdapter( quickSearchValueCombo, new ComboContentAdapter(), quickSearchValuePP,
+// null, null, true );
quickSearchValueCombo.addSelectionListener( new SelectionAdapter()
{
public void widgetDefaultSelected( SelectionEvent e )
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/ShowQuickSearchAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/ShowQuickSearchAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/ShowQuickSearchAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/ShowQuickSearchAction.java Fri Aug 20 17:07:19 2010
@@ -25,7 +25,6 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
/**
@@ -48,7 +47,7 @@ public class ShowQuickSearchAction exten
{
super( Messages.getString( "ShowQuickSearchAction.ShowQuickSearch" ), IAction.AS_CHECK_BOX ); //$NON-NLS-1$
this.quickSearchWidget = quickSearchWidget;
- setActionDefinitionId( IWorkbenchActionDefinitionIds.FIND_REPLACE );
+ setActionDefinitionId( "" /*IWorkbenchActionDefinitionIds.FIND_REPLACE*/ );
setEnabled( true );
setChecked( BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean(
BrowserCommonConstants.PREFERENCE_BROWSER_SHOW_QUICK_SEARCH ) );
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java Fri Aug 20 17:07:19 2010
@@ -20,7 +20,6 @@
package org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor;
-
import org.apache.directory.studio.common.ui.widgets.ViewFormWidget;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.TreeViewer;
@@ -33,178 +32,168 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
-
/**
- * The EntryEditorWidget is a reusable widget to display and edit the attributes of an entry.
- * It is used by
- * {@link org.apache.directory.studio.ldapbrowser.ui.editors.entry.EntryEditor},
- * {@link org.apache.directory.studio.ldapbrowser.common.dialogs.MultivaluedDialog},
- * {@link org.apache.directory.studio.ldapbrowser.common.dialogs.LdifEntryEditorDialog} and
- * {@link org.apache.directory.studio.ldapbrowser.common.wizards.NewEntryAttributesWizardPage}.
+ * The EntryEditorWidget is a reusable widget to display and edit the attributes
+ * of an entry. It is used by
+ * {@link org.apache.directory.studio.ldapbrowser.ui.editors.entry.EntryEditor},
+ * {@link org.apache.directory.studio.ldapbrowser.common.dialogs.MultivaluedDialog}
+ * ,
+ * {@link org.apache.directory.studio.ldapbrowser.common.dialogs.LdifEntryEditorDialog}
+ * and
+ * {@link org.apache.directory.studio.ldapbrowser.common.wizards.NewEntryAttributesWizardPage}
+ * .
+ *
+ * It provides a context menu and a local toolbar with actions to manage
+ * attributes. Further there is an instant search feature to filter the visible
+ * attributes.
*
- * It provides a context menu and a local toolbar with actions to
- * manage attributes. Further there is an instant search feature to filter
- * the visible attributes.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory
+ * Project</a>
*/
-public class EntryEditorWidget extends ViewFormWidget
-{
+public class EntryEditorWidget extends ViewFormWidget {
- /** The configuration. */
- private EntryEditorWidgetConfiguration configuration;
+ /** The configuration. */
+ private EntryEditorWidgetConfiguration configuration;
- /** The quick filter widget. */
- private EntryEditorWidgetQuickFilterWidget quickFilterWidget;
+ /** The quick filter widget. */
+ private EntryEditorWidgetQuickFilterWidget quickFilterWidget;
- /** The tree. */
- private Tree tree;
-
- /** The viewer. */
- private TreeViewer viewer;
-
-
- /**
- * Creates a new instance of EntryEditorWidget.
- *
- * @param configuration the configuration
- */
- public EntryEditorWidget( EntryEditorWidgetConfiguration configuration )
- {
- this.configuration = configuration;
- }
-
-
- /**
- * {@inheritDoc}
- */
- protected Control createContent( Composite parent )
- {
- quickFilterWidget = new EntryEditorWidgetQuickFilterWidget( configuration.getFilter(), this );
- quickFilterWidget.createComposite( parent );
-
- // create tree widget and viewer
- tree = new Tree( parent, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION
- | SWT.HIDE_SELECTION );
- GridData data = new GridData( GridData.FILL_BOTH );
- data.widthHint = 450;
- data.heightHint = 250;
- tree.setLayoutData( data );
- tree.setHeaderVisible( true );
- tree.setLinesVisible( true );
- viewer = new TreeViewer( tree );
- viewer.setUseHashlookup( true );
-
- // set tree columns
- for ( int i = 0; i < EntryEditorWidgetTableMetadata.COLUM_NAMES.length; i++ )
- {
- TreeColumn column = new TreeColumn( tree, SWT.LEFT, i );
- column.setText( EntryEditorWidgetTableMetadata.COLUM_NAMES[i] );
- column.setWidth( 200 );
- column.setResizable( true );
-
- }
- viewer.setColumnProperties( EntryEditorWidgetTableMetadata.COLUM_NAMES );
- tree.addControlListener( new ControlAdapter()
- {
- public void controlResized( ControlEvent e )
- {
- if ( tree.getClientArea().width > 0 )
- {
- int width = tree.getClientArea().width - 2 * tree.getBorderWidth();
- if ( tree.getVerticalBar().isVisible() )
- {
- width -= tree.getVerticalBar().getSize().x;
- }
- tree.getColumn( EntryEditorWidgetTableMetadata.VALUE_COLUMN_INDEX ).setWidth(
- width - tree.getColumn( EntryEditorWidgetTableMetadata.KEY_COLUMN_INDEX ).getWidth() );
- }
- }
- } );
-
- // setup sorter, filter and layout
- configuration.getSorter().connect( viewer );
- configuration.getFilter().connect( viewer );
- configuration.getPreferences().connect( viewer );
-
- // setup providers
- viewer.setContentProvider( configuration.getContentProvider( this ) );
- viewer.setLabelProvider( configuration.getLabelProvider( viewer ) );
-
- // set table cell editors
- viewer.setCellModifier( configuration.getCellModifier( viewer ) );
- CellEditor[] editors = new CellEditor[EntryEditorWidgetTableMetadata.COLUM_NAMES.length];
- viewer.setCellEditors( editors );
-
- return tree;
-
- }
-
-
- /**
- * Sets the focus to the tree viewer.
- */
- public void setFocus()
- {
- viewer.getTree().setFocus();
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void dispose()
- {
- if ( viewer != null )
- {
- configuration.dispose();
- configuration = null;
-
- if ( quickFilterWidget != null )
- {
- quickFilterWidget.dispose();
- quickFilterWidget = null;
- }
-
- tree.dispose();
- tree = null;
- viewer = null;
- }
-
- super.dispose();
- }
-
-
- /**
- * Gets the viewer.
- *
- * @return the viewer
- */
- public TreeViewer getViewer()
- {
- return viewer;
- }
-
-
- /**
- * Gets the quick filter widget.
- *
- * @return the quick filter widget
- */
- public EntryEditorWidgetQuickFilterWidget getQuickFilterWidget()
- {
- return quickFilterWidget;
- }
-
-
- /**
- * Enables or disables this widget.
- *
- * @param enabled true to enable this widget, false to disable this widget
- */
- public void setEnabled( boolean enabled )
- {
- tree.setEnabled( enabled );
- }
+ /** The tree. */
+ private Tree tree;
+
+ /** The viewer. */
+ private TreeViewer viewer;
+
+ /**
+ * Creates a new instance of EntryEditorWidget.
+ *
+ * @param configuration
+ * the configuration
+ */
+ public EntryEditorWidget(EntryEditorWidgetConfiguration configuration) {
+ this.configuration = configuration;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Control createContent(Composite parent) {
+ quickFilterWidget = new EntryEditorWidgetQuickFilterWidget(
+ configuration.getFilter(), this);
+ quickFilterWidget.createComposite(parent);
+
+ // create tree widget and viewer
+ tree = new Tree(parent, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL
+ | SWT.V_SCROLL | SWT.FULL_SELECTION);
+ GridData data = new GridData(GridData.FILL_BOTH);
+ data.widthHint = 450;
+ data.heightHint = 250;
+ tree.setLayoutData(data);
+ tree.setHeaderVisible(true);
+ tree.setLinesVisible(true);
+ viewer = new TreeViewer(tree);
+ viewer.setUseHashlookup(true);
+
+ // set tree columns
+ for (int i = 0; i < EntryEditorWidgetTableMetadata.COLUM_NAMES.length; i++) {
+ TreeColumn column = new TreeColumn(tree, SWT.LEFT, i);
+ column.setText(EntryEditorWidgetTableMetadata.COLUM_NAMES[i]);
+ column.setWidth(200);
+ column.setResizable(true);
+
+ }
+ viewer.setColumnProperties(EntryEditorWidgetTableMetadata.COLUM_NAMES);
+ tree.addControlListener(new ControlAdapter() {
+ public void controlResized(ControlEvent e) {
+ if (tree.getClientArea().width > 0) {
+ int width = tree.getClientArea().width - 2
+ * tree.getBorderWidth();
+// if (tree.getVerticalBar().isVisible()) {
+// width -= tree.getVerticalBar().getSize().x;
+// }
+ tree.getColumn(
+ EntryEditorWidgetTableMetadata.VALUE_COLUMN_INDEX)
+ .setWidth(
+ width
+ - tree.getColumn(
+ EntryEditorWidgetTableMetadata.KEY_COLUMN_INDEX)
+ .getWidth());
+ }
+ }
+ });
+
+ // setup sorter, filter and layout
+ configuration.getSorter().connect(viewer);
+ configuration.getFilter().connect(viewer);
+ configuration.getPreferences().connect(viewer);
+
+ // setup providers
+ viewer.setContentProvider(configuration.getContentProvider(this));
+ viewer.setLabelProvider(configuration.getLabelProvider(viewer));
+
+ // set table cell editors
+ viewer.setCellModifier(configuration.getCellModifier(viewer));
+ CellEditor[] editors = new CellEditor[EntryEditorWidgetTableMetadata.COLUM_NAMES.length];
+ viewer.setCellEditors(editors);
+
+ return tree;
+
+ }
+
+ /**
+ * Sets the focus to the tree viewer.
+ */
+ public void setFocus() {
+ viewer.getTree().setFocus();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dispose() {
+ if (viewer != null) {
+ configuration.dispose();
+ configuration = null;
+
+ if (quickFilterWidget != null) {
+ quickFilterWidget.dispose();
+ quickFilterWidget = null;
+ }
+
+ tree.dispose();
+ tree = null;
+ viewer = null;
+ }
+
+ super.dispose();
+ }
+
+ /**
+ * Gets the viewer.
+ *
+ * @return the viewer
+ */
+ public TreeViewer getViewer() {
+ return viewer;
+ }
+
+ /**
+ * Gets the quick filter widget.
+ *
+ * @return the quick filter widget
+ */
+ public EntryEditorWidgetQuickFilterWidget getQuickFilterWidget() {
+ return quickFilterWidget;
+ }
+
+ /**
+ * Enables or disables this widget.
+ *
+ * @param enabled
+ * true to enable this widget, false to disable this widget
+ */
+ public void setEnabled(boolean enabled) {
+ tree.setEnabled(enabled);
+ }
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/ShowQuickFilterAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/ShowQuickFilterAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/ShowQuickFilterAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/ShowQuickFilterAction.java Fri Aug 20 17:07:19 2010
@@ -20,93 +20,90 @@
package org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor;
-
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.eclipse.jface.action.Action;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
/**
* This action shows/hides the instant search.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory
+ * Project</a>
*/
-public class ShowQuickFilterAction extends Action
-{
+public class ShowQuickFilterAction extends Action {
- /** The Constant SHOW_QUICKFILTER_DIALOGSETTING_KEY. */
- public static final String SHOW_QUICKFILTER_DIALOGSETTING_KEY = ShowQuickFilterAction.class.getName()
- + ".showQuickFilter"; //$NON-NLS-1$
-
- /** The quick filter widget. */
- private EntryEditorWidgetQuickFilterWidget quickFilterWidget;
-
-
- /**
- * Creates a new instance of ShowQuickFilterAction.
- *
- * @param quickFilterWidget the quick filter widget
- */
- public ShowQuickFilterAction( EntryEditorWidgetQuickFilterWidget quickFilterWidget )
- {
- super( Messages.getString( "ShowQuickFilterAction.ShowQuickFilter" ), AS_CHECK_BOX ); //$NON-NLS-1$
- setToolTipText( Messages.getString( "ShowQuickFilterAction.ShowQuickFilter" ) ); //$NON-NLS-1$
- setImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor( BrowserCommonConstants.IMG_FILTER ) );
- setActionDefinitionId( IWorkbenchActionDefinitionIds.FIND_REPLACE );
- setEnabled( true );
-
- this.quickFilterWidget = quickFilterWidget;
-
- if ( BrowserCommonActivator.getDefault().getDialogSettings().get( SHOW_QUICKFILTER_DIALOGSETTING_KEY ) == null )
- {
- BrowserCommonActivator.getDefault().getDialogSettings().put( SHOW_QUICKFILTER_DIALOGSETTING_KEY, false );
- }
-
- // call the super implementation here because the local implementation
- // does nothing.
- super.setChecked( BrowserCommonActivator.getDefault().getDialogSettings().getBoolean(
- SHOW_QUICKFILTER_DIALOGSETTING_KEY ) );
- quickFilterWidget.setActive( isChecked() );
- }
-
-
- /**
- * {@inheritDoc}
- *
- * This implementation toggles the checked state and
- * activates or deactivates the quick filter accordingly.
- */
- public void run()
- {
- boolean checked = isChecked();
- super.setChecked( !checked );
-
- BrowserCommonActivator.getDefault().getDialogSettings().put( SHOW_QUICKFILTER_DIALOGSETTING_KEY, isChecked() );
-
- if ( quickFilterWidget != null )
- {
- quickFilterWidget.setActive( isChecked() );
- }
- }
-
-
- /**
- * {@inheritDoc}
- *
- * This implementation does nothing. Toggling of the checked state is done within the run() method.
- */
- public void setChecked( boolean checked )
- {
- }
-
-
- /**
- * Disposes this action.
- */
- public void dispose()
- {
- quickFilterWidget = null;
- }
+ /** The Constant SHOW_QUICKFILTER_DIALOGSETTING_KEY. */
+ public static final String SHOW_QUICKFILTER_DIALOGSETTING_KEY = ShowQuickFilterAction.class
+ .getName() + ".showQuickFilter"; //$NON-NLS-1$
+
+ /** The quick filter widget. */
+ private EntryEditorWidgetQuickFilterWidget quickFilterWidget;
+
+ /**
+ * Creates a new instance of ShowQuickFilterAction.
+ *
+ * @param quickFilterWidget
+ * the quick filter widget
+ */
+ public ShowQuickFilterAction(
+ EntryEditorWidgetQuickFilterWidget quickFilterWidget) {
+ super(
+ Messages.getString("ShowQuickFilterAction.ShowQuickFilter"), AS_CHECK_BOX); //$NON-NLS-1$
+ setToolTipText(Messages
+ .getString("ShowQuickFilterAction.ShowQuickFilter")); //$NON-NLS-1$
+ setImageDescriptor(BrowserCommonActivator.getDefault()
+ .getImageDescriptor(BrowserCommonConstants.IMG_FILTER));
+ setActionDefinitionId("FindReplace");
+ setEnabled(true);
+
+ this.quickFilterWidget = quickFilterWidget;
+
+ if (BrowserCommonActivator.getDefault().getDialogSettings()
+ .get(SHOW_QUICKFILTER_DIALOGSETTING_KEY) == null) {
+ BrowserCommonActivator.getDefault().getDialogSettings()
+ .put(SHOW_QUICKFILTER_DIALOGSETTING_KEY, false);
+ }
+
+ // call the super implementation here because the local implementation
+ // does nothing.
+ super.setChecked(BrowserCommonActivator.getDefault()
+ .getDialogSettings()
+ .getBoolean(SHOW_QUICKFILTER_DIALOGSETTING_KEY));
+ quickFilterWidget.setActive(isChecked());
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * This implementation toggles the checked state and activates or
+ * deactivates the quick filter accordingly.
+ */
+ public void run() {
+ boolean checked = isChecked();
+ super.setChecked(!checked);
+
+ BrowserCommonActivator.getDefault().getDialogSettings()
+ .put(SHOW_QUICKFILTER_DIALOGSETTING_KEY, isChecked());
+
+ if (quickFilterWidget != null) {
+ quickFilterWidget.setActive(isChecked());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * This implementation does nothing. Toggling of the checked state is done
+ * within the run() method.
+ */
+ public void setChecked(boolean checked) {
+ }
+
+ /**
+ * Disposes this action.
+ */
+ public void dispose() {
+ quickFilterWidget = null;
+ }
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java Fri Aug 20 17:07:19 2010
@@ -129,20 +129,20 @@ public class FilterWidget extends Browse
// either with 3rd mouse button (linux)
if ( !filterCombo.getText().equals( e.text ) && e.character == 0 && e.start == e.end )
{
- filterCPA.closeProposalPopup();
+// filterCPA.closeProposalPopup();
}
// or with ctrl+v / command+v
if ( !filterCombo.getText().equals( e.text ) && e.stateMask == SWT.MOD1 && e.start == e.end )
{
- filterCPA.closeProposalPopup();
+// filterCPA.closeProposalPopup();
}
}
} );
parser = new LdapFilterParser();
- contentAssistProcessor = new FilterContentAssistProcessor( parser );
- filterCPA = new ExtendedContentAssistCommandAdapter( filterCombo, new ComboContentAdapter(),
- contentAssistProcessor, null, null, true );
+// contentAssistProcessor = new FilterContentAssistProcessor( parser );
+// filterCPA = new ExtendedContentAssistCommandAdapter( filterCombo, new ComboContentAdapter(),
+// contentAssistProcessor, null, null, true );
// auto edit strategy
new FilterWidgetAutoEditStrategyAdapter( filterCombo, parser );
@@ -215,9 +215,9 @@ public class FilterWidget extends Browse
if ( this.browserConnection != browserConnection )
{
this.browserConnection = browserConnection;
- contentAssistProcessor.setSchema( browserConnection == null ? null : browserConnection.getSchema() );
- filterCPA.setAutoActivationCharacters( contentAssistProcessor
- .getCompletionProposalAutoActivationCharacters() );
+// contentAssistProcessor.setSchema( browserConnection == null ? null : browserConnection.getSchema() );
+// filterCPA.setAutoActivationCharacters( contentAssistProcessor
+// .getCompletionProposalAutoActivationCharacters() );
}
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidgetAutoEditStrategyAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidgetAutoEditStrategyAdapter.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidgetAutoEditStrategyAdapter.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidgetAutoEditStrategyAdapter.java Fri Aug 20 17:07:19 2010
@@ -25,13 +25,11 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.studio.ldapbrowser.common.filtereditor.FilterAutoEditStrategy;
-import org.apache.directory.studio.ldapbrowser.common.filtereditor.FilterAutoEditStrategy.AutoEditParameters;
import org.apache.directory.studio.ldapbrowser.core.model.filter.parser.LdapFilterParser;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Combo;
@@ -74,7 +72,7 @@ public class FilterWidgetAutoEditStrateg
this.verifyEvents = new ArrayList<VerifyEvent>();
this.inApplyComboCustomization = false;
- this.autoEditStrategy = new FilterAutoEditStrategy( parser );
+// this.autoEditStrategy = new FilterAutoEditStrategy( parser );
combo.addVerifyListener( new VerifyListener()
{
public void verifyText( VerifyEvent e )
@@ -135,38 +133,38 @@ public class FilterWidgetAutoEditStrateg
- verifyEvent.end;
// apply auto edit strategy
- AutoEditParameters autoEditParameters = new AutoEditParameters( text, offset, length, -1, true );
- autoEditStrategy.customizeAutoEditParameters( oldText, autoEditParameters );
-
- // get current selection
- Point oldSelection = combo.getSelection();
-
- // compose new text
- String newText = ""; //$NON-NLS-1$
- newText += oldText.substring( 0, autoEditParameters.offset );
- newText += autoEditParameters.text;
- newText += oldText.substring( autoEditParameters.offset + autoEditParameters.length, oldText.length() );
-
- // determine new cursor position
- Point newSelection;
- if ( autoEditParameters.caretOffset != -1 )
- {
- int x = autoEditParameters.caretOffset;
- newSelection = new Point( x, x );
- }
- else
- {
- newSelection = new Point( oldSelection.x, oldSelection.y );
- }
-
- // set new text and cursor position
- if ( verifyEvents.isEmpty() )
- {
- combo.setText( newText );
- combo.setSelection( newSelection );
- }
-
- inApplyComboCustomization = false;
+// AutoEditParameters autoEditParameters = new AutoEditParameters( text, offset, length, -1, true );
+//// autoEditStrategy.customizeAutoEditParameters( oldText, autoEditParameters );
+////
+//// // get current selection
+//// Point oldSelection = combo.getSelection();
+////
+//// // compose new text
+//// String newText = ""; //$NON-NLS-1$
+//// newText += oldText.substring( 0, autoEditParameters.offset );
+//// newText += autoEditParameters.text;
+//// newText += oldText.substring( autoEditParameters.offset + autoEditParameters.length, oldText.length() );
+////
+//// // determine new cursor position
+//// Point newSelection;
+//// if ( autoEditParameters.caretOffset != -1 )
+//// {
+//// int x = autoEditParameters.caretOffset;
+//// newSelection = new Point( x, x );
+//// }
+//// else
+//// {
+//// newSelection = new Point( oldSelection.x, oldSelection.y );
+//// }
+//
+// // set new text and cursor position
+// if ( verifyEvents.isEmpty() )
+// {
+// combo.setText( newText );
+// combo.setSelection( newSelection );
+// }
+//
+// inApplyComboCustomization = false;
}
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java Fri Aug 20 17:07:19 2010
@@ -21,22 +21,6 @@
package org.apache.directory.studio.ldapbrowser.common.widgets.search;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jface.contentassist.IContentAssistSubjectControl;
-import org.eclipse.jface.contentassist.ISubjectControlContentAssistProcessor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
/**
@@ -46,210 +30,210 @@ import org.eclipse.jface.text.contentass
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ReturningAttributesContentAssistProcessor implements ISubjectControlContentAssistProcessor
-{
-
- /** The auto activation characters */
- private char[] autoActivationCharacters;
-
- /** The possible attribute types */
- private List<String> proposals;
-
-
- /**
- * Creates a new instance of ReturningAttributesContentAssistProcessor.
- *
- * @param proposals the proposals
- */
- public ReturningAttributesContentAssistProcessor( List<String> proposals )
- {
- super();
- setProposals( proposals );
- }
-
-
- /**
- * {@inheritDoc}
- */
- public char[] getCompletionProposalAutoActivationCharacters()
- {
- return autoActivationCharacters;
- }
-
-
- /**
- * Sets the possible attribute types.
- *
- * @param proposals the possible strings
- */
- public void setProposals( List<String> proposals )
- {
- if ( proposals == null )
- {
- proposals = new ArrayList<String>();
- }
-
- // sort proposals, attributes first
- Comparator<? super String> comparator = new Comparator<String>()
- {
- public int compare( String o1, String o2 )
- {
- if ( "+".equals( o1 ) && !"+".equals( o2 ) ) //$NON-NLS-1$ //$NON-NLS-2$
- {
- return 4;
- }
- if ( "+".equals( o2 ) && !"+".equals( o1 ) ) //$NON-NLS-1$ //$NON-NLS-2$
- {
- return -4;
- }
-
- if ( "*".equals( o1 ) && !"*".equals( o2 ) ) //$NON-NLS-1$ //$NON-NLS-2$
- {
- return 3;
- }
- if ( "*".equals( o2 ) && !"*".equals( o1 ) ) //$NON-NLS-1$ //$NON-NLS-2$
- {
- return -3;
- }
-
- if ( o1.startsWith( "@" ) && !o2.startsWith( "@" ) ) //$NON-NLS-1$ //$NON-NLS-2$
- {
- return 2;
- }
- if ( o2.startsWith( "@" ) && !o1.startsWith( "@" ) ) //$NON-NLS-1$ //$NON-NLS-2$
- {
- return -2;
- }
-
- return o1.compareToIgnoreCase( o2 );
- }
- };
- Collections.sort( proposals, comparator );
- this.proposals = proposals;
-
- // set auto activation characters
- Set<Character> characterSet = new HashSet<Character>();
- for ( String string : proposals )
- {
- for ( int k = 0; k < string.length(); k++ )
- {
- char ch = string.charAt( k );
- characterSet.add( Character.toLowerCase( ch ) );
- characterSet.add( Character.toUpperCase( ch ) );
- }
- }
- autoActivationCharacters = new char[characterSet.size()];
- int i = 0;
- for ( Iterator<Character> it = characterSet.iterator(); it.hasNext(); )
- {
- Character ch = it.next();
- autoActivationCharacters[i] = ch.charValue();
- i++;
- }
- }
-
-
- /**
- * {@inheritDoc}
- *
- * This implementation always returns null.
- */
- public ICompletionProposal[] computeCompletionProposals( ITextViewer viewer, int offset )
- {
- return null;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public ICompletionProposal[] computeCompletionProposals( IContentAssistSubjectControl contentAssistSubjectControl,
- int documentOffset )
- {
- IDocument document = contentAssistSubjectControl.getDocument();
- String text = document.get();
-
- // search start of current attribute type
- int start = 0;
- for ( int i = documentOffset - 1; i >= 0; i-- )
- {
- char c = text.charAt( i );
- if ( c == ',' || Character.isWhitespace( c ) )
- {
- start = i + 1;
- break;
- }
- }
- String attribute = text.substring( start, documentOffset );
-
- // create proposal list
- List<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>();
- for ( String string : proposals )
- {
- if ( string.toUpperCase().startsWith( attribute.toUpperCase() ) )
- {
- ICompletionProposal proposal = new CompletionProposal( string + ", ", start, //$NON-NLS-1$
- documentOffset - start, string.length() + 2, null, string, null, null );
- proposalList.add( proposal );
- }
- }
- return proposalList.toArray( new ICompletionProposal[proposalList.size()] );
- }
-
-
- /**
- * {@inheritDoc}
- *
- * This implementation always returns null.
- */
- public char[] getContextInformationAutoActivationCharacters()
- {
- return null;
- }
-
-
- /**
- * {@inheritDoc}
- *
- * This implementation always returns null.
- */
- public IContextInformation[] computeContextInformation( ITextViewer viewer, int offset )
- {
- return null;
- }
-
-
- /**
- * {@inheritDoc}
- *
- * This implementation always returns null.
- */
- public IContextInformation[] computeContextInformation( IContentAssistSubjectControl contentAssistSubjectControl,
- int documentOffset )
- {
- return null;
- }
-
-
- /**
- * {@inheritDoc}
- *
- * This implementation always returns null.
- */
- public String getErrorMessage()
- {
- return null;
- }
-
-
- /**
- * {@inheritDoc}
- *
- * This implementation always returns null.
- */
- public IContextInformationValidator getContextInformationValidator()
- {
- return null;
- }
+public class ReturningAttributesContentAssistProcessor /*implements ISubjectControlContentAssistProcessor
+*/{
+//
+// /** The auto activation characters */
+// private char[] autoActivationCharacters;
+//
+// /** The possible attribute types */
+// private List<String> proposals;
+//
+//
+// /**
+// * Creates a new instance of ReturningAttributesContentAssistProcessor.
+// *
+// * @param proposals the proposals
+// */
+// public ReturningAttributesContentAssistProcessor( List<String> proposals )
+// {
+// super();
+// setProposals( proposals );
+// }
+//
+//
+// /**
+// * {@inheritDoc}
+// */
+// public char[] getCompletionProposalAutoActivationCharacters()
+// {
+// return autoActivationCharacters;
+// }
+//
+//
+// /**
+// * Sets the possible attribute types.
+// *
+// * @param proposals the possible strings
+// */
+// public void setProposals( List<String> proposals )
+// {
+// if ( proposals == null )
+// {
+// proposals = new ArrayList<String>();
+// }
+//
+// // sort proposals, attributes first
+// Comparator<? super String> comparator = new Comparator<String>()
+// {
+// public int compare( String o1, String o2 )
+// {
+// if ( "+".equals( o1 ) && !"+".equals( o2 ) ) //$NON-NLS-1$ //$NON-NLS-2$
+// {
+// return 4;
+// }
+// if ( "+".equals( o2 ) && !"+".equals( o1 ) ) //$NON-NLS-1$ //$NON-NLS-2$
+// {
+// return -4;
+// }
+//
+// if ( "*".equals( o1 ) && !"*".equals( o2 ) ) //$NON-NLS-1$ //$NON-NLS-2$
+// {
+// return 3;
+// }
+// if ( "*".equals( o2 ) && !"*".equals( o1 ) ) //$NON-NLS-1$ //$NON-NLS-2$
+// {
+// return -3;
+// }
+//
+// if ( o1.startsWith( "@" ) && !o2.startsWith( "@" ) ) //$NON-NLS-1$ //$NON-NLS-2$
+// {
+// return 2;
+// }
+// if ( o2.startsWith( "@" ) && !o1.startsWith( "@" ) ) //$NON-NLS-1$ //$NON-NLS-2$
+// {
+// return -2;
+// }
+//
+// return o1.compareToIgnoreCase( o2 );
+// }
+// };
+// Collections.sort( proposals, comparator );
+// this.proposals = proposals;
+//
+// // set auto activation characters
+// Set<Character> characterSet = new HashSet<Character>();
+// for ( String string : proposals )
+// {
+// for ( int k = 0; k < string.length(); k++ )
+// {
+// char ch = string.charAt( k );
+// characterSet.add( Character.toLowerCase( ch ) );
+// characterSet.add( Character.toUpperCase( ch ) );
+// }
+// }
+// autoActivationCharacters = new char[characterSet.size()];
+// int i = 0;
+// for ( Iterator<Character> it = characterSet.iterator(); it.hasNext(); )
+// {
+// Character ch = it.next();
+// autoActivationCharacters[i] = ch.charValue();
+// i++;
+// }
+// }
+//
+//
+// /**
+// * {@inheritDoc}
+// *
+// * This implementation always returns null.
+// */
+// public ICompletionProposal[] computeCompletionProposals( ITextViewer viewer, int offset )
+// {
+// return null;
+// }
+//
+//
+// /**
+// * {@inheritDoc}
+// */
+// public ICompletionProposal[] computeCompletionProposals( IContentAssistSubjectControl contentAssistSubjectControl,
+// int documentOffset )
+// {
+// IDocument document = contentAssistSubjectControl.getDocument();
+// String text = document.get();
+//
+// // search start of current attribute type
+// int start = 0;
+// for ( int i = documentOffset - 1; i >= 0; i-- )
+// {
+// char c = text.charAt( i );
+// if ( c == ',' || Character.isWhitespace( c ) )
+// {
+// start = i + 1;
+// break;
+// }
+// }
+// String attribute = text.substring( start, documentOffset );
+//
+// // create proposal list
+// List<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>();
+// for ( String string : proposals )
+// {
+// if ( string.toUpperCase().startsWith( attribute.toUpperCase() ) )
+// {
+// ICompletionProposal proposal = new CompletionProposal( string + ", ", start, //$NON-NLS-1$
+// documentOffset - start, string.length() + 2, null, string, null, null );
+// proposalList.add( proposal );
+// }
+// }
+// return proposalList.toArray( new ICompletionProposal[proposalList.size()] );
+// }
+//
+//
+// /**
+// * {@inheritDoc}
+// *
+// * This implementation always returns null.
+// */
+// public char[] getContextInformationAutoActivationCharacters()
+// {
+// return null;
+// }
+//
+//
+// /**
+// * {@inheritDoc}
+// *
+// * This implementation always returns null.
+// */
+// public IContextInformation[] computeContextInformation( ITextViewer viewer, int offset )
+// {
+// return null;
+// }
+//
+//
+// /**
+// * {@inheritDoc}
+// *
+// * This implementation always returns null.
+// */
+// public IContextInformation[] computeContextInformation( IContentAssistSubjectControl contentAssistSubjectControl,
+// int documentOffset )
+// {
+// return null;
+// }
+//
+//
+// /**
+// * {@inheritDoc}
+// *
+// * This implementation always returns null.
+// */
+// public String getErrorMessage()
+// {
+// return null;
+// }
+//
+//
+// /**
+// * {@inheritDoc}
+// *
+// * This implementation always returns null.
+// */
+// public IContextInformationValidator getContextInformationValidator()
+// {
+// return null;
+// }
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java Fri Aug 20 17:07:19 2010
@@ -28,12 +28,10 @@ import java.util.List;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.DialogContentAssistant;
import org.apache.directory.studio.ldapbrowser.common.widgets.HistoryUtils;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
@@ -104,13 +102,13 @@ public class ReturningAttributesWidget e
returningAttributesCombo.setLayoutData( gd );
// Content assist
- contentAssistProcessor = new ReturningAttributesContentAssistProcessor( null );
- DialogContentAssistant raca = new DialogContentAssistant();
- raca.enableAutoInsert( true );
- raca.enableAutoActivation( true );
- raca.setAutoActivationDelay( 500 );
- raca.setContentAssistProcessor( contentAssistProcessor, IDocument.DEFAULT_CONTENT_TYPE );
- raca.install( returningAttributesCombo );
+// contentAssistProcessor = new ReturningAttributesContentAssistProcessor( null );
+// DialogContentAssistant raca = new DialogContentAssistant();
+// raca.enableAutoInsert( true );
+// raca.enableAutoActivation( true );
+// raca.setAutoActivationDelay( 500 );
+// raca.setContentAssistProcessor( contentAssistProcessor, IDocument.DEFAULT_CONTENT_TYPE );
+// raca.install( returningAttributesCombo );
// History
String[] history = HistoryUtils.load( BrowserCommonConstants.DIALOGSETTING_KEY_RETURNING_ATTRIBUTES_HISTORY );
@@ -160,7 +158,7 @@ public class ReturningAttributesWidget e
proposals.add( "*" ); //$NON-NLS-1$
}
- contentAssistProcessor.setProposals( proposals );
+// contentAssistProcessor.setProposals( proposals );
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java Fri Aug 20 17:07:19 2010
@@ -183,8 +183,8 @@ public class AttributeTypeWizardPage ext
// attribute combo with field decoration and content proposal
attributeTypeCombo = BaseWidgetUtils.createCombo( composite, possibleAttributeTypes, -1, 1 );
attributeTypeCombo.setText( parsedAttributeType );
- new ExtendedContentAssistCommandAdapter( attributeTypeCombo, new ComboContentAdapter(),
- new ListContentProposalProvider( possibleAttributeTypes ), null, null, true );
+// new ExtendedContentAssistCommandAdapter( attributeTypeCombo, new ComboContentAdapter(),
+// new ListContentProposalProvider( possibleAttributeTypes ), null, null, true );
BaseWidgetUtils.createSpacer( composite, 1 );
showSubschemAttributesOnlyButton = BaseWidgetUtils.createCheckbox( composite, Messages
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java Fri Aug 20 17:07:19 2010
@@ -443,8 +443,8 @@ public class NewEntryDnWizardPage extend
} );
// attach content proposal behavior
- contextEntryDnComboCPA = new ContentProposalAdapter( contextEntryDnCombo, new ComboContentAdapter(), null,
- null, null );
+// contextEntryDnComboCPA = new ContentProposalAdapter( contextEntryDnCombo, new ComboContentAdapter(), null,
+// null, null );
contextEntryDnComboCPA.setFilterStyle( ContentProposalAdapter.FILTER_NONE );
contextEntryDnComboCPA.setProposalAcceptanceStyle( ContentProposalAdapter.PROPOSAL_REPLACE );
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/search/LdapSearchPageScoreComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/search/LdapSearchPageScoreComputer.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/search/LdapSearchPageScoreComputer.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/search/LdapSearchPageScoreComputer.java Fri Aug 20 17:07:19 2010
@@ -20,24 +20,18 @@
package org.apache.directory.studio.ldapbrowser.core.internal.search;
-
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
-import org.eclipse.search.ui.ISearchPageScoreComputer;
-
-public class LdapSearchPageScoreComputer implements ISearchPageScoreComputer
+public class LdapSearchPageScoreComputer /* implements ISearchPageScoreComputer */
{
- public static final String LDAP_SEARCH_PAGE_ID = BrowserCoreConstants.LDAP_SEARCH_PAGE_ID;
-
+ public static final String LDAP_SEARCH_PAGE_ID = BrowserCoreConstants.LDAP_SEARCH_PAGE_ID;
- public int computeScore( String pageId, Object input )
- {
- if ( pageId.equals( LDAP_SEARCH_PAGE_ID ) )
- {
- return 90;
- }
- return 0;
- }
+ public int computeScore(String pageId, Object input) {
+ if (pageId.equals(LDAP_SEARCH_PAGE_ID)) {
+ return 90;
+ }
+ return 0;
+ }
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java Fri Aug 20 17:07:19 2010
@@ -42,7 +42,6 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.core.events.EntryDeletedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EntryModificationEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
-import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeDescription;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
@@ -51,7 +50,6 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
-import org.eclipse.search.ui.ISearchPageScoreComputer;
/**
@@ -895,10 +893,10 @@ public abstract class AbstractEntry impl
public Object getAdapter( Class adapter )
{
Class<?> clazz = ( Class<?> ) adapter;
- if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
- {
- return new LdapSearchPageScoreComputer();
- }
+// if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
+// {
+// return new LdapSearchPageScoreComputer();
+// }
if ( clazz.isAssignableFrom( Connection.class ) )
{
return getBrowserConnection().getConnection();
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java Fri Aug 20 17:07:19 2010
@@ -37,14 +37,12 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.core.events.ValueAddedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.ValueDeletedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.ValueModifiedEvent;
-import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeDescription;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
-import org.eclipse.search.ui.ISearchPageScoreComputer;
/**
@@ -447,10 +445,10 @@ public class Attribute implements IAttri
public Object getAdapter( Class adapter )
{
Class<?> clazz = ( Class<?> ) adapter;
- if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
- {
- return new LdapSearchPageScoreComputer();
- }
+// if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
+// {
+// return new LdapSearchPageScoreComputer();
+// }
if ( clazz.isAssignableFrom( Connection.class ) )
{
return getEntry().getBrowserConnection().getConnection();
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Bookmark.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Bookmark.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Bookmark.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Bookmark.java Fri Aug 20 17:07:19 2010
@@ -25,12 +25,10 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.ldapbrowser.core.events.BookmarkUpdateEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
-import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.BookmarkParameter;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
-import org.eclipse.search.ui.ISearchPageScoreComputer;
/**
@@ -136,10 +134,10 @@ public class Bookmark implements IBookma
public Object getAdapter( Class adapter )
{
Class<?> clazz = ( Class<?> ) adapter;
- if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
- {
- return new LdapSearchPageScoreComputer();
- }
+// if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
+// {
+// return new LdapSearchPageScoreComputer();
+// }
if ( clazz.isAssignableFrom( Connection.class ) )
{
return getBrowserConnection().getConnection();
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java Fri Aug 20 17:07:19 2010
@@ -35,14 +35,12 @@ import org.apache.directory.studio.conne
import org.apache.directory.studio.connection.core.event.ConnectionEventRegistry;
import org.apache.directory.studio.ldapbrowser.core.BookmarkManager;
import org.apache.directory.studio.ldapbrowser.core.SearchManager;
-import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
-import org.eclipse.search.ui.ISearchPageScoreComputer;
/**
@@ -557,10 +555,10 @@ public class BrowserConnection implement
public Object getAdapter( Class adapter )
{
Class<?> clazz = ( Class<?> ) adapter;
- if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
- {
- return new LdapSearchPageScoreComputer();
- }
+// if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
+// {
+// return new LdapSearchPageScoreComputer();
+// }
if ( clazz.isAssignableFrom( IBrowserConnection.class ) )
{
return this;
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java Fri Aug 20 17:07:19 2010
@@ -29,14 +29,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
-import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
-import org.eclipse.search.ui.ISearchPageScoreComputer;
/**
@@ -898,10 +896,10 @@ public abstract class DelegateEntry impl
@SuppressWarnings("unchecked")
public Object getAdapter( Class adapter )
{
- if ( adapter.isAssignableFrom( ISearchPageScoreComputer.class ) )
- {
- return new LdapSearchPageScoreComputer();
- }
+// if ( adapter.isAssignableFrom( ISearchPageScoreComputer.class ) )
+// {
+// return new LdapSearchPageScoreComputer();
+// }
if ( adapter == IBrowserConnection.class )
{
return this.getBrowserConnection();
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java Fri Aug 20 17:07:19 2010
@@ -28,19 +28,17 @@ import java.util.List;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.StudioControl;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
+import org.apache.directory.studio.connection.core.StudioControl;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateEvent;
-import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
-import org.eclipse.search.ui.ISearchPageScoreComputer;
/**
@@ -567,10 +565,10 @@ public class Search implements ISearch
public Object getAdapter( Class adapter )
{
Class<?> clazz = ( Class<?> ) adapter;
- if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
- {
- return new LdapSearchPageScoreComputer();
- }
+// if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
+// {
+// return new LdapSearchPageScoreComputer();
+// }
if ( clazz.isAssignableFrom( Connection.class ) )
{
return getBrowserConnection().getConnection();
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java Fri Aug 20 17:07:19 2010
@@ -25,14 +25,12 @@ import java.util.ArrayList;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
-import org.eclipse.search.ui.ISearchPageScoreComputer;
/**
@@ -130,10 +128,10 @@ public class SearchResult implements ISe
public Object getAdapter( Class adapter )
{
Class<?> clazz = ( Class<?> ) adapter;
- if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
- {
- return new LdapSearchPageScoreComputer();
- }
+// if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
+// {
+// return new LdapSearchPageScoreComputer();
+// }
if ( clazz.isAssignableFrom( Connection.class ) )
{
return search.getBrowserConnection().getConnection();
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java Fri Aug 20 17:07:19 2010
@@ -25,14 +25,12 @@ import java.util.Iterator;
import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.apache.directory.studio.ldifparser.LdifUtils;
-import org.eclipse.search.ui.ISearchPageScoreComputer;
/**
@@ -272,10 +270,10 @@ public class Value implements IValue
public Object getAdapter( Class adapter )
{
Class<?> clazz = ( Class<?> ) adapter;
- if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
- {
- return new LdapSearchPageScoreComputer();
- }
+// if ( clazz.isAssignableFrom( ISearchPageScoreComputer.class ) )
+// {
+// return new LdapSearchPageScoreComputer();
+// }
if ( clazz.isAssignableFrom( Connection.class ) )
{
return getAttribute().getEntry().getBrowserConnection().getConnection();
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/plugin.xml?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/plugin.xml (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/plugin.xml Fri Aug 20 17:07:19 2010
@@ -257,7 +257,7 @@
<selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
</wizard>
</extension>
-
+<!--
<extension point="org.eclipse.search.searchPages">
<page
enabled="true"
@@ -268,7 +268,7 @@
sizeHint="450,450"
id="%SearchPage_LdapSearch_id">
</page>
- </extension>
+ </extension>-->
<extension
point="org.eclipse.core.runtime.preferences">
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java Fri Aug 20 17:07:19 2010
@@ -190,7 +190,7 @@ public class EntryEditorManager
Messages.getString( "EntryEditorManager.SaveChanges" ), null,//$NON-NLS-1$
Messages.getString( "EntryEditorManager.SaveChangesDescription" ), //$NON-NLS-1$
MessageDialog.QUESTION, new String[]
- { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0 );
+ { "Yes", "No" }, 0 );
int result = dialog.open();
if ( result == 0 )
{
@@ -457,11 +457,11 @@ public class EntryEditorManager
public EntryEditorManager()
{
initEntryEditorExtensions();
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener( partListener );
- EventRegistry
- .addEntryUpdateListener( entryUpdateListener, BrowserCommonActivator.getDefault().getEventRunner() );
- ConnectionEventRegistry.addConnectionUpdateListener( connectionUpdateListener, ConnectionUIPlugin.getDefault()
- .getEventRunner() );
+// PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener( partListener );
+// EventRegistry
+// .addEntryUpdateListener( entryUpdateListener, BrowserCommonActivator.getDefault().getEventRunner() );
+// ConnectionEventRegistry.addConnectionUpdateListener( connectionUpdateListener, ConnectionUIPlugin.getDefault()
+// .getEventRunner() );
}
@@ -985,7 +985,7 @@ public class EntryEditorManager
MessageDialog dialog = new MessageDialog( partRef.getPart( false ).getSite().getShell(), Messages
.getString( "EntryEditorManager.EntryChanged" ), null, Messages //$NON-NLS-1$
.getString( "EntryEditorManager.EntryChangedDescription" ), MessageDialog.QUESTION, new String[] //$NON-NLS-1$
- { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0 );
+ { "Yes", "No" }, 0 );
int result = dialog.open();
if ( result == 0 )
{
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java Fri Aug 20 17:07:19 2010
@@ -165,7 +165,7 @@ public class EntryEditorUtils
MessageDialog dialog = new MessageDialog( Display.getCurrent().getActiveShell(), Messages
.getString( "EntryEditorUtils.SaveChanges" ), null, Messages //$NON-NLS-1$
.getString( "EntryEditorUtils.SaveChangesDescription" ), MessageDialog.QUESTION, new String[] //$NON-NLS-1$
- { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0 );
+ { "Yes", "No" }, 0 );
int result = dialog.open();
if ( result == 0 )
{
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java Fri Aug 20 17:07:19 2010
@@ -31,10 +31,6 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
/**
@@ -260,18 +256,18 @@ public abstract class CopyEntryAsAction
*/
protected void copyToClipboard( String text )
{
- Clipboard clipboard = null;
- try
- {
- clipboard = new Clipboard( Display.getCurrent() );
- clipboard.setContents( new Object[]
- { text }, new Transfer[]
- { TextTransfer.getInstance() } );
- }
- finally
- {
- if ( clipboard != null )
- clipboard.dispose();
- }
+// Clipboard clipboard = null;
+// try
+// {
+// clipboard = new Clipboard( Display.getCurrent() );
+// clipboard.setContents( new Object[]
+// { text }, new Transfer[]
+// { TextTransfer.getInstance() } );
+// }
+// finally
+// {
+// if ( clipboard != null )
+// clipboard.dispose();
+// }
}
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java Fri Aug 20 17:07:19 2010
@@ -29,9 +29,6 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.widgets.Display;
/**
@@ -113,23 +110,24 @@ public class GotoDnAction extends Locate
private static String getStringFromClipboard()
{
- Clipboard clipboard = null;
- try
- {
- clipboard = new Clipboard( Display.getCurrent() );
- Object contents = clipboard.getContents( TextTransfer.getInstance() );
- if ( contents != null && contents instanceof String )
- {
- return ( String ) contents;
- }
- }
- finally
- {
- if ( clipboard != null )
- {
- clipboard.dispose();
- }
- }
- return null;
+// Clipboard clipboard = null;
+// try
+// {
+// clipboard = new Clipboard( Display.getCurrent() );
+// Object contents = clipboard.getContents( TextTransfer.getInstance() );
+// if ( contents != null && contents instanceof String )
+// {
+// return ( String ) contents;
+// }
+// }
+// finally
+// {
+// if ( clipboard != null )
+// {
+// clipboard.dispose();
+// }
+// }
+// return null;
+ return null;
}
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java Fri Aug 20 17:07:19 2010
@@ -37,7 +37,6 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.core.model.impl.RootDSE;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
/**
@@ -90,7 +89,7 @@ public class MoveAction extends BrowserA
*/
public String getCommandId()
{
- return IWorkbenchActionDefinitionIds.MOVE;
+ return "move";//IWorkbenchActionDefinitionIds.MOVE;
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/NewSearchAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/NewSearchAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/NewSearchAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/NewSearchAction.java Fri Aug 20 17:07:19 2010
@@ -24,10 +24,7 @@ package org.apache.directory.studio.ldap
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
-import org.apache.directory.studio.ldapbrowser.ui.search.SearchPage;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.ui.PlatformUI;
/**
@@ -51,7 +48,7 @@ public class NewSearchAction extends Bro
*/
public void run()
{
- NewSearchUI.openSearchDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow(), SearchPage.getId() );
+// NewSearchUI.openSearchDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow(), SearchPage.getId() );
}
Modified: directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchAction.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchAction.java (original)
+++ directory/studio/branches/studio-rap/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchAction.java Fri Aug 20 17:07:19 2010
@@ -23,14 +23,11 @@ package org.apache.directory.studio.ldap
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
-import org.apache.directory.studio.ldapbrowser.ui.search.SearchPage;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.search.ui.NewSearchUI;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
/**
@@ -58,7 +55,7 @@ public class OpenSearchAction extends Ac
*/
public void run()
{
- NewSearchUI.openSearchDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow(), SearchPage.getId() );
+// NewSearchUI.openSearchDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow(), SearchPage.getId() );
}