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 2009/10/21 14:12:13 UTC
svn commit: r827980 [1/2] - in
/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core:
./ events/ jobs/ model/ model/filter/ model/filter/parser/ model/impl/
model/schema/ utils/
Author: pamarcelot
Date: Wed Oct 21 12:12:12 2009
New Revision: 827980
URL: http://svn.apache.org/viewvc?rev=827980&view=rev
Log:
Code formatting.
Modified:
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BookmarkManager.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
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/SearchManager.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/BookmarkUpdateListener.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeChildrenRunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterParser.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.java
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BookmarkManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BookmarkManager.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BookmarkManager.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BookmarkManager.java Wed Oct 21 12:12:12 2009
@@ -107,8 +107,8 @@
}
bookmarkList.add( index, bookmark );
- EventRegistry.fireBookmarkUpdated( new BookmarkUpdateEvent( bookmark, BookmarkUpdateEvent.Detail.BOOKMARK_ADDED ),
- this );
+ EventRegistry.fireBookmarkUpdated(
+ new BookmarkUpdateEvent( bookmark, BookmarkUpdateEvent.Detail.BOOKMARK_ADDED ), this );
}
@@ -157,8 +157,8 @@
public void removeBookmark( IBookmark bookmark )
{
bookmarkList.remove( bookmark );
- EventRegistry.fireBookmarkUpdated( new BookmarkUpdateEvent( bookmark, BookmarkUpdateEvent.Detail.BOOKMARK_REMOVED ),
- this );
+ EventRegistry.fireBookmarkUpdated( new BookmarkUpdateEvent( bookmark,
+ BookmarkUpdateEvent.Detail.BOOKMARK_REMOVED ), this );
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java Wed Oct 21 12:12:12 2009
@@ -70,7 +70,8 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class BrowserConnectionManager implements ConnectionUpdateListener, BrowserConnectionUpdateListener, SearchUpdateListener, BookmarkUpdateListener
+public class BrowserConnectionManager implements ConnectionUpdateListener, BrowserConnectionUpdateListener,
+ SearchUpdateListener, BookmarkUpdateListener
{
/** The list of connections. */
@@ -119,7 +120,8 @@
*/
public static final String getBrowserConnectionStoreFileName()
{
- String filename = BrowserCorePlugin.getDefault().getStateLocation().append( "browserconnections.xml" ).toOSString(); //$NON-NLS-1$
+ String filename = BrowserCorePlugin.getDefault().getStateLocation()
+ .append( "browserconnections.xml" ).toOSString(); //$NON-NLS-1$
File file = new File( filename );
if ( !file.exists() )
{
@@ -182,8 +184,8 @@
Connection connection = ConnectionCorePlugin.getDefault().getConnectionManager().getConnectionByName( name );
return getBrowserConnection( connection );
}
-
-
+
+
/**
* Gets a browser connection from its underlying connection.
*
@@ -344,7 +346,8 @@
// To avoid a corrupt file, save object to a temp file first
try
{
- BrowserConnectionIO.save( new FileOutputStream( getBrowserConnectionStoreFileName() + "-temp" ), connectionMap );
+ BrowserConnectionIO.save( new FileOutputStream( getBrowserConnectionStoreFileName() + "-temp" ),
+ connectionMap );
}
catch ( IOException e )
{
@@ -370,34 +373,34 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
-
-// Object[][] object = new Object[connectionMap.size()][3];
-//
-// Iterator<IBrowserConnection> connectionIterator = connectionMap.values().iterator();
-// for ( int i = 0; connectionIterator.hasNext(); i++ )
-// {
-// IBrowserConnection browserConnection = connectionIterator.next();
-//
-// ISearch[] searches = browserConnection.getSearchManager().getSearches();
-// SearchParameter[] searchParameters = new SearchParameter[searches.length];
-// for ( int k = 0; k < searches.length; k++ )
-// {
-// searchParameters[k] = searches[k].getSearchParameter();
-// }
-//
-// IBookmark[] bookmarks = browserConnection.getBookmarkManager().getBookmarks();
-// BookmarkParameter[] bookmarkParameters = new BookmarkParameter[bookmarks.length];
-// for ( int k = 0; k < bookmarks.length; k++ )
-// {
-// bookmarkParameters[k] = bookmarks[k].getBookmarkParameter();
-// }
-//
-// object[i][0] = browserConnection.getConnection().getId();
-// object[i][1] = searchParameters;
-// object[i][2] = bookmarkParameters;
-// }
-//
-// save( object, getBrowserConnectionStoreFileName() );
+
+ // Object[][] object = new Object[connectionMap.size()][3];
+ //
+ // Iterator<IBrowserConnection> connectionIterator = connectionMap.values().iterator();
+ // for ( int i = 0; connectionIterator.hasNext(); i++ )
+ // {
+ // IBrowserConnection browserConnection = connectionIterator.next();
+ //
+ // ISearch[] searches = browserConnection.getSearchManager().getSearches();
+ // SearchParameter[] searchParameters = new SearchParameter[searches.length];
+ // for ( int k = 0; k < searches.length; k++ )
+ // {
+ // searchParameters[k] = searches[k].getSearchParameter();
+ // }
+ //
+ // IBookmark[] bookmarks = browserConnection.getBookmarkManager().getBookmarks();
+ // BookmarkParameter[] bookmarkParameters = new BookmarkParameter[bookmarks.length];
+ // for ( int k = 0; k < bookmarks.length; k++ )
+ // {
+ // bookmarkParameters[k] = bookmarks[k].getBookmarkParameter();
+ // }
+ //
+ // object[i][0] = browserConnection.getConnection().getId();
+ // object[i][1] = searchParameters;
+ // object[i][2] = bookmarkParameters;
+ // }
+ //
+ // save( object, getBrowserConnectionStoreFileName() );
}
@@ -434,7 +437,7 @@
Connection connection = connections[i];
BrowserConnection browserConnection = new BrowserConnection( connection );
connectionMap.put( connection.getId(), browserConnection );
-
+
try
{
String schemaFilename = getSchemaCacheFileName( connection.getId() );
@@ -447,7 +450,7 @@
{
}
}
-
+
// java.beans.XMLDecoder
try
{
@@ -456,20 +459,21 @@
if ( file.exists() )
{
String oldContent = FileUtils.readFileToString( file, "UTF-8" );
- if(!oldContent.contains( "java.beans.XMLDecoder" ))
+ if ( !oldContent.contains( "java.beans.XMLDecoder" ) )
{
// new file format
try
{
- BrowserConnectionIO.load( new FileInputStream( getBrowserConnectionStoreFileName() ), connectionMap );
+ BrowserConnectionIO.load( new FileInputStream( getBrowserConnectionStoreFileName() ),
+ connectionMap );
}
catch ( Exception e )
{
// If loading failed, try with temp file
try
{
- BrowserConnectionIO
- .load( new FileInputStream( getBrowserConnectionStoreFileName() + "-temp" ), connectionMap );
+ BrowserConnectionIO.load( new FileInputStream( getBrowserConnectionStoreFileName()
+ + "-temp" ), connectionMap );
}
catch ( FileNotFoundException e1 )
{
@@ -483,7 +487,7 @@
}
}
}
- else
+ else
{
// old file format
Object[][] object = ( Object[][] ) this.load( getBrowserConnectionStoreFileName() );
@@ -536,8 +540,7 @@
catch ( Exception e )
{
}
-
-
+
}
@@ -585,7 +588,6 @@
}
}
-
class TypeSafeEnumPersistenceDelegate extends PersistenceDelegate
{
protected boolean mutatesTo( Object oldInstance, Object newInstance )
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=827980&r1=827979&r2=827980&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 Wed Oct 21 12:12:12 2009
@@ -34,11 +34,11 @@
{
private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.core.browsercoremessages"; //$NON-NLS-1$
-
- /**
- * Creates a new instance of BrowserCoreMessages.
- */
- private BrowserCoreMessages()
+
+ /**
+ * Creates a new instance of BrowserCoreMessages.
+ */
+ private BrowserCoreMessages()
{
}
@@ -57,7 +57,7 @@
public static String event__dn_attributes_initialized;
public static String event__dn_children_initialized;
-
+
public static String event__bulk_modification;
public static String event__empty_value_added_to_att_at_dn;
@@ -179,7 +179,7 @@
public static String ldif__import_into_host_port_failed_on_date;
public static String ldif__error_msg;
-
+
public static String dsml__n_errors_see_responsefile;
public static String model__no_connection;
@@ -293,7 +293,7 @@
public static String jobs__export_ldif_task;
public static String jobs__export_ldif_error;
-
+
public static String jobs__export_dsml_name;
public static String jobs__export_dsml_task;
@@ -323,7 +323,7 @@
public static String jobs__import_ldif_task;
public static String jobs__import_ldif_error;
-
+
public static String jobs__import_dsml_name;
public static String jobs__import_dsml_task;
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/SearchManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/SearchManager.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/SearchManager.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/SearchManager.java Wed Oct 21 12:12:12 2009
@@ -172,7 +172,7 @@
*/
public void removeSearch( ISearch search )
{
- if(search == quickSearch)
+ if ( search == quickSearch )
{
quickSearch = null;
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java Wed Oct 21 12:12:12 2009
@@ -73,5 +73,5 @@
return BrowserCoreMessages.bind( BrowserCoreMessages.event__deleted_att_from_dn, new String[]
{ getDeletedAttribute().getDescription(), getModifiedEntry().getDn().getUpName() } );
}
-
+
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/BookmarkUpdateListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/BookmarkUpdateListener.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/BookmarkUpdateListener.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/BookmarkUpdateListener.java Wed Oct 21 12:12:12 2009
@@ -20,6 +20,7 @@
package org.apache.directory.studio.ldapbrowser.core.events;
+
import java.util.EventListener;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java Wed Oct 21 12:12:12 2009
@@ -159,7 +159,7 @@
public boolean shouldSchedule()
{
-
+
Object[] myLockedObjects = getLockedObjects();
String[] myLockedObjectsIdentifiers = getLockIdentifiers( myLockedObjects );
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java Wed Oct 21 12:12:12 2009
@@ -402,13 +402,12 @@
delResponseDsml.getLdapResult().setMatchedDN( request.getEntry() );
batchResponseDsml.addResponse( delResponseDsml );
}
-
+
// Update cached entries
LdapDN dn = request.getEntry();
IEntry e = browserConnection.getEntryFromCache( dn );
LdapDN parentDn = DnUtils.getParent( dn );
- IEntry parentEntry = parentDn != null ? browserConnection.getEntryFromCache( parentDn )
- : null;
+ IEntry parentEntry = parentDn != null ? browserConnection.getEntryFromCache( parentDn ) : null;
if ( e != null )
{
e.setAttributesInitialized( false );
@@ -479,7 +478,7 @@
modifyResponseDsml.getLdapResult().setMatchedDN( request.getObject() );
batchResponseDsml.addResponse( modifyResponseDsml );
}
-
+
LdapDN dn = request.getObject();
IEntry e = browserConnection.getEntryFromCache( dn );
if ( e != null )
@@ -536,13 +535,12 @@
modDNResponseDsml.getLdapResult().setMatchedDN( request.getEntry() );
batchResponseDsml.addResponse( modDNResponseDsml );
}
-
+
// Update cached entries
LdapDN dn = request.getEntry();
IEntry e = browserConnection.getEntryFromCache( dn );
LdapDN parentDn = DnUtils.getParent( dn );
- IEntry parentEntry = parentDn != null ? browserConnection.getEntryFromCache( parentDn )
- : null;
+ IEntry parentEntry = parentDn != null ? browserConnection.getEntryFromCache( parentDn ) : null;
if ( e != null )
{
e.setAttributesInitialized( false );
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java Wed Oct 21 12:12:12 2009
@@ -287,7 +287,7 @@
IEntry entry = browserConnection.getEntryFromCache( dn );
LdapDN parentDn = DnUtils.getParent( dn );
IEntry parentEntry = null;
- while(parentEntry == null && parentDn != null)
+ while ( parentEntry == null && parentDn != null )
{
parentEntry = browserConnection.getEntryFromCache( parentDn );
parentDn = DnUtils.getParent( parentDn );
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeChildrenRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeChildrenRunnable.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeChildrenRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeChildrenRunnable.java Wed Oct 21 12:12:12 2009
@@ -215,7 +215,7 @@
SearchContinuation[] scs = search.getSearchContinuations();
// fill children in search result
- if ( (srs != null && srs.length > 0) || (scs != null && scs.length > 0) )
+ if ( ( srs != null && srs.length > 0 ) || ( scs != null && scs.length > 0 ) )
{
// clearing old children before filling new children is
// necessary to handle aliases and referrals.
@@ -223,7 +223,7 @@
do
{
- if(srs != null)
+ if ( srs != null )
{
for ( ISearchResult searchResult : srs )
{
@@ -231,8 +231,8 @@
}
srs = null;
}
-
- if(scs != null)
+
+ if ( scs != null )
{
for ( SearchContinuation searchContinuation : scs )
{
@@ -317,7 +317,8 @@
}
// get aliases and referrals
- ISearch aliasOrReferralSearch = createSearch( parent, null, false, parent.isFetchAliases(), parent.isFetchReferrals() );
+ ISearch aliasOrReferralSearch = createSearch( parent, null, false, parent.isFetchAliases(), parent
+ .isFetchReferrals() );
if ( parent.isFetchAliases() || parent.isFetchReferrals() )
{
executeSubSearch( parent, aliasOrReferralSearch, monitor );
@@ -347,8 +348,8 @@
}
for ( SearchContinuation searchContinuation : subScs )
{
- ContinuedSearchResultEntry entry = new ContinuedSearchResultEntry( parent
- .getBrowserConnection(), searchContinuation.getUrl().getDn() );
+ ContinuedSearchResultEntry entry = new ContinuedSearchResultEntry( parent.getBrowserConnection(),
+ searchContinuation.getUrl().getDn() );
entry.setUnresolved( searchContinuation.getUrl() );
parent.addChild( entry );
}
@@ -424,11 +425,11 @@
static void clearCaches( IEntry entry, boolean purgeAllCaches )
{
- if(entry instanceof IContinuation)
+ if ( entry instanceof IContinuation )
{
return;
}
-
+
// clear the parent-child relationship, recursively
IEntry[] children = entry.getChildren();
if ( children != null )
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java Wed Oct 21 12:12:12 2009
@@ -181,8 +181,8 @@
// load all user attributes
search = new Search( null, browserConnection, LdapDN.EMPTY_LDAPDN, ISearch.FILTER_TRUE, new String[]
- { SchemaConstants.ALL_USER_ATTRIBUTES }, SearchScope.OBJECT, 0, 0, Connection.AliasDereferencingMethod.NEVER,
- Connection.ReferralHandlingMethod.IGNORE, false, null );
+ { SchemaConstants.ALL_USER_ATTRIBUTES }, SearchScope.OBJECT, 0, 0,
+ Connection.AliasDereferencingMethod.NEVER, Connection.ReferralHandlingMethod.IGNORE, false, null );
SearchRunnable.searchAndUpdateModel( browserConnection, search, monitor );
// the list of entries under the Root DSE
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=827980&r1=827979&r2=827980&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 Wed Oct 21 12:12:12 2009
@@ -157,7 +157,8 @@
*
* @return the read entry
*/
- static IEntry getEntry( IBrowserConnection browserConnection, LdapDN dn, List<StudioControl> controls, StudioProgressMonitor monitor )
+ static IEntry getEntry( IBrowserConnection browserConnection, LdapDN dn, List<StudioControl> controls,
+ StudioProgressMonitor monitor )
{
try
{
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java Wed Oct 21 12:12:12 2009
@@ -167,8 +167,7 @@
* if the value is null or if the value's attribute
* isn't this attribute.
*/
- public abstract void modifyValue( IValue oldValue, IValue newValue )
- throws IllegalArgumentException;
+ public abstract void modifyValue( IValue oldValue, IValue newValue ) throws IllegalArgumentException;
/**
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java Wed Oct 21 12:12:12 2009
@@ -70,7 +70,7 @@
/** The constant used for unsupported hash methods */
public static final String HASH_METHOD_UNSUPPORTED = BrowserCoreMessages.model__unsupported_hash;
-
+
/** The constant used for invalid password hashes */
public static final String HASH_METHOD_INVALID = BrowserCoreMessages.model__invalid_hash;
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java Wed Oct 21 12:12:12 2009
@@ -113,9 +113,8 @@
&& ( filtertypeToken.getType() == LdapFilterToken.EQUAL
|| filtertypeToken.getType() == LdapFilterToken.GREATER
|| filtertypeToken.getType() == LdapFilterToken.LESS
- || filtertypeToken.getType() == LdapFilterToken.APROX
- || filtertypeToken.getType() == LdapFilterToken.PRESENT
- || filtertypeToken.getType() == LdapFilterToken.SUBSTRING ) )
+ || filtertypeToken.getType() == LdapFilterToken.APROX
+ || filtertypeToken.getType() == LdapFilterToken.PRESENT || filtertypeToken.getType() == LdapFilterToken.SUBSTRING ) )
{
this.filtertypeToken = filtertypeToken;
return true;
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterParser.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterParser.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterParser.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterParser.java Wed Oct 21 12:12:12 2009
@@ -173,19 +173,20 @@
{
LdapFilter currentFilter = filterStack.peek();
LdapFilterComponent filterComponent = currentFilter.getFilterComponent();
- if( filterComponent instanceof LdapFilterItemComponent )
+ if ( filterComponent instanceof LdapFilterItemComponent )
{
handleError( ( filterComponent instanceof LdapFilterItemComponent )
&& ( ( LdapFilterItemComponent ) filterComponent ).setValueToken( token ), token,
currentFilter );
}
- else if( filterComponent instanceof LdapFilterExtensibleComponent )
+ else if ( filterComponent instanceof LdapFilterExtensibleComponent )
{
handleError( ( filterComponent instanceof LdapFilterExtensibleComponent )
&& ( ( LdapFilterExtensibleComponent ) filterComponent ).setValueToken( token ), token,
currentFilter );
}
- else {
+ else
+ {
handleError( false, token, currentFilter );
}
break;
@@ -199,19 +200,20 @@
{
LdapFilter currentFilter = filterStack.peek();
LdapFilterComponent filterComponent = currentFilter.getFilterComponent();
- if( filterComponent instanceof LdapFilterItemComponent )
+ if ( filterComponent instanceof LdapFilterItemComponent )
{
handleError( ( filterComponent instanceof LdapFilterItemComponent )
&& ( ( LdapFilterItemComponent ) filterComponent ).setFiltertypeToken( token ), token,
currentFilter );
}
- else if( filterComponent instanceof LdapFilterExtensibleComponent )
+ else if ( filterComponent instanceof LdapFilterExtensibleComponent )
{
handleError( ( filterComponent instanceof LdapFilterExtensibleComponent )
- && ( ( LdapFilterExtensibleComponent ) filterComponent ).setEqualsToken( token ), token,
- currentFilter );
+ && ( ( LdapFilterExtensibleComponent ) filterComponent ).setEqualsToken( token ),
+ token, currentFilter );
}
- else {
+ else
+ {
handleError( false, token, currentFilter );
}
break;
@@ -225,7 +227,8 @@
case LdapFilterToken.EXTENSIBLE_ATTRIBUTE:
{
LdapFilter currentFilter = ( LdapFilter ) filterStack.peek();
- LdapFilterExtensibleComponent filterComponent = new LdapFilterExtensibleComponent( currentFilter );
+ LdapFilterExtensibleComponent filterComponent = new LdapFilterExtensibleComponent(
+ currentFilter );
filterComponent.setAttributeToken( token );
handleError( currentFilter.setFilterComponent( filterComponent ), token, currentFilter );
break;
@@ -234,17 +237,17 @@
{
LdapFilter currentFilter = ( LdapFilter ) filterStack.peek();
LdapFilterComponent filterComponent = currentFilter.getFilterComponent();
- if( filterComponent == null )
+ if ( filterComponent == null )
{
filterComponent = new LdapFilterExtensibleComponent( currentFilter );
- (( LdapFilterExtensibleComponent ) filterComponent ).setDnAttrColonToken( token );
+ ( ( LdapFilterExtensibleComponent ) filterComponent ).setDnAttrColonToken( token );
handleError( currentFilter.setFilterComponent( filterComponent ), token, currentFilter );
}
else
{
handleError( ( filterComponent instanceof LdapFilterExtensibleComponent )
- && ( ( LdapFilterExtensibleComponent ) filterComponent ).setDnAttrColonToken( token ), token,
- currentFilter );
+ && ( ( LdapFilterExtensibleComponent ) filterComponent ).setDnAttrColonToken( token ),
+ token, currentFilter );
}
break;
}
@@ -261,17 +264,17 @@
{
LdapFilter currentFilter = ( LdapFilter ) filterStack.peek();
LdapFilterComponent filterComponent = currentFilter.getFilterComponent();
- if( filterComponent == null )
+ if ( filterComponent == null )
{
filterComponent = new LdapFilterExtensibleComponent( currentFilter );
- (( LdapFilterExtensibleComponent ) filterComponent ).setMatchingRuleColonToken( token );
+ ( ( LdapFilterExtensibleComponent ) filterComponent ).setMatchingRuleColonToken( token );
handleError( currentFilter.setFilterComponent( filterComponent ), token, currentFilter );
}
else
{
handleError( ( filterComponent instanceof LdapFilterExtensibleComponent )
- && ( ( LdapFilterExtensibleComponent ) filterComponent ).setMatchingRuleColonToken( token ), token,
- currentFilter );
+ && ( ( LdapFilterExtensibleComponent ) filterComponent )
+ .setMatchingRuleColonToken( token ), token, currentFilter );
}
break;
}
@@ -280,20 +283,20 @@
LdapFilter currentFilter = ( LdapFilter ) filterStack.peek();
LdapFilterComponent filterComponent = currentFilter.getFilterComponent();
handleError( ( filterComponent instanceof LdapFilterExtensibleComponent )
- && ( ( LdapFilterExtensibleComponent ) filterComponent ).setMatchingRuleToken( token ), token,
- currentFilter );
+ && ( ( LdapFilterExtensibleComponent ) filterComponent ).setMatchingRuleToken( token ),
+ token, currentFilter );
break;
}
case LdapFilterToken.EXTENSIBLE_EQUALS_COLON:
- {
- LdapFilter currentFilter = ( LdapFilter ) filterStack.peek();
- LdapFilterComponent filterComponent = currentFilter.getFilterComponent();
- handleError( ( filterComponent instanceof LdapFilterExtensibleComponent )
- && ( ( LdapFilterExtensibleComponent ) filterComponent ).setEqualsColonToken( token ), token,
- currentFilter );
- break;
- }
-
+ {
+ LdapFilter currentFilter = ( LdapFilter ) filterStack.peek();
+ LdapFilterComponent filterComponent = currentFilter.getFilterComponent();
+ handleError( ( filterComponent instanceof LdapFilterExtensibleComponent )
+ && ( ( LdapFilterExtensibleComponent ) filterComponent ).setEqualsColonToken( token ),
+ token, currentFilter );
+ break;
+ }
+
case LdapFilterToken.EOF:
{
model.addOtherToken( token );
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java Wed Oct 21 12:12:12 2009
@@ -98,7 +98,6 @@
}
-
/**
* Resets this scanner.
*
@@ -123,7 +122,6 @@
}
-
/**
* Increments the position counter and gets
* the character at that positon.
@@ -225,7 +223,7 @@
return new LdapFilterToken( this.lastTokenType, "(", pos );
case ')':
if ( lastTokenType != LdapFilterToken.EQUAL && lastTokenType != LdapFilterToken.GREATER
- && lastTokenType != LdapFilterToken.LESS && lastTokenType != LdapFilterToken.APROX
+ && lastTokenType != LdapFilterToken.LESS && lastTokenType != LdapFilterToken.APROX
&& lastTokenType != LdapFilterToken.SUBSTRING )
{
this.lastTokenType = LdapFilterToken.RPAR;
@@ -292,7 +290,7 @@
{
prevChar();
}
-
+
// substring or equal
// read till ) or eof, if we found an * we have an substring
boolean asteriskFound = false;
@@ -300,21 +298,21 @@
int count = 1;
while ( c != ')' && c != '\u0000' )
{
- if( c == '*' )
+ if ( c == '*' )
{
asteriskFound = true;
break;
}
-
+
c = nextNonLinebreakChar();
count++;
}
- while( count > 0 )
+ while ( count > 0 )
{
prevNonLinebreakChar();
count--;
}
- if( asteriskFound )
+ if ( asteriskFound )
{
this.lastTokenType = LdapFilterToken.SUBSTRING;
return new LdapFilterToken( this.lastTokenType, "=", pos );
@@ -381,38 +379,33 @@
prevChar();
prevChar();
if ( ( lastTokenType == LdapFilterToken.LPAR || lastTokenType == LdapFilterToken.EXTENSIBLE_ATTRIBUTE )
- &&
- (
-// ( t1 == ':' && t2 != '=' )
-// ||
-// ( ( t1 == 'd' || t1 == 'D' ) && t2 == ':' && t3 == ':' )
-// ||
- ( ( t1 == 'd' || t1 == 'D' ) && ( t2 == 'n' || t2 == 'N' ) && ( t3 == ':' ) )
- )
- )
+ && (
+ // ( t1 == ':' && t2 != '=' )
+ // ||
+ // ( ( t1 == 'd' || t1 == 'D' ) && t2 == ':' && t3 == ':' )
+ // ||
+ ( ( t1 == 'd' || t1 == 'D' ) && ( t2 == 'n' || t2 == 'N' ) && ( t3 == ':' ) ) ) )
{
this.lastTokenType = LdapFilterToken.EXTENSIBLE_DNATTR_COLON;
return new LdapFilterToken( this.lastTokenType, ":", pos );
}
else if ( ( lastTokenType == LdapFilterToken.EXTENSIBLE_ATTRIBUTE
|| lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR
- || lastTokenType == LdapFilterToken.EXTENSIBLE_MATCHINGRULEOID
- || lastTokenType == LdapFilterToken.EXTENSIBLE_MATCHINGRULEOID_COLON )
+ || lastTokenType == LdapFilterToken.EXTENSIBLE_MATCHINGRULEOID || lastTokenType == LdapFilterToken.EXTENSIBLE_MATCHINGRULEOID_COLON )
&& t1 == '=' )
{
this.lastTokenType = LdapFilterToken.EXTENSIBLE_EQUALS_COLON;
return new LdapFilterToken( this.lastTokenType, ":", pos );
}
else if ( ( lastTokenType == LdapFilterToken.LPAR
- || lastTokenType == LdapFilterToken.EXTENSIBLE_ATTRIBUTE
- || lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR
- || lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR_COLON ) )
+ || lastTokenType == LdapFilterToken.EXTENSIBLE_ATTRIBUTE
+ || lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR || lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR_COLON ) )
{
this.lastTokenType = LdapFilterToken.EXTENSIBLE_MATCHINGRULEOID_COLON;
return new LdapFilterToken( this.lastTokenType, ":", pos );
}
break;
-
+
} // switch
prevChar();
@@ -434,7 +427,7 @@
if ( sb.length() > 0 )
{
boolean isExtensible = ( c == ':' );
- if(isExtensible)
+ if ( isExtensible )
{
this.lastTokenType = LdapFilterToken.EXTENSIBLE_ATTRIBUTE;
return new LdapFilterToken( this.lastTokenType, sb.toString(), pos - sb.length() + 1 );
@@ -477,7 +470,8 @@
count--;
}
}
- else //if ( sb.length() > 0 )
+ else
+ //if ( sb.length() > 0 )
{
this.lastTokenType = LdapFilterToken.VALUE;
return new LdapFilterToken( this.lastTokenType, sb.toString(), pos - sb.length() + 1 );
@@ -525,17 +519,15 @@
char t2 = nextChar();
char t3 = nextChar();
prevChar();
- if ( ( t1 == 'd' || t1 == 'D' )
- && ( t2 == 'n' || t2 == 'N' )
- && ( t3 == ':' || t3 == '\u0000' ) )
+ if ( ( t1 == 'd' || t1 == 'D' ) && ( t2 == 'n' || t2 == 'N' ) && ( t3 == ':' || t3 == '\u0000' ) )
{
this.lastTokenType = LdapFilterToken.EXTENSIBLE_DNATTR;
- return new LdapFilterToken( this.lastTokenType, ""+t1+t2, pos - 1 );
+ return new LdapFilterToken( this.lastTokenType, "" + t1 + t2, pos - 1 );
}
prevChar();
prevChar();
}
-
+
// check extensible matchingrule
if ( lastTokenType == LdapFilterToken.EXTENSIBLE_MATCHINGRULEOID_COLON )
{
@@ -557,7 +549,7 @@
return new LdapFilterToken( this.lastTokenType, sb.toString(), pos - sb.length() + 1 );
}
}
-
+
// no match
StringBuffer sb = new StringBuffer();
c = nextChar();
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java Wed Oct 21 12:12:12 2009
@@ -77,7 +77,7 @@
/** The token identifier for the present filter type =* */
public static final int PRESENT = 45;
-
+
/** The token identifier for the substring filter type =* */
public static final int SUBSTRING = 46;
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java Wed Oct 21 12:12:12 2009
@@ -307,7 +307,7 @@
public boolean isRdnPart()
{
Iterator<AttributeTypeAndValue> atavIterator = getAttribute().getEntry().getRdn().iterator();
- while(atavIterator.hasNext())
+ while ( atavIterator.hasNext() )
{
AttributeTypeAndValue atav = atavIterator.next();
if ( getAttribute().getDescription().equals( atav.getUpType() )
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Wed Oct 21 12:12:12 2009
@@ -81,12 +81,12 @@
DUMMY_LDAP_SYNTAX.setDescription( "" );
}
- public static final HashMap<String,List<String>> DUMMY_EXTENSIONS;
+ public static final HashMap<String, List<String>> DUMMY_EXTENSIONS;
static
{
DUMMY_EXTENSIONS = new HashMap<String, List<String>>();
List<String> dummyValues = new ArrayList<String>();
- dummyValues.add("DUMMY");
+ dummyValues.add( "DUMMY" );
DUMMY_EXTENSIONS.put( "X-DUMMY", dummyValues );
}
@@ -796,7 +796,8 @@
*/
public Collection<MatchingRuleUseDescription> getMatchingRuleUseDescriptions()
{
- Set<MatchingRuleUseDescription> set = new HashSet<MatchingRuleUseDescription>( mrudMapByNameOrNumericOid.values() );
+ Set<MatchingRuleUseDescription> set = new HashSet<MatchingRuleUseDescription>( mrudMapByNameOrNumericOid
+ .values() );
return set;
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java Wed Oct 21 12:12:12 2009
@@ -205,5 +205,4 @@
: s2.compareToIgnoreCase( s1 );
}
-
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java?rev=827980&r1=827979&r2=827980&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java Wed Oct 21 12:12:12 2009
@@ -211,7 +211,7 @@
{
LdifContentRecord record = LdifContentRecord.create( entry.getDn().getUpName() );
- if(entry.getAttributes() != null)
+ if ( entry.getAttributes() != null )
{
for ( IAttribute attribute : entry.getAttributes() )
{