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 [2/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...
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=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java Thu Jul 22 16:36:00 2010
@@ -24,18 +24,18 @@ package org.apache.directory.studio.ldap
import java.util.List;
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.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.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
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.Search;
@@ -44,7 +44,7 @@ import org.apache.directory.studio.ldapb
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ReadEntryRunnable implements StudioBulkRunnableWithProgress
+public class ReadEntryRunnable implements StudioConnectionBulkRunnableWithProgress
{
/** The browser connection. */
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=966736&r1=966735&r2=966736&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 Thu Jul 22 16:36:00 2010
@@ -27,15 +27,15 @@ import javax.naming.directory.SearchResu
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.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.BrowserConnectionUpdateEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch.SearchScope;
+import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldifparser.model.LdifEnumeration;
import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
@@ -46,7 +46,7 @@ import org.apache.directory.studio.ldifp
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ReloadSchemaRunnable implements StudioBulkRunnableWithProgress
+public class ReloadSchemaRunnable implements StudioConnectionBulkRunnableWithProgress
{
/** The browser connection. */
Modified: 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/RenameEntryJob.java?rev=966736&r1=966735&r2=966736&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/RenameEntryJob.java Thu Jul 22 16:36:00 2010
@@ -33,10 +33,10 @@ import javax.naming.ldap.ManageReferralC
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.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.EntryRenamedEvent;
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/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=966736&r1=966735&r2=966736&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 Thu Jul 22 16:36:00 2010
@@ -41,16 +41,16 @@ import javax.naming.ldap.PagedResultsRes
import org.apache.directory.shared.ldap.constants.SchemaConstants;
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.DnUtils;
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.io.jndi.StudioNamingEnumeration;
import org.apache.directory.studio.connection.core.io.jndi.StudioSearchResult;
-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.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -60,9 +60,9 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
+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.SearchParameter;
-import org.apache.directory.studio.ldapbrowser.core.model.ISearch.SearchScope;
import org.apache.directory.studio.ldapbrowser.core.model.impl.BaseDNEntry;
import org.apache.directory.studio.ldapbrowser.core.model.impl.ContinuedSearchResultEntry;
import org.apache.directory.studio.ldapbrowser.core.model.impl.Entry;
@@ -77,7 +77,7 @@ import org.apache.directory.studio.ldapb
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SearchRunnable implements StudioBulkRunnableWithProgress
+public class SearchRunnable implements StudioConnectionBulkRunnableWithProgress
{
/** The searches. */
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/StudioBrowserJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/StudioBrowserJob.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/StudioBrowserJob.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/StudioBrowserJob.java Thu Jul 22 16:36:00 2010
@@ -21,30 +21,31 @@ package org.apache.directory.studio.ldap
import org.apache.directory.studio.connection.core.jobs.StudioConnectionJob;
-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.events.EventRegistry;
/**
- * Job to run {@link StudioRunnableWithProgress} runnables.
+ * Job to run {@link StudioConnectionRunnableWithProgress} runnables.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StudioBrowserJob extends StudioConnectionJob
{
-
/**
* Creates a new instance of StudioBrowserJob.
*
* @param runnables the runnables to run
*/
- public StudioBrowserJob( StudioRunnableWithProgress... runnables )
+ public StudioBrowserJob( StudioConnectionRunnableWithProgress... runnables )
{
super( runnables );
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
protected void suspendEventFiringInCurrentThread()
{
EventRegistry.suspendEventFiringInCurrentThread();
@@ -52,7 +53,9 @@ public class StudioBrowserJob extends St
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
protected void resumeEventFiringInCurrentThread()
{
EventRegistry.resumeEventFiringInCurrentThread();
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=966736&r1=966735&r2=966736&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 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.EntryModificationEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java Thu Jul 22 16:36:00 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
-import org.apache.directory.studio.connection.core.jobs.StudioBulkRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.EntryPropertyPageProvider;
import org.eclipse.core.runtime.IAdaptable;
@@ -381,7 +381,7 @@ public interface IEntry extends Serializ
*
* @return the runnable used to fetch the top page of children, null if none
*/
- public abstract StudioBulkRunnableWithProgress getTopPageChildrenRunnable();
+ public abstract StudioConnectionBulkRunnableWithProgress getTopPageChildrenRunnable();
/**
@@ -389,7 +389,7 @@ public interface IEntry extends Serializ
*
* @param moreChildrenRunnable the runnable used to fetch the top page of children
*/
- public abstract void setTopPageChildrenRunnable( StudioBulkRunnableWithProgress topPageChildrenRunnable );
+ public abstract void setTopPageChildrenRunnable( StudioConnectionBulkRunnableWithProgress topPageChildrenRunnable );
/**
@@ -397,7 +397,7 @@ public interface IEntry extends Serializ
*
* @return the runnable used to fetch the next page of children, null if none
*/
- public abstract StudioBulkRunnableWithProgress getNextPageChildrenRunnable();
+ public abstract StudioConnectionBulkRunnableWithProgress getNextPageChildrenRunnable();
/**
@@ -405,7 +405,7 @@ public interface IEntry extends Serializ
*
* @param moreChildrenRunnable the runnable used to fetch the next page of children
*/
- public abstract void setNextPageChildrenRunnable( StudioBulkRunnableWithProgress nextPageChildrenRunnable );
+ public abstract void setNextPageChildrenRunnable( StudioConnectionBulkRunnableWithProgress nextPageChildrenRunnable );
/**
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java Thu Jul 22 16:36:00 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
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.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.model.impl.SearchContinuation;
import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.SearchPropertyPageProvider;
import org.eclipse.core.runtime.IAdaptable;
@@ -409,7 +409,7 @@ public interface ISearch extends Seriali
*
* @return the next search runnable, null if none
*/
- public abstract StudioBulkRunnableWithProgress getNextSearchRunnable();
+ public abstract StudioConnectionBulkRunnableWithProgress getNextSearchRunnable();
/**
@@ -417,7 +417,7 @@ public interface ISearch extends Seriali
*
* @param nextSearchRunnable the next search runnable
*/
- public abstract void setNextPageSearchRunnable( StudioBulkRunnableWithProgress nextSearchRunnable );
+ public abstract void setNextPageSearchRunnable( StudioConnectionBulkRunnableWithProgress nextSearchRunnable );
/**
@@ -425,7 +425,7 @@ public interface ISearch extends Seriali
*
* @return the top search runnable, null if none
*/
- public abstract StudioBulkRunnableWithProgress getTopSearchRunnable();
+ public abstract StudioConnectionBulkRunnableWithProgress getTopSearchRunnable();
/**
@@ -433,7 +433,7 @@ public interface ISearch extends Seriali
*
* @param nextSearchRunnable the top search runnable
*/
- public abstract void setTopPageSearchRunnable( StudioBulkRunnableWithProgress nextSearchRunnable );
+ public abstract void setTopPageSearchRunnable( StudioConnectionBulkRunnableWithProgress nextSearchRunnable );
/**
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java Thu Jul 22 16:36:00 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
import org.apache.directory.shared.ldap.util.LdapURL;
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.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.AttributeAddedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.AttributeDeletedEvent;
@@ -734,7 +734,7 @@ public abstract class AbstractEntry impl
/**
* {@inheritDoc}
*/
- public void setTopPageChildrenRunnable( StudioBulkRunnableWithProgress topPageChildrenRunnable )
+ public void setTopPageChildrenRunnable( StudioConnectionBulkRunnableWithProgress topPageChildrenRunnable )
{
ChildrenInfo ci = getBrowserConnectionImpl().getChildrenInfo( this );
if ( ci == null && topPageChildrenRunnable != null )
@@ -753,7 +753,7 @@ public abstract class AbstractEntry impl
/**
* {@inheritDoc}
*/
- public StudioBulkRunnableWithProgress getTopPageChildrenRunnable()
+ public StudioConnectionBulkRunnableWithProgress getTopPageChildrenRunnable()
{
ChildrenInfo ci = getBrowserConnectionImpl().getChildrenInfo( this );
return ci != null ? ci.topPageChildrenRunnable : null;
@@ -763,7 +763,7 @@ public abstract class AbstractEntry impl
/**
* {@inheritDoc}
*/
- public void setNextPageChildrenRunnable( StudioBulkRunnableWithProgress nextPageChildrenRunnable )
+ public void setNextPageChildrenRunnable( StudioConnectionBulkRunnableWithProgress nextPageChildrenRunnable )
{
ChildrenInfo ci = getBrowserConnectionImpl().getChildrenInfo( this );
if ( ci == null && nextPageChildrenRunnable != null )
@@ -782,7 +782,7 @@ public abstract class AbstractEntry impl
/**
* {@inheritDoc}
*/
- public StudioBulkRunnableWithProgress getNextPageChildrenRunnable()
+ public StudioConnectionBulkRunnableWithProgress getNextPageChildrenRunnable()
{
ChildrenInfo ci = getBrowserConnectionImpl().getChildrenInfo( this );
return ci != null ? ci.nextPageChildrenRunnable : null;
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ChildrenInfo.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ChildrenInfo.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ChildrenInfo.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ChildrenInfo.java Thu Jul 22 16:36:00 2010
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
import java.io.Serializable;
import java.util.Set;
-import org.apache.directory.studio.connection.core.jobs.StudioBulkRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
@@ -49,10 +49,10 @@ public class ChildrenInfo implements Ser
protected volatile boolean hasMoreChildren = false;
/** The runnable used to fetch the top page of children. */
- protected StudioBulkRunnableWithProgress topPageChildrenRunnable;
+ protected StudioConnectionBulkRunnableWithProgress topPageChildrenRunnable;
/** The runnable used to fetch the next page of children. */
- protected StudioBulkRunnableWithProgress nextPageChildrenRunnable;
+ protected StudioConnectionBulkRunnableWithProgress nextPageChildrenRunnable;
/**
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java Thu Jul 22 16:36:00 2010
@@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
import org.apache.directory.shared.ldap.util.LdapURL;
-import org.apache.directory.studio.connection.core.jobs.StudioBulkRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
@@ -478,7 +478,7 @@ public abstract class DelegateEntry impl
/**
* {@inheritDoc}
*/
- public StudioBulkRunnableWithProgress getTopPageChildrenRunnable()
+ public StudioConnectionBulkRunnableWithProgress getTopPageChildrenRunnable()
{
if ( getDelegate() != null )
{
@@ -494,7 +494,7 @@ public abstract class DelegateEntry impl
/**
* {@inheritDoc}
*/
- public StudioBulkRunnableWithProgress getNextPageChildrenRunnable()
+ public StudioConnectionBulkRunnableWithProgress getNextPageChildrenRunnable()
{
if ( getDelegate() != null )
{
@@ -731,7 +731,7 @@ public abstract class DelegateEntry impl
/**
* {@inheritDoc}
*/
- public void setTopPageChildrenRunnable( StudioBulkRunnableWithProgress topPageChildrenRunnable )
+ public void setTopPageChildrenRunnable( StudioConnectionBulkRunnableWithProgress topPageChildrenRunnable )
{
if ( getDelegate() != null )
{
@@ -743,7 +743,7 @@ public abstract class DelegateEntry impl
/**
* {@inheritDoc}
*/
- public void setNextPageChildrenRunnable( StudioBulkRunnableWithProgress nextPageChildrenRunnable )
+ public void setNextPageChildrenRunnable( StudioConnectionBulkRunnableWithProgress nextPageChildrenRunnable )
{
if ( getDelegate() != null )
{
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java Thu Jul 22 16:36:00 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
import org.apache.directory.shared.ldap.util.LdapURL;
-import org.apache.directory.studio.connection.core.jobs.StudioBulkRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.events.AttributeAddedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.AttributeDeletedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -281,7 +281,7 @@ public class DummyEntry implements IEntr
/**
* This implementation always returns null.
*/
- public StudioBulkRunnableWithProgress getNextPageChildrenRunnable()
+ public StudioConnectionBulkRunnableWithProgress getNextPageChildrenRunnable()
{
return null;
}
@@ -290,7 +290,7 @@ public class DummyEntry implements IEntr
/**
* This implementation always returns null.
*/
- public StudioBulkRunnableWithProgress getTopPageChildrenRunnable()
+ public StudioConnectionBulkRunnableWithProgress getTopPageChildrenRunnable()
{
return null;
}
@@ -465,7 +465,7 @@ public class DummyEntry implements IEntr
/**
* This implementation does nothing.
*/
- public void setTopPageChildrenRunnable( StudioBulkRunnableWithProgress topPageChildrenRunnable )
+ public void setTopPageChildrenRunnable( StudioConnectionBulkRunnableWithProgress topPageChildrenRunnable )
{
}
@@ -473,7 +473,7 @@ public class DummyEntry implements IEntr
/**
* This implementation does nothing.
*/
- public void setNextPageChildrenRunnable( StudioBulkRunnableWithProgress nextPageChildrenRunnable )
+ public void setNextPageChildrenRunnable( StudioConnectionBulkRunnableWithProgress nextPageChildrenRunnable )
{
}
Modified: directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java (original)
+++ directory/studio/trunk/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java Thu Jul 22 16:36:00 2010
@@ -31,7 +31,7 @@ import org.apache.directory.studio.conne
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.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateEvent;
import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
@@ -67,10 +67,10 @@ public class Search implements ISearch
protected boolean countLimitExceeded;
/** The next search runnable. */
- protected StudioBulkRunnableWithProgress nextSearchRunnable;
+ protected StudioConnectionBulkRunnableWithProgress nextSearchRunnable;
/** The top search runnable. */
- protected StudioBulkRunnableWithProgress topSearchRunnable;
+ protected StudioConnectionBulkRunnableWithProgress topSearchRunnable;
/** The search continuations. */
protected SearchContinuation[] searchContinuations;
@@ -466,7 +466,7 @@ public class Search implements ISearch
/**
* {@inheritDoc}
*/
- public StudioBulkRunnableWithProgress getNextSearchRunnable()
+ public StudioConnectionBulkRunnableWithProgress getNextSearchRunnable()
{
return nextSearchRunnable;
}
@@ -475,7 +475,7 @@ public class Search implements ISearch
/**
* {@inheritDoc}
*/
- public void setNextPageSearchRunnable( StudioBulkRunnableWithProgress nextSearchRunnable )
+ public void setNextPageSearchRunnable( StudioConnectionBulkRunnableWithProgress nextSearchRunnable )
{
this.nextSearchRunnable = nextSearchRunnable;
}
@@ -484,7 +484,7 @@ public class Search implements ISearch
/**
* {@inheritDoc}
*/
- public StudioBulkRunnableWithProgress getTopSearchRunnable()
+ public StudioConnectionBulkRunnableWithProgress getTopSearchRunnable()
{
return topSearchRunnable;
}
@@ -493,7 +493,7 @@ public class Search implements ISearch
/**
* {@inheritDoc}
*/
- public void setTopPageSearchRunnable( StudioBulkRunnableWithProgress topSearchRunnable )
+ public void setTopPageSearchRunnable( StudioConnectionBulkRunnableWithProgress topSearchRunnable )
{
this.topSearchRunnable = topSearchRunnable;
}
Modified: directory/studio/trunk/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/pom.xml?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.ui/pom.xml Thu Jul 22 16:36:00 2010
@@ -116,24 +116,24 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.runtime,
- org.eclipse.core.expressions,
+ <Require-Bundle>org.eclipse.core.expressions,
org.eclipse.core.filesystem,
- org.eclipse.search,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.views,
org.eclipse.ui.forms,
- org.eclipse.jface.text,
- org.apache.directory.studio.jars,
- org.apache.directory.studio.ldifparser,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.search,
+ org.apache.directory.studio.common.core,
org.apache.directory.studio.connection.core,
org.apache.directory.studio.connection.ui,
+ org.apache.directory.studio.jars,
org.apache.directory.studio.ldapbrowser.core,
org.apache.directory.studio.ldapbrowser.common,
- org.apache.directory.studio.ldifeditor
- </Require-Bundle>
+ org.apache.directory.studio.ldifeditor,
+ org.apache.directory.studio.ldifparser</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
@@ -164,6 +164,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/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java Thu Jul 22 16:36:00 2010
@@ -21,16 +21,16 @@
package org.apache.directory.studio.entryeditors;
+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.StudioRunnableWithProgressAdapter;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgressAdapter;
import org.apache.directory.studio.ldapbrowser.core.jobs.InitializeAttributesRunnable;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
import org.apache.directory.studio.ldapbrowser.core.model.IContinuation;
+import org.apache.directory.studio.ldapbrowser.core.model.IContinuation.State;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
-import org.apache.directory.studio.ldapbrowser.core.model.IContinuation.State;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PartInitException;
@@ -42,8 +42,8 @@ import org.eclipse.ui.PlatformUI;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OpenEntryEditorRunnable extends StudioRunnableWithProgressAdapter implements
- StudioBulkRunnableWithProgress
+public class OpenEntryEditorRunnable extends StudioConnectionRunnableWithProgressAdapter implements
+ StudioConnectionBulkRunnableWithProgress
{
private IEntry[] entries;
private ISearchResult[] searchResults;
Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java Thu Jul 22 16:36:00 2010
@@ -21,9 +21,9 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.searchresult;
+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.connection.core.jobs.StudioRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
/**
@@ -32,7 +32,7 @@ import org.apache.directory.studio.conne
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class FilterAndSortRunnable implements StudioRunnableWithProgress
+public class FilterAndSortRunnable implements StudioConnectionRunnableWithProgress
{
/** The configuration. */
Modified: directory/studio/trunk/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/pom.xml?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/pom.xml (original)
+++ directory/studio/trunk/ldifeditor/pom.xml Thu Jul 22 16:36:00 2010
@@ -125,12 +125,13 @@
org.eclipse.jface.text,
org.eclipse.ui.ide,
org.eclipse.core.resources,
- 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.jars,
org.apache.directory.studio.ldapbrowser.core,
- org.apache.directory.studio.ldapbrowser.common</Require-Bundle>
+ org.apache.directory.studio.ldapbrowser.common,
+ org.apache.directory.studio.ldifparser</Require-Bundle>
<Export-Package>org.apache.directory.studio.ldifeditor.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
@@ -159,6 +160,11 @@
<dependencies>
<!-- 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>
Modified: directory/studio/trunk/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/pom.xml?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/schemaeditor/pom.xml Thu Jul 22 16:36:00 2010
@@ -119,6 +119,7 @@
org.eclipse.search,
org.eclipse.ui,
org.eclipse.ui.forms,
+ org.apache.directory.studio.common.core,
org.apache.directory.studio.connection.core,
org.apache.directory.studio.connection.ui,
org.apache.directory.studio.jars
@@ -168,6 +169,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>connection.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java Thu Jul 22 16:36:00 2010
@@ -22,8 +22,8 @@ package org.apache.directory.studio.sche
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.StudioProgressMonitor;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.model.io.SchemaConnector;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/AbstractSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/AbstractSchemaConnector.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/AbstractSchemaConnector.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/AbstractSchemaConnector.java Thu Jul 22 16:36:00 2010
@@ -20,8 +20,8 @@
package org.apache.directory.studio.schemaeditor.model.io;
+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;
/**
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Thu Jul 22 16:36:00 2010
@@ -31,11 +31,11 @@ import javax.naming.directory.SearchResu
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.schema.UsageEnum;
+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.io.jndi.JNDIConnectionWrapper;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Thu Jul 22 16:36:00 2010
@@ -38,12 +38,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-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.Utils;
import org.apache.directory.studio.connection.core.io.jndi.JNDIConnectionWrapper;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java Thu Jul 22 16:36:00 2010
@@ -22,8 +22,8 @@ package org.apache.directory.studio.sche
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.StudioProgressMonitor;
import org.apache.directory.studio.schemaeditor.model.Schema;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java Thu Jul 22 16:36:00 2010
@@ -24,9 +24,9 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-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.StudioRunnableWithProgressAdapter;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgressAdapter;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -83,7 +83,7 @@ public class ImportSchemasFromOpenLdapWi
final File[] selectedSchemasFiles = page.getSelectedSchemaFiles();
schemaChecker.disableModificationsListening();
- StudioRunnableWithProgress runnable = new StudioRunnableWithProgressAdapter()
+ StudioConnectionRunnableWithProgress runnable = new StudioConnectionRunnableWithProgressAdapter()
{
public void run( StudioProgressMonitor monitor )
{
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java Thu Jul 22 16:36:00 2010
@@ -24,9 +24,9 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-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.StudioRunnableWithProgressAdapter;
+import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgressAdapter;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -84,7 +84,7 @@ public class ImportSchemasFromXmlWizard
final File[] selectedSchemasFiles = page.getSelectedSchemaFiles();
schemaChecker.disableModificationsListening();
- StudioRunnableWithProgress runnable = new StudioRunnableWithProgressAdapter()
+ StudioConnectionRunnableWithProgress runnable = new StudioConnectionRunnableWithProgressAdapter()
{
public void run( StudioProgressMonitor monitor )
{
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java?rev=966736&r1=966735&r2=966736&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java Thu Jul 22 16:36:00 2010
@@ -23,9 +23,9 @@ package org.apache.directory.studio.sche
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.StudioProgressMonitor;
-import org.apache.directory.studio.connection.core.jobs.StudioRunnableWithProgress;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -94,7 +94,7 @@ public class NewProjectWizard extends Wi
// Setting the connection to use
project.setConnection( connectionSelectionPage.getSelectedConnection() );
- RunnableContextRunner.execute( new StudioRunnableWithProgress()
+ RunnableContextRunner.execute( new StudioConnectionRunnableWithProgress()
{
public void run( StudioProgressMonitor monitor )