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 2006/12/29 22:18:36 UTC
svn commit: r491105 - in
/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core:
internal/model/ jobs/ model/
Author: seelmann
Date: Fri Dec 29 13:18:35 2006
New Revision: 491105
URL: http://svn.apache.org/viewvc?view=rev&rev=491105
Log:
Added extension point for value editors. Refactoring of value editor framework.
Added:
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierarchy.java
- copied, changed from r490780, directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierachie.java
Removed:
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierachie.java
Modified:
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/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/DummyEntry.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/SearchResult.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/model/IEntry.java
directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/ISearchResult.java
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=491105&r1=491104&r2=491105
==============================================================================
--- 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 Fri Dec 29 13:18:35 2006
@@ -40,7 +40,7 @@
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.AttributeHierachie;
+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;
import org.apache.directory.ldapstudio.browser.core.model.IEntry;
@@ -422,7 +422,7 @@
}
- public AttributeHierachie getAttributeWithSubtypes( String attributeDescription )
+ public AttributeHierarchy getAttributeWithSubtypes( String attributeDescription )
{
AttributeInfo ai = this.getJNDIConnection().getAttributeInfo( this );
@@ -461,7 +461,7 @@
else
{
IAttribute[] attributes = ( IAttribute[] ) attributeList.toArray( new IAttribute[attributeList.size()] );
- AttributeHierachie ah = new AttributeHierachie( this, attributeDescription, attributes );
+ AttributeHierarchy ah = new AttributeHierarchy( this, attributeDescription, attributes );
return ah;
}
}
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=491105&r1=491104&r2=491105
==============================================================================
--- 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 Fri Dec 29 13:18:35 2006
@@ -31,7 +31,7 @@
import org.apache.directory.ldapstudio.browser.core.BrowserCoreMessages;
import org.apache.directory.ldapstudio.browser.core.jobs.ExtendedProgressMonitor;
-import org.apache.directory.ldapstudio.browser.core.model.AttributeHierachie;
+import org.apache.directory.ldapstudio.browser.core.model.AttributeHierarchy;
import org.apache.directory.ldapstudio.browser.core.model.Control;
import org.apache.directory.ldapstudio.browser.core.model.DN;
import org.apache.directory.ldapstudio.browser.core.model.IAttribute;
@@ -490,7 +490,7 @@
}
}
- AttributeHierachie ah = entry.getAttributeWithSubtypes( ra );
+ AttributeHierarchy ah = entry.getAttributeWithSubtypes( ra );
if ( ah != null )
{
for ( Iterator it = ah.iterator(); it.hasNext(); )
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=491105&r1=491104&r2=491105
==============================================================================
--- 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 Fri Dec 29 13:18:35 2006
@@ -37,7 +37,7 @@
import org.apache.directory.ldapstudio.browser.core.events.ValueModifiedEvent;
import org.apache.directory.ldapstudio.browser.core.events.ValueRenamedEvent;
import org.apache.directory.ldapstudio.browser.core.internal.search.LdapSearchPageScoreComputer;
-import org.apache.directory.ldapstudio.browser.core.model.AttributeHierachie;
+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;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
@@ -192,7 +192,7 @@
}
- public AttributeHierachie getAttributeWithSubtypes( String attributeDescription )
+ public AttributeHierarchy getAttributeWithSubtypes( String attributeDescription )
{
if ( this.getDelegate() != null )
return getDelegate().getAttributeWithSubtypes( attributeDescription );
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=491105&r1=491104&r2=491105
==============================================================================
--- 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 Fri Dec 29 13:18:35 2006
@@ -33,7 +33,7 @@
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.AttributeHierachie;
+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;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
@@ -118,7 +118,7 @@
}
- public AttributeHierachie getAttributeWithSubtypes( String attributeDescription )
+ public AttributeHierarchy getAttributeWithSubtypes( String attributeDescription )
{
AttributeDescription ad = new AttributeDescription( attributeDescription );
@@ -142,7 +142,7 @@
}
else
{
- AttributeHierachie ah = new AttributeHierachie( this, attributeDescription, ( IAttribute[] ) attributeList
+ AttributeHierarchy ah = new AttributeHierarchy( this, attributeDescription, ( IAttribute[] ) attributeList
.toArray( new IAttribute[attributeList.size()] ) );
return ah;
}
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/SearchResult.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/SearchResult.java?view=diff&rev=491105&r1=491104&r2=491105
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/SearchResult.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/SearchResult.java Fri Dec 29 13:18:35 2006
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import org.apache.directory.ldapstudio.browser.core.internal.search.LdapSearchPageScoreComputer;
-import org.apache.directory.ldapstudio.browser.core.model.AttributeHierachie;
+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;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
@@ -82,7 +82,7 @@
}
- public AttributeHierachie getAttributeWithSubtypes( String attributeDescription )
+ public AttributeHierarchy getAttributeWithSubtypes( String attributeDescription )
{
return this.entry.getAttributeWithSubtypes( attributeDescription );
}
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=491105&r1=491104&r2=491105
==============================================================================
--- 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 Fri Dec 29 13:18:35 2006
@@ -29,7 +29,7 @@
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.ValueDeletedEvent;
-import org.apache.directory.ldapstudio.browser.core.model.AttributeHierachie;
+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.IEntry;
import org.apache.directory.ldapstudio.browser.core.model.IValue;
@@ -72,7 +72,7 @@
}
- public DeleteAttributesValueJob( AttributeHierachie ah )
+ public DeleteAttributesValueJob( AttributeHierarchy ah )
{
this( ah.getAttributes(), new IValue[0] );
}
Copied: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierarchy.java (from r490780, directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierachie.java)
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierarchy.java?view=diff&rev=491105&p1=directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierachie.java&r1=490780&p2=directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierarchy.java&r2=491105
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierachie.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/AttributeHierarchy.java Fri Dec 29 13:18:35 2006
@@ -25,7 +25,7 @@
import java.util.Iterator;
-public class AttributeHierachie
+public class AttributeHierarchy
{
private IEntry entry;
@@ -35,7 +35,7 @@
private IAttribute[] attributes;
- public AttributeHierachie( IEntry entry, String attributeDescription, IAttribute[] attributes )
+ public AttributeHierarchy( IEntry entry, String attributeDescription, IAttribute[] attributes )
{
if ( entry == null || attributeDescription == null || attributes == null || attributes.length < 1
|| attributes[0] == null )
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=491105&r1=491104&r2=491105
==============================================================================
--- 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 Fri Dec 29 13:18:35 2006
@@ -195,7 +195,7 @@
* @return The attributes of the entry or null if the attribute doesn't
* exist or if the attributes arn't initialized.
*/
- public abstract AttributeHierachie getAttributeWithSubtypes( String attributeDescription );
+ public abstract AttributeHierarchy getAttributeWithSubtypes( String attributeDescription );
/**
Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/ISearchResult.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/ISearchResult.java?view=diff&rev=491105&r1=491104&r2=491105
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/ISearchResult.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/ISearchResult.java Fri Dec 29 13:18:35 2006
@@ -65,7 +65,7 @@
* the description of the attribute to return
* @return the AttributeHierachie with the given description or null.
*/
- public AttributeHierachie getAttributeWithSubtypes( String attributeDescription );
+ public AttributeHierarchy getAttributeWithSubtypes( String attributeDescription );
/**