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 [2/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...
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/InitializeChildrenJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/InitializeChildrenJob.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/InitializeChildrenJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/InitializeChildrenJob.java Sun Jan 21 05:57:52 2007
@@ -108,7 +108,7 @@
IEntry parent = entries[pi];
if ( parent.getConnection() != null && entries[pi].getConnection().isOpened() && parent.isDirectoryEntry() )
{
- EventRegistry.fireEntryUpdated( new ChildrenInitializedEvent( parent, parent.getConnection() ), this );
+ EventRegistry.fireEntryUpdated( new ChildrenInitializedEvent( parent ), this );
}
}
}
@@ -124,7 +124,7 @@
// root DSE has no children
if ( parent instanceof IRootDSE )
{
- parent.setChildrenInitialized( true, parent.getConnection() );
+ parent.setChildrenInitialized( true );
return;
}
@@ -134,10 +134,10 @@
{
if ( oldChildren[i] != null )
{
- parent.deleteChild( oldChildren[i], parent.getConnection() );
+ parent.deleteChild( oldChildren[i] );
}
}
- parent.setChildrenInitialized( false, parent.getConnection() );
+ parent.setChildrenInitialized( false );
// determine alias and referral handling
int scope = ISearch.SCOPE_ONELEVEL;
@@ -179,10 +179,10 @@
{
if ( connChildren[i] != null )
{
- parent.deleteChild( connChildren[i], parent.getConnection() );
+ parent.deleteChild( connChildren[i] );
}
}
- parent.setChildrenInitialized( false, parent.getConnection() );
+ parent.setChildrenInitialized( false );
for ( int i = 0; srs != null && i < srs.length; i++ )
{
@@ -190,7 +190,7 @@
{
ReferralBaseEntry referralBaseEntry = new ReferralBaseEntry( srs[i].getEntry().getConnection(),
srs[i].getEntry().getDn() );
- parent.addChild( referralBaseEntry, parent.getConnection() );
+ parent.addChild( referralBaseEntry );
// System.out.println("Ref: " +
// referralBaseEntry.getUrl());
}
@@ -198,19 +198,19 @@
{
AliasBaseEntry aliasBaseEntry = new AliasBaseEntry( srs[i].getEntry().getConnection(), srs[i]
.getEntry().getDn() );
- parent.addChild( aliasBaseEntry, parent.getConnection() );
+ parent.addChild( aliasBaseEntry );
// System.out.println("Ali: " +
// aliasBaseEntry.getUrl());
}
else
{
- parent.addChild( srs[i].getEntry(), parent.getConnection() );
+ parent.addChild( srs[i].getEntry() );
}
}
}
else
{
- parent.setHasChildrenHint( false, parent.getConnection() );
+ parent.setHasChildrenHint( false );
}
// get subentries
@@ -236,17 +236,17 @@
for ( int i = 0; subSrs != null && i < subSrs.length; i++ )
{
- parent.addChild( subSrs[i].getEntry(), parent.getConnection() );
+ parent.addChild( subSrs[i].getEntry() );
}
}
}
// check exceeded limits / canceled
parent.setHasMoreChildren( search.isCountLimitExceeded() || subSearch.isCountLimitExceeded()
- || monitor.isCanceled(), parent.getConnection() );
+ || monitor.isCanceled() );
// set initialized state
- parent.setChildrenInitialized( true, parent.getConnection() );
+ parent.setChildrenInitialized( true );
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ModifyValueJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ModifyValueJob.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/ModifyValueJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ModifyValueJob.java Sun Jan 21 05:57:52 2007
@@ -60,11 +60,11 @@
monitor.worked( 1 );
IValue newValue = new Value( attribute, newRawValue );
- attribute.modifyValue( oldValue, newValue, this );
+ attribute.modifyValue( oldValue, newValue );
attribute.getEntry().getConnection().modify( oldValue, newValue, monitor );
this.event = new ValueModifiedEvent( attribute.getEntry().getConnection(), attribute.getEntry(), attribute,
- oldValue, newValue, this );
+ oldValue, newValue );
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/MoveEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/MoveEntriesJob.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/MoveEntriesJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/MoveEntriesJob.java Sun Jan 21 05:57:52 2007
@@ -31,7 +31,6 @@
import org.apache.directory.ldapstudio.browser.core.BrowserCoreMessages;
import org.apache.directory.ldapstudio.browser.core.events.EntryMovedEvent;
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.SearchUpdateEvent;
import org.apache.directory.ldapstudio.browser.core.model.DN;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
@@ -40,7 +39,7 @@
import org.apache.directory.ldapstudio.browser.core.model.ISearchResult;
-public class MoveEntriesJob extends AbstractAsyncBulkJob implements ModelModifier
+public class MoveEntriesJob extends AbstractAsyncBulkJob
{
private IConnection connection;
@@ -110,13 +109,13 @@
if ( errorStatusSize1 == errorStatusSize2 )
{
// move in parent
- oldParent.deleteChild( oldEntry, this );
+ oldParent.deleteChild( oldEntry );
IEntry newEntry = connection.getEntry( newDn, monitor );
this.newEntries[i] = newEntry;
- newParent.addChild( newEntry, this );
- newParent.setHasMoreChildren( false, this );
+ newParent.addChild( newEntry );
+ newParent.setHasMoreChildren( false );
- newEntry.setHasChildrenHint( oldEntry.hasChildren(), this );
+ newEntry.setHasChildrenHint( oldEntry.hasChildren() );
if ( oldEntry.isChildrenInitialized() )
{
InitializeChildrenJob.initializeChildren( newEntry, monitor );
@@ -157,7 +156,7 @@
{
if ( oldEntries[i] != null && newEntries[i] != null )
{
- EventRegistry.fireEntryUpdated( new EntryMovedEvent( oldEntries[i], newEntries[i], this ), this );
+ EventRegistry.fireEntryUpdated( new EntryMovedEvent( oldEntries[i], newEntries[i] ), 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/RenameEntryJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameEntryJob.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/RenameEntryJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameEntryJob.java Sun Jan 21 05:57:52 2007
@@ -30,7 +30,6 @@
import org.apache.directory.ldapstudio.browser.core.BrowserCoreMessages;
import org.apache.directory.ldapstudio.browser.core.events.EntryRenamedEvent;
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.SearchUpdateEvent;
import org.apache.directory.ldapstudio.browser.core.model.DN;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
@@ -40,7 +39,7 @@
import org.apache.directory.ldapstudio.browser.core.model.RDN;
-public class RenameEntryJob extends AbstractAsyncBulkJob implements ModelModifier
+public class RenameEntryJob extends AbstractAsyncBulkJob
{
private IConnection connection;
@@ -101,12 +100,12 @@
if ( !monitor.errorsReported() )
{
// rename in parent
- parent.deleteChild( oldEntry, this );
+ parent.deleteChild( oldEntry );
this.newEntry = connection.getEntry( newDn, monitor );
- parent.addChild( newEntry, this );
- parent.setHasMoreChildren( false, this );
+ parent.addChild( newEntry );
+ parent.setHasMoreChildren( false );
- newEntry.setHasChildrenHint( oldEntry.hasChildren(), this );
+ newEntry.setHasChildrenHint( oldEntry.hasChildren() );
if ( oldEntry.isChildrenInitialized() )
{
InitializeChildrenJob.initializeChildren( newEntry, monitor );
@@ -144,7 +143,7 @@
{
if ( oldEntry != null && newEntry != null )
{
- EventRegistry.fireEntryUpdated( new EntryRenamedEvent( oldEntry, newEntry, this ), this );
+ EventRegistry.fireEntryUpdated( new EntryRenamedEvent( oldEntry, newEntry ), 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/RenameValuesJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameValuesJob.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/RenameValuesJob.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameValuesJob.java Sun Jan 21 05:57:52 2007
@@ -82,17 +82,17 @@
if ( newAttribute == null )
{
newAttribute = new Attribute( entry, newAttributeName );
- entry.addAttribute( newAttribute, this );
+ entry.addAttribute( newAttribute );
}
newValues[i] = new Value( newAttribute, oldValues[i].getRawValue() );
- newAttribute.addValue( newValues[i], this );
+ newAttribute.addValue( newValues[i] );
- oldValues[i].getAttribute().deleteValue( oldValues[i], this );
+ oldValues[i].getAttribute().deleteValue( oldValues[i] );
if ( this.event == null )
{
- this.event = new ValueRenamedEvent( entry.getConnection(), entry, oldValues[0], newValues[0], this );
+ this.event = new ValueRenamedEvent( entry.getConnection(), entry, oldValues[0], newValues[0] );
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IAttribute.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IAttribute.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IAttribute.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IAttribute.java Sun Jan 21 05:57:52 2007
@@ -23,7 +23,6 @@
import java.io.Serializable;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.internal.model.AttributeDescription;
import org.apache.directory.ldapstudio.browser.core.model.schema.AttributeTypeDescription;
import org.apache.directory.ldapstudio.browser.core.propertypageproviders.AttributePropertyPageProvider;
@@ -229,19 +228,15 @@
/**
* Adds an empty value.
*
- * @param source
- * the ModelModifier
*/
- public abstract void addEmptyValue( ModelModifier source );
+ public abstract void addEmptyValue();
/**
* Removes one empty value if one is present.
*
- * @param source
- * the ModelModifier
*/
- public abstract void deleteEmptyValue( ModelModifier source );
+ public abstract void deleteEmptyValue();
/**
@@ -250,13 +245,11 @@
*
* @param valueToAdd
* the value to add
- * @param source
- * the ModelModifier
* @throws ModelModificationException
* if the value is null or if the value's attribute
* isn't this attribute.
*/
- public abstract void addValue( IValue valueToAdd, ModelModifier source ) throws ModelModificationException;
+ public abstract void addValue( IValue valueToAdd ) throws ModelModificationException;
/**
@@ -264,13 +257,11 @@
*
* @param valueToDelete
* the value to delete
- * @param source
- * the ModelModifier
* @throws ModelModificationException
* if the value is null or if the value's attribute
* isn't this attribute.
*/
- public abstract void deleteValue( IValue valueToDelete, ModelModifier source ) throws ModelModificationException;
+ public abstract void deleteValue( IValue valueToDelete ) throws ModelModificationException;
/**
@@ -280,13 +271,11 @@
* the value that should be replaced
* @param newValue
* the value that should be added
- * @param source
- * the ModelModifier
* @throws ModelModificationException
* if the value is null or if the value's attribute
* isn't this attribute.
*/
- public abstract void modifyValue( IValue oldValue, IValue newValue, ModelModifier source )
+ public abstract void modifyValue( IValue oldValue, IValue newValue )
throws ModelModificationException;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IConnection.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IConnection.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IConnection.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IConnection.java Sun Jan 21 05:57:52 2007
@@ -26,7 +26,6 @@
import org.apache.directory.ldapstudio.browser.core.BookmarkManager;
import org.apache.directory.ldapstudio.browser.core.SearchManager;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.internal.model.ConnectionException;
import org.apache.directory.ldapstudio.browser.core.internal.model.ModificationLogger;
import org.apache.directory.ldapstudio.browser.core.jobs.ExtendedProgressMonitor;
@@ -36,7 +35,7 @@
import org.eclipse.core.runtime.IAdaptable;
-public interface IConnection extends Serializable, IAdaptable, ConnectionPropertyPageProvider, ModelModifier
+public interface IConnection extends Serializable, IAdaptable, ConnectionPropertyPageProvider
{
public static final String[] ROOT_DSE_ATTRIBUTES =
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IEntry.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IEntry.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IEntry.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/IEntry.java Sun Jan 21 05:57:52 2007
@@ -23,7 +23,6 @@
import java.io.Serializable;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.schema.Subschema;
import org.apache.directory.ldapstudio.browser.core.propertypageproviders.ConnectionPropertyPageProvider;
import org.apache.directory.ldapstudio.browser.core.propertypageproviders.EntryPropertyPageProvider;
@@ -44,10 +43,8 @@
*
* @param childToAdd
* the child to add
- * @param source
- * the ModelModifier
*/
- public abstract void addChild( IEntry childToAdd, ModelModifier source );
+ public abstract void addChild( IEntry childToAdd );
/**
@@ -55,10 +52,8 @@
*
* @param childToDelete
* the child to delete
- * @param source
- * the ModelModifier
*/
- public abstract void deleteChild( IEntry childToDelete, ModelModifier source );
+ public abstract void deleteChild( IEntry childToDelete );
/**
@@ -67,14 +62,11 @@
*
* @param attributeToAdd
* the attribute to add
- * @param source
- * the ModelModifier
* @throws ModelModificationException
* if the attribute is alreade present in this entry or
* if the attribute's entry isn't this entry.
*/
- public abstract void addAttribute( IAttribute attributeToAdd, ModelModifier source )
- throws ModelModificationException;
+ public abstract void addAttribute( IAttribute attributeToAdd ) throws ModelModificationException;
/**
@@ -82,13 +74,10 @@
*
* @param attributeToDelete
* the attribute to delete
- * @param source
- * the ModelModifier
* @throws ModelModificationException
* if the attribute isn't present in this entry.
*/
- public abstract void deleteAttribute( IAttribute attributeToDelete, ModelModifier source )
- throws ModelModificationException;
+ public abstract void deleteAttribute( IAttribute attributeToDelete ) throws ModelModificationException;
/**
@@ -236,7 +225,7 @@
*
* @param b the attributes initialized flag
*/
- public abstract void setAttributesInitialized( boolean b, ModelModifier source );
+ public abstract void setAttributesInitialized( boolean b );
/**
@@ -296,11 +285,11 @@
/**
- * Sets a flag wheter this entry's children are initialized..
+ * Sets a flag wheter this entry's children are initialized..
*
* @param b the children initialized flag
*/
- public abstract void setChildrenInitialized( boolean b, ModelModifier source );
+ public abstract void setChildrenInitialized( boolean b );
/**
@@ -316,7 +305,7 @@
*
* @param b the has children hint
*/
- public abstract void setHasChildrenHint( boolean b, ModelModifier source );
+ public abstract void setHasChildrenHint( boolean b );
/**
@@ -353,7 +342,7 @@
*
* @param b the has more children flag
*/
- public abstract void setHasMoreChildren( boolean b, ModelModifier source );
+ public abstract void setHasMoreChildren( boolean b );
/**
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/utils/ModelConverter.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/utils/ModelConverter.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/utils/ModelConverter.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/utils/ModelConverter.java Sun Jan 21 05:57:52 2007
@@ -83,9 +83,9 @@
if ( attribute == null )
{
attribute = new Attribute( entry, attributeName );
- entry.addAttribute( attribute, null );
+ entry.addAttribute( attribute );
}
- attribute.addValue( new Value( attribute, value ), null );
+ attribute.addValue( new Value( attribute, value ) );
}
else if ( !( parts[i] instanceof LdifDnLine ) && !( parts[i] instanceof LdifSepLine ) )
{
@@ -93,8 +93,8 @@
name = name.replaceAll( "\n", "" );
name = name.replaceAll( "\r", "" );
IAttribute attribute = new Attribute( entry, name );
- attribute.addValue( new Value( attribute, parts[i] ), null );
- entry.addAttribute( attribute, null );
+ attribute.addValue( new Value( attribute, parts[i] ) );
+ entry.addAttribute( attribute );
// IAttribute attribute = entry.getAttribute("");
// if(attribute == null) {
// attribute = new Attribute(entry, "");
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/DeleteAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/DeleteAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/DeleteAction.java Sun Jan 21 05:57:52 2007
@@ -33,7 +33,6 @@
import org.apache.directory.ldapstudio.browser.core.BrowserCoreConstants;
import org.apache.directory.ldapstudio.browser.core.BrowserCorePlugin;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.jobs.DeleteAttributesValueJob;
import org.apache.directory.ldapstudio.browser.core.jobs.DeleteEntriesJob;
import org.apache.directory.ldapstudio.browser.core.model.AttributeHierarchy;
@@ -47,7 +46,6 @@
import org.apache.directory.ldapstudio.browser.core.model.RDNPart;
import org.apache.directory.ldapstudio.browser.core.model.schema.ObjectClassDescription;
import org.apache.directory.ldapstudio.browser.core.model.schema.SchemaUtils;
-
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.ISharedImages;
@@ -61,7 +59,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class DeleteAction extends BrowserAction implements ModelModifier
+public class DeleteAction extends BrowserAction
{
/**
* {@inheritDoc}
@@ -322,14 +320,14 @@
{
if ( vals[i].isEmpty() )
{
- att.deleteEmptyValue( this );
+ att.deleteEmptyValue();
}
}
if ( att.getValueSize() == 0 )
{
try
{
- att.getEntry().deleteAttribute( att, this );
+ att.getEntry().deleteAttribute( att );
}
catch ( ModelModificationException e )
{
@@ -342,7 +340,7 @@
IValue value = ( IValue ) it.next();
if ( value.isEmpty() )
{
- value.getAttribute().deleteEmptyValue( this );
+ value.getAttribute().deleteEmptyValue();
it.remove();
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/MoveAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/MoveAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/MoveAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/MoveAction.java Sun Jan 21 05:57:52 2007
@@ -23,7 +23,6 @@
import java.util.LinkedHashSet;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.internal.model.BaseDNEntry;
import org.apache.directory.ldapstudio.browser.core.internal.model.DirectoryMetadataEntry;
import org.apache.directory.ldapstudio.browser.core.internal.model.RootDSE;
@@ -33,7 +32,6 @@
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
import org.apache.directory.ldapstudio.browser.core.model.ISearch;
import org.apache.directory.ldapstudio.browser.ui.dialogs.MoveEntriesDialog;
-
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
@@ -45,7 +43,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class MoveAction extends BrowserAction implements ModelModifier
+public class MoveAction extends BrowserAction
{
/**
* Creates a new instance of MoveAction.
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewAttributeAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewAttributeAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewAttributeAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewAttributeAction.java Sun Jan 21 05:57:52 2007
@@ -21,7 +21,6 @@
package org.apache.directory.ldapstudio.browser.ui.actions;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.internal.model.Attribute;
import org.apache.directory.ldapstudio.browser.core.model.IAttribute;
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
@@ -29,7 +28,6 @@
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
import org.apache.directory.ldapstudio.browser.ui.wizards.AttributeWizard;
-
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.WizardDialog;
@@ -42,7 +40,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class NewAttributeAction extends BrowserAction implements ModelModifier
+public class NewAttributeAction extends BrowserAction
{
/**
* Creates a new instance of NewAttributeAction.
@@ -103,10 +101,10 @@
if ( att == null )
{
att = new Attribute( entry, newAttributeDescription );
- entry.addAttribute( att, this );
+ entry.addAttribute( att ) ;
}
- att.addEmptyValue( this );
+ att.addEmptyValue();
}
catch ( ModelModificationException mme )
{
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewValueAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewValueAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewValueAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/NewValueAction.java Sun Jan 21 05:57:52 2007
@@ -21,11 +21,9 @@
package org.apache.directory.ldapstudio.browser.ui.actions;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.schema.SchemaUtils;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
-
import org.eclipse.jface.resource.ImageDescriptor;
@@ -35,7 +33,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class NewValueAction extends BrowserAction implements ModelModifier
+public class NewValueAction extends BrowserAction
{
/**
* Creates a new instance of NewValueAction.
@@ -62,15 +60,15 @@
{
if ( getSelectedValues().length == 1 )
{
- getSelectedValues()[0].getAttribute().addEmptyValue( this );
+ getSelectedValues()[0].getAttribute().addEmptyValue();
}
else if ( getSelectedAttributes().length == 1 )
{
- getSelectedAttributes()[0].addEmptyValue( this );
+ getSelectedAttributes()[0].addEmptyValue();
}
else if ( getSelectedAttributeHierarchies().length == 1 )
{
- getSelectedAttributeHierarchies()[0].getAttribute().addEmptyValue( this );
+ getSelectedAttributeHierarchies()[0].getAttribute().addEmptyValue();
}
if ( getSelectedSearchResults().length > 0 )
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RefreshAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RefreshAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RefreshAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RefreshAction.java Sun Jan 21 05:57:52 2007
@@ -25,7 +25,6 @@
import java.util.Arrays;
import java.util.List;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.jobs.InitializeAttributesJob;
import org.apache.directory.ldapstudio.browser.core.jobs.InitializeChildrenJob;
import org.apache.directory.ldapstudio.browser.core.jobs.SearchJob;
@@ -33,7 +32,6 @@
import org.apache.directory.ldapstudio.browser.core.model.ISearch;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
-
import org.eclipse.jface.resource.ImageDescriptor;
@@ -43,7 +41,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class RefreshAction extends BrowserAction implements ModelModifier
+public class RefreshAction extends BrowserAction
{
/**
* Creates a new instance of RefreshAction.
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RenameAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RenameAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RenameAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/RenameAction.java Sun Jan 21 05:57:52 2007
@@ -22,7 +22,6 @@
import org.apache.directory.ldapstudio.browser.core.BrowserCorePlugin;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.internal.model.BaseDNEntry;
import org.apache.directory.ldapstudio.browser.core.internal.model.DirectoryMetadataEntry;
import org.apache.directory.ldapstudio.browser.core.internal.model.RootDSE;
@@ -33,7 +32,6 @@
import org.apache.directory.ldapstudio.browser.core.model.ISearch;
import org.apache.directory.ldapstudio.browser.core.model.RDN;
import org.apache.directory.ldapstudio.browser.ui.dialogs.RenameEntryDialog;
-
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IInputValidator;
import org.eclipse.jface.dialogs.InputDialog;
@@ -47,7 +45,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class RenameAction extends BrowserAction implements ModelModifier
+public class RenameAction extends BrowserAction
{
/**
* Creates a new instance of RenameAction.
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/UpAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/UpAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/UpAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/UpAction.java Sun Jan 21 05:57:52 2007
@@ -21,7 +21,6 @@
package org.apache.directory.ldapstudio.browser.ui.actions;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.IBookmark;
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
import org.apache.directory.ldapstudio.browser.core.model.ISearch;
@@ -30,7 +29,6 @@
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
import org.apache.directory.ldapstudio.browser.ui.widgets.browser.BrowserEntryPage;
import org.apache.directory.ldapstudio.browser.ui.widgets.browser.BrowserSearchResultPage;
-
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.StructuredSelection;
@@ -43,7 +41,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class UpAction extends BrowserAction implements ModelModifier
+public class UpAction extends BrowserAction
{
protected TreeViewer viewer;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/MultivaluedDialog.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/MultivaluedDialog.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/MultivaluedDialog.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/MultivaluedDialog.java Sun Jan 21 05:57:52 2007
@@ -28,7 +28,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;
@@ -45,7 +44,6 @@
import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EntryEditorWidgetConfiguration;
import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.EntryEditorWidgetUniversalListener;
import org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor.OpenDefaultEditorAction;
-
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.StructuredSelection;
@@ -56,7 +54,7 @@
import org.eclipse.swt.widgets.Shell;
-public class MultivaluedDialog extends Dialog implements ModelModifier
+public class MultivaluedDialog extends Dialog
{
public static final String DIALOG_TITLE = "Multivalued Editor";
@@ -204,7 +202,7 @@
{
if ( this.attributeHierarchie.getAttribute().getValueSize() == 0 )
{
- this.attributeHierarchie.getAttribute().addEmptyValue( this );
+ this.attributeHierarchie.getAttribute().addEmptyValue();
}
}
@@ -224,7 +222,7 @@
{
if ( values[i].isEmpty() )
{
- attribute.deleteEmptyValue( this );
+ attribute.deleteEmptyValue();
}
}
@@ -233,7 +231,7 @@
{
try
{
- attribute.getEntry().deleteAttribute( attribute, this );
+ attribute.getEntry().deleteAttribute( attribute );
}
catch ( ModelModificationException e )
{
@@ -276,8 +274,8 @@
try
{
IAttribute attribute = new Attribute( entry, attributeDescription );
- entry.addAttribute( attribute, null );
- attribute.addEmptyValue( null );
+ entry.addAttribute( attribute );
+ attribute.addEmptyValue();
}
catch ( ModelModificationException e )
{
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractOpenEditorAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractOpenEditorAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractOpenEditorAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/AbstractOpenEditorAction.java Sun Jan 21 05:57:52 2007
@@ -21,9 +21,7 @@
package org.apache.directory.ldapstudio.browser.ui.editors.searchresult;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager;
-
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
@@ -35,7 +33,7 @@
public abstract class AbstractOpenEditorAction extends AbstractSearchResultListenerAction implements FocusListener,
- KeyListener, ModelModifier
+ KeyListener
{
protected SearchResultEditorActionGroup actionGroup;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorCellModifier.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorCellModifier.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorCellModifier.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorCellModifier.java Sun Jan 21 05:57:52 2007
@@ -23,7 +23,6 @@
import java.util.Iterator;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.internal.model.Attribute;
import org.apache.directory.ldapstudio.browser.core.model.AttributeHierarchy;
import org.apache.directory.ldapstudio.browser.core.model.IAttribute;
@@ -32,14 +31,13 @@
import org.apache.directory.ldapstudio.browser.core.model.schema.SchemaUtils;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager;
-
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.widgets.Item;
-public class SearchResultEditorCellModifier implements ICellModifier, ModelModifier
+public class SearchResultEditorCellModifier implements ICellModifier
{
private TableViewer viewer;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogBinaryValueEditor.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogBinaryValueEditor.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogBinaryValueEditor.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogBinaryValueEditor.java Sun Jan 21 05:57:52 2007
@@ -22,7 +22,6 @@
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.model.Attribute;
import org.apache.directory.ldapstudio.browser.core.jobs.CreateValuesJob;
import org.apache.directory.ldapstudio.browser.core.jobs.DeleteAttributesValueJob;
@@ -45,7 +44,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public abstract class AbstractDialogBinaryValueEditor extends AbstractDialogValueEditor implements ModelModifier
+public abstract class AbstractDialogBinaryValueEditor extends AbstractDialogValueEditor
{
protected AbstractDialogBinaryValueEditor()
@@ -222,7 +221,7 @@
{
EventRegistry.suspendEventFireingInCurrentThread();
IAttribute attribute = new Attribute( entry, attributeDescription );
- entry.addAttribute( attribute, this );
+ entry.addAttribute( attribute );
EventRegistry.resumeEventFireingInCurrentThread();
Object newValue;
@@ -276,7 +275,7 @@
if ( oldValue.isEmpty() )
{
EventRegistry.suspendEventFireingInCurrentThread();
- attribute.deleteEmptyValue( this );
+ attribute.deleteEmptyValue();
EventRegistry.resumeEventFireingInCurrentThread();
new CreateValuesJob( attribute, newValue ).execute();
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogStringValueEditor.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogStringValueEditor.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogStringValueEditor.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractDialogStringValueEditor.java Sun Jan 21 05:57:52 2007
@@ -22,7 +22,6 @@
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.model.Attribute;
import org.apache.directory.ldapstudio.browser.core.jobs.CreateValuesJob;
import org.apache.directory.ldapstudio.browser.core.jobs.DeleteAttributesValueJob;
@@ -44,7 +43,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public abstract class AbstractDialogStringValueEditor extends AbstractDialogValueEditor implements ModelModifier
+public abstract class AbstractDialogStringValueEditor extends AbstractDialogValueEditor
{
protected AbstractDialogStringValueEditor()
@@ -198,7 +197,7 @@
{
EventRegistry.suspendEventFireingInCurrentThread();
IAttribute attribute = new Attribute( entry, attributeDescription );
- entry.addAttribute( attribute, this );
+ entry.addAttribute( attribute );
EventRegistry.resumeEventFireingInCurrentThread();
Object newValue;
@@ -253,7 +252,7 @@
if ( oldValue.isEmpty() )
{
EventRegistry.suspendEventFireingInCurrentThread();
- attribute.deleteEmptyValue( this );
+ attribute.deleteEmptyValue();
EventRegistry.resumeEventFireingInCurrentThread();
new CreateValuesJob( attribute, newValue ).execute();
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractInPlaceStringValueEditor.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractInPlaceStringValueEditor.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractInPlaceStringValueEditor.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/AbstractInPlaceStringValueEditor.java Sun Jan 21 05:57:52 2007
@@ -26,7 +26,6 @@
import java.util.Iterator;
import java.util.List;
-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.IAttribute;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
@@ -50,7 +49,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public abstract class AbstractInPlaceStringValueEditor extends TextCellEditor implements IValueEditor, ModelModifier
+public abstract class AbstractInPlaceStringValueEditor extends TextCellEditor implements IValueEditor
{
/**
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/internal/MultivaluedValueEditor.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/internal/MultivaluedValueEditor.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/internal/MultivaluedValueEditor.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/valueeditors/internal/MultivaluedValueEditor.java Sun Jan 21 05:57:52 2007
@@ -26,7 +26,6 @@
import java.util.Iterator;
import java.util.List;
-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.IAttribute;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
@@ -47,7 +46,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class MultivaluedValueEditor extends CellEditor implements IValueEditor, ModelModifier
+public class MultivaluedValueEditor extends CellEditor implements IValueEditor
{
/** The value to handle */
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserView.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserView.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserView.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserView.java Sun Jan 21 05:57:52 2007
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.IAttribute;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
@@ -34,7 +33,6 @@
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
import org.apache.directory.ldapstudio.browser.ui.widgets.browser.BrowserConfiguration;
import org.apache.directory.ldapstudio.browser.ui.widgets.browser.BrowserWidget;
-
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -49,7 +47,7 @@
import org.eclipse.ui.part.ViewPart;
-public class BrowserView extends ViewPart implements ModelModifier
+public class BrowserView extends ViewPart
{
private BrowserConfiguration configuration;
@@ -175,8 +173,8 @@
if ( !parentEntries[i].isChildrenInitialized() )
{
- parentEntries[i].setChildrenInitialized( true, this );
- parentEntries[i].setHasMoreChildren( true, this );
+ parentEntries[i].setChildrenInitialized( true );
+ parentEntries[i].setHasMoreChildren( true );
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/NewerAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/NewerAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/NewerAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/NewerAction.java Sun Jan 21 05:57:52 2007
@@ -21,15 +21,13 @@
package org.apache.directory.ldapstudio.browser.ui.views.modificationlogs;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
import org.apache.directory.ldapstudio.browser.ui.actions.BrowserAction;
-
import org.eclipse.jface.resource.ImageDescriptor;
-public class NewerAction extends BrowserAction implements ModelModifier
+public class NewerAction extends BrowserAction
{
ModificationLogsView view;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/OlderAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/OlderAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/OlderAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/OlderAction.java Sun Jan 21 05:57:52 2007
@@ -23,15 +23,13 @@
import java.io.File;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
import org.apache.directory.ldapstudio.browser.ui.actions.BrowserAction;
-
import org.eclipse.jface.resource.ImageDescriptor;
-public class OlderAction extends BrowserAction implements ModelModifier
+public class OlderAction extends BrowserAction
{
private ModificationLogsView view;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/RefreshAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/RefreshAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/RefreshAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/RefreshAction.java Sun Jan 21 05:57:52 2007
@@ -21,15 +21,13 @@
package org.apache.directory.ldapstudio.browser.ui.views.modificationlogs;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
import org.apache.directory.ldapstudio.browser.ui.actions.BrowserAction;
-
import org.eclipse.jface.resource.ImageDescriptor;
-public class RefreshAction extends BrowserAction implements ModelModifier
+public class RefreshAction extends BrowserAction
{
private ModificationLogsView view;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/browser/BrowserUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/browser/BrowserUniversalListener.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/browser/BrowserUniversalListener.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/browser/BrowserUniversalListener.java Sun Jan 21 05:57:52 2007
@@ -28,7 +28,6 @@
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.model.IEntry;
-
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -135,7 +134,7 @@
if ( entry.isChildrenInitialized() && entry.hasMoreChildren()
&& entry.getChildrenCount() < entry.getConnection().getCountLimit() )
{
- entry.setChildrenInitialized( false, entry.getConnection() );
+ entry.setChildrenInitialized( false );
}
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/AbstractOpenEditorAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/AbstractOpenEditorAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/AbstractOpenEditorAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/AbstractOpenEditorAction.java Sun Jan 21 05:57:52 2007
@@ -21,9 +21,7 @@
package org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.ui.valueeditors.internal.ValueEditorManager;
-
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
@@ -34,7 +32,7 @@
public abstract class AbstractOpenEditorAction extends AbstractEntryEditorListenerAction implements FocusListener,
- KeyListener, ModelModifier
+ KeyListener
{
protected EntryEditorWidgetActionGroup actionGroup;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/EditAttributeDescriptionAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/EditAttributeDescriptionAction.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/EditAttributeDescriptionAction.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/widgets/entryeditor/EditAttributeDescriptionAction.java Sun Jan 21 05:57:52 2007
@@ -21,20 +21,18 @@
package org.apache.directory.ldapstudio.browser.ui.widgets.entryeditor;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.jobs.RenameValuesJob;
import org.apache.directory.ldapstudio.browser.core.model.IValue;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.actions.DeleteAction;
import org.apache.directory.ldapstudio.browser.ui.wizards.AttributeWizard;
-
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Display;
-public class EditAttributeDescriptionAction extends AbstractEntryEditorListenerAction implements ModelModifier
+public class EditAttributeDescriptionAction extends AbstractEntryEditorListenerAction
{
private DeleteAction deleteAction;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java Sun Jan 21 05:57:52 2007
@@ -21,10 +21,8 @@
package org.apache.directory.ldapstudio.browser.ui.wizards;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
-
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
@@ -38,7 +36,7 @@
import org.eclipse.ui.PlatformUI;
-public class AttributeWizard extends Wizard implements INewWizard, ModelModifier
+public class AttributeWizard extends Wizard implements INewWizard
{
private AttributeTypeWizardPage typePage;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewBookmarkWizard.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewBookmarkWizard.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewBookmarkWizard.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewBookmarkWizard.java Sun Jan 21 05:57:52 2007
@@ -21,7 +21,6 @@
package org.apache.directory.ldapstudio.browser.ui.wizards;
-import org.apache.directory.ldapstudio.browser.core.events.ModelModifier;
import org.apache.directory.ldapstudio.browser.core.internal.model.Bookmark;
import org.apache.directory.ldapstudio.browser.core.model.DN;
import org.apache.directory.ldapstudio.browser.core.model.IAttribute;
@@ -29,7 +28,6 @@
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
import org.apache.directory.ldapstudio.browser.core.model.ISearchResult;
import org.apache.directory.ldapstudio.browser.core.model.IValue;
-
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
@@ -42,7 +40,7 @@
import org.eclipse.ui.IWorkbench;
-public class NewBookmarkWizard extends Wizard implements INewWizard, ModelModifier
+public class NewBookmarkWizard extends Wizard implements INewWizard
{
private NewBookmarkMainWizardPage mainPage;
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryAttributesWizardPage.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryAttributesWizardPage.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryAttributesWizardPage.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryAttributesWizardPage.java Sun Jan 21 05:57:52 2007
@@ -112,12 +112,12 @@
{
if ( values[v].isEmpty() )
{
- attribute.deleteValue( values[v], wizard );
+ attribute.deleteValue( values[v] );
}
}
if ( attribute.getValueSize() == 0 )
{
- newEntry.deleteAttribute( attribute, wizard );
+ newEntry.deleteAttribute( attribute );
}
}
}
@@ -129,8 +129,8 @@
if ( newEntry.getAttribute( newMust[i] ) == null )
{
IAttribute att = new Attribute( newEntry, newMust[i] );
- newEntry.addAttribute( att, wizard );
- att.addEmptyValue( wizard );
+ newEntry.addAttribute( att );
+ att.addEmptyValue();
}
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryDnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryDnWizardPage.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryDnWizardPage.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryDnWizardPage.java Sun Jan 21 05:57:52 2007
@@ -140,7 +140,7 @@
{
if ( values[v].getStringValue().equals( oldRdnParts[i].getUnencodedValue() ) )
{
- attribute.deleteValue( values[v], wizard );
+ attribute.deleteValue( values[v] );
}
}
}
@@ -158,13 +158,13 @@
if ( rdnAttribute == null )
{
rdnAttribute = new Attribute( newEntry, newRdnParts[i].getType() );
- newEntry.addAttribute( rdnAttribute, wizard );
+ newEntry.addAttribute( rdnAttribute );
}
String rdnValue = newRdnParts[i].getUnencodedValue();
String[] stringValues = rdnAttribute.getStringValues();
if ( !Arrays.asList( stringValues ).contains( rdnValue ) )
{
- rdnAttribute.addValue( new Value( rdnAttribute, rdnValue ), wizard );
+ rdnAttribute.addValue( new Value( rdnAttribute, rdnValue ) );
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryObjectclassWizardPage.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryObjectclassWizardPage.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryObjectclassWizardPage.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryObjectclassWizardPage.java Sun Jan 21 05:57:52 2007
@@ -36,7 +36,6 @@
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils;
-
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -152,17 +151,17 @@
if ( ocAttribute == null )
{
ocAttribute = new Attribute( newEntry, IAttribute.OBJECTCLASS_ATTRIBUTE );
- newEntry.addAttribute( ocAttribute, wizard );
+ newEntry.addAttribute( ocAttribute );
}
IValue[] values = ocAttribute.getValues();
for ( int i = 0; i < values.length; i++ )
{
- ocAttribute.deleteValue( values[i], wizard );
+ ocAttribute.deleteValue( values[i] );
}
for ( Iterator it = selectedObjectClasses.iterator(); it.hasNext(); )
{
Object oc = ( Object ) it.next();
- ocAttribute.addValue( new Value( ocAttribute, oc ), wizard );
+ ocAttribute.addValue( new Value( ocAttribute, oc ) );
}
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryTypeWizardPage.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryTypeWizardPage.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryTypeWizardPage.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryTypeWizardPage.java Sun Jan 21 05:57:52 2007
@@ -177,7 +177,7 @@
{
if ( !SchemaUtils.isModifyable( attributes[i].getAttributeTypeDescription() ) )
{
- newEntry.deleteAttribute( attributes[i], wizard );
+ newEntry.deleteAttribute( attributes[i] );
}
}
wizard.setNewEntry( newEntry );
Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java?view=diff&rev=498315&r1=498314&r2=498315
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java Sun Jan 21 05:57:52 2007
@@ -22,7 +22,6 @@
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.model.Bookmark;
import org.apache.directory.ldapstudio.browser.core.internal.model.DummyEntry;
import org.apache.directory.ldapstudio.browser.core.jobs.CreateEntryJob;
@@ -36,7 +35,6 @@
import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
import org.apache.directory.ldapstudio.browser.ui.jobs.RunnableContextJobAdapter;
-
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
@@ -50,7 +48,7 @@
import org.eclipse.ui.PlatformUI;
-public class NewEntryWizard extends Wizard implements INewWizard, ModelModifier
+public class NewEntryWizard extends Wizard implements INewWizard
{
private NewEntryTypeWizardPage typePage;