directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r967024 [2/2] - in /directory/studio/trunk: ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/ ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ ldapbrowser.core/src/main/java/o...
Date Fri, 23 Jul 2010 10:24:39 GMT
Copied: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java (from r966736, 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/ImportLdifRunnable.java?p2=directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java&p1=directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java&r1=966736&r2=967024&rev=967024&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/ImportLdifRunnable.java Fri Jul 23 10:24:38 2010
@@ -53,6 +53,7 @@ import org.apache.directory.studio.commo
 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.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;
@@ -79,13 +80,12 @@ import org.apache.directory.studio.ldifp
 
 
 /**
- * Job used to import an LDIF file.
+ * Runnable used to import an LDIF file.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ImportLdifJob extends AbstractNotificationJob
+public class ImportLdifRunnable implements StudioConnectionBulkRunnableWithProgress
 {
-
     /** The browser connection. */
     private IBrowserConnection browserConnection;
 
@@ -103,7 +103,7 @@ public class ImportLdifJob extends Abstr
 
 
     /**
-     * Creates a new instance of ImportLdifJob.
+     * Creates a new instance of ImportLdifRunnable.
      * 
      * @param browserConnection the browser connection
      * @param ldifFile the LDIF file
@@ -111,7 +111,7 @@ public class ImportLdifJob extends Abstr
      * @param updateIfEntryExists the update if entry exists flag
      * @param continueOnError the continue on error flag
      */
-    public ImportLdifJob( IBrowserConnection browserConnection, File ldifFile, File logFile,
+    public ImportLdifRunnable( IBrowserConnection browserConnection, File ldifFile, File logFile,
         boolean updateIfEntryExists, boolean continueOnError )
     {
         this.browserConnection = browserConnection;
@@ -119,20 +119,18 @@ public class ImportLdifJob extends Abstr
         this.logFile = logFile;
         this.continueOnError = continueOnError;
         this.updateIfEntryExists = updateIfEntryExists;
-
-        setName( BrowserCoreMessages.jobs__import_ldif_name );
     }
 
 
     /**
-     * Creates a new instance of ImportLdifJob.
+     * Creates a new instance of ImportLdifRunnable.
      * 
      * @param connection the connection
      * @param ldifFile the LDIF file
      * @param updateIfEntryExists the update if entry exists flag
      * @param continueOnError the continue on error flag
      */
-    public ImportLdifJob( IBrowserConnection connection, File ldifFile, boolean updateIfEntryExists,
+    public ImportLdifRunnable( IBrowserConnection connection, File ldifFile, boolean updateIfEntryExists,
         boolean continueOnError )
     {
         this( connection, ldifFile, null, updateIfEntryExists, continueOnError );
@@ -142,7 +140,7 @@ public class ImportLdifJob extends Abstr
     /**
      * {@inheritDoc}
      */
-    protected Connection[] getConnections()
+    public Connection[] getConnections()
     {
         return new Connection[]
             { browserConnection.getConnection() };
@@ -152,7 +150,16 @@ public class ImportLdifJob extends Abstr
     /**
      * {@inheritDoc}
      */
-    protected Object[] getLockedObjects()
+    public String getName()
+    {
+        return BrowserCoreMessages.jobs__import_ldif_name;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public Object[] getLockedObjects()
     {
         List<Object> l = new ArrayList<Object>();
         l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( ldifFile.toString() ) );
@@ -163,7 +170,16 @@ public class ImportLdifJob extends Abstr
     /**
      * {@inheritDoc}
      */
-    protected void executeNotificationJob( StudioProgressMonitor monitor )
+    public String getErrorMessage()
+    {
+        return BrowserCoreMessages.jobs__import_ldif_error;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void run( StudioProgressMonitor monitor )
     {
         monitor.beginTask( BrowserCoreMessages.jobs__import_ldif_task, 2 );
         monitor.reportProgress( " " ); //$NON-NLS-1$
@@ -215,16 +231,7 @@ public class ImportLdifJob extends Abstr
     /**
      * {@inheritDoc}
      */
-    protected String getErrorMessage()
-    {
-        return BrowserCoreMessages.jobs__import_ldif_error;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void runNotification()
+    public void runNotification( StudioProgressMonitor monitor )
     {
         EventRegistry.fireEntryUpdated( new BulkModificationEvent( browserConnection ), this );
     }
@@ -453,8 +460,8 @@ public class ImportLdifJob extends Abstr
                 }
             }
 
-            browserConnection.getConnection().getJNDIConnectionWrapper().createEntry( dn, jndiAttributes,
-                getControls( record ), monitor, null );
+            browserConnection.getConnection().getJNDIConnectionWrapper()
+                .createEntry( dn, jndiAttributes, getControls( record ), monitor, null );
 
             if ( monitor.errorsReported() && updateIfEntryExists
                 && monitor.getException() instanceof NameAlreadyBoundException )
@@ -463,15 +470,15 @@ public class ImportLdifJob extends Abstr
                 monitor.reset();
 
                 ModificationItem[] mis = ModelConverter.entryToReplaceModificationItems( dummyEntry );
-                browserConnection.getConnection().getJNDIConnectionWrapper().modifyEntry( dn, mis,
-                    getControls( record ), monitor, null );
+                browserConnection.getConnection().getJNDIConnectionWrapper()
+                    .modifyEntry( dn, mis, getControls( record ), monitor, null );
             }
         }
         else if ( record instanceof LdifChangeDeleteRecord )
         {
             LdifChangeDeleteRecord changeDeleteRecord = ( LdifChangeDeleteRecord ) record;
-            browserConnection.getConnection().getJNDIConnectionWrapper().deleteEntry( dn,
-                getControls( changeDeleteRecord ), monitor, null );
+            browserConnection.getConnection().getJNDIConnectionWrapper()
+                .deleteEntry( dn, getControls( changeDeleteRecord ), monitor, null );
         }
         else if ( record instanceof LdifChangeModifyRecord )
         {
@@ -503,8 +510,8 @@ public class ImportLdifJob extends Abstr
                 }
             }
 
-            browserConnection.getConnection().getJNDIConnectionWrapper().modifyEntry( dn, mis,
-                getControls( modifyRecord ), monitor, null );
+            browserConnection.getConnection().getJNDIConnectionWrapper()
+                .modifyEntry( dn, mis, getControls( modifyRecord ), monitor, null );
         }
         else if ( record instanceof LdifChangeModDnRecord )
         {
@@ -526,8 +533,8 @@ public class ImportLdifJob extends Abstr
                     newDn = DnUtils.composeDn( newRdn, parent.getUpName() );
                 }
 
-                browserConnection.getConnection().getJNDIConnectionWrapper().renameEntry( dn, newDn.toString(),
-                    deleteOldRdn, getControls( modDnRecord ), monitor, null );
+                browserConnection.getConnection().getJNDIConnectionWrapper()
+                    .renameEntry( dn, newDn.toString(), deleteOldRdn, getControls( modDnRecord ), monitor, null );
             }
         }
     }
