Attachment 46463 Details for Bug 150985 – Patch for attribute and model groups

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for attribute and model groups

150985patch.txt (text/plain), 4.21 KB, created by Valentin Baciu

on 2006-07-18 14:23:48 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Valentin Baciu

Created: 2006-07-18 14:23:48 EDT

Size: 4.21 KB

patch

obsolete

>Index: src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DeleteAction.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DeleteAction.java,v
>retrieving revision 1.3
>diff -u -r1.3 DeleteAction.java
>--- src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DeleteAction.java	5 Jul 2006 21:24:40 -0000	1.3
>+++ src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DeleteAction.java	18 Jul 2006 18:26:46 -0000
>@@ -20,6 +20,7 @@
> import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
> import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
> import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
>+import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
> import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
> 
> public class DeleteAction extends BaseSelectionAction
>@@ -56,6 +57,14 @@
>         }
>         command = ((IField)selection).getDeleteCommand();
>       }  
>+      else if (selection instanceof IStructure)
>+      {
>+        // Fallback for model groups and attribute groups.
>+        IStructure structure = (IStructure)selection; 
>+        model = structure.getModel();
>+        command = structure.getDeleteCommand();
>+      }  
>+
>       if (command != null)
>       {
>         command.execute();
>Index: src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupDefinitionAdapter.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupDefinitionAdapter.java,v
>retrieving revision 1.7
>diff -u -r1.7 XSDModelGroupDefinitionAdapter.java
>--- src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupDefinitionAdapter.java	16 May 2006 23:08:50 -0000	1.7
>+++ src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupDefinitionAdapter.java	18 Jul 2006 18:26:46 -0000
>@@ -29,6 +29,7 @@
> import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;
> import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupAction;
> import org.eclipse.wst.xsd.ui.internal.common.actions.DeleteXSDConcreteComponentAction;
>+import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
> import org.eclipse.wst.xsd.ui.internal.editor.Messages;
> import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
> import org.eclipse.xsd.XSDModelGroup;
>@@ -126,8 +127,7 @@
> 
>   public Command getDeleteCommand()
>   {
>-    // TODO Auto-generated method stub
>-    return null;
>+    return new DeleteCommand("", getXSDModelGroupDefinition()); //$NON-NLS-1$
>   }
> 
>   // TODO Common this up with XSDComplexType's.  See also getFields 
>Index: src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeGroupDefinitionAdapter.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeGroupDefinitionAdapter.java,v
>retrieving revision 1.6
>diff -u -r1.6 XSDAttributeGroupDefinitionAdapter.java
>--- src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeGroupDefinitionAdapter.java	16 May 2006 22:49:54 -0000	1.6
>+++ src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeGroupDefinitionAdapter.java	18 Jul 2006 18:26:46 -0000
>@@ -26,6 +26,7 @@
> import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAnyAttributeAction;
> import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction;
> import org.eclipse.wst.xsd.ui.internal.common.actions.DeleteXSDConcreteComponentAction;
>+import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
> import org.eclipse.wst.xsd.ui.internal.editor.Messages;
> import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
> import org.eclipse.xsd.XSDAttributeGroupDefinition;
>@@ -101,8 +102,7 @@
> 
>   public Command getDeleteCommand()
>   {
>-    // TODO Auto-generated method stub
>-    return null;
>+    return new DeleteCommand("", getXSDAttributeGroupDefinition()); //$NON-NLS-1$
>   }
> 
>   public List getFields()

Actions: View | Diff

Attachments on bug 150985: 46463