Author: pamarcelot
Date: Thu Mar 15 17:06:04 2012
New Revision: 1301094

URL: http://svn.apache.org/viewvc?rev=1301094&view=rev
Log:
Fix for DIRSTUDIO-795 (Unable to delete multiple schema elements (attribute type, object class or schema)).

Modified:
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java?rev=1301094&r1=1301093&r2=1301094&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java Thu Mar 15 17:06:04 2012
@@ -78,10 +78,30 @@ public class DeleteSchemaElementAction e
             public void selectionChanged( SelectionChangedEvent event )
             {
                 StructuredSelection selection = ( StructuredSelection ) event.getSelection();
-                setEnabled( ( selection.size() == 1 )
-                    && ( ( selection.getFirstElement() instanceof SchemaWrapper )
-                        || ( selection.getFirstElement() instanceof AttributeTypeWrapper )
-                        || ( selection.getFirstElement() instanceof ObjectClassWrapper ) ) );
+
+                if ( selection.size() > 0 )
+                {
+                    boolean enabled = true;
+
+                    for ( Iterator<?> iterator = selection.iterator(); iterator.hasNext(); )
+                    {
+                        Object selectedItem = iterator.next();
+
+                        if ( !( selectedItem instanceof SchemaWrapper )
+                            && !( selectedItem instanceof AttributeTypeWrapper )
+                            && !( selectedItem instanceof ObjectClassWrapper ) )
+                        {
+                            enabled = false;
+                            break;
+                        }
+                    }
+
+                    setEnabled( enabled );
+                }
+                else
+                {
+                    setEnabled( false );
+                }
             }
         } );
     }
@@ -119,7 +139,6 @@ public class DeleteSchemaElementAction e
                 {
                     message.append( Messages.getString( "DeleteSchemaElementAction.SureDeleteItem" ) ); //$NON-NLS-1$
                 }
-
             }
             else
             {