directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r927618 - in /directory/studio/trunk: ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/ ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/ ldapbrowser-core...
Date Thu, 25 Mar 2010 22:42:32 GMT
Author: seelmann
Date: Thu Mar 25 22:42:32 2010
New Revision: 927618

URL: http://svn.apache.org/viewvc?rev=927618&view=rev
Log:
Fix for DIRSTUDIO-634 (add search context menu entry / simplify search)

Added:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/OpenQuickSearchAction.java
Modified:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_fr.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_fr.properties
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/QuickSearch.java

Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/OpenQuickSearchAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/OpenQuickSearchAction.java?rev=927618&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/OpenQuickSearchAction.java
(added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/OpenQuickSearchAction.java
Thu Mar 25 22:42:32 2010
@@ -0,0 +1,138 @@
+/*
+ *  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.studio.ldapbrowser.common.actions;
+
+
+import org.apache.directory.studio.connection.core.Utils;
+import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
+import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IQuickSearch;
+import org.apache.directory.studio.ldapbrowser.core.model.impl.QuickSearch;
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+
+
+/**
+ * This class implements the Open Quick Seach Action.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class OpenQuickSearchAction extends BrowserAction
+{
+
+    /**
+     * Creates a new instance of OpenQuickSearchAction.
+     */
+    public OpenQuickSearchAction()
+    {
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void run()
+    {
+        IBrowserConnection browserConnection = getBrowserConnection();
+        if ( browserConnection != null )
+        {
+            IQuickSearch quickSearch = browserConnection.getSearchManager().getQuickSearch();
+            if ( quickSearch == null )
+            {
+                quickSearch = new QuickSearch( browserConnection.getRootDSE(), browserConnection
);
+                browserConnection.getSearchManager().setQuickSearch( quickSearch );
+            }
+
+            String pageId = BrowserCommonConstants.PROP_SEARCH;
+            PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn( getShell(),
quickSearch, pageId, null,
+                null );
+            String title = quickSearch.getName();
+            if ( dialog != null )
+            {
+                title = Utils.shorten( title, 30 );
+            }
+            dialog.getShell().setText( NLS.bind( Messages.getString( "PropertiesAction.PropertiesForX"
), title ) ); //$NON-NLS-1$
+            dialog.open();
+        }
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getText()
+    {
+        return Messages.getString( "OpenQuickSearchAction.OpenQuickSearch" ); //$NON-NLS-1$
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public ImageDescriptor getImageDescriptor()
+    {
+        return BrowserCommonActivator.getDefault().getImageDescriptor( BrowserCommonConstants.IMG_QUICKSEARCH
);
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getCommandId()
+    {
+        return null;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean isEnabled()
+    {
+        return getBrowserConnection() != null;
+    }
+
+
+    private IBrowserConnection getBrowserConnection()
+    {
+        if ( getInput() instanceof IBrowserConnection )
+        {
+            return ( IBrowserConnection ) getInput();
+        }
+        if ( getSelectedSearchResults().length > 0 )
+        {
+            return getSelectedSearchResults()[0].getEntry().getBrowserConnection();
+        }
+        if ( getSelectedEntries().length > 0 )
+        {
+            return getSelectedEntries()[0].getBrowserConnection();
+        }
+        if ( getSelectedSearches().length > 0 )
+        {
+            return getSelectedSearches()[0].getBrowserConnection();
+        }
+        return null;
+    }
+}

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties
Thu Mar 25 22:42:32 2010
@@ -60,6 +60,7 @@ FilterChildrenAction.FilterChildrenLabel
 NewAttributeAction.NewAttribute=New Attribute
 NewAttributeAction.NewAttributeLabel=New Attribute...
 NewValueAction.NewValue=New Value
+OpenQuickSearchAction.OpenQuickSearch=Quick Search
 PasteAction.Paste=Paste
 PasteAction.PasteEntries=Paste Entries
 PasteAction.PasteEntry=Paste Entry

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties
Thu Mar 25 22:42:32 2010
@@ -60,6 +60,7 @@ FilterChildrenAction.FilterChildrenLabel
 NewAttributeAction.NewAttribute=Neues Attribut
 NewAttributeAction.NewAttributeLabel=Neues Attribut...
 NewValueAction.NewValue=Neuer Wert
+OpenQuickSearchAction.OpenQuickSearch=Schnellsuche
 PasteAction.Paste=Einf\u00FCgen
 PasteAction.PasteEntries=Eintr\u00E4ge einf\u00FCgen
 PasteAction.PasteEntry=Eintrag einf\u00FCgen

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_fr.properties?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_fr.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_fr.properties
Thu Mar 25 22:42:32 2010
@@ -60,6 +60,7 @@ FilterChildrenAction.FilterChildrenLabel
 NewAttributeAction.NewAttribute=Nouvel attribut
 NewAttributeAction.NewAttributeLabel=Nouvel attribut...
 NewValueAction.NewValue=Nouvelle valeur
+OpenQuickSearchAction.OpenQuickSearch=TODO: Quick Search
 PasteAction.Paste=Coller
 PasteAction.PasteEntries=Coller les entr\u00E9es
 PasteAction.PasteEntry=Coller l'entr\u00E9e

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
Thu Mar 25 22:42:32 2010
@@ -27,6 +27,7 @@ import java.util.Map;
 import org.apache.directory.studio.connection.ui.actions.CollapseAllAction;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
 import org.apache.directory.studio.ldapbrowser.common.actions.FilterChildrenAction;
+import org.apache.directory.studio.ldapbrowser.common.actions.OpenQuickSearchAction;
 import org.apache.directory.studio.ldapbrowser.common.actions.PropertiesAction;
 import org.apache.directory.studio.ldapbrowser.common.actions.RefreshAction;
 import org.apache.directory.studio.ldapbrowser.common.actions.UnfilterChildrenAction;
@@ -73,6 +74,9 @@ public class BrowserActionGroup implemen
     /** The Constant filterChildrenAction. */
     protected static final String filterChildrenAction = "filterChildrenAction"; //$NON-NLS-1$
 
+    /** The Constant openQuickSearchAction. */
+    protected static final String openQuickSearchAction = "openQuickSearch"; //$NON-NLS-1$
+
     /** The Constant unfilterChildrenAction. */
     protected static final String unfilterChildrenAction = "unfilterChildrenAction"; //$NON-NLS-1$
 
@@ -105,6 +109,7 @@ public class BrowserActionGroup implemen
         showQuickSearchAction = new ShowQuickSearchAction( mainWidget.getQuickSearchWidget()
);
         collapseAllAction = new CollapseAllAction( viewer );
 
+        browserActionMap.put( openQuickSearchAction, new BrowserViewActionProxy( viewer,
new OpenQuickSearchAction() ) );
         browserActionMap.put( upAction, new BrowserViewActionProxy( viewer, new UpAction(
viewer ) ) );
         browserActionMap.put( refreshAction, new BrowserViewActionProxy( viewer, new RefreshAction()
) );
         browserActionMap.put( filterChildrenAction, new BrowserViewActionProxy( viewer, new
FilterChildrenAction() ) );
@@ -212,6 +217,7 @@ public class BrowserActionGroup implemen
         {
             menuManager.add( browserActionMap.get( unfilterChildrenAction ) );
         }
+        menuManager.add( browserActionMap.get( openQuickSearchAction ) );
         menuManager.add( new Separator() );
 
         // refresh

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
Thu Mar 25 22:42:32 2010
@@ -294,13 +294,6 @@ public class BrowserQuickSearchWidget
         IBrowserConnection conn = entry.getBrowserConnection();
 
         QuickSearch quickSearch = new QuickSearch( entry, conn );
-        quickSearch.getSearchParameter().setName( Messages.getString( "BrowserQuickSearchWidget.QuickSearch"
) ); //$NON-NLS-1$
-        quickSearch.getSearchParameter().setSearchBase( entry.getDn() );
-        quickSearch.getSearchParameter().setReturningAttributes( ISearch.NO_ATTRIBUTES );
-        quickSearch.getSearchParameter().setAliasesDereferencingMethod( conn.getAliasesDereferencingMethod()
);
-        quickSearch.getSearchParameter().setReferralsHandlingMethod( conn.getReferralsHandlingMethod()
);
-        quickSearch.getSearchParameter().setCountLimit( conn.getCountLimit() );
-        quickSearch.getSearchParameter().setTimeLimit( conn.getTimeLimit() );
         quickSearch.getSearchParameter().setScope( quickSearchScopeButton.getSelection()
? SearchScope.SUBTREE : SearchScope.ONELEVEL );
 
         StringBuffer filter = new StringBuffer();

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
Thu Mar 25 22:42:32 2010
@@ -46,7 +46,6 @@ BrowserSorterDialog.SortLimitToolTip=If 
 OpenSortDialogAction.Sorting=Sorting...
 ShowQuickSearchAction.ShowQuickSearch=Show Quick Search
 BrowserQuickSearchWidget.RunQuickSearch=Run Quick Search
-BrowserQuickSearchWidget.QuickSearch=Quick Search
 BrowserQuickSearchWidget.ScopeOneLevelToolTip=Search one level only
 BrowserQuickSearchWidget.ScopeSubtreeToolTip=Search whole subtree
 BrowserQuickSearchWidget.SearchAttribute=Search Attribute: Type in a search attribute or
select a recently used search attribute from the list.

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties
Thu Mar 25 22:42:32 2010
@@ -44,7 +44,6 @@ BrowserSorterDialog.SortEntries=Eintr\u0
 BrowserSorterDialog.SortLimit=Sortier-Limit:
 BrowserSorterDialog.SortLimitToolTip=Bei mehr Eintr\u00E4gen wird keine Sortierung durchgef\u00FChrt.
Hinweis: Der Wert sollte 10000 nicht \u00FCbersteigen\!
 OpenSortDialogAction.Sorting=Sortierung...
-ShowQuickSearchAction.ShowQuickSearch=Schnellsuche anzeigen
 BrowserQuickSearchWidget.RunQuickSearch=Schnellsuche ausf\u00FChren
 BrowserQuickSearchWidget.QuickSearch=Schnellsuche
 BrowserQuickSearchWidget.ScopeOneLevelToolTip=Nur eine Ebene durchsuchen (One Level)

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_fr.properties?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_fr.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_fr.properties
Thu Mar 25 22:42:32 2010
@@ -44,7 +44,6 @@ BrowserSorterDialog.SortEntries=Tri des 
 BrowserSorterDialog.SortLimit=Limite de tri:
 BrowserSorterDialog.SortLimitToolTip=S'il y a plus de fils que la valeur sp\u00E9cifi\u00E9e,
le tri ne sera pas effectu\u00E9. Conseil: Pour des raisons de performance, la valeur maximale
ne devrait pas d\u00E9passer 10 000 \!
 OpenSortDialogAction.Sorting=Tri...
-ShowQuickSearchAction.ShowQuickSearch=Afficher la recherche rapide
 BrowserQuickSearchWidget.RunQuickSearch=Lancer la recherche rapide
 BrowserQuickSearchWidget.QuickSearch=Recherche rapide
 BrowserQuickSearchWidget.ScopeOneLevelToolTip=Rechercher sur un niveau uniquement

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreMessages.java
Thu Mar 25 22:42:32 2010
@@ -429,4 +429,7 @@ public class BrowserCoreMessages extends
     public static String model_filter_missing_closing_parenthesis;
 
     public static String model_filter_missing_filter_expression;
+
+    public static String model__quick_search_name;
+
 }

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
Thu Mar 25 22:42:32 2010
@@ -103,6 +103,7 @@ model__url_no_protocol=No protocol
 model__url_no_attributes=No attributes
 model__url_no_extensions=No extensions
 model__no_hash=Plaintext
+model__quick_search_name=Quick Search
 
 jobs__error_occurred=Error occurred
 jobs__progressmonitor_check_cancellation=Check Cancellation

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
Thu Mar 25 22:42:32 2010
@@ -101,6 +101,7 @@ model__url_no_protocol=Kein Protokoll
 model__url_no_attributes=Keine Attribute
 model__url_no_extensions=Keine Erweiterungen
 model__no_hash=Klartext
+model__quick_search_name=Schnellsuche anzeigen
 
 jobs__error_occurred=Ein Fehler ist aufgetreten
 jobs__progressmonitor_check_cancellation=Abbruch \u00FCberpr\u00FCfen

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
Thu Mar 25 22:42:32 2010
@@ -103,6 +103,7 @@ model__url_no_protocol=Pas de protocol
 model__url_no_attributes=Pas d'attributs
 model__url_no_extensions=Pas d'extensions
 model__no_hash=Texte brut
+model__quick_search_name=Afficher la recherche rapide
 
 jobs__error_occurred=Une erreur est survenue
 jobs__progressmonitor_check_cancellation=V\u00E9rification de l'annulation

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/QuickSearch.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/QuickSearch.java?rev=927618&r1=927617&r2=927618&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/QuickSearch.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/QuickSearch.java
Thu Mar 25 22:42:32 2010
@@ -21,9 +21,11 @@
 package org.apache.directory.studio.ldapbrowser.core.model.impl;
 
 
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 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.IQuickSearch;
+import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
 
 
 /**
@@ -61,6 +63,16 @@ public class QuickSearch extends Search 
     {
         this.searchBaseEntry = searchBaseEntry;
         this.connection = connection;
+
+        // set default parameter
+        getSearchParameter().setName( BrowserCoreMessages.model__quick_search_name );
+        getSearchParameter().setSearchBase( searchBaseEntry.getDn() );
+        getSearchParameter().setReturningAttributes( ISearch.NO_ATTRIBUTES );
+        getSearchParameter().setAliasesDereferencingMethod( connection.getAliasesDereferencingMethod()
);
+        getSearchParameter().setReferralsHandlingMethod( connection.getReferralsHandlingMethod()
);
+        getSearchParameter().setCountLimit( connection.getCountLimit() );
+        getSearchParameter().setTimeLimit( connection.getTimeLimit() );
+        getSearchParameter().setScope( SearchScope.SUBTREE );
     }
 
 



Mime
View raw message