Attachment #46463 for bug #150985

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

View | Details | Raw Unified | Return to bug 150985
Collapse All | Expand All

Lines 20-25 Link Here

(-)src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DeleteAction.java (+9 lines)
20	import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;	20	import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
21	import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;	21	import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
22	import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;	22	import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
		23	import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
23	import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;	24	import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
24		25
25	public class DeleteAction extends BaseSelectionAction	26	public class DeleteAction extends BaseSelectionAction
Lines 56-61 Link Here
56	}	57	}
57	command = ((IField)selection).getDeleteCommand();	58	command = ((IField)selection).getDeleteCommand();
58	}	59	}
		60	else if (selection instanceof IStructure)
		61	{
		62	// Fallback for model groups and attribute groups.
		63	IStructure structure = (IStructure)selection;
		64	model = structure.getModel();
		65	command = structure.getDeleteCommand();
		66	}
		67
59	if (command != null)	68	if (command != null)
60	{	69	{
61	command.execute();	70	command.execute();

Lines 29-34 Link Here

(-)src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupDefinitionAdapter.java (-2 / +2 lines)
29	import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;	29	import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;
30	import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupAction;	30	import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupAction;
31	import org.eclipse.wst.xsd.ui.internal.common.actions.DeleteXSDConcreteComponentAction;	31	import org.eclipse.wst.xsd.ui.internal.common.actions.DeleteXSDConcreteComponentAction;
		32	import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
32	import org.eclipse.wst.xsd.ui.internal.editor.Messages;	33	import org.eclipse.wst.xsd.ui.internal.editor.Messages;
33	import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;	34	import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
34	import org.eclipse.xsd.XSDModelGroup;	35	import org.eclipse.xsd.XSDModelGroup;
Lines 126-133 Link Here
126		127
127	public Command getDeleteCommand()	128	public Command getDeleteCommand()
128	{	129	{
129	// TODO Auto-generated method stub	130	return new DeleteCommand("", getXSDModelGroupDefinition()); //$NON-NLS-1$
130	return null;
131	}	131	}
132		132
133	// TODO Common this up with XSDComplexType's. See also getFields	133	// TODO Common this up with XSDComplexType's. See also getFields

Lines 26-31 Link Here

(-)src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeGroupDefinitionAdapter.java (-2 / +2 lines)
26	import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAnyAttributeAction;	26	import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAnyAttributeAction;
27	import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction;	27	import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction;
28	import org.eclipse.wst.xsd.ui.internal.common.actions.DeleteXSDConcreteComponentAction;	28	import org.eclipse.wst.xsd.ui.internal.common.actions.DeleteXSDConcreteComponentAction;
		29	import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
29	import org.eclipse.wst.xsd.ui.internal.editor.Messages;	30	import org.eclipse.wst.xsd.ui.internal.editor.Messages;
30	import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;	31	import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
31	import org.eclipse.xsd.XSDAttributeGroupDefinition;	32	import org.eclipse.xsd.XSDAttributeGroupDefinition;
Lines 101-108 Link Here
101		102
102	public Command getDeleteCommand()	103	public Command getDeleteCommand()
103	{	104	{
104	// TODO Auto-generated method stub	105	return new DeleteCommand("", getXSDAttributeGroupDefinition()); //$NON-NLS-1$
105	return null;
106	}	106	}
107		107
108	public List getFields()	108	public List getFields()

Return to bug 150985