@@ -551,8 +558,8 @@ public class ImportLdifJob extends Abstr
             for ( int i = 0; i < controlLines.length; i++ )
             {
                 LdifControlLine line = controlLines[i];
-                controls[i] = new BasicControl( line.getUnfoldedOid(), line.isCritical(), line
-                    .getControlValueAsBinary() );
+                controls[i] = new BasicControl( line.getUnfoldedOid(), line.isCritical(),
+                    line.getControlValueAsBinary() );
             }
         }
         return controls;

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=967024&r1=967023&r2=967024&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 Fri Jul 23 10:24:38 2010
@@ -54,7 +54,6 @@ import org.apache.directory.studio.ldapb
  */
 public class InitializeAttributesRunnable implements StudioConnectionBulkRunnableWithProgress
 {
-
     /** The entries. */
     private IEntry[] 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=967024&r1=967023&r2=967024&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 Fri Jul 23 10:24:38 2010
@@ -55,7 +55,6 @@ import org.apache.directory.studio.ldapb
  */
 public class InitializeChildrenRunnable implements StudioConnectionBulkRunnableWithProgress
 {
-
     /** The entries. */
     private IEntry[] entries;
 
@@ -454,5 +453,4 @@ public class InitializeChildrenRunnable 
             entry.setHasMoreChildren( false );
         }
     }
