You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2007/07/20 14:59:36 UTC
svn commit: r557988 - in /directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers: AbstractTreeNode.java OidSorter.java

Author: pamarcelot
Date: Fri Jul 20 05:59:35 2007
New Revision: 557988

URL: http://svn.apache.org/viewvc?view=rev&rev=557988
Log:
Added some missing comparisons for the OID Sorter.

Modified:
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/AbstractTreeNode.java
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/OidSorter.java

Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/AbstractTreeNode.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/AbstractTreeNode.java?view=diff&rev=557988&r1=557987&r2=557988
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/AbstractTreeNode.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/AbstractTreeNode.java Fri Jul 20 05:59:35 2007
@@ -118,12 +118,6 @@
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemas.view.viewers.wrappers.ITreeNode#removeChild(org.apache.directory.studio.schemas.view.viewers.wrappers.ITreeNode)
      */
-    /* (non-Javadoc)
-     * @see org.apache.directory.studio.schemas.view.viewers.wrappers.ITreeNode#removeChild(org.apache.directory.studio.schemas.view.viewers.wrappers.ITreeNode)
-     */
-    /* (non-Javadoc)
-     * @see org.apache.directory.studio.schemas.view.viewers.wrappers.ITreeNode#removeChild(org.apache.directory.studio.schemas.view.viewers.wrappers.ITreeNode)
-     */
     public void removeChild( TreeNode node )
     {
         if ( fChildren != null )

Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/OidSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/OidSorter.java?view=diff&rev=557988&r1=557987&r2=557988
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/OidSorter.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/OidSorter.java Fri Jul 20 05:59:35 2007
@@ -51,6 +51,20 @@
 
             return oc1.getOid().compareToIgnoreCase( oc2.getOid() );
         }
+        else if ( ( o1 instanceof AttributeTypeWrapper ) && ( o2 instanceof ObjectClassWrapper ) )
+        {
+            AttributeTypeImpl at = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
+            ObjectClassImpl oc = ( ( ObjectClassWrapper ) o2 ).getObjectClass();
+
+            return at.getOid().compareToIgnoreCase( oc.getOid() );
+        }
+        else if ( ( o1 instanceof ObjectClassWrapper ) && ( o2 instanceof AttributeTypeWrapper ) )
+        {
+            ObjectClassImpl oc = ( ( ObjectClassWrapper ) o1 ).getObjectClass();
+            AttributeTypeImpl at = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
+
+            return oc.getOid().compareToIgnoreCase( at.getOid() );
+        }
 
         // Default
         return o1.toString().compareToIgnoreCase( o2.toString() );