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/07/22 18:36:03 UTC
svn commit: r966736 [1/2] - in /directory/studio/trunk:
common.core/src/main/java/org/apache/directory/studio/common/core/jobs/
connection.core/
connection.core/src/main/java/org/apache/directory/studio/connection/core/
connection.core/src/main/java/or...
Author: pamarcelot
Date: Thu Jul 22 16:36:00 2010
New Revision: 966736
URL: http://svn.apache.org/viewvc?rev=966736&view=rev
Log:
Moved to the newly introduced Job/Runnable classes and interfaces in the 'common.core' plugin.
Added:
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionBulkRunnableWithProgress.java
- copied, changed from r966259, 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/StudioConnectionRunnableWithProgress.java
- copied, changed from r966259, directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgress.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionRunnableWithProgressAdapter.java
- copied, changed from r966259, directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgressAdapter.java
Removed:
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/StudioProgressMonitor.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgress.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgressAdapter.java
Modified:
directory/studio/trunk/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioJob.java
directory/studio/trunk/connection.core/pom.xml
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/io/ConnectionWrapper.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java
directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java
directory/studio/trunk/connection.ui/pom.xml
directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java
directory/studio/trunk/ldapbrowser.common/pom.xml
directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java
directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java
directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java
directory/studio/trunk/ldapbrowser.core/pom.xml
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.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/AbstractNotificationJob.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java
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/DeleteEntriesJob.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.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/InitializeAttributesRunnable.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/MoveEntriesJob.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/jobs/ReloadSchemaRunnable.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryJob.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/StudioBrowserJob.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/UpdateEntryRunnable.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ChildrenInfo.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java
directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
directory/studio/trunk/ldapbrowser.ui/pom.xml
directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java
directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java
directory/studio/trunk/ldifeditor/pom.xml
directory/studio/trunk/schemaeditor/pom.xml
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/AbstractSchemaConnector.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
Modified: directory/studio/trunk/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioJob.java (original)
+++ directory/studio/trunk/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioJob.java Thu Jul 22 16:36:00 2010
@@ -32,10 +32,10 @@ import org.eclipse.core.runtime.jobs.Job
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StudioJob extends Job
+public class StudioJob<T extends StudioRunnableWithProgress> extends Job
{
/** The runnables. */
- private StudioRunnableWithProgress[] runnables;
+ protected T[] runnables;
/**
@@ -43,7 +43,7 @@ public class StudioJob extends Job
*
* @param runnables the runnables to run
*/
- public StudioJob( StudioRunnableWithProgress... runnables )
+ public StudioJob( T... runnables )
{
super( runnables[0].getName() );
this.runnables = runnables;
@@ -53,7 +53,7 @@ public class StudioJob extends Job
/**
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
*/
- protected final IStatus run( IProgressMonitor ipm )
+ protected IStatus run( IProgressMonitor ipm )
{
StudioProgressMonitor monitor = new StudioProgressMonitor( ipm );
@@ -132,7 +132,7 @@ public class StudioJob extends Job
/**
* Executes the job.
*/
- public final void execute()
+ public void execute()
{
setUser( true );
schedule();
@@ -147,7 +147,7 @@ public class StudioJob extends Job
// We don't schedule a job if the same type of runnable should run
// that works on the same entry as the current runnable.
- for ( StudioRunnableWithProgress runnable : runnables )
+ for ( T runnable : runnables )
{
Object[] myLockedObjects = runnable.getLockedObjects();
String[] myLockedObjectsIdentifiers = getLockIdentifiers( myLockedObjects );
@@ -158,7 +158,8 @@ public class StudioJob extends Job
Job job = jobs[i];
if ( job instanceof StudioJob )
{
- StudioJob otherJob = ( StudioJob ) job;
+ @SuppressWarnings("unchecked")
+ StudioJob<StudioRunnableWithProgress> otherJob = ( StudioJob<StudioRunnableWithProgress> ) job;
for ( StudioRunnableWithProgress otherRunnable : otherJob.runnables )
{
if ( runnable.getClass() == otherRunnable.getClass() && runnable != otherRunnable )
Modified: directory/studio/trunk/connection.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/pom.xml?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/pom.xml (original)
+++ directory/studio/trunk/connection.core/pom.xml Thu Jul 22 16:36:00 2010
@@ -106,6 +106,7 @@
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.connection.core.ConnectionCorePlugin</Bundle-Activator>
<Require-Bundle>org.eclipse.core.runtime,
+ org.apache.directory.studio.common.core,
org.apache.directory.studio.jars,
org.apache.directory.studio.ldifparser
</Require-Bundle>
@@ -139,6 +140,11 @@
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>common.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>jars</artifactId>
<scope>provided</scope>
</dependency>
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=966736&r1=966735&r2=966736&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 Thu Jul 22 16:36:00 2010
@@ -20,7 +20,7 @@
package org.apache.directory.studio.connection.core;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
/**
Modified: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapper.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapper.java (original)
+++ directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapper.java Thu Jul 22 16:36:00 2010
@@ -20,7 +20,7 @@
package org.apache.directory.studio.connection.core.io;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
/**
Modified: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java (original)
+++ directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java Thu Jul 22 16:36:00 2010
@@ -58,20 +58,24 @@ import javax.security.auth.callback.Name
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.LdapURL;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
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.ConnectionCoreConstants;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionParameter;
+import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.IAuthHandler;
import org.apache.directory.studio.connection.core.IConnectionListener;
import org.apache.directory.studio.connection.core.ICredentials;
@@ -79,13 +83,9 @@ import org.apache.directory.studio.conne
import org.apache.directory.studio.connection.core.IReferralHandler;
import org.apache.directory.studio.connection.core.Messages;
import org.apache.directory.studio.connection.core.Utils;
-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.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.event.ConnectionEventRegistry;
import org.apache.directory.studio.connection.core.io.ConnectionWrapper;
import org.apache.directory.studio.connection.core.io.jndi.ReferralsInfo.Referral;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.osgi.util.NLS;
Modified: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java (original)
+++ directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java Thu Jul 22 16:36:00 2010
@@ -34,13 +34,13 @@ import javax.naming.ldap.Control;
import javax.naming.ldap.LdapContext;
import org.apache.directory.shared.ldap.util.LdapURL;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
-import org.apache.directory.studio.connection.core.IJndiLogger;
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.ConnectionCorePlugin;
+import org.apache.directory.studio.connection.core.IJndiLogger;
import org.apache.directory.studio.connection.core.io.jndi.ReferralsInfo.Referral;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
/**
Modified: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java (original)
+++ directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java Thu Jul 22 16:36:00 2010
@@ -21,6 +21,8 @@
package org.apache.directory.studio.connection.core.jobs;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.common.core.jobs.StudioRunnableWithProgress;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Messages;
@@ -30,7 +32,7 @@ import org.apache.directory.studio.conne
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CheckBindRunnable implements StudioRunnableWithProgress
+public class CheckBindRunnable implements StudioConnectionRunnableWithProgress
{
private Connection connection;
Modified: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java (original)
+++ directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java Thu Jul 22 16:36:00 2010
@@ -21,6 +21,8 @@
package org.apache.directory.studio.connection.core.jobs;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.common.core.jobs.StudioRunnableWithProgress;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Messages;
@@ -31,7 +33,7 @@ import org.apache.directory.studio.conne
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CheckNetworkParameterRunnable implements StudioRunnableWithProgress
+public class CheckNetworkParameterRunnable implements StudioConnectionRunnableWithProgress
{
private Connection connection;
Modified: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java (original)
+++ directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java Thu Jul 22 16:36:00 2010
@@ -23,6 +23,8 @@ package org.apache.directory.studio.conn
import java.util.List;
+import org.apache.directory.studio.common.core.jobs.StudioBulkRunnableWithProgress;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.IConnectionListener;
@@ -35,7 +37,7 @@ import org.apache.directory.studio.conne
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CloseConnectionsRunnable implements StudioBulkRunnableWithProgress
+public class CloseConnectionsRunnable implements StudioConnectionBulkRunnableWithProgress
{
private Connection[] connections;
Modified: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java (original)
+++ directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java Thu Jul 22 16:36:00 2010
@@ -21,6 +21,7 @@
package org.apache.directory.studio.connection.core.jobs;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.IConnectionListener;
@@ -33,7 +34,7 @@ import org.apache.directory.studio.conne
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OpenConnectionsRunnable implements StudioBulkRunnableWithProgress
+public class OpenConnectionsRunnable implements StudioConnectionBulkRunnableWithProgress
{
private Connection[] connections;
Copied: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionBulkRunnableWithProgress.java (from r966259, 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/StudioConnectionBulkRunnableWithProgress.java?p2=directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionBulkRunnableWithProgress.java&p1=directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java&r1=966259&r2=966736&rev=966736&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/StudioConnectionBulkRunnableWithProgress.java Thu Jul 22 16:36:00 2010
@@ -21,21 +21,22 @@
package org.apache.directory.studio.connection.core.jobs;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
+
+
/**
- * A runnable with a progess monitor. When invoked by the {@link StudioConnectionJob}
+ * A runnable with a progess monitor. When invoked by the {@link StudioJob}
* during the run() method all event notifications are blocked and the runNotification()
* method is called afterwards to fire event notifications.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface StudioBulkRunnableWithProgress extends StudioRunnableWithProgress
+public interface StudioConnectionBulkRunnableWithProgress extends StudioConnectionRunnableWithProgress
{
-
/**
- * Runs notification, called by {@link StudioConnectionJob} after the run() method.
+ * Runs notification, called by {@link StudioJob} after the run() method.
*
* @param monitor the monitor
*/
public void runNotification( StudioProgressMonitor monitor );
-
}
Modified: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java (original)
+++ directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java Thu Jul 22 16:36:00 2010
@@ -21,6 +21,8 @@
package org.apache.directory.studio.connection.core.jobs;
+import org.apache.directory.studio.common.core.jobs.StudioJob;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.IConnectionListener;
@@ -37,34 +39,28 @@ import org.eclipse.core.runtime.jobs.Job
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StudioConnectionJob extends Job
+public class StudioConnectionJob extends StudioJob<StudioConnectionRunnableWithProgress>
{
-
- /** The runnables. */
- private StudioRunnableWithProgress[] runnables;
-
-
/**
* Creates a new instance of StudioConnectionJob.
*
* @param runnables the runnables to run
*/
- public StudioConnectionJob( StudioRunnableWithProgress... runnables )
+ public StudioConnectionJob( StudioConnectionRunnableWithProgress... runnables )
{
- super( runnables[0].getName() );
- this.runnables = runnables;
+ super( runnables );
}
/**
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
*/
- protected final IStatus run( IProgressMonitor ipm )
+ protected IStatus run( IProgressMonitor ipm )
{
StudioProgressMonitor monitor = new StudioProgressMonitor( ipm );
// ensure that connections are opened
- for ( StudioRunnableWithProgress runnable : runnables )
+ for ( StudioConnectionRunnableWithProgress runnable : runnables )
{
Connection[] connections = runnable.getConnections();
if ( connections != null )
@@ -102,11 +98,11 @@ public class StudioConnectionJob extends
{
try
{
- for ( StudioRunnableWithProgress runnable : runnables )
+ for ( StudioConnectionRunnableWithProgress runnable : runnables )
{
- if ( runnable instanceof StudioBulkRunnableWithProgress )
+ if ( runnable instanceof StudioConnectionBulkRunnableWithProgress )
{
- StudioBulkRunnableWithProgress bulkRunnable = ( StudioBulkRunnableWithProgress ) runnable;
+ StudioConnectionBulkRunnableWithProgress bulkRunnable = ( StudioConnectionBulkRunnableWithProgress ) runnable;
suspendEventFiringInCurrentThread();
try
{
@@ -169,16 +165,6 @@ public class StudioConnectionJob extends
/**
- * Executes the job.
- */
- public final void execute()
- {
- setUser( true );
- schedule();
- }
-
-
- /**
* {@inheritDoc}
*/
public boolean shouldSchedule()
@@ -186,7 +172,7 @@ public class StudioConnectionJob extends
// We don't schedule a job if the same type of runnable should run
// that works on the same entry as the current runnable.
- for ( StudioRunnableWithProgress runnable : runnables )
+ for ( StudioConnectionRunnableWithProgress runnable : runnables )
{
Object[] myLockedObjects = runnable.getLockedObjects();
String[] myLockedObjectsIdentifiers = getLockIdentifiers( myLockedObjects );
@@ -198,7 +184,7 @@ public class StudioConnectionJob extends
if ( job instanceof StudioConnectionJob )
{
StudioConnectionJob otherJob = ( StudioConnectionJob ) job;
- for ( StudioRunnableWithProgress otherRunnable : otherJob.runnables )
+ for ( StudioConnectionRunnableWithProgress otherRunnable : otherJob.runnables )
{
if ( runnable.getClass() == otherRunnable.getClass() && runnable != otherRunnable )
{
@@ -226,7 +212,10 @@ public class StudioConnectionJob extends
}
- private static String[] getLockIdentifiers( Object[] objects )
+ /**
+ * {@inheritDoc}
+ */
+ protected String[] getLockIdentifiers( Object[] objects )
{
String[] identifiers = new String[objects.length];
for ( int i = 0; i < identifiers.length; i++ )
@@ -245,17 +234,32 @@ public class StudioConnectionJob extends
}
- private static String getLockIdentifier( Connection connection )
+ /**
+ * Gets the string identifier for a {@link Connection} object.
+ *
+ * @param connection
+ * the connection
+ * @return
+ * the lock identifier for the connection
+ */
+ private String getLockIdentifier( Connection connection )
{
return connection.getHost() + ':' + connection.getPort();
}
- private static String getLockIdentifier( Object object )
+ /**
+ * Gets the generic lock identifier for an object.
+ *
+ * @param object
+ * the object
+ * @return
+ * the lock identifier for the object
+ */
+ private String getLockIdentifier( Object object )
{
String s = object != null ? object.toString() : "null"; //$NON-NLS-1$
s = '-' + s;
return s;
}
-
}
Copied: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionRunnableWithProgress.java (from r966259, 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/StudioConnectionRunnableWithProgress.java?p2=directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionRunnableWithProgress.java&p1=directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgress.java&r1=966259&r2=966736&rev=966736&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/StudioConnectionRunnableWithProgress.java Thu Jul 22 16:36:00 2010
@@ -21,6 +21,7 @@
package org.apache.directory.studio.connection.core.jobs;
+import org.apache.directory.studio.common.core.jobs.StudioRunnableWithProgress;
import org.apache.directory.studio.connection.core.Connection;
@@ -29,41 +30,8 @@ import org.apache.directory.studio.conne
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface StudioRunnableWithProgress
+public interface StudioConnectionRunnableWithProgress extends StudioRunnableWithProgress
{
-
- /**
- * Runs the runnable.
- *
- * @param monitor the monitor
- */
- public void run( StudioProgressMonitor monitor );
-
-
- /**
- * Gets the locked objects.
- *
- * @return the locked objects
- */
- public Object[] getLockedObjects();
-
-
- /**
- * Gets the error message.
- *
- * @return the error message
- */
- public String getErrorMessage();
-
-
- /**
- * Gets the name that is used when reporting progress.
- *
- * @return the name
- */
- public String getName();
-
-
/**
* Gets the connections that must be opened before running this runnable.
*
Copied: directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionRunnableWithProgressAdapter.java (from r966259, directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgressAdapter.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionRunnableWithProgressAdapter.java?p2=directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionRunnableWithProgressAdapter.java&p1=directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgressAdapter.java&r1=966259&r2=966736&rev=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioRunnableWithProgressAdapter.java (original)
+++ directory/studio/trunk/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionRunnableWithProgressAdapter.java Thu Jul 22 16:36:00 2010
@@ -21,42 +21,25 @@
package org.apache.directory.studio.connection.core.jobs;
+import org.apache.directory.studio.common.core.jobs.StudioRunnableWithProgressAdapter;
import org.apache.directory.studio.connection.core.Connection;
/**
- * An adapter class for StudioRunnableWithProgress.
+ * An adapter class for StudioConnectionRunnableWithProgress.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class StudioRunnableWithProgressAdapter implements StudioRunnableWithProgress
+public abstract class StudioConnectionRunnableWithProgressAdapter extends StudioRunnableWithProgressAdapter implements
+ StudioConnectionRunnableWithProgress
{
-
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
+ /** The connections*/
private static final Connection[] EMPTY_CONNECTION_ARRAY = new Connection[0];
/**
* @return an empty array
*/
- public Object[] getLockedObjects()
- {
- return EMPTY_OBJECT_ARRAY;
- }
-
-
- /**
- * @return empty string
- */
- public String getErrorMessage()
- {
- return "";
- }
-
-
- /**
- * @return an empty array
- */
public Connection[] getConnections()
{
return EMPTY_CONNECTION_ARRAY;
Modified: directory/studio/trunk/connection.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.ui/pom.xml?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.ui/pom.xml (original)
+++ directory/studio/trunk/connection.ui/pom.xml Thu Jul 22 16:36:00 2010
@@ -116,8 +116,9 @@
org.eclipse.ui.forms,
org.eclipse.core.runtime,
org.eclipse.ui.workbench.texteditor,
- org.apache.directory.studio.jars,
- org.apache.directory.studio.connection.core
+ org.apache.directory.studio.common.core,
+ org.apache.directory.studio.connection.core,
+ org.apache.directory.studio.jars
</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
@@ -149,7 +150,7 @@
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>jars</artifactId>
+ <artifactId>common.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -157,6 +158,11 @@
<artifactId>connection.core</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>jars</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Eclipse plugins dependencies -->
<dependency>
Modified: directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java (original)
+++ directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java Thu Jul 22 16:36:00 2010
@@ -21,14 +21,14 @@
package org.apache.directory.studio.connection.ui;
+import org.apache.directory.studio.common.core.jobs.StudioBulkRunnableWithProgress;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.IConnectionListener;
import org.apache.directory.studio.connection.core.Messages;
import org.apache.directory.studio.connection.core.event.ConnectionEventRegistry;
-import org.apache.directory.studio.connection.core.jobs.StudioBulkRunnableWithProgress;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
-import org.apache.directory.studio.connection.core.jobs.StudioRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -53,8 +53,8 @@ public class RunnableContextRunner
* @param runnableContext the runnable context or null to create a progress monitor dialog
* @param handleError true to handle errors
*/
- public static IStatus execute( final StudioRunnableWithProgress runnable, IRunnableContext runnableContext,
- boolean handleError )
+ public static IStatus execute( final StudioConnectionRunnableWithProgress runnable,
+ IRunnableContext runnableContext, boolean handleError )
{
if ( runnableContext == null )
{
@@ -141,9 +141,12 @@ public class RunnableContextRunner
}
catch ( Exception ex )
{
- ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
- new Status( IStatus.ERROR, ConnectionUIConstants.PLUGIN_ID, IStatus.ERROR, ex.getMessage() != null ? ex
- .getMessage() : "", ex ) ); //$NON-NLS-1$
+ ConnectionUIPlugin
+ .getDefault()
+ .getExceptionHandler()
+ .handleException(
+ new Status( IStatus.ERROR, ConnectionUIConstants.PLUGIN_ID, IStatus.ERROR,
+ ex.getMessage() != null ? ex.getMessage() : "", ex ) ); //$NON-NLS-1$
}
IStatus status = spm[0].getErrorStatus( runnable.getErrorMessage() );
Modified: directory/studio/trunk/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/pom.xml?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.common/pom.xml Thu Jul 22 16:36:00 2010
@@ -115,11 +115,12 @@
org.eclipse.jface.text,
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.editors,
- org.apache.directory.studio.jars,
- org.apache.directory.studio.ldifparser,
+ org.apache.directory.studio.common.core,
org.apache.directory.studio.connection.core,
org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.ldapbrowser.core
+ org.apache.directory.studio.jars,
+ org.apache.directory.studio.ldapbrowser.core,
+ org.apache.directory.studio.ldifparser
</Require-Bundle>
<Export-Package>org.apache.directory.studio.ldapbrowser.common.*, org.apache.directory.studio.valueeditors.*</Export-Package>
<Import-Package>!</Import-Package>
@@ -151,7 +152,7 @@
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>ldifparser</artifactId>
+ <artifactId>common.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -161,17 +162,22 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>ldapbrowser.core</artifactId>
+ <artifactId>connection.ui</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.ui</artifactId>
+ <artifactId>jars</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ldapbrowser.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ldifparser</artifactId>
<scope>provided</scope>
</dependency>
Modified: directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java (original)
+++ directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java Thu Jul 22 16:36:00 2010
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import org.apache.directory.studio.connection.core.jobs.OpenConnectionsRunnable;
-import org.apache.directory.studio.connection.core.jobs.StudioRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.SearchManager;
import org.apache.directory.studio.ldapbrowser.core.jobs.InitializeChildrenRunnable;
import org.apache.directory.studio.ldapbrowser.core.jobs.SearchRunnable;
@@ -86,9 +86,9 @@ public class BrowserContentProvider impl
public void selectionChanged( SelectionChangedEvent event )
{
IStructuredSelection selection = ( IStructuredSelection ) event.getSelection();
- if ( selection.size() == 1 && selection.getFirstElement() instanceof StudioRunnableWithProgress )
+ if ( selection.size() == 1 && selection.getFirstElement() instanceof StudioConnectionRunnableWithProgress )
{
- StudioRunnableWithProgress runnable = ( StudioRunnableWithProgress ) selection.getFirstElement();
+ StudioConnectionRunnableWithProgress runnable = ( StudioConnectionRunnableWithProgress ) selection.getFirstElement();
new StudioBrowserJob( runnable ).execute();
}
}
Modified: directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java (original)
+++ directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java Thu Jul 22 16:36:00 2010
@@ -26,7 +26,7 @@ import java.util.Collection;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
import org.apache.directory.studio.connection.core.Utils;
-import org.apache.directory.studio.connection.core.jobs.StudioRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
@@ -224,9 +224,9 @@ public class BrowserLabelProvider extend
}
}
- else if ( obj instanceof StudioRunnableWithProgress )
+ else if ( obj instanceof StudioConnectionRunnableWithProgress )
{
- StudioRunnableWithProgress runnable = ( StudioRunnableWithProgress ) obj;
+ StudioConnectionRunnableWithProgress runnable = ( StudioConnectionRunnableWithProgress ) obj;
for ( Object lockedObject : runnable.getLockedObjects() )
{
if ( lockedObject instanceof ISearch )
@@ -337,9 +337,9 @@ public class BrowserLabelProvider extend
IEntry entry = sr.getEntry();
return BrowserLabelProvider.getImageByObjectClass( entry );
}
- else if ( obj instanceof StudioRunnableWithProgress )
+ else if ( obj instanceof StudioConnectionRunnableWithProgress )
{
- StudioRunnableWithProgress runnable = ( StudioRunnableWithProgress ) obj;
+ StudioConnectionRunnableWithProgress runnable = ( StudioConnectionRunnableWithProgress ) obj;
for ( Object lockedObject : runnable.getLockedObjects() )
{
if ( lockedObject instanceof ISearch )
Modified: directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java (original)
+++ directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java Thu Jul 22 16:36:00 2010
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
import java.math.BigInteger;
import org.apache.directory.shared.ldap.name.Rdn;
-import org.apache.directory.studio.connection.core.jobs.StudioRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
@@ -143,9 +143,9 @@ public class BrowserSorter extends Viewe
*/
public int compare( Viewer viewer, Object o1, Object o2 )
{
- if ( o1 instanceof StudioRunnableWithProgress )
+ if ( o1 instanceof StudioConnectionRunnableWithProgress )
{
- StudioRunnableWithProgress runnable = ( StudioRunnableWithProgress ) o1;
+ StudioConnectionRunnableWithProgress runnable = ( StudioConnectionRunnableWithProgress ) o1;
for ( Object lockedObject : runnable.getLockedObjects() )
{
if ( lockedObject instanceof ISearch )
@@ -175,9 +175,9 @@ public class BrowserSorter extends Viewe
}
return lessThan();
}
- if ( o2 instanceof StudioRunnableWithProgress )
+ if ( o2 instanceof StudioConnectionRunnableWithProgress )
{
- StudioRunnableWithProgress runnable = ( StudioRunnableWithProgress ) o2;
+ StudioConnectionRunnableWithProgress runnable = ( StudioConnectionRunnableWithProgress ) o2;
for ( Object lockedObject : runnable.getLockedObjects() )
{
if ( lockedObject instanceof ISearch )
Modified: directory/studio/trunk/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/pom.xml?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.core/pom.xml Thu Jul 22 16:36:00 2010
@@ -108,9 +108,10 @@
<Bundle-Activator>org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin</Bundle-Activator>
<Require-Bundle>org.eclipse.core.runtime,
org.eclipse.search,
+ org.apache.directory.studio.common.core,
+ org.apache.directory.studio.connection.core,
org.apache.directory.studio.jars,
- org.apache.directory.studio.ldifparser,
- org.apache.directory.studio.connection.core
+ org.apache.directory.studio.ldifparser
</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
@@ -161,17 +162,22 @@
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>jars</artifactId>
+ <artifactId>connection.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>ldifparser</artifactId>
+ <artifactId>common.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.core</artifactId>
+ <artifactId>jars</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ldifparser</artifactId>
<scope>provided</scope>
</dependency>
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java Thu Jul 22 16:36:00 2010
@@ -26,9 +26,9 @@ import java.util.Collection;
import java.util.List;
import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.IConnectionListener;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.ldapbrowser.core.events.BrowserConnectionUpdateEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.jobs.InitializeAttributesRunnable;
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=966736&r1=966735&r2=966736&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 Thu Jul 22 16:36:00 2010
@@ -21,11 +21,11 @@
package org.apache.directory.studio.ldapbrowser.core.jobs;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.IConnectionListener;
import org.apache.directory.studio.connection.core.Messages;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.event.ConnectionEventRegistry;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
@@ -170,7 +170,7 @@ public abstract class AbstractEclipseJob
{
Job job = jobs[i];
- // if(job instanceof AbstractEclipseJob) {
+ // if(job instanceof AbstractStudioJob) {
if ( job.getClass() == this.getClass() && job != this )
{
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractNotificationJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractNotificationJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractNotificationJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractNotificationJob.java Thu Jul 22 16:36:00 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.core.jobs;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java Thu Jul 22 16:36:00 2010
@@ -43,11 +43,11 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.DnUtils;
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.StudioProgressMonitor;
+import org.apache.directory.studio.connection.core.DnUtils;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
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=966736&r1=966735&r2=966736&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 Jul 22 16:36:00 2010
@@ -29,10 +29,10 @@ import javax.naming.directory.BasicAttri
import javax.naming.ldap.Control;
import javax.naming.ldap.ManageReferralControl;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.StudioControl;
-import org.apache.directory.studio.connection.core.jobs.StudioBulkRunnableWithProgress;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.EntryAddedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -47,7 +47,7 @@ import org.apache.directory.studio.ldapb
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CreateEntryRunnable implements StudioBulkRunnableWithProgress
+public class CreateEntryRunnable implements StudioConnectionBulkRunnableWithProgress
{
/** The entry to create. */
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesJob.java Thu Jul 22 16:36:00 2010
@@ -38,11 +38,11 @@ import javax.naming.ldap.Control;
import javax.naming.ldap.ManageReferralControl;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
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.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.connection.core.StudioControl;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java Thu Jul 22 16:36:00 2010
@@ -28,9 +28,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.jobs.StudioBulkRunnableWithProgress;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -44,7 +44,7 @@ import org.apache.directory.studio.ldifp
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExecuteLdifRunnable implements StudioBulkRunnableWithProgress
+public class ExecuteLdifRunnable implements StudioConnectionBulkRunnableWithProgress
{
/** The browser connection. */
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java Thu Jul 22 16:36:00 2010
@@ -32,8 +32,8 @@ import java.util.Map;
import javax.naming.NamingException;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java Thu Jul 22 16:36:00 2010
@@ -55,9 +55,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.LdapURL;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.io.jndi.StudioNamingEnumeration;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
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.SearchParameter;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java Thu Jul 22 16:36:00 2010
@@ -37,11 +37,11 @@ import javax.naming.ldap.PagedResultsRes
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.StudioControl;
import org.apache.directory.studio.connection.core.StudioPagedResultsControl;
import org.apache.directory.studio.connection.core.io.jndi.StudioNamingEnumeration;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
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.SearchParameter;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfJob.java Thu Jul 22 16:36:00 2010
@@ -28,8 +28,8 @@ import java.util.Map;
import javax.naming.NamingException;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java Thu Jul 22 16:36:00 2010
@@ -29,8 +29,8 @@ import java.util.Map;
import javax.naming.NamingException;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java Thu Jul 22 16:36:00 2010
@@ -24,9 +24,9 @@ package org.apache.directory.studio.ldap
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.jobs.StudioBulkRunnableWithProgress;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
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;
@@ -38,7 +38,7 @@ import org.apache.directory.studio.ldapb
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class FetchBaseDNsRunnable implements StudioBulkRunnableWithProgress
+public class FetchBaseDNsRunnable implements StudioConnectionBulkRunnableWithProgress
{
private IBrowserConnection connection;
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=966736&r1=966735&r2=966736&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 Thu Jul 22 16:36:00 2010
@@ -67,12 +67,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.AttributeUtils;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.DnUtils;
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.DnUtils;
import org.apache.directory.studio.connection.core.io.jndi.StudioNamingEnumeration;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
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=966736&r1=966735&r2=966736&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 Thu Jul 22 16:36:00 2010
@@ -49,10 +49,10 @@ import javax.naming.ldap.Control;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
import org.apache.directory.studio.connection.core.DnUtils;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java Thu Jul 22 16:36:00 2010
@@ -29,12 +29,12 @@ import java.util.List;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
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.jobs.StudioBulkRunnableWithProgress;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.connection.core.StudioControl;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.AttributesInitializedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -52,7 +52,7 @@ import org.apache.directory.studio.ldapb
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class InitializeAttributesRunnable implements StudioBulkRunnableWithProgress
+public class InitializeAttributesRunnable implements StudioConnectionBulkRunnableWithProgress
{
/** The entries. */
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=966736&r1=966735&r2=966736&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 Thu Jul 22 16:36:00 2010
@@ -25,13 +25,13 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.StudioControl;
-import org.apache.directory.studio.connection.core.StudioPagedResultsControl;
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.connection.core.StudioControl;
+import org.apache.directory.studio.connection.core.StudioPagedResultsControl;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
@@ -41,8 +41,8 @@ import org.apache.directory.studio.ldapb
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.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch.SearchScope;
+import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.impl.ContinuedSearchResultEntry;
import org.apache.directory.studio.ldapbrowser.core.model.impl.Search;
import org.apache.directory.studio.ldapbrowser.core.model.impl.SearchContinuation;
@@ -53,7 +53,7 @@ import org.apache.directory.studio.ldapb
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class InitializeChildrenRunnable implements StudioBulkRunnableWithProgress
+public class InitializeChildrenRunnable implements StudioConnectionBulkRunnableWithProgress
{
/** The entries. */
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=966736&r1=966735&r2=966736&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 Thu Jul 22 16:36:00 2010
@@ -32,11 +32,11 @@ import javax.naming.InvalidNameException
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
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.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.AttributesInitializedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -45,8 +45,8 @@ import org.apache.directory.studio.ldapb
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.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch.SearchScope;
+import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.impl.BaseDNEntry;
import org.apache.directory.studio.ldapbrowser.core.model.impl.DirectoryMetadataEntry;
import org.apache.directory.studio.ldapbrowser.core.model.impl.Search;
@@ -57,7 +57,7 @@ import org.apache.directory.studio.ldapb
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class InitializeRootDSERunnable implements StudioBulkRunnableWithProgress
+public class InitializeRootDSERunnable implements StudioConnectionBulkRunnableWithProgress
{
/** The requested attributes when reading the Root DSE. */
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesJob.java Thu Jul 22 16:36:00 2010
@@ -31,10 +31,10 @@ import javax.naming.ContextNotEmptyExcep
import javax.naming.directory.SearchControls;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.DnUtils;
import org.apache.directory.studio.connection.core.StudioControl;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EntryMovedEvent;