-
 }

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=967024&r1=967023&r2=967024&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 Fri Jul 23 10:24:38 2010
@@ -59,7 +59,6 @@ import org.apache.directory.studio.ldapb
  */
 public class InitializeRootDSERunnable implements StudioConnectionBulkRunnableWithProgress
 {
-
     /** The requested attributes when reading the Root DSE. */
     public static final String[] ROOT_DSE_ATTRIBUTES =
         { SchemaConstants.NAMING_CONTEXTS_AT, SchemaConstants.SUBSCHEMA_SUBENTRY_AT,

Copied: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java (from r966736, 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/MoveEntriesRunnable.java?p2=directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java&p1=directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesJob.java&r1=966736&r2=967024&rev=967024&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/MoveEntriesRunnable.java Fri Jul 23 10:24:38 2010
@@ -35,6 +35,7 @@ import org.apache.directory.studio.commo
 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.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.EntryMovedEvent;
@@ -46,7 +47,7 @@ import org.apache.directory.studio.ldapb
 
 
 /**
- * Job to move entries.
+ * Runnable to move entries.
  * 
  * First it tries to move an entry using an moddn operation. If
  * that operation fails with an LDAP error 66 (ContextNotEmptyException)
@@ -55,9 +56,8 @@ import org.apache.directory.studio.ldapb
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class MoveEntriesJob extends AbstractNotificationJob
+public class MoveEntriesRunnable implements StudioConnectionBulkRunnableWithProgress
 {
-
     /** The browser connection. */
     private IBrowserConnection browserConnection;
 
@@ -78,29 +78,26 @@ public class MoveEntriesJob extends Abst
 
 
     /**
-     * Creates a new instance of MoveEntriesJob.
+     * Creates a new instance of MoveEntriesRunnable.
      * 
      * @param entries the entries to move
      * @param newParent the new parent
      * @param dialog the dialog
      */
-    public MoveEntriesJob( IEntry[] entries, IEntry newParent, SimulateRenameDialog dialog )
+    public MoveEntriesRunnable( IEntry[] entries, IEntry newParent, SimulateRenameDialog dialog )
     {
         this.browserConnection = newParent.getBrowserConnection();
         this.oldEntries = entries;
         this.newParent = newParent;
         this.dialog = dialog;
         this.newEntries = new IEntry[oldEntries.length];
-
-        setName( entries.length == 1 ? BrowserCoreMessages.jobs__move_entry_name_1
-            : BrowserCoreMessages.jobs__move_entry_name_n );
     }
 
 
     /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#getConnections()
+     * {@inheritDoc}
      */
-    protected Connection[] getConnections()
+    public Connection[] getConnections()
     {
         return new Connection[]
             { browserConnection.getConnection() };
@@ -108,9 +105,19 @@ public class MoveEntriesJob extends Abst
 
 
     /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#getLockedObjects()
+     * {@inheritDoc}
      */
-    protected Object[] getLockedObjects()
+    public String getName()
+    {
+        return oldEntries.length == 1 ? BrowserCoreMessages.jobs__move_entry_name_1
+            : BrowserCoreMessages.jobs__move_entry_name_n;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public Object[] getLockedObjects()
     {
         List<IEntry> l = new ArrayList<IEntry>();
         l.add( newParent );
@@ -120,9 +127,19 @@ public class MoveEntriesJob extends Abst
 
 
     /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractNotificationJob#executeNotificationJob(org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor)
+     * {@inheritDoc}
      */
-    protected void executeNotificationJob( StudioProgressMonitor monitor )
+    public String getErrorMessage()
+    {
+        return oldEntries.length == 1 ? BrowserCoreMessages.jobs__move_entry_error_1
+            : BrowserCoreMessages.jobs__move_entry_error_n;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void run( StudioProgressMonitor monitor )
     {
         monitor.beginTask( BrowserCoreMessages.bind(
             oldEntries.length == 1 ? BrowserCoreMessages.jobs__move_entry_task_1
@@ -148,7 +165,7 @@ public class MoveEntriesJob extends Abst
             LdapDN newDn = DnUtils.composeDn( oldDn.getRdn(), parentDn );
 
             // try to move entry
-            RenameEntryJob.renameEntry( browserConnection, oldEntry, newDn, dummyMonitor );
+            RenameEntryRunnable.renameEntry( browserConnection, oldEntry, newDn, dummyMonitor );
 
             // do a simulated rename, if renaming of a non-leaf entry is not supported.
             if ( dummyMonitor.errorsReported() )
@@ -168,13 +185,13 @@ public class MoveEntriesJob extends Abst
                         // do simulated rename operation
                         dummyMonitor.reset();
 
-                        numAdd = CopyEntriesJob.copyEntry( oldEntry, newParent, null, SearchControls.SUBTREE_SCOPE,
+                        numAdd = CopyEntriesRunnable.copyEntry( oldEntry, newParent, null, SearchControls.SUBTREE_SCOPE,
                             numAdd, null, dummyMonitor, monitor );
 
                         if ( !dummyMonitor.errorsReported() )
                         {
                             dummyMonitor.reset();
-                            numDel = DeleteEntriesJob.optimisticDeleteEntryRecursive( browserConnection, oldDn,
+                            numDel = DeleteEntriesRunnable.optimisticDeleteEntryRecursive( browserConnection, oldDn,
                                 oldEntry.isReferral(), false, numDel, dummyMonitor, monitor );
                         }
                     }
@@ -240,9 +257,9 @@ public class MoveEntriesJob extends Abst
 
 
     /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractNotificationJob#runNotification()
+     * {@inheritDoc}
      */
-    protected void runNotification()
+    public void runNotification( StudioProgressMonitor monitor )
     {
         // notify the entries and their parents
         if ( newEntries.length < 2 )
@@ -268,15 +285,4 @@ public class MoveEntriesJob extends Abst
             EventRegistry.fireEntryUpdated( new BulkModificationEvent( browserConnection ), this );
         }
     }
-
-
-    /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#getErrorMessage()
-     */
-    protected String getErrorMessage()
-    {
-        return oldEntries.length == 1 ? BrowserCoreMessages.jobs__move_entry_error_1
-            : BrowserCoreMessages.jobs__move_entry_error_n;
-    }
-
 }

Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java Fri Jul 23 10:24:38 2010
@@ -46,7 +46,6 @@ import org.apache.directory.studio.ldapb
  */
 public class ReadEntryRunnable implements StudioConnectionBulkRunnableWithProgress
 {
-
     /** The browser connection. */
     private IBrowserConnection browserConnection;
 
@@ -101,17 +100,6 @@ public class ReadEntryRunnable implement
 
 
     /**
-     * Gets the read entry.
-     * 
-     * @return the read entry
-     */
-    public IEntry getReadEntry()
-    {
-        return readEntry;
-    }
-
-
-    /**
      * {@inheritDoc}
      */
     public String getErrorMessage()
@@ -190,4 +178,14 @@ public class ReadEntryRunnable implement
         }
     }
 
+
+    /**
+     * Gets the read entry.
+     * 
+     * @return the read entry
+     */
+    public IEntry getReadEntry()
+    {
+        return readEntry;
+    }
 }

Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java Fri Jul 23 10:24:38 2010
@@ -48,7 +48,6 @@ import org.apache.directory.studio.ldifp
  */
 public class ReloadSchemaRunnable implements StudioConnectionBulkRunnableWithProgress
 {
-
     /** The browser connection. */
     private IBrowserConnection browserConnection;
 
@@ -96,6 +95,15 @@ public class ReloadSchemaRunnable implem
     /**
      * {@inheritDoc}
      */
+    public String getErrorMessage()
+    {
+        return BrowserCoreMessages.jobs__reload_schemas_error_1;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
     public void run( StudioProgressMonitor monitor )
     {
         monitor.beginTask( " ", 3 ); //$NON-NLS-1$
@@ -124,15 +132,6 @@ public class ReloadSchemaRunnable implem
 
 
     /**
-     * {@inheritDoc}
-     */
-    public String getErrorMessage()
-    {
-        return BrowserCoreMessages.jobs__reload_schemas_error_1;
-    }
-
-
-    /**
      * Reloads the schema.
      * 
      * @param forceReload true to force the reload of the schema, otherwise it would only be reloaded
@@ -171,7 +170,7 @@ public class ReloadSchemaRunnable implem
                         SchemaConstants.MATCHING_RULE_USE_AT, SchemaConstants.CREATE_TIMESTAMP_AT,
                         SchemaConstants.MODIFY_TIMESTAMP_AT } );
 
-                LdifEnumeration le = ExportLdifJob.search( browserConnection, sp, monitor );
+                LdifEnumeration le = ExportLdifRunnable.search( browserConnection, sp, monitor );
                 if ( le.hasNext() )
                 {
                     LdifContentRecord schemaRecord = ( LdifContentRecord ) le.next();

Copied: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java (from r966736, directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryJob.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java?p2=directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java&p1=directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryJob.java&r1=966736&r2=967024&rev=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java Fri Jul 23 10:24:38 2010
@@ -37,6 +37,7 @@ import org.apache.directory.studio.commo
 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.StudioConnectionBulkRunnableWithProgress;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.events.EntryRenamedEvent;
 import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -48,7 +49,7 @@ import org.apache.directory.studio.ldapb
 
 
 /**
- * Job to rename an entry.
+ * Runnable to rename an entry.
  *
  * First it tries to rename an entry using an modrdn operation. If
  * that operation fails with an LDAP error 66 (ContextNotEmptyException)
@@ -57,9 +58,8 @@ import org.apache.directory.studio.ldapb
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class RenameEntryJob extends AbstractNotificationJob
+public class RenameEntryRunnable implements StudioConnectionBulkRunnableWithProgress
 {
-
     /** The browser connection. */
     private IBrowserConnection browserConnection;
 
@@ -80,28 +80,26 @@ public class RenameEntryJob extends Abst
 
 
     /**
-     * Creates a new instance of RenameEntryJob.
+     * Creates a new instance of RenameEntryRunnable.
      * 
      * @param entry the entry to rename
      * @param newRdn the new RDN
      * @param dialog the dialog
      */
-    public RenameEntryJob( IEntry entry, Rdn newRdn, SimulateRenameDialog dialog )
+    public RenameEntryRunnable( IEntry entry, Rdn newRdn, SimulateRenameDialog dialog )
     {
         this.browserConnection = entry.getBrowserConnection();
         this.oldEntry = entry;
         this.newEntry = null;
         this.newRdn = newRdn;
         this.dialog = dialog;
-
-        setName( BrowserCoreMessages.jobs__rename_entry_name );
     }
 
 
     /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#getConnections()
+     * {@inheritDoc}
      */
-    protected Connection[] getConnections()
+    public Connection[] getConnections()
     {
         return new Connection[]
             { browserConnection.getConnection() };
@@ -109,9 +107,18 @@ public class RenameEntryJob extends Abst
 
 
     /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#getLockedObjects()
+     * {@inheritDoc}
+     */
+    public String getName()
+    {
+        return BrowserCoreMessages.jobs__rename_entry_name;
+    }
+
+
+    /**
+     * {@inheritDoc}
      */
-    protected Object[] getLockedObjects()
+    public Object[] getLockedObjects()
     {
         List<Object> l = new ArrayList<Object>();
         l.add( oldEntry.getParententry() );
@@ -120,9 +127,18 @@ public class RenameEntryJob extends Abst
 
 
     /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractNotificationJob#executeNotificationJob(org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor)
+     * {@inheritDoc}
      */
-    protected void executeNotificationJob( StudioProgressMonitor monitor )
+    public String getErrorMessage()
+    {
+        return BrowserCoreMessages.jobs__rename_entry_error;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void run( StudioProgressMonitor monitor )
     {
         monitor.beginTask( BrowserCoreMessages.bind( BrowserCoreMessages.jobs__rename_entry_task, new String[]
             { oldEntry.getDn().getUpName() } ), 3 );
@@ -153,14 +169,14 @@ public class RenameEntryJob extends Abst
                 {
                     // do simulated rename operation
                     dummyMonitor.reset();
-                    CopyEntriesJob.copyEntry( oldEntry, oldEntry.getParententry(), newRdn,
+                    CopyEntriesRunnable.copyEntry( oldEntry, oldEntry.getParententry(), newRdn,
                         SearchControls.SUBTREE_SCOPE, 0, null, dummyMonitor, monitor );
 
                     if ( !dummyMonitor.errorsReported() )
                     {
                         dummyMonitor.reset();
-                        DeleteEntriesJob.optimisticDeleteEntryRecursive( browserConnection, oldDn, oldEntry
-                            .isReferral(), false, 0, dummyMonitor, monitor );
+                        DeleteEntriesRunnable.optimisticDeleteEntryRecursive( browserConnection, oldDn,
+                            oldEntry.isReferral(), false, 0, dummyMonitor, monitor );
                     }
                 }
                 else
@@ -233,9 +249,9 @@ public class RenameEntryJob extends Abst
 
 
     /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractNotificationJob#runNotification()
+     * {@inheritDoc}
      */
-    protected void runNotification()
+    public void runNotification( StudioProgressMonitor monitor )
     {
         if ( oldEntry != null && newEntry != null )
         {
@@ -251,15 +267,6 @@ public class RenameEntryJob extends Abst
 
 
     /**
-     * @see org.apache.directory.studio.ldapbrowser.core.jobs.AbstractEclipseJob#getErrorMessage()
-     */
-    protected String getErrorMessage()
-    {
-        return BrowserCoreMessages.jobs__rename_entry_error;
-    }
-
-
-    /**
      * Moves/Renames an entry.
      * 
      * @param browserConnection the browser connection
@@ -284,9 +291,8 @@ public class RenameEntryJob extends Abst
 
         if ( browserConnection.getConnection() != null )
         {
-            browserConnection.getConnection().getJNDIConnectionWrapper().renameEntry( oldDnString, newDnString, true,
-                controls, monitor, null );
+            browserConnection.getConnection().getJNDIConnectionWrapper()
+                .renameEntry( oldDnString, newDnString, true, controls, monitor, null );
         }
     }
-
 }

Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java Fri Jul 23 10:24:38 2010
@@ -79,7 +79,6 @@ import org.apache.directory.studio.ldapb
  */
 public class SearchRunnable implements StudioConnectionBulkRunnableWithProgress
 {
-
     /** The searches. */
     protected ISearch[] searches;
 
@@ -151,6 +150,16 @@ public class SearchRunnable implements S
     /**
      * {@inheritDoc}
      */
+    public String getErrorMessage()
+    {
+        return searches.length == 1 ? BrowserCoreMessages.jobs__search_error_1
+            : BrowserCoreMessages.jobs__search_error_n;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
     public void run( StudioProgressMonitor monitor )
     {
         monitor.beginTask( " ", searches.length + 1 ); //$NON-NLS-1$
@@ -160,7 +169,7 @@ public class SearchRunnable implements S
         {
             ISearch search = searches[pi];
             ISearch searchToPerform = searchesToPerform[pi];
-            
+
             monitor.setTaskName( BrowserCoreMessages.bind( BrowserCoreMessages.jobs__search_task, new String[]
                 { search.getName() } ) );
             monitor.worked( 1 );
@@ -279,16 +288,6 @@ public class SearchRunnable implements S
 
 
     /**
-     * {@inheritDoc}
-     */
-    public String getErrorMessage()
-    {
-        return searches.length == 1 ? BrowserCoreMessages.jobs__search_error_1
-            : BrowserCoreMessages.jobs__search_error_n;
-    }
-
-
-    /**
      * Searches the directory and updates the browser model.
      * 
      * @param browserConnection the browser connection
@@ -403,8 +402,8 @@ public class SearchRunnable implements S
                                 if ( jndiControl instanceof PagedResultsResponseControl )
                                 {
                                     PagedResultsResponseControl prrc = ( PagedResultsResponseControl ) jndiControl;
-                                    StudioPagedResultsControl studioControl = new StudioPagedResultsControl( prrc
-                                        .getResultSize(), prrc.getCookie(), prrc.isCritical(), false );
+                                    StudioPagedResultsControl studioControl = new StudioPagedResultsControl(
+                                        prrc.getResultSize(), prrc.getCookie(), prrc.isCritical(), false );
                                     search.getResponseControls().add( studioControl );
 
                                     search.setCountLimitExceeded( prrc.getCookie() != null );
@@ -496,9 +495,11 @@ public class SearchRunnable implements S
             }
         }
 
-        StudioNamingEnumeration result = browserConnection.getConnection().getJNDIConnectionWrapper().search(
-            searchBase, filter, controls, aliasesDereferencingMethod, referralsHandlingMethod, jndiControls, monitor,
-            null );
+        StudioNamingEnumeration result = browserConnection
+            .getConnection()
+            .getJNDIConnectionWrapper()
+            .search( searchBase, filter, controls, aliasesDereferencingMethod, referralsHandlingMethod, jndiControls,
+                monitor, null );
         return result;
     }
 
@@ -510,36 +511,36 @@ public class SearchRunnable implements S
         // add children detetion attributes
         if ( search.isInitHasChildrenFlag() )
         {
-            if ( search.getBrowserConnection().getSchema().hasAttributeTypeDescription(
-                SchemaConstants.HAS_SUBORDINATES_AT )
+            if ( search.getBrowserConnection().getSchema()
+                .hasAttributeTypeDescription( SchemaConstants.HAS_SUBORDINATES_AT )
                 && !Utils.containsIgnoreCase( Arrays.asList( searchParameter.getReturningAttributes() ),
                     SchemaConstants.HAS_SUBORDINATES_AT ) )
             {
                 String[] returningAttributes = new String[searchParameter.getReturningAttributes().length + 1];
-                System.arraycopy( searchParameter.getReturningAttributes(), 0, returningAttributes, 0, searchParameter
-                    .getReturningAttributes().length );
+                System.arraycopy( searchParameter.getReturningAttributes(), 0, returningAttributes, 0,
+                    searchParameter.getReturningAttributes().length );
                 returningAttributes[returningAttributes.length - 1] = SchemaConstants.HAS_SUBORDINATES_AT;
                 searchParameter.setReturningAttributes( returningAttributes );
             }
-            else if ( search.getBrowserConnection().getSchema().hasAttributeTypeDescription(
-                SchemaConstants.NUM_SUBORDINATES_AT )
+            else if ( search.getBrowserConnection().getSchema()
+                .hasAttributeTypeDescription( SchemaConstants.NUM_SUBORDINATES_AT )
                 && !Utils.containsIgnoreCase( Arrays.asList( searchParameter.getReturningAttributes() ),
                     SchemaConstants.NUM_SUBORDINATES_AT ) )
             {
                 String[] returningAttributes = new String[searchParameter.getReturningAttributes().length + 1];
-                System.arraycopy( searchParameter.getReturningAttributes(), 0, returningAttributes, 0, searchParameter
-                    .getReturningAttributes().length );
+                System.arraycopy( searchParameter.getReturningAttributes(), 0, returningAttributes, 0,
+                    searchParameter.getReturningAttributes().length );
                 returningAttributes[returningAttributes.length - 1] = SchemaConstants.NUM_SUBORDINATES_AT;
                 searchParameter.setReturningAttributes( returningAttributes );
             }
-            else if ( search.getBrowserConnection().getSchema().hasAttributeTypeDescription(
-                SchemaConstants.SUBORDINATE_COUNT_AT )
+            else if ( search.getBrowserConnection().getSchema()
+                .hasAttributeTypeDescription( SchemaConstants.SUBORDINATE_COUNT_AT )
                 && !Utils.containsIgnoreCase( Arrays.asList( searchParameter.getReturningAttributes() ),
                     SchemaConstants.SUBORDINATE_COUNT_AT ) )
             {
                 String[] returningAttributes = new String[searchParameter.getReturningAttributes().length + 1];
-                System.arraycopy( searchParameter.getReturningAttributes(), 0, returningAttributes, 0, searchParameter
-                    .getReturningAttributes().length );
+                System.arraycopy( searchParameter.getReturningAttributes(), 0, returningAttributes, 0,
+                    searchParameter.getReturningAttributes().length );
                 returningAttributes[returningAttributes.length - 1] = SchemaConstants.SUBORDINATE_COUNT_AT;
                 searchParameter.setReturningAttributes( returningAttributes );
             }
@@ -555,8 +556,8 @@ public class SearchRunnable implements S
                 SchemaConstants.ALL_USER_ATTRIBUTES ) )
         {
             String[] returningAttributes = new String[searchParameter.getReturningAttributes().length + 1];
-            System.arraycopy( searchParameter.getReturningAttributes(), 0, returningAttributes, 0, searchParameter
-                .getReturningAttributes().length );
+            System.arraycopy( searchParameter.getReturningAttributes(), 0, returningAttributes, 0,
+                searchParameter.getReturningAttributes().length );
             returningAttributes[returningAttributes.length - 1] = SchemaConstants.OBJECT_CLASS_AT;
             searchParameter.setReturningAttributes( returningAttributes );
         }
@@ -880,5 +881,4 @@ public class SearchRunnable implements S
             }
         }
     }
-
 }

Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/UpdateEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/UpdateEntryRunnable.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/UpdateEntryRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/UpdateEntryRunnable.java Fri Jul 23 10:24:38 2010
@@ -34,7 +34,7 @@ import org.apache.directory.studio.ldapb
  */
 public class UpdateEntryRunnable extends ExecuteLdifRunnable
 {
-
+    /** The entry */
     private IEntry entry;
 
 
@@ -51,7 +51,9 @@ public class UpdateEntryRunnable extends
     }
 
 
-    @Override
+    /**
+     * {@inheritDoc}
+     */
     public void run( StudioProgressMonitor monitor )
     {
         super.run( monitor );

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java Fri Jul 23 10:24:38 2010
@@ -29,7 +29,7 @@ import org.apache.directory.studio.ldapb
 import org.apache.directory.studio.ldapbrowser.common.dnd.EntryTransfer;
 import org.apache.directory.studio.ldapbrowser.common.dnd.SearchTransfer;
 import org.apache.directory.studio.ldapbrowser.common.dnd.ValuesTransfer;
-import org.apache.directory.studio.ldapbrowser.core.jobs.CopyEntriesJob;
+import org.apache.directory.studio.ldapbrowser.core.jobs.CopyEntriesRunnable;
 import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
 import org.apache.directory.studio.ldapbrowser.core.jobs.UpdateEntryRunnable;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -178,15 +178,15 @@ public class BrowserPasteAction extends 
         }
         if ( askForScope )
         {
-            ScopeDialog scopeDialog = new ScopeDialog( Display.getDefault().getActiveShell(), Messages
-                .getString( "BrowserPasteAction.SelectCopyDepth" ), //$NON-NLS-1$
+            ScopeDialog scopeDialog = new ScopeDialog( Display.getDefault().getActiveShell(),
+                Messages.getString( "BrowserPasteAction.SelectCopyDepth" ), //$NON-NLS-1$
                 entriesToPaste.length > 1 );
             scopeDialog.open();
             scope = scopeDialog.getScope();
         }
 
-        new CopyEntriesJob( parent, entriesToPaste, scope, new EntryExistsCopyStrategyDialogImpl( Display.getDefault()
-            .getActiveShell() ) ).execute();
+        new StudioBrowserJob( new CopyEntriesRunnable( parent, entriesToPaste, scope, new EntryExistsCopyStrategyDialogImpl(
+            Display.getDefault().getActiveShell() ) ) ).execute();
     }
 
 
@@ -266,8 +266,8 @@ public class BrowserPasteAction extends 
             LdifFile diff = org.apache.directory.studio.ldapbrowser.core.utils.Utils.computeDiff( entry, clone );
             if ( diff != null )
             {
-                UpdateEntryRunnable runnable = new UpdateEntryRunnable( entry, diff
-                    .toFormattedString( LdifFormatParameters.DEFAULT ) );
+                UpdateEntryRunnable runnable = new UpdateEntryRunnable( entry,
+                    diff.toFormattedString( LdifFormatParameters.DEFAULT ) );
                 new StudioBrowserJob( runnable ).execute();
             }
         }

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java Fri Jul 23 10:24:38 2010
@@ -28,8 +28,9 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
 import org.apache.directory.studio.ldapbrowser.common.dialogs.MoveEntriesDialog;
 import org.apache.directory.studio.ldapbrowser.common.dialogs.SimulateRenameDialogImpl;
-import org.apache.directory.studio.ldapbrowser.core.jobs.MoveEntriesJob;
+import org.apache.directory.studio.ldapbrowser.core.jobs.MoveEntriesRunnable;
 import org.apache.directory.studio.ldapbrowser.core.jobs.ReadEntryRunnable;
+import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
 import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
@@ -190,7 +191,8 @@ public class MoveAction extends BrowserA
                 }
                 if ( newParentEntry != null )
                 {
-                    new MoveEntriesJob( entries, newParentEntry, new SimulateRenameDialogImpl( getShell() ) ).execute();
+                    new StudioBrowserJob( new MoveEntriesRunnable( entries, newParentEntry,
+                        new SimulateRenameDialogImpl( getShell() ) ) ).execute();
                 }
             }
         }

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/DropListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/DropListener.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/DropListener.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/DropListener.java Fri Jul 23 10:24:38 2010
@@ -239,7 +239,7 @@ public class DropListener /* implements 
 * (IEntry[]) objectToTransfer; if (entries != null && entries.length >
 * 0) { if(internalClipboard.getOperationType() ==
 * InternalClipboard.TYPE_DUPLICATE_OPERATION) new
-* CopyEntriesJob(selectedEntries[0], entries).execute(); else
+* CopyEntriesRunnable(selectedEntries[0], entries).execute(); else
 * if(internalClipboard.getOperationType() ==
 * InternalClipboard.TYPE_MOVE_OPERATION) this.move(selectedEntries[0],
 * entries); } } else if (objectToTransfer != null && objectToTransfer
@@ -250,7 +250,7 @@ public class DropListener /* implements 
 * i++) { entries[i] = searchResults[i].getEntry(); } if (entries !=
 * null && entries.length > 0) { if(internalClipboard.getOperationType() ==
 * InternalClipboard.TYPE_DUPLICATE_OPERATION) new
-* CopyEntriesJob(selectedEntries[0], entries).execute(); else
+* CopyEntriesRunnable(selectedEntries[0], entries).execute(); else
 * if(internalClipboard.getOperationType() ==
 * InternalClipboard.TYPE_MOVE_OPERATION) this.move(selectedEntries[0],
 * entries); } }

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvWizard.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvWizard.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvWizard.java Fri Jul 23 10:24:38 2010
@@ -21,7 +21,8 @@
 package org.apache.directory.studio.ldapbrowser.ui.wizards;
 
 
-import org.apache.directory.studio.ldapbrowser.core.jobs.ExportCsvJob;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ExportCsvRunnable;
+import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.PlatformUI;
@@ -82,10 +83,10 @@ public class ExportCsvWizard extends Exp
         super.createPageControls( pageContainer );
 
         // set help context ID
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_csvexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_csvexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( fromPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_csvexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( toPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_csvexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 
@@ -98,11 +99,9 @@ public class ExportCsvWizard extends Exp
         toPage.saveDialogSettings();
         boolean exportDn = this.fromPage.isExportDn();
 
-        ExportCsvJob ecj = new ExportCsvJob( exportFilename, search.getBrowserConnection(),
-            search.getSearchParameter(), exportDn );
-        ecj.execute();
+        new StudioBrowserJob( new ExportCsvRunnable( exportFilename, search.getBrowserConnection(),
+            search.getSearchParameter(), exportDn ) ).execute();
 
         return true;
     }
-
 }

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java Fri Jul 23 10:24:38 2010
@@ -21,8 +21,9 @@
 package org.apache.directory.studio.ldapbrowser.ui.wizards;
 
 
-import org.apache.directory.studio.ldapbrowser.core.jobs.ExportDsmlJob;
-import org.apache.directory.studio.ldapbrowser.core.jobs.ExportDsmlJob.ExportDsmlJobType;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ExportDsmlRunnable;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ExportDsmlRunnable.ExportDsmlJobType;
+import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.PlatformUI;
@@ -115,12 +116,12 @@ public class ExportDsmlWizard extends Ex
         switch ( saveAsType )
         {
             case RESPONSE:
-                new ExportDsmlJob( exportFilename, search.getBrowserConnection(), search.getSearchParameter(),
-                    ExportDsmlJobType.RESPONSE ).execute();
+                new StudioBrowserJob( new ExportDsmlRunnable( exportFilename, search.getBrowserConnection(), search.getSearchParameter(),
+                    ExportDsmlJobType.RESPONSE )).execute();
                 break;
             case REQUEST:
-                new ExportDsmlJob( exportFilename, search.getBrowserConnection(), search.getSearchParameter(),
-                    ExportDsmlJobType.REQUEST ).execute();
+                new StudioBrowserJob( new ExportDsmlRunnable( exportFilename, search.getBrowserConnection(), search.getSearchParameter(),
+                    ExportDsmlJobType.REQUEST )).execute();
                 break;
         }
 

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelWizard.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelWizard.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelWizard.java Fri Jul 23 10:24:38 2010
@@ -21,7 +21,8 @@
 package org.apache.directory.studio.ldapbrowser.ui.wizards;
 
 
-import org.apache.directory.studio.ldapbrowser.core.jobs.ExportXlsJob;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ExportXlsRunnable;
+import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.PlatformUI;
@@ -82,10 +83,10 @@ public class ExportExcelWizard extends E
         super.createPageControls( pageContainer );
 
         // set help context ID
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_excelexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_excelexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( fromPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_excelexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( toPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_excelexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 
@@ -98,9 +99,8 @@ public class ExportExcelWizard extends E
         toPage.saveDialogSettings();
         boolean exportDn = this.fromPage.isExportDn();
 
-        ExportXlsJob eej = new ExportXlsJob( exportFilename, search.getBrowserConnection(),
-            search.getSearchParameter(), exportDn );
-        eej.execute();
+        new StudioBrowserJob( new ExportXlsRunnable( exportFilename, search.getBrowserConnection(),
+            search.getSearchParameter(), exportDn ) ).execute();
 
         return true;
     }

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifWizard.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifWizard.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifWizard.java Fri Jul 23 10:24:38 2010
@@ -21,7 +21,8 @@
 package org.apache.directory.studio.ldapbrowser.ui.wizards;
 
 
-import org.apache.directory.studio.ldapbrowser.core.jobs.ExportLdifJob;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ExportLdifRunnable;
+import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.PlatformUI;
@@ -82,10 +83,10 @@ public class ExportLdifWizard extends Ex
         super.createPageControls( pageContainer );
 
         // set help context ID
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( fromPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( toPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 
@@ -97,9 +98,8 @@ public class ExportLdifWizard extends Ex
         fromPage.saveDialogSettings();
         toPage.saveDialogSettings();
 
-        ExportLdifJob elj = new ExportLdifJob( exportFilename, search.getBrowserConnection(), search
-            .getSearchParameter() );
-        elj.execute();
+        new StudioBrowserJob( new ExportLdifRunnable( exportFilename, search.getBrowserConnection(),
+            search.getSearchParameter() ) ).execute();
 
         return true;
     }

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfWizard.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfWizard.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfWizard.java Fri Jul 23 10:24:38 2010
@@ -21,7 +21,8 @@
 package org.apache.directory.studio.ldapbrowser.ui.wizards;
 
 
-import org.apache.directory.studio.ldapbrowser.core.jobs.ExportOdfJob;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ExportOdfRunnable;
+import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.PlatformUI;
@@ -82,10 +83,10 @@ public class ExportOdfWizard extends Exp
         super.createPageControls( pageContainer );
 
         // set help context ID
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_odfexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_odfexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( fromPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_odfexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( toPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_odfexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 
@@ -98,9 +99,8 @@ public class ExportOdfWizard extends Exp
         toPage.saveDialogSettings();
         boolean exportDn = this.fromPage.isExportDn();
 
-        ExportOdfJob eoj = new ExportOdfJob( exportFilename, search.getBrowserConnection(),
-            search.getSearchParameter(), exportDn );
-        eoj.execute();
+        new StudioBrowserJob( new ExportOdfRunnable( exportFilename, search.getBrowserConnection(),
+            search.getSearchParameter(), exportDn ) ).execute();
 
         return true;
     }

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java Fri Jul 23 10:24:38 2010
@@ -23,7 +23,8 @@ package org.apache.directory.studio.ldap
 
 import java.io.File;
 
-import org.apache.directory.studio.ldapbrowser.core.jobs.ImportDsmlJob;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ImportDsmlRunnable;
+import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
 import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -108,11 +109,11 @@ public class ImportDsmlWizard extends Wi
             if ( saveResponse )
             {
                 File responseFile = new File( responseFilename );
-                new ImportDsmlJob( importConnection, dsmlFile, responseFile ).execute();
+                new StudioBrowserJob( new ImportDsmlRunnable( importConnection, dsmlFile, responseFile ) ).execute();
             }
             else
             {
-                new ImportDsmlJob( importConnection, dsmlFile ).execute();
+                new StudioBrowserJob( new ImportDsmlRunnable( importConnection, dsmlFile ) ).execute();
             }
 
             return true;
@@ -176,8 +177,8 @@ public class ImportDsmlWizard extends Wi
         super.createPageControls( pageContainer );
 
         // set help context ID
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( mainPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_dsmlimport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( mainPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_dsmlimport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java?rev=967024&r1=967023&r2=967024&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java Fri Jul 23 10:24:38 2010
@@ -23,7 +23,8 @@ package org.apache.directory.studio.ldap
 
 import java.io.File;
 
-import org.apache.directory.studio.ldapbrowser.core.jobs.ImportLdifJob;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ImportLdifRunnable;
+import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
 import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -156,8 +157,8 @@ public class ImportLdifWizard extends Wi
     {
         super.createPageControls( pageContainer );
 
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( mainPage.getControl(),
-            BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifimport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
+        PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp( mainPage.getControl(), BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifimport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 
@@ -175,12 +176,13 @@ public class ImportLdifWizard extends Wi
             if ( enableLogging )
             {
                 File logFile = new File( logFilename );
-                new ImportLdifJob( importConnection, ldifFile, logFile, updateIfEntryExists, continueOnError )
-                    .execute();
+                new StudioBrowserJob( new ImportLdifRunnable( importConnection, ldifFile, logFile, updateIfEntryExists,
+                    continueOnError ) ).execute();
             }
             else
             {
-                new ImportLdifJob( importConnection, ldifFile, updateIfEntryExists, continueOnError ).execute();
+                new StudioBrowserJob( new ImportLdifRunnable( importConnection, ldifFile, updateIfEntryExists,
+                    continueOnError ) ).execute();
             }
 
             return true;



Mime
View raw message