[261131] [Editor] More improvements to editing enumerations
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDEnumerationFacetAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDEnumerationFacetAction.java
index 953d7dc..5614d5e 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDEnumerationFacetAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDEnumerationFacetAction.java
@@ -67,11 +67,10 @@
return;
}
- List enumList = st.getFacetContents();
+ List enumList = st.getEnumerationFacets();
String newName = XSDCommonUIUtils.createUniqueEnumerationValue("value", enumList); //$NON-NLS-1$
-// AddEnumerationsCommand command = new AddEnumerationsCommand(Messages._UI_ACTION_ADD_ENUMERATION, st);
int index = st.getEnumerationFacets().indexOf(selection);
command = new AddEnumerationsCommand(getText(), st, getId(), index);
command.setValue(newName);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddEnumerationsCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddEnumerationsCommand.java
index b6f8e49..d1fccf4 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddEnumerationsCommand.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddEnumerationsCommand.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.wst.xsd.ui.internal.common.commands;
+import java.util.List;
+
import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDEnumerationFacetAction;
import org.eclipse.xsd.XSDEnumerationFacet;
import org.eclipse.xsd.XSDFactory;
@@ -55,13 +57,14 @@
enumerationFacet.setLexicalValue(value);
index = getInsertionIndex();
- if (index >=0 && index < simpleType.getEnumerationFacets().size())
+ List facets = simpleType.getEnumerationFacets();
+ if (index >=0 && index < facets.size())
{
- simpleType.getFacetContents().add(index, enumerationFacet);
+ facets.add(index, enumerationFacet);
}
else
{
- simpleType.getFacetContents().add(enumerationFacet);
+ facets.add(enumerationFacet);
}
formatChild(simpleType.getElement());
addedXSDConcreteComponent = enumerationFacet;
