You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/10/07 22:03:29 UTC
svn commit: r822885 - in /directory/studio/trunk:
connection-core/src/main/java/org/apache/directory/studio/connection/core/event/
connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/
connection-ui/src/main/java/org/apache/di...
Author: seelmann
Date: Wed Oct 7 20:03:20 2009
New Revision: 822885
URL: http://svn.apache.org/viewvc?rev=822885&view=rev
Log:
Fix for DIRSTUDIO-503 (New Entry -> Available object classes list remains stale after new objectclasses added):
o Fixed the way the schema cache is written after the connection is opened
o Added 'Reload Schema' button to 'New Entry wizard'
Modified:
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java
directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioProgressMonitor.java
directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages.properties
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_de.properties
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_fr.properties
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeChildrenRunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java Wed Oct 7 20:03:20 2009
@@ -431,6 +431,8 @@
return;
}
+ System.out.println( System.currentTimeMillis() + " Fire: " + factory);
+
Map<L, EventRunner> clone = new HashMap<L, EventRunner>( listeners );
for ( final L listener : clone.keySet() )
{
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java Wed Oct 7 20:03:20 2009
@@ -125,7 +125,14 @@
connection.getJNDIConnectionWrapper().disconnect();
}
}
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runNotification( StudioProgressMonitor monitor )
+ {
for ( Connection connection : connections )
{
if ( !connection.getJNDIConnectionWrapper().isConnected() )
@@ -136,14 +143,7 @@
}
}
}
- }
-
- /**
- * {@inheritDoc}
- */
- public void runNotification()
- {
for ( Connection connection : connections )
{
if ( !connection.getJNDIConnectionWrapper().isConnected() )
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java Wed Oct 7 20:03:20 2009
@@ -109,13 +109,20 @@
monitor.worked( 1 );
connection.getJNDIConnectionWrapper().connect( monitor );
- if(connection.getJNDIConnectionWrapper().isConnected())
+ if ( connection.getJNDIConnectionWrapper().isConnected() )
{
connection.getJNDIConnectionWrapper().bind( monitor );
}
}
}
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runNotification( StudioProgressMonitor monitor )
+ {
for ( Connection connection : connections )
{
if ( connection.getJNDIConnectionWrapper().isConnected() )
@@ -126,14 +133,7 @@
}
}
}
- }
-
- /**
- * {@inheritDoc}
- */
- public void runNotification()
- {
for ( Connection connection : connections )
{
if ( connection.getJNDIConnectionWrapper().isConnected() )
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioBulkRunnableWithProgress.java Wed Oct 7 20:03:20 2009
@@ -36,7 +36,9 @@
/**
* Runs notification, called by {@link StudioConnectionJob} after the run() method.
+ *
+ * @param monitor the monitor
*/
- public void runNotification();
+ public void runNotification( StudioProgressMonitor monitor );
}
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java Wed Oct 7 20:03:20 2009
@@ -117,7 +117,7 @@
{
resumeEventFiringInCurrentThread();
}
- bulkRunnable.runNotification();
+ bulkRunnable.runNotification( monitor );
}
else
{
@@ -129,12 +129,10 @@
{
monitor.reportError( e );
}
- finally
- {
- monitor.done();
- ipm.done();
- }
}
+ // always set done, even if errors were reported
+ monitor.done();
+ ipm.done();
// error handling
if ( monitor.isCanceled() )
Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioProgressMonitor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioProgressMonitor.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioProgressMonitor.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioProgressMonitor.java Wed Oct 7 20:03:20 2009
@@ -80,9 +80,10 @@
{
spm.fireCancelRequested();
}
- if ( spm == next && ( spm.isCanceled() || spm.done ) )
+ if ( spm.isCanceled() || spm.done )
{
it.remove();
+ break;
}
if ( spm.getWrappedProgressMonitor() != null
Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java Wed Oct 7 20:03:20 2009
@@ -116,7 +116,7 @@
{
ConnectionEventRegistry.resumeEventFiringInCurrentThread();
}
- bulkRunnable.runNotification();
+ bulkRunnable.runNotification( spm[0] );
}
else
{
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java Wed Oct 7 20:03:20 2009
@@ -29,11 +29,14 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
+import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.connection.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
+import org.apache.directory.studio.ldapbrowser.core.jobs.ReloadSchemaRunnable;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.core.model.impl.Attribute;
import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyEntry;
@@ -321,8 +324,10 @@
Composite availableObjectClassesComposite = BaseWidgetUtils.createColumnContainer( composite, 1, 1 );
- availableObjectClassesInstantSearch = new Text( availableObjectClassesComposite, SWT.NONE | SWT.BORDER
- | SWT.SEARCH | SWT.CANCEL );
+ Composite availableObjectClassesInstantSearchComposite = BaseWidgetUtils
+ .createColumnContainer( availableObjectClassesComposite, 2, 1 );
+ availableObjectClassesInstantSearch = new Text( availableObjectClassesInstantSearchComposite, SWT.NONE
+ | SWT.BORDER | SWT.SEARCH | SWT.CANCEL );
availableObjectClassesInstantSearch.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
availableObjectClassesInstantSearch.addModifyListener( new ModifyListener()
{
@@ -356,6 +361,20 @@
.getString( "NewEntryObjectclassWizardPage.FilterDescription" ) ); //$NON-NLS-1$
availableObjectClassesInstantSearchDecoration.setImage( FieldDecorationRegistry.getDefault()
.getFieldDecoration( FieldDecorationRegistry.DEC_CONTENT_PROPOSAL ).getImage() );
+ Button reloadButton = new Button( availableObjectClassesInstantSearchComposite, SWT.PUSH | SWT.FLAT );
+ reloadButton.setToolTipText( Messages.getString( "NewEntryObjectclassWizardPage.ReloadSchema" ) ); //$NON-NLS-1$
+ reloadButton.setImage( BrowserCommonActivator.getDefault().getImage( BrowserCommonConstants.IMG_REFRESH ) );
+ reloadButton.addSelectionListener( new SelectionAdapter()
+ {
+ @Override
+ public void widgetSelected( SelectionEvent e )
+ {
+ IBrowserConnection browserConnection = wizard.getSelectedConnection();
+ ReloadSchemaRunnable runnable = new ReloadSchemaRunnable( browserConnection );
+ RunnableContextRunner.execute( runnable, wizard.getContainer(), true );
+ setVisible( true );
+ }
+ } );
availableObjectClassesViewer = new TableViewer( availableObjectClassesComposite );
GridData data = new GridData( GridData.FILL_BOTH );
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages.properties?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages.properties Wed Oct 7 20:03:20 2009
@@ -44,6 +44,7 @@
NewEntryObjectclassWizardPage.FilterDescription=You may enter a filter to restrict the list below
NewEntryObjectclassWizardPage.ObjectClasses=Object Classes
NewEntryObjectclassWizardPage.ObjectClassesDescription=Please select object classes of the entry. Select at least one structural object class.
+NewEntryObjectclassWizardPage.ReloadSchema=Reload Schema
NewEntryObjectclassWizardPage.RemoveButton=&Remove
NewEntryObjectclassWizardPage.SelectedObjectClasses=Selected object classes
NewEntryObjectclassWizardPage.SelectStructuralObjectClass=Please select at least one structural object class.
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_de.properties?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_de.properties Wed Oct 7 20:03:20 2009
@@ -44,6 +44,7 @@
NewEntryObjectclassWizardPage.FilterDescription=Filter eingeben, um die Liste der angezeigten Obljektklassen zu verkleinern
NewEntryObjectclassWizardPage.ObjectClasses=Objektklassen
NewEntryObjectclassWizardPage.ObjectClassesDescription=Bitte die Objektklassen des Eintrags ausw\u00E4hlen. Mindestens eine strukturelle Objektklasse ausw\u00E4hlen.
+NewEntryObjectclassWizardPage.ReloadSchema=Schema erneut laden
NewEntryObjectclassWizardPage.RemoveButton=&Entfernen
NewEntryObjectclassWizardPage.SelectedObjectClasses=Ausgew\u00E4hlte Objektklassen
NewEntryObjectclassWizardPage.SelectStructuralObjectClass=Bitte mindestens eine strukturelle Objektklasse ausw\u00E4hlen.
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_fr.properties?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/messages_fr.properties Wed Oct 7 20:03:20 2009
@@ -44,6 +44,7 @@
NewEntryObjectclassWizardPage.FilterDescription=Vous pouvez entrer un filtre pour restreindre la liste ci-dessous
NewEntryObjectclassWizardPage.ObjectClasses=Object Classes
NewEntryObjectclassWizardPage.ObjectClassesDescription=Veuillez s\u00E9lectionner les object classes de l'entr\u00E9e. S\u00E9lectionnez au minimum un object class structural.
+NewEntryObjectclassWizardPage.ReloadSchema=Recharger le sch\u00E9ma
NewEntryObjectclassWizardPage.RemoveButton=Supp&rimer
NewEntryObjectclassWizardPage.SelectedObjectClasses=Object classes s\u00E9lectionn\u00E9s
NewEntryObjectclassWizardPage.SelectStructuralObjectClass=Veuillez s\u00E9lectionner au minimum un object class structural.
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/AbstractEclipseJob.java Wed Oct 7 20:03:20 2009
@@ -104,12 +104,10 @@
{
monitor.reportError( e );
}
- finally
- {
- monitor.done();
- ipm.done();
- }
}
+ // always set done, even if errors were reported
+ monitor.done();
+ ipm.done();
// error handling
if ( monitor.isCanceled() )
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java Wed Oct 7 20:03:20 2009
@@ -125,7 +125,7 @@
/**
* {@inheritDoc}
*/
- public void runNotification()
+ public void runNotification( StudioProgressMonitor monitor )
{
if ( createdEntry != null )
{
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java Wed Oct 7 20:03:20 2009
@@ -165,7 +165,7 @@
/**
* {@inheritDoc}
*/
- public void runNotification()
+ public void runNotification( StudioProgressMonitor monitor )
{
EventRegistry.fireEntryUpdated( new BulkModificationEvent( browserConnection ), this );
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java Wed Oct 7 20:03:20 2009
@@ -30,7 +30,6 @@
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.IRootDSE;
import org.apache.directory.studio.ldapbrowser.core.model.impl.DirectoryMetadataEntry;
@@ -138,7 +137,7 @@
/**
* {@inheritDoc}
*/
- public void runNotification()
+ public void runNotification( StudioProgressMonitor monitor )
{
}
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=822885&r1=822884&r2=822885&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 Wed Oct 7 20:03:20 2009
@@ -139,7 +139,7 @@
/**
* {@inheritDoc}
*/
- public void runNotification()
+ public void runNotification( StudioProgressMonitor monitor )
{
for ( IEntry entry : 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=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeChildrenRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeChildrenRunnable.java Wed Oct 7 20:03:20 2009
@@ -176,7 +176,7 @@
/**
* {@inheritDoc}
*/
- public void runNotification()
+ public void runNotification( StudioProgressMonitor monitor )
{
for ( IEntry entry : entries )
{
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java?rev=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java Wed Oct 7 20:03:20 2009
@@ -144,7 +144,7 @@
/**
* {@inheritDoc}
*/
- public void runNotification()
+ public void runNotification( StudioProgressMonitor monitor )
{
EventRegistry.fireEntryUpdated( new AttributesInitializedEvent( rootDSE ), this );
}
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=822885&r1=822884&r2=822885&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java Wed Oct 7 20:03:20 2009
@@ -137,7 +137,7 @@
/**
* {@inheritDoc}
*/
- public void runNotification()
+ public void runNotification( StudioProgressMonitor monitor )
{
}
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=822885&r1=822884&r2=822885&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 Wed Oct 7 20:03:20 2009
@@ -116,7 +116,7 @@
/**
* {@inheritDoc}
*/
- public void runNotification()
+ public void runNotification( StudioProgressMonitor monitor )
{
BrowserConnectionUpdateEvent browserConnectionUpdateEvent = new BrowserConnectionUpdateEvent(
browserConnection, BrowserConnectionUpdateEvent.Detail.SCHEMA_UPDATED );
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=822885&r1=822884&r2=822885&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 Wed Oct 7 20:03:20 2009
@@ -267,7 +267,7 @@
/**
* {@inheritDoc}
*/
- public void runNotification()
+ public void runNotification( StudioProgressMonitor monitor )
{
for ( int pi = 0; pi < searches.length; pi++ )
{