You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/10/08 16:48:24 UTC

svn commit: r823196 - in /directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs: CreateEntryRunnable.java ReadEntryRunnable.java

Author: seelmann
Date: Thu Oct  8 14:48:24 2009
New Revision: 823196

URL: http://svn.apache.org/viewvc?rev=823196&view=rev
Log:
Fix for DIRSTUDIO-437 (Alias are not exposed as such in the browser)
o enable flags at parent entry if alias (or referral or subentry) was created

Modified:
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java?rev=823196&r1=823195&r2=823196&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java Thu Oct  8 14:48:24 2009
@@ -115,6 +115,23 @@
         {
             createdEntry = ReadEntryRunnable.getEntry( browserConnection, entryToCreate.getDn(), monitor );
             createdEntry.setHasChildrenHint( false );
+
+            // set some flags at the parent
+            if ( createdEntry.hasParententry() )
+            {
+                if ( createdEntry.isAlias() )
+                {
+                    createdEntry.getParententry().setFetchAliases( true );
+                }
+                if ( createdEntry.isReferral() )
+                {
+                    createdEntry.getParententry().setFetchReferrals( true );
+                }
+                if ( createdEntry.isSubentry() )
+                {
+                    createdEntry.getParententry().setFetchSubentries( true );
+                }
+            }
         }
 
         monitor.reportProgress( " " ); //$NON-NLS-1$

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java?rev=823196&r1=823195&r2=823196&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java Thu Oct  8 14:48:24 2009
@@ -23,6 +23,8 @@
 
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.studio.connection.core.Connection;
+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.jobs.StudioBulkRunnableWithProgress;
 import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
@@ -164,8 +166,7 @@
 
             // search in directory
             ISearch search = new Search( null, browserConnection, dn, null, ISearch.NO_ATTRIBUTES, SearchScope.OBJECT,
-                1, 0, browserConnection.getAliasesDereferencingMethod(),
-                browserConnection.getReferralsHandlingMethod(), true, null );
+                1, 0, AliasDereferencingMethod.NEVER, ReferralHandlingMethod.MANAGE, true, null );
             SearchRunnable.searchAndUpdateModel( browserConnection, search, monitor );
             ISearchResult[] srs = search.getSearchResults();
             if ( srs.length > 0 )