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 2007/01/21 14:57:56 UTC
svn commit: r498315 [1/2] - in /directory/trunks/ldapstudio:
ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/
ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/
l...
Author: seelmann
Date: Sun Jan 21 05:57:52 2007
New Revision: 498315
URL: http://svn.apache.org/viewvc?view=rev&rev=498315
Log:
Removed useless ModelModifer interface.
Removed:
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ModelModifier.java
Modified:
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeAddedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeDeletedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributesInitializedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ChildrenInitializedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueAddedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueDeletedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryAddedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryDeletedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryModificationEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryMovedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryRenamedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueAddedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueDeletedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueModifiedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueRenamedEvent.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/AbstractEntry.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Attribute.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/BaseDNEntry.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Connection.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionModifyHandler.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionSearchHandler.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DelegateEntry.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DirectoryMetadataEntry.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DummyEntry.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Entry.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractAsyncBulkJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractModificationJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CopyEntriesJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateEntryJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateValuesJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteAttributesValueJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteEntriesJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/InitializeAttributesJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/InitializeChildrenJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ModifyValueJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/MoveEntriesJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameEntryJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameValuesJob.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IAttribute.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IConnection.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IEntry.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/utils/ModelConverter.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/DeleteAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/MoveAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewAttributeAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewValueAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RefreshAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RenameAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/UpAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/MultivaluedDialog.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractOpenEditorAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorCellModifier.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogBinaryValueEditor.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogStringValueEditor.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractInPlaceStringValueEditor.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/internal/MultivaluedValueEditor.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserView.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/NewerAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/OlderAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/RefreshAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/browser/BrowserUniversalListener.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/AbstractOpenEditorAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/EditAttributeDescriptionAction.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewBookmarkWizard.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryAttributesWizardPage.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryDnWizardPage.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryObjectclassWizardPage.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryTypeWizardPage.java
directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeAddedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeAddedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeAddedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeAddedEvent.java Sun Jan 21 05:57:52 2007
@@ -33,10 +33,9 @@
private IAttribute addedAttribute;
- public AttributeAddedEvent( IConnection connection, IEntry modifiedEntry, IAttribute addedAttribute,
- ModelModifier source )
+ public AttributeAddedEvent( IConnection connection, IEntry modifiedEntry, IAttribute addedAttribute )
{
- super( connection, modifiedEntry, source );
+ super( connection, modifiedEntry );
this.addedAttribute = addedAttribute;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeDeletedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeDeletedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeDeletedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributeDeletedEvent.java Sun Jan 21 05:57:52 2007
@@ -33,10 +33,9 @@
private IAttribute deletedAttribute;
- public AttributeDeletedEvent( IConnection connection, IEntry modifiedEntry, IAttribute deletedAttribute,
- ModelModifier source )
+ public AttributeDeletedEvent( IConnection connection, IEntry modifiedEntry, IAttribute deletedAttribute )
{
- super( connection, modifiedEntry, source );
+ super( connection, modifiedEntry );
this.deletedAttribute = deletedAttribute;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributesInitializedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributesInitializedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributesInitializedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/AttributesInitializedEvent.java Sun Jan 21 05:57:52 2007
@@ -28,9 +28,9 @@
public class AttributesInitializedEvent extends EntryModificationEvent
{
- public AttributesInitializedEvent( IEntry initializedEntry, ModelModifier source )
+ public AttributesInitializedEvent( IEntry initializedEntry )
{
- super( initializedEntry.getConnection(), initializedEntry, source );
+ super( initializedEntry.getConnection(), initializedEntry );
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ChildrenInitializedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ChildrenInitializedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ChildrenInitializedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ChildrenInitializedEvent.java Sun Jan 21 05:57:52 2007
@@ -28,9 +28,9 @@
public class ChildrenInitializedEvent extends EntryModificationEvent
{
- public ChildrenInitializedEvent( IEntry initializedEntry, ModelModifier source )
+ public ChildrenInitializedEvent( IEntry initializedEntry )
{
- super( initializedEntry.getConnection(), initializedEntry, source );
+ super( initializedEntry.getConnection(), initializedEntry );
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueAddedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueAddedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueAddedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueAddedEvent.java Sun Jan 21 05:57:52 2007
@@ -37,9 +37,9 @@
public EmptyValueAddedEvent( IConnection connection, IEntry modifiedEntry, IAttribute modifiedAttribute,
- IValue addedValue, ModelModifier source )
+ IValue addedValue )
{
- super( connection, modifiedEntry, source );
+ super( connection, modifiedEntry );
this.modifiedAttribute = modifiedAttribute;
this.addedValue = addedValue;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueDeletedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueDeletedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueDeletedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EmptyValueDeletedEvent.java Sun Jan 21 05:57:52 2007
@@ -37,9 +37,9 @@
public EmptyValueDeletedEvent( IConnection connection, IEntry modifiedEntry, IAttribute modifiedAttribute,
- IValue deletedValue, ModelModifier source )
+ IValue deletedValue )
{
- super( connection, modifiedEntry, source );
+ super( connection, modifiedEntry );
this.modifiedAttribute = modifiedAttribute;
this.deletedValue = deletedValue;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryAddedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryAddedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryAddedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryAddedEvent.java Sun Jan 21 05:57:52 2007
@@ -29,9 +29,9 @@
public class EntryAddedEvent extends EntryModificationEvent
{
- public EntryAddedEvent( IConnection connection, IEntry addedEntry, ModelModifier source )
+ public EntryAddedEvent( IConnection connection, IEntry addedEntry )
{
- super( connection, addedEntry, source );
+ super( connection, addedEntry );
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryDeletedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryDeletedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryDeletedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryDeletedEvent.java Sun Jan 21 05:57:52 2007
@@ -29,9 +29,9 @@
public class EntryDeletedEvent extends EntryModificationEvent
{
- public EntryDeletedEvent( IConnection connection, IEntry deletedEntry, ModelModifier source )
+ public EntryDeletedEvent( IConnection connection, IEntry deletedEntry )
{
- super( connection, deletedEntry, source );
+ super( connection, deletedEntry );
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryModificationEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryModificationEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryModificationEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryModificationEvent.java Sun Jan 21 05:57:52 2007
@@ -32,20 +32,11 @@
protected IEntry modifiedEntry;
- protected ModelModifier source;
-
- public EntryModificationEvent( IConnection connection, IEntry modifiedEntry, ModelModifier source )
+ public EntryModificationEvent( IConnection connection, IEntry modifiedEntry )
{
this.originalConnection = connection;
this.modifiedEntry = modifiedEntry;
- this.source = source;
- }
-
-
- public ModelModifier getSource()
- {
- return this.source;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryMovedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryMovedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryMovedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryMovedEvent.java Sun Jan 21 05:57:52 2007
@@ -33,9 +33,9 @@
private IEntry newEntry;
- public EntryMovedEvent( IEntry oldEntry, IEntry newEntry, ModelModifier source )
+ public EntryMovedEvent( IEntry oldEntry, IEntry newEntry )
{
- super( newEntry.getConnection(), newEntry.getParententry(), source );
+ super( newEntry.getConnection(), newEntry.getParententry() );
this.oldEntry = oldEntry;
this.newEntry = newEntry;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryRenamedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryRenamedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryRenamedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/EntryRenamedEvent.java Sun Jan 21 05:57:52 2007
@@ -33,9 +33,9 @@
private IEntry newEntry;
- public EntryRenamedEvent( IEntry oldEntry, IEntry newEntry, ModelModifier source )
+ public EntryRenamedEvent( IEntry oldEntry, IEntry newEntry )
{
- super( newEntry.getConnection(), newEntry.getParententry(), source );
+ super( newEntry.getConnection(), newEntry.getParententry() );
this.oldEntry = oldEntry;
this.newEntry = newEntry;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueAddedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueAddedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueAddedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueAddedEvent.java Sun Jan 21 05:57:52 2007
@@ -37,9 +37,9 @@
public ValueAddedEvent( IConnection connection, IEntry modifiedEntry, IAttribute modifiedAttribute,
- IValue addedValue, ModelModifier source )
+ IValue addedValue )
{
- super( connection, modifiedEntry, source );
+ super( connection, modifiedEntry );
this.modifiedAttribute = modifiedAttribute;
this.addedValue = addedValue;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueDeletedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueDeletedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueDeletedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueDeletedEvent.java Sun Jan 21 05:57:52 2007
@@ -37,9 +37,9 @@
public ValueDeletedEvent( IConnection connection, IEntry modifiedEntry, IAttribute modifiedAttribute,
- IValue deletedValue, ModelModifier source )
+ IValue deletedValue )
{
- super( connection, modifiedEntry, source );
+ super( connection, modifiedEntry );
this.modifiedAttribute = modifiedAttribute;
this.deletedValue = deletedValue;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueModifiedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueModifiedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueModifiedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueModifiedEvent.java Sun Jan 21 05:57:52 2007
@@ -39,9 +39,9 @@
public ValueModifiedEvent( IConnection connection, IEntry modifiedEntry, IAttribute modifiedAttribute,
- IValue oldValue, IValue newValue, ModelModifier source )
+ IValue oldValue, IValue newValue )
{
- super( connection, modifiedEntry, source );
+ super( connection, modifiedEntry );
this.modifiedAttribute = modifiedAttribute;
this.oldValue = oldValue;
this.newValue = newValue;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueRenamedEvent.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueRenamedEvent.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueRenamedEvent.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/events/ValueRenamedEvent.java Sun Jan 21 05:57:52 2007
@@ -35,10 +35,9 @@
private IValue newValue;
- public ValueRenamedEvent( IConnection connection, IEntry modifiedEntry, IValue oldValue, IValue newValue,
- ModelModifier source )
+ public ValueRenamedEvent( IConnection connection, IEntry modifiedEntry, IValue oldValue, IValue newValue )
{
- super( connection, modifiedEntry, source );
+ super( connection, modifiedEntry );
this.oldValue = oldValue;
this.newValue = newValue;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/AbstractEntry.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/AbstractEntry.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/AbstractEntry.java Sun Jan 21 05:57:52 2007
@@ -38,7 +38,6 @@
import org.apache.directory.ldapstudio.browser.core.events.EntryDeletedEvent;
import org.apache.directory.ldapstudio.browser.core.events.EntryModificationEvent;
import org.apache.directory.ldapstudio.browser.core.events.EventRegistry;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.ldapstudio.browser.core.model.AttributeHierarchy;
import org.apache.directory.ldapstudio.browser.core.model.IAttribute;
@@ -81,7 +80,7 @@
protected abstract void setRdn( RDN newRdn );
- public void addChild( IEntry childToAdd, ModelModifier source )
+ public void addChild( IEntry childToAdd )
{
ChildrenInfo ci = this.getJNDIConnection().getChildrenInfo( this );
@@ -96,11 +95,11 @@
ci.childrenSet = new LinkedHashSet();
}
ci.childrenSet.add( childToAdd );
- this.entryModified( new EntryAddedEvent( childToAdd.getConnection(), childToAdd, source ) );
+ this.entryModified( new EntryAddedEvent( childToAdd.getConnection(), childToAdd ) );
}
- public void deleteChild( IEntry childToDelete, ModelModifier source )
+ public void deleteChild( IEntry childToDelete )
{
ChildrenInfo ci = this.getJNDIConnection().getChildrenInfo( this );
@@ -112,12 +111,12 @@
{
this.getJNDIConnection().setChildrenInfo( this, null );
}
- this.entryModified( new EntryDeletedEvent( this.getJNDIConnection(), childToDelete, source ) );
+ this.entryModified( new EntryDeletedEvent( this.getJNDIConnection(), childToDelete ) );
}
}
- public void addAttribute( IAttribute attributeToAdd, ModelModifier source ) throws ModelModificationException
+ public void addAttribute( IAttribute attributeToAdd ) throws ModelModificationException
{
String oidString = attributeToAdd.getAttributeDescription().toOidString( getConnection().getSchema() );
@@ -145,12 +144,12 @@
// ai.attributeMap.put(attributeToAdd.getDescription().toLowerCase(),
// attributeToAdd);
ai.attributeMap.put( oidString.toLowerCase(), attributeToAdd );
- this.entryModified( new AttributeAddedEvent( this.getJNDIConnection(), this, attributeToAdd, source ) );
+ this.entryModified( new AttributeAddedEvent( this.getJNDIConnection(), this, attributeToAdd ) );
}
}
- public void deleteAttribute( IAttribute attributeToDelete, ModelModifier source ) throws ModelModificationException
+ public void deleteAttribute( IAttribute attributeToDelete ) throws ModelModificationException
{
String oidString = attributeToDelete.getAttributeDescription().toOidString( getConnection().getSchema() );
@@ -171,7 +170,7 @@
{
this.getJNDIConnection().setAttributeInfo( this, null );
}
- this.entryModified( new AttributeDeletedEvent( this.getJNDIConnection(), this, attribute, source ) );
+ this.entryModified( new AttributeDeletedEvent( this.getJNDIConnection(), this, attribute ) );
}
else
{
@@ -367,7 +366,7 @@
}
- public void setAttributesInitialized( boolean b, ModelModifier source )
+ public void setAttributesInitialized( boolean b )
{
AttributeInfo ai = this.getJNDIConnection().getAttributeInfo( this );
@@ -388,7 +387,7 @@
this.getJNDIConnection().setAttributeInfo( this, null );
}
- this.entryModified( new AttributesInitializedEvent( this, source ) );
+ this.entryModified( new AttributesInitializedEvent( this ) );
}
@@ -485,7 +484,7 @@
}
- public void setChildrenInitialized( boolean b, ModelModifier source )
+ public void setChildrenInitialized( boolean b )
{
ChildrenInfo ci = this.getJNDIConnection().getChildrenInfo( this );
if ( ci == null && b )
@@ -508,7 +507,7 @@
this.getJNDIConnection().setChildrenInfo( this, null );
}
- this.entryModified( new ChildrenInitializedEvent( this, source ) );
+ this.entryModified( new ChildrenInitializedEvent( this ) );
}
@@ -566,7 +565,7 @@
}
- public void setHasMoreChildren( boolean b, ModelModifier source )
+ public void setHasMoreChildren( boolean b )
{
ChildrenInfo ci = this.getJNDIConnection().getChildrenInfo( this );
if ( ci == null )
@@ -576,7 +575,7 @@
}
ci.hasMoreChildren = b;
- this.entryModified( new ChildrenInitializedEvent( this, source ) );
+ this.entryModified( new ChildrenInitializedEvent( this ) );
}
@@ -587,7 +586,7 @@
}
- public void setHasChildrenHint( boolean b, ModelModifier source )
+ public void setHasChildrenHint( boolean b )
{
if ( b )
this.flags = this.flags | HAS_CHILDREN_HINT_FLAG;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Attribute.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Attribute.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Attribute.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Attribute.java Sun Jan 21 05:57:52 2007
@@ -30,7 +30,6 @@
import org.apache.directory.ldapstudio.browser.core.events.EmptyValueDeletedEvent;
import org.apache.directory.ldapstudio.browser.core.events.EntryModificationEvent;
import org.apache.directory.ldapstudio.browser.core.events.EventRegistry;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.events.ValueAddedEvent;
import org.apache.directory.ldapstudio.browser.core.events.ValueDeletedEvent;
import org.apache.directory.ldapstudio.browser.core.events.ValueModifiedEvent;
@@ -201,14 +200,13 @@
/**
* {@inheritDoc}
*/
- public void addEmptyValue( ModelModifier source )
+ public void addEmptyValue()
{
try
{
IValue emptyValue = new Value( this );
valueList.add( emptyValue );
- this.attributeModified( new EmptyValueAddedEvent( getEntry().getConnection(), getEntry(), this, emptyValue,
- source ) );
+ this.attributeModified( new EmptyValueAddedEvent( getEntry().getConnection(), getEntry(), this, emptyValue ) );
}
catch ( ModelModificationException mme )
{
@@ -220,7 +218,7 @@
/**
* {@inheritDoc}
*/
- public void deleteEmptyValue( ModelModifier source )
+ public void deleteEmptyValue()
{
for ( Iterator it = this.valueList.iterator(); it.hasNext(); )
{
@@ -228,8 +226,7 @@
if ( value.isEmpty() )
{
it.remove();
- attributeModified( new EmptyValueDeletedEvent( getEntry().getConnection(), getEntry(), this, value,
- source ) );
+ attributeModified( new EmptyValueDeletedEvent( getEntry().getConnection(), getEntry(), this, value ) );
return;
}
}
@@ -272,7 +269,7 @@
* @param valueToDelete the value to delete
* @return true if deleted
*/
- private boolean deleteValue( IValue valueToDelete )
+ private boolean internalDeleteValue( IValue valueToDelete )
{
for ( Iterator it = valueList.iterator(); it.hasNext(); )
{
@@ -290,26 +287,25 @@
/**
* {@inheritDoc}
*/
- public void addValue( IValue valueToAdd, ModelModifier source ) throws ModelModificationException
+ public void addValue( IValue valueToAdd ) throws ModelModificationException
{
this.checkValue( valueToAdd );
valueList.add( valueToAdd );
- attributeModified( new ValueAddedEvent( getEntry().getConnection(), getEntry(), this, valueToAdd, source ) );
+ attributeModified( new ValueAddedEvent( getEntry().getConnection(), getEntry(), this, valueToAdd ) );
}
/**
* {@inheritDoc}
*/
- public void deleteValue( IValue valueToDelete, ModelModifier source ) throws ModelModificationException
+ public void deleteValue( IValue valueToDelete ) throws ModelModificationException
{
this.checkValue( valueToDelete );
- if ( this.deleteValue( valueToDelete ) )
+ if ( this.internalDeleteValue( valueToDelete ) )
{
- this.attributeModified( new ValueDeletedEvent( getEntry().getConnection(), getEntry(), this, valueToDelete,
- source ) );
+ this.attributeModified( new ValueDeletedEvent( getEntry().getConnection(), getEntry(), this, valueToDelete ) );
}
}
@@ -317,15 +313,15 @@
/**
* {@inheritDoc}
*/
- public void modifyValue( IValue oldValue, IValue newValue, ModelModifier source ) throws ModelModificationException
+ public void modifyValue( IValue oldValue, IValue newValue ) throws ModelModificationException
{
this.checkValue( oldValue );
this.checkValue( newValue );
- this.deleteValue( oldValue );
+ this.internalDeleteValue( oldValue );
this.valueList.add( newValue );
this.attributeModified( new ValueModifiedEvent( getEntry().getConnection(), getEntry(), this, oldValue,
- newValue, source ) );
+ newValue ) );
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/BaseDNEntry.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/BaseDNEntry.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/BaseDNEntry.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/BaseDNEntry.java Sun Jan 21 05:57:52 2007
@@ -22,7 +22,6 @@
import org.apache.directory.ldapstudio.browser.core.BrowserCoreMessages;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.DN;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
@@ -46,7 +45,7 @@
}
- public BaseDNEntry( DN baseDn, IConnection connection, ModelModifier source ) throws ModelModificationException
+ public BaseDNEntry( DN baseDn, IConnection connection ) throws ModelModificationException
{
super();
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Connection.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Connection.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Connection.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Connection.java Sun Jan 21 05:57:52 2007
@@ -279,7 +279,7 @@
if ( !this.connectionParameter.isFetchBaseDNs() )
{
this.baseDNEntries = new BaseDNEntry[1];
- this.baseDNEntries[0] = new BaseDNEntry( new DN( this.connectionParameter.getBaseDN() ), this, this );
+ this.baseDNEntries[0] = new BaseDNEntry( new DN( this.connectionParameter.getBaseDN() ), this );
this.cacheEntry( this.baseDNEntries[0] );
}
}
@@ -446,7 +446,7 @@
private void loadRootDSE( ExtendedProgressMonitor monitor ) throws Exception
{
- this.rootDSE = new RootDSE( this, this );
+ this.rootDSE = new RootDSE( this );
this.cacheEntry( this.rootDSE );
// First get ALL attributes
@@ -484,7 +484,7 @@
this.baseDNEntries = new BaseDNEntry[baseDnEntryList.size()];
for ( int i = 0; i < this.baseDNEntries.length; i++ )
{
- this.baseDNEntries[i] = new BaseDNEntry( new DN( ( String ) baseDnEntryList.get( i ) ), this, this );
+ this.baseDNEntries[i] = new BaseDNEntry( new DN( ( String ) baseDnEntryList.get( i ) ), this );
this.cacheEntry( this.baseDNEntries[i] );
}
@@ -554,7 +554,7 @@
DirectoryMetadataEntry[] metadataEntries = new DirectoryMetadataEntry[metadataEntryList.size()];
for ( int i = 0; i < metadataEntryList.size(); i++ )
{
- metadataEntries[i] = new DirectoryMetadataEntry( ( DN ) metadataEntryList.get( i ), this, this );
+ metadataEntries[i] = new DirectoryMetadataEntry( ( DN ) metadataEntryList.get( i ), this );
metadataEntries[i].setDirectoryEntry( true );
}
return metadataEntries;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionModifyHandler.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionModifyHandler.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionModifyHandler.java Sun Jan 21 05:57:52 2007
@@ -393,7 +393,7 @@
}
else
{
- entry.setAttributesInitialized( false, connection );
+ entry.setAttributesInitialized( false );
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionSearchHandler.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionSearchHandler.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionSearchHandler.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/ConnectionSearchHandler.java Sun Jan 21 05:57:52 2007
@@ -257,21 +257,21 @@
DN aDN = ( DN ) it.next();
if ( aDN.getParentDn() == null )
{
- entry = new BaseDNEntry( aDN, connection, connection );
+ entry = new BaseDNEntry( aDN, connection );
connection.cacheEntry( entry );
}
else if ( connection.getEntryFromCache( aDN.getParentDn() ) != null )
{
IEntry parentEntry = connection.getEntryFromCache( aDN.getParentDn() );
- entry = new Entry( parentEntry, aDN.getRdn(), connection );
+ entry = new Entry( parentEntry, aDN.getRdn() );
entry.setDirectoryEntry( true );
- parentEntry.addChild( entry, connection );
+ parentEntry.addChild( entry );
// parentEntry.setAttributesInitialized(false, this);
- parentEntry.setChildrenInitialized( true, connection );
- parentEntry.setHasMoreChildren( true, connection );
- parentEntry.setHasChildrenHint( true, connection );
+ parentEntry.setChildrenInitialized( true );
+ parentEntry.setHasMoreChildren( true );
+ parentEntry.setHasChildrenHint( true );
connection.cacheEntry( entry );
}
@@ -300,19 +300,19 @@
if ( IAttribute.OPERATIONAL_ATTRIBUTE_HAS_SUBORDINATES.equalsIgnoreCase( attributeName ) )
{
if ( "FALSE".equalsIgnoreCase( lines[i].getValueAsString() ) ) { //$NON-NLS-1$
- entry.setHasChildrenHint( false, connection );
+ entry.setHasChildrenHint( false );
}
}
if ( IAttribute.OPERATIONAL_ATTRIBUTE_NUM_SUBORDINATES.equalsIgnoreCase( attributeName ) )
{
if ( "0".equalsIgnoreCase( lines[i].getValueAsString() ) ) { //$NON-NLS-1$
- entry.setHasChildrenHint( false, connection );
+ entry.setHasChildrenHint( false );
}
}
if ( IAttribute.OPERATIONAL_ATTRIBUTE_SUBORDINATE_COUNT.equalsIgnoreCase( attributeName ) )
{
if ( "0".equalsIgnoreCase( lines[i].getValueAsString() ) ) { //$NON-NLS-1$
- entry.setHasChildrenHint( false, connection );
+ entry.setHasChildrenHint( false );
}
}
}
@@ -338,7 +338,7 @@
&& Arrays.asList( search.getControls() ).contains( Control.SUBENTRIES_CONTROL ) )
{
entry.setSubentry( true );
- entry.setHasChildrenHint( false, connection );
+ entry.setHasChildrenHint( false );
}
}
@@ -472,7 +472,7 @@
{
try
{
- entry.deleteAttribute( oldAttributes[i], connection );
+ entry.deleteAttribute( oldAttributes[i] );
}
catch ( ModelModificationException e )
{
@@ -492,7 +492,7 @@
{
try
{
- entry.deleteAttribute( oldAttributes[i], connection );
+ entry.deleteAttribute( oldAttributes[i] );
}
catch ( ModelModificationException e )
{
@@ -513,7 +513,7 @@
IAttribute attribute = ( IAttribute ) it.next();
try
{
- entry.deleteAttribute( attribute, connection );
+ entry.deleteAttribute( attribute );
}
catch ( ModelModificationException e )
{
@@ -530,7 +530,7 @@
{
try
{
- entry.deleteAttribute( oldAttributes[i], connection );
+ entry.deleteAttribute( oldAttributes[i] );
}
catch ( ModelModificationException e )
{
@@ -549,7 +549,7 @@
{
try
{
- entry.deleteAttribute( oldAttribute, connection );
+ entry.deleteAttribute( oldAttribute );
}
catch ( ModelModificationException mme )
{
@@ -567,14 +567,14 @@
if ( entry.getAttribute( attributeName ) == null )
{
attribute = new Attribute( entry, attributeName );
- entry.addAttribute( attribute, connection );
+ entry.addAttribute( attribute );
}
else
{
attribute = entry.getAttribute( attributeName );
}
- attribute.addValue( new Value( attribute, lines[i].getValueAsObject() ), connection );
+ attribute.addValue( new Value( attribute, lines[i].getValueAsObject() ) );
}
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DelegateEntry.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DelegateEntry.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DelegateEntry.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DelegateEntry.java Sun Jan 21 05:57:52 2007
@@ -31,7 +31,6 @@
import org.apache.directory.ldapstudio.browser.core.events.EntryModificationEvent;
import org.apache.directory.ldapstudio.browser.core.events.EntryUpdateListener;
import org.apache.directory.ldapstudio.browser.core.events.EventRegistry;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.events.ValueAddedEvent;
import org.apache.directory.ldapstudio.browser.core.events.ValueDeletedEvent;
import org.apache.directory.ldapstudio.browser.core.events.ValueModifiedEvent;
@@ -155,31 +154,31 @@
}
- public void addAttribute( IAttribute attributeToAdd, ModelModifier source ) throws ModelModificationException
+ public void addAttribute( IAttribute attributeToAdd ) throws ModelModificationException
{
if ( this.getDelegate() != null )
- getDelegate().addAttribute( attributeToAdd, source );
+ getDelegate().addAttribute( attributeToAdd );
}
- public void addChild( IEntry childrenToAdd, ModelModifier source )
+ public void addChild( IEntry childrenToAdd )
{
if ( this.getDelegate() != null )
- getDelegate().addChild( childrenToAdd, source );
+ getDelegate().addChild( childrenToAdd );
}
- public void deleteAttribute( IAttribute attributeToDelete, ModelModifier source ) throws ModelModificationException
+ public void deleteAttribute( IAttribute attributeToDelete ) throws ModelModificationException
{
if ( this.getDelegate() != null )
- getDelegate().deleteAttribute( attributeToDelete, source );
+ getDelegate().deleteAttribute( attributeToDelete );
}
- public void deleteChild( IEntry childrenToDelete, ModelModifier source )
+ public void deleteChild( IEntry childrenToDelete )
{
if ( this.getDelegate() != null )
- getDelegate().deleteChild( childrenToDelete, source );
+ getDelegate().deleteChild( childrenToDelete );
}
@@ -300,14 +299,14 @@
}
- public void setAttributesInitialized( boolean b, ModelModifier source )
+ public void setAttributesInitialized( boolean b )
{
if ( !b )
{
if ( this.getDelegate() != null )
{
- getDelegate().setAttributesInitialized( b, source );
+ getDelegate().setAttributesInitialized( b );
}
setDelegate( null );
this.entryDoesNotExist = false;
@@ -325,7 +324,7 @@
}
if ( this.getDelegate() != null )
{
- getDelegate().setAttributesInitialized( b, source );
+ getDelegate().setAttributesInitialized( b );
}
}
}
@@ -338,17 +337,17 @@
}
- public void setHasMoreChildren( boolean b, ModelModifier source )
+ public void setHasMoreChildren( boolean b )
{
if ( this.getDelegate() != null )
- getDelegate().setHasMoreChildren( b, source );
+ getDelegate().setHasMoreChildren( b );
}
- public void setHasChildrenHint( boolean b, ModelModifier source )
+ public void setHasChildrenHint( boolean b )
{
if ( this.getDelegate() != null )
- getDelegate().setHasChildrenHint( b, source );
+ getDelegate().setHasChildrenHint( b );
}
@@ -359,14 +358,14 @@
}
- public void setChildrenInitialized( boolean b, ModelModifier source )
+ public void setChildrenInitialized( boolean b )
{
if ( !b )
{
if ( this.getDelegate() != null )
{
- getDelegate().setChildrenInitialized( b, source );
+ getDelegate().setChildrenInitialized( b );
}
// setDelegate(null);
this.entryDoesNotExist = false;
@@ -384,7 +383,7 @@
}
if ( this.getDelegate() != null )
{
- getDelegate().setChildrenInitialized( b, source );
+ getDelegate().setChildrenInitialized( b );
}
}
}
@@ -448,34 +447,34 @@
{
AttributeAddedEvent e = ( AttributeAddedEvent ) event;
AttributeAddedEvent delegateEvent = new AttributeAddedEvent( e.getOriginalConnection(), this, e
- .getAddedAttribute(), e.getSource() );
+ .getAddedAttribute() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof AttributeDeletedEvent )
{
AttributeDeletedEvent e = ( AttributeDeletedEvent ) event;
AttributeDeletedEvent delegateEvent = new AttributeDeletedEvent( e.getOriginalConnection(), this, e
- .getDeletedAttribute(), e.getSource() );
+ .getDeletedAttribute() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof AttributesInitializedEvent )
{
AttributesInitializedEvent e = ( AttributesInitializedEvent ) event;
- AttributesInitializedEvent delegateEvent = new AttributesInitializedEvent( this, e.getSource() );
+ AttributesInitializedEvent delegateEvent = new AttributesInitializedEvent( this );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof EmptyValueAddedEvent )
{
EmptyValueAddedEvent e = ( EmptyValueAddedEvent ) event;
EmptyValueAddedEvent delegateEvent = new EmptyValueAddedEvent( e.getOriginalConnection(), this, e
- .getModifiedAttribute(), e.getAddedValue(), e.getSource() );
+ .getModifiedAttribute(), e.getAddedValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof EmptyValueDeletedEvent )
{
EmptyValueDeletedEvent e = ( EmptyValueDeletedEvent ) event;
EmptyValueDeletedEvent delegateEvent = new EmptyValueDeletedEvent( e.getOriginalConnection(), this, e
- .getModifiedAttribute(), e.getDeletedValue(), e.getSource() );
+ .getModifiedAttribute(), e.getDeletedValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
// EntryAddedEvent
@@ -485,35 +484,35 @@
else if ( event instanceof ChildrenInitializedEvent )
{
ChildrenInitializedEvent e = ( ChildrenInitializedEvent ) event;
- ChildrenInitializedEvent delegateEvent = new ChildrenInitializedEvent( this, e.getSource() );
+ ChildrenInitializedEvent delegateEvent = new ChildrenInitializedEvent( this );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof ValueAddedEvent )
{
ValueAddedEvent e = ( ValueAddedEvent ) event;
ValueAddedEvent delegateEvent = new ValueAddedEvent( e.getOriginalConnection(), this, e
- .getModifiedAttribute(), e.getAddedValue(), e.getSource() );
+ .getModifiedAttribute(), e.getAddedValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof ValueDeletedEvent )
{
ValueDeletedEvent e = ( ValueDeletedEvent ) event;
ValueDeletedEvent delegateEvent = new ValueDeletedEvent( e.getOriginalConnection(), this, e
- .getModifiedAttribute(), e.getDeletedValue(), e.getSource() );
+ .getModifiedAttribute(), e.getDeletedValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof ValueModifiedEvent )
{
ValueModifiedEvent e = ( ValueModifiedEvent ) event;
ValueModifiedEvent delegateEvent = new ValueModifiedEvent( e.getOriginalConnection(), this, e
- .getModifiedAttribute(), e.getOldValue(), e.getNewValue(), e.getSource() );
+ .getModifiedAttribute(), e.getOldValue(), e.getNewValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof ValueRenamedEvent )
{
ValueRenamedEvent e = ( ValueRenamedEvent ) event;
ValueRenamedEvent delegateEvent = new ValueRenamedEvent( e.getOriginalConnection(), this, e
- .getOldValue(), e.getNewValue(), e.getSource() );
+ .getOldValue(), e.getNewValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
// ValuesSetEvent
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DirectoryMetadataEntry.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DirectoryMetadataEntry.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DirectoryMetadataEntry.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DirectoryMetadataEntry.java Sun Jan 21 05:57:52 2007
@@ -21,7 +21,6 @@
package org.apache.directory.ldapstudio.browser.core.internal.model;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.DN;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
import org.apache.directory.ldapstudio.browser.core.model.ModelModificationException;
@@ -40,7 +39,7 @@
}
- public DirectoryMetadataEntry( DN dn, IConnection connection, ModelModifier source )
+ public DirectoryMetadataEntry( DN dn, IConnection connection )
throws ModelModificationException
{
super();
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DummyEntry.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DummyEntry.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DummyEntry.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DummyEntry.java Sun Jan 21 05:57:52 2007
@@ -32,7 +32,6 @@
import org.apache.directory.ldapstudio.browser.core.events.AttributeAddedEvent;
import org.apache.directory.ldapstudio.browser.core.events.AttributeDeletedEvent;
import org.apache.directory.ldapstudio.browser.core.events.EventRegistry;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.AttributeHierarchy;
import org.apache.directory.ldapstudio.browser.core.model.DN;
import org.apache.directory.ldapstudio.browser.core.model.IAttribute;
@@ -86,28 +85,28 @@
}
- public void addAttribute( IAttribute attributeToAdd, ModelModifier source ) throws ModelModificationException
+ public void addAttribute( IAttribute attributeToAdd ) throws ModelModificationException
{
attributeMap.put( attributeToAdd.getDescription().toLowerCase(), attributeToAdd );
EventRegistry.fireEntryUpdated( new AttributeAddedEvent( attributeToAdd.getEntry().getConnection(), this,
- attributeToAdd, attributeToAdd.getEntry().getConnection() ), this );
+ attributeToAdd ), this );
}
- public void addChild( IEntry childrenToAdd, ModelModifier source )
+ public void addChild( IEntry childrenToAdd )
{
}
- public void deleteAttribute( IAttribute attributeToDelete, ModelModifier source ) throws ModelModificationException
+ public void deleteAttribute( IAttribute attributeToDelete ) throws ModelModificationException
{
attributeMap.remove( attributeToDelete.getDescription().toLowerCase() );
EventRegistry.fireEntryUpdated( new AttributeDeletedEvent( attributeToDelete.getEntry().getConnection(), this,
- attributeToDelete, attributeToDelete.getEntry().getConnection() ), this );
+ attributeToDelete ), this );
}
- public void deleteChild( IEntry childrenToDelete, ModelModifier source )
+ public void deleteChild( IEntry childrenToDelete )
{
}
@@ -309,12 +308,12 @@
}
- public void moveTo( IEntry newParent, ModelModifier source ) throws ModelModificationException
+ public void moveTo( IEntry newParent ) throws ModelModificationException
{
}
- public void rename( RDN newRdn, boolean deleteOldRdn, ModelModifier source ) throws ModelModificationException
+ public void rename( RDN newRdn, boolean deleteOldRdn ) throws ModelModificationException
{
}
@@ -325,7 +324,7 @@
}
- public void setAttributesInitialized( boolean b, ModelModifier source )
+ public void setAttributesInitialized( boolean b )
{
}
@@ -335,12 +334,12 @@
}
- public void setHasMoreChildren( boolean b, ModelModifier source )
+ public void setHasMoreChildren( boolean b )
{
}
- public void setHasChildrenHint( boolean b, ModelModifier source )
+ public void setHasChildrenHint( boolean b )
{
}
@@ -360,7 +359,7 @@
}
- public void setChildrenInitialized( boolean b, ModelModifier source )
+ public void setChildrenInitialized( boolean b )
{
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Entry.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Entry.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Entry.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Entry.java Sun Jan 21 05:57:52 2007
@@ -22,7 +22,6 @@
import org.apache.directory.ldapstudio.browser.core.BrowserCoreMessages;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.DN;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
@@ -45,7 +44,7 @@
}
- public Entry( IEntry parent, RDN rdn, ModelModifier source ) throws ModelModificationException
+ public Entry( IEntry parent, RDN rdn ) throws ModelModificationException
{
super();
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java Sun Jan 21 05:57:52 2007
@@ -25,7 +25,6 @@
import java.util.Arrays;
import java.util.Properties;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.DN;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
import org.apache.directory.ldapstudio.browser.core.model.IRootDSE;
@@ -62,7 +61,7 @@
}
- public RootDSE( IConnection connection, ModelModifier source ) throws ModelModificationException
+ public RootDSE( IConnection connection ) throws ModelModificationException
{
super();
this.setDirectoryEntry( true );
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractAsyncBulkJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractAsyncBulkJob.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractAsyncBulkJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractAsyncBulkJob.java Sun Jan 21 05:57:52 2007
@@ -22,11 +22,10 @@
import org.apache.directory.ldapstudio.browser.core.events.EventRegistry;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.ModelModificationException;
-public abstract class AbstractAsyncBulkJob extends AbstractEclipseJob implements ModelModifier
+public abstract class AbstractAsyncBulkJob extends AbstractEclipseJob
{
protected final void executeAsyncJob( ExtendedProgressMonitor pm ) throws ModelModificationException
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractModificationJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractModificationJob.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractModificationJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/AbstractModificationJob.java Sun Jan 21 05:57:52 2007
@@ -21,13 +21,12 @@
package org.apache.directory.ldapstudio.browser.core.jobs;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
import org.apache.directory.ldapstudio.browser.core.model.ModelModificationException;
-public abstract class AbstractModificationJob extends AbstractAsyncBulkJob implements ModelModifier
+public abstract class AbstractModificationJob extends AbstractAsyncBulkJob
{
protected void executeBulkJob( ExtendedProgressMonitor pm ) throws ModelModificationException
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CopyEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CopyEntriesJob.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CopyEntriesJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CopyEntriesJob.java Sun Jan 21 05:57:52 2007
@@ -116,7 +116,7 @@
protected void runNotification()
{
- EventRegistry.fireEntryUpdated( new ChildrenInitializedEvent( parent, parent.getConnection() ), this );
+ EventRegistry.fireEntryUpdated( new ChildrenInitializedEvent( parent ), this );
}
@@ -151,7 +151,7 @@
// create new entry
RDN rdn = entryToCopy.getRdn();
- IEntry newEntry = new Entry( parent, rdn, parent.getConnection() );
+ IEntry newEntry = new Entry( parent, rdn );
// change RDN if entry already exists
ExtendedProgressMonitor testMonitor = new ExtendedProgressMonitor( monitor );
@@ -161,13 +161,13 @@
String rdnValue = rdn.getValue();
String newRdnValue = BrowserCoreMessages.bind( BrowserCoreMessages.copy_n_of_s, "", rdnValue ); //$NON-NLS-1$
RDN newRdn = getNewRdn( rdn, newRdnValue );
- newEntry = new Entry( parent, newRdn, parent.getConnection() );
+ newEntry = new Entry( parent, newRdn );
testEntry = parent.getConnection().getEntry( newEntry.getDn(), testMonitor );
for ( int i = 2; testEntry != null; i++ )
{
newRdnValue = BrowserCoreMessages.bind( BrowserCoreMessages.copy_n_of_s, i + " ", rdnValue ); //$NON-NLS-1$
newRdn = getNewRdn( rdn, newRdnValue );
- newEntry = new Entry( parent, newRdn, parent.getConnection() );
+ newEntry = new Entry( parent, newRdn );
testEntry = parent.getConnection().getEntry( newEntry.getDn(), testMonitor );
}
}
@@ -181,13 +181,13 @@
|| IAttribute.REFERRAL_ATTRIBUTE.equalsIgnoreCase( attributeToCopy.getDescription() ) )
{
IAttribute newAttribute = new Attribute( newEntry, attributeToCopy.getDescription() );
- newEntry.addAttribute( newAttribute, newEntry.getConnection() );
+ newEntry.addAttribute( newAttribute );
IValue[] valuesToCopy = attributeToCopy.getValues();
for ( int j = 0; j < valuesToCopy.length; j++ )
{
IValue valueToCopy = valuesToCopy[j];
IValue newValue = new Value( newAttribute, valueToCopy.getRawValue() );
- newAttribute.addValue( newValue, newEntry.getConnection() );
+ newAttribute.addValue( newValue );
}
}
}
@@ -206,11 +206,11 @@
{
if ( part.getUnencodedValue().equals( values[ii].getRawValue() ) )
{
- rdnAttribute.deleteValue( values[ii], newEntry.getConnection() );
+ rdnAttribute.deleteValue( values[ii] );
}
if ( rdnAttribute.getValueSize() == 0 )
{
- newEntry.deleteAttribute( rdnAttribute, newEntry.getConnection() );
+ newEntry.deleteAttribute( rdnAttribute );
}
}
}
@@ -223,9 +223,8 @@
if ( rdnAttribute == null )
{
rdnAttribute = new Attribute( newEntry, part.getType() );
- newEntry.addAttribute( rdnAttribute, newEntry.getConnection() );
- rdnAttribute.addValue( new Value( rdnAttribute, part.getUnencodedValue() ), newEntry
- .getConnection() );
+ newEntry.addAttribute( rdnAttribute );
+ rdnAttribute.addValue( new Value( rdnAttribute, part.getUnencodedValue() ) );
}
else
{
@@ -241,15 +240,14 @@
}
if ( mustAdd )
{
- rdnAttribute.addValue( new Value( rdnAttribute, part.getUnencodedValue() ), newEntry
- .getConnection() );
+ rdnAttribute.addValue( new Value( rdnAttribute, part.getUnencodedValue() ) );
}
}
}
newEntry.getConnection().create( newEntry, monitor );
- newEntry.getParententry().addChild( newEntry, newEntry.getConnection() );
- newEntry.setHasChildrenHint( false, newEntry.getConnection() );
+ newEntry.getParententry().addChild( newEntry );
+ newEntry.setHasChildrenHint( false );
num++;
monitor.reportProgress( BrowserCoreMessages.bind( BrowserCoreMessages.model__copied_n_entries,
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateEntryJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateEntryJob.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateEntryJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateEntryJob.java Sun Jan 21 05:57:52 2007
@@ -89,7 +89,7 @@
{
createdEntries[i] = entryToCreate.getConnection().getEntry( entryToCreate.getDn(), monitor );
// createdEntries[i].getParententry().addChild(entry, this);
- createdEntries[i].setHasChildrenHint( false, this );
+ createdEntries[i].setHasChildrenHint( false );
}
monitor.worked( 1 );
@@ -104,7 +104,7 @@
if ( createdEntries[i] != null )
{
EventRegistry.fireEntryUpdated( new EntryAddedEvent( createdEntries[i].getConnection(),
- createdEntries[i], this ), this );
+ createdEntries[i] ), this );
}
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateValuesJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateValuesJob.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateValuesJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/CreateValuesJob.java Sun Jan 21 05:57:52 2007
@@ -88,15 +88,15 @@
// "+attributeNames[i]+" is not in subschema");
// }
attribute = new Attribute( entry, attributeDescriptions[i] );
- entry.addAttribute( attribute, this );
+ entry.addAttribute( attribute );
}
newValues[i] = new Value( attribute, rawValues[i] );
- attribute.addValue( newValues[i], this );
+ attribute.addValue( newValues[i] );
if ( this.event == null )
{
- event = new ValueAddedEvent( entry.getConnection(), entry, attribute, newValues[i], this );
+ event = new ValueAddedEvent( entry.getConnection(), entry, attribute, newValues[i] );
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteAttributesValueJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteAttributesValueJob.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteAttributesValueJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteAttributesValueJob.java Sun Jan 21 05:57:52 2007
@@ -95,11 +95,11 @@
for ( int i = 0; attributes != null && i < attributes.length; i++ )
{
- attributes[i].getEntry().deleteAttribute( attributes[i], this );
+ attributes[i].getEntry().deleteAttribute( attributes[i] );
}
for ( int i = 0; values != null && i < values.length; i++ )
{
- values[i].getAttribute().deleteValue( values[i], this );
+ values[i].getAttribute().deleteValue( values[i] );
}
entry.getConnection().delete( attributes, monitor );
@@ -107,11 +107,11 @@
if ( values.length > 0 )
{
- this.event = new ValueDeletedEvent( entry.getConnection(), entry, values[0].getAttribute(), values[0], this );
+ this.event = new ValueDeletedEvent( entry.getConnection(), entry, values[0].getAttribute(), values[0] );
}
else if ( attributes.length > 0 )
{
- this.event = new AttributeDeletedEvent( entry.getConnection(), entry, attributes[0], this );
+ this.event = new AttributeDeletedEvent( entry.getConnection(), entry, attributes[0] );
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteEntriesJob.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteEntriesJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteEntriesJob.java Sun Jan 21 05:57:52 2007
@@ -101,7 +101,7 @@
num = deleteEntryRecursive( entryToDelete, false, num, monitor );
// delete from parent
- entryToDelete.getParententry().deleteChild( entryToDelete, connection );
+ entryToDelete.getParententry().deleteChild( entryToDelete );
entriesToUpdateSet.add( entryToDelete.getParententry() );
// delete from searches
@@ -215,7 +215,7 @@
for ( Iterator it = entriesToUpdateSet.iterator(); it.hasNext(); )
{
IEntry parent = ( IEntry ) it.next();
- EventRegistry.fireEntryUpdated( new ChildrenInitializedEvent( parent, parent.getConnection() ), this );
+ EventRegistry.fireEntryUpdated( new ChildrenInitializedEvent( parent ), this );
}
for ( Iterator it = searchesToUpdateSet.iterator(); it.hasNext(); )
{
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/InitializeAttributesJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/InitializeAttributesJob.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/InitializeAttributesJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/InitializeAttributesJob.java Sun Jan 21 05:57:52 2007
@@ -107,7 +107,7 @@
IEntry parent = entries[pi];
if ( parent.getConnection() != null && entries[pi].getConnection().isOpened() && parent.isDirectoryEntry() )
{
- EventRegistry.fireEntryUpdated( new AttributesInitializedEvent( parent, parent.getConnection() ), this );
+ EventRegistry.fireEntryUpdated( new AttributesInitializedEvent( parent ), this );
}
}
}
@@ -160,7 +160,7 @@
entry.getConnection().search( search, monitor );
// set initialized state
- entry.setAttributesInitialized( true, entry.getConnection() );
+ entry.setAttributesInitialized( true );
}
}