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 13:45:16 UTC
svn commit: r827969 - in
/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core:
./ event/ io/ io/jndi/ jobs/
Author: pamarcelot
Date: Wed Oct 21 11:45:16 2009
New Revision: 827969
URL: http://svn.apache.org/viewvc?rev=827969&view=rev
Log:
Code formatting.
Modified:
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolder.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/IConnectionListener.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionUpdateListener.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/EventRunnableFactory.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioTrustManager.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgress.java
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolder.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolder.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolder.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolder.java Wed Oct 21 11:45:16 2009
@@ -87,9 +87,10 @@
folder.addConnectionId( newConnection.getId() );
}
}
-
+
// clone subfolders
- ConnectionFolderManager connectionFolderManager = ConnectionCorePlugin.getDefault().getConnectionFolderManager();
+ ConnectionFolderManager connectionFolderManager = ConnectionCorePlugin.getDefault()
+ .getConnectionFolderManager();
for ( String id : subFolderIds )
{
ConnectionFolder subFolder = connectionFolderManager.getConnectionFolderById( id );
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java Wed Oct 21 11:45:16 2009
@@ -65,7 +65,6 @@
public static final String TEMP_SUFFIX = "-temp"; //$NON-NLS-1$
-
/** The list of connections. */
private Set<Connection> connectionList;
@@ -148,8 +147,8 @@
{
file.mkdir();
}
- return p
- .append( MODIFICATIONS_LOG_PREFIX + Utils.getFilenameString( connection.getId() ) + LDIFLOG_SUFFIX ).toOSString();
+ return p.append( MODIFICATIONS_LOG_PREFIX + Utils.getFilenameString( connection.getId() ) + LDIFLOG_SUFFIX )
+ .toOSString();
}
@@ -169,7 +168,8 @@
{
file.mkdir();
}
- return p.append( SEARCH_LOGS_PREFIX + Utils.getFilenameString( connection.getId() ) + LDIFLOG_SUFFIX ).toOSString();
+ return p.append( SEARCH_LOGS_PREFIX + Utils.getFilenameString( connection.getId() ) + LDIFLOG_SUFFIX )
+ .toOSString();
}
@@ -371,7 +371,8 @@
// To avoid a corrupt file, save object to a temp file first
try
{
- ConnectionIO.save( connectionParameters, new FileOutputStream( getConnectionStoreFileName() + TEMP_SUFFIX ) );
+ ConnectionIO
+ .save( connectionParameters, new FileOutputStream( getConnectionStoreFileName() + TEMP_SUFFIX ) );
}
catch ( IOException e )
{
@@ -418,8 +419,8 @@
// If loading failed, try with temp file
try
{
- connectionParameters = ConnectionIO
- .load( new FileInputStream( getConnectionStoreFileName() + TEMP_SUFFIX ) );
+ connectionParameters = ConnectionIO.load( new FileInputStream( getConnectionStoreFileName()
+ + TEMP_SUFFIX ) );
}
catch ( FileNotFoundException e1 )
{
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java Wed Oct 21 11:45:16 2009
@@ -103,7 +103,7 @@
for ( int i = 0; i < prefix.size(); i++ )
{
- ldapDn.add( (Rdn) prefix.getRdn( i ).clone() );
+ ldapDn.add( ( Rdn ) prefix.getRdn( i ).clone() );
}
return ldapDn;
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/IConnectionListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/IConnectionListener.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/IConnectionListener.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/IConnectionListener.java Wed Oct 21 11:45:16 2009
@@ -19,6 +19,7 @@
*/
package org.apache.directory.studio.connection.core;
+
import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
@@ -49,5 +50,5 @@
* @param connection the closed connection
* @param monitor the progress monitor
*/
- public void connectionClosed( Connection connection, StudioProgressMonitor monitor );
+ public void connectionClosed( Connection connection, StudioProgressMonitor monitor );
}
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java Wed Oct 21 11:45:16 2009
@@ -430,7 +430,7 @@
{
return;
}
-
+
Map<L, EventRunner> clone = new HashMap<L, EventRunner>( listeners );
for ( final L listener : clone.keySet() )
{
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionUpdateListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionUpdateListener.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionUpdateListener.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionUpdateListener.java Wed Oct 21 11:45:16 2009
@@ -82,16 +82,16 @@
* @param connectionFolder the modified connection folder
*/
public void connectionFolderModified( ConnectionFolder connectionFolder );
-
-
+
+
/**
* Called when an {@link ConnectionFolder} was added.
*
* @param connectionFolder the added connection folder
*/
public void connectionFolderAdded( ConnectionFolder connectionFolder );
-
-
+
+
/**
* Called when an {@link ConnectionFolder} was removed.
*
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/EventRunnableFactory.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/EventRunnableFactory.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/EventRunnableFactory.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/EventRunnableFactory.java Wed Oct 21 11:45:16 2009
@@ -29,7 +29,7 @@
*/
public interface EventRunnableFactory<L>
{
-
+
/**
* Creates a new {@link EventRunnable} object.
*
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java Wed Oct 21 11:45:16 2009
@@ -395,7 +395,7 @@
// SASL Quality of Protection
connectionElement.addAttribute( SASL_QOP_TAG, connection.getSaslQop().toString() );
-
+
// SASL Security Strength
connectionElement.addAttribute( SASL_SEC_STRENGTH_TAG, connection.getSaslSecurityStrength().toString() );
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioTrustManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioTrustManager.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioTrustManager.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioTrustManager.java Wed Oct 21 11:45:16 2009
@@ -152,7 +152,7 @@
{
failCauses.add( FailCause.NoValidCertificationPath );
}
-
+
try
{
chain[0].checkValidity();
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java Wed Oct 21 11:45:16 2009
@@ -21,8 +21,6 @@
package org.apache.directory.studio.connection.core.jobs;
-
-
/**
* A runnable with a progess monitor. When invoked by the {@link StudioConnectionJob}
* during the run() method all event notifications are blocked and the runNotification()
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgress.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgress.java?rev=827969&r1=827968&r2=827969&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgress.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgress.java Wed Oct 21 11:45:16 2009
@@ -20,6 +20,7 @@
package org.apache.directory.studio.connection.core.jobs;
+
import org.apache.directory.studio.connection.core.Connection;