diff options
author | itrimble | 2007-03-22 21:19:49 +0000 |
---|---|---|
committer | itrimble | 2007-03-22 21:19:49 +0000 |
commit | 371a1beece194592f2259dee3758177ee35e9050 (patch) | |
tree | 108a0947a4a4b2890979d699fc9f8139786c4976 | |
parent | f60553418664ffc72c91a8c64f9f0749152ea1a5 (diff) | |
download | webtools.jsf-371a1beece194592f2259dee3758177ee35e9050.tar.gz webtools.jsf-371a1beece194592f2259dee3758177ee35e9050.tar.xz webtools.jsf-371a1beece194592f2259dee3758177ee35e9050.zip |
Make user-defined transform operations play nicely along-side system-supplied ones.
8 files changed, 199 insertions, 272 deletions
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_core_dti.xml b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_core_dti.xml index 64b388cf2..66297c356 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_core_dti.xml +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_core_dti.xml @@ -108,7 +108,11 @@ <entity id="loadBundle" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.LoadBundleOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.LoadBundleOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" nonVisual="true" nonVisualImagePath="icons/palette/JSFCORE/small/JSF_LOADBUNDLE.gif" diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_html_dti.xml b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_html_dti.xml index 2ec9b7dae..57e49a0d6 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_html_dti.xml +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_html_dti.xml @@ -9,7 +9,11 @@ <entity id="column" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.ColumnOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.ColumnOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" /> @@ -20,7 +24,11 @@ <entity id="commandButton" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.CommandButtonOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.CommandButtonOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" widget="true" @@ -68,7 +76,11 @@ <entity id="dataTable" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.DataTableOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.DataTableOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" needBorderDecorator="true" @@ -144,7 +156,6 @@ nonVisual="true" nonVisualImagePath="icons/palette/JSFHTML/small/JSF_INPUTHIDDEN.gif" widget="true" - /> <tag-decorate-info id="vpd-decorate-preview" nonVisual="true" @@ -246,7 +257,6 @@ nonVisual="true" nonVisualImagePath="icons/palette/JSFHTML/small/JSF_MESSAGE.gif" widget="true" - /> <tag-decorate-info id="vpd-decorate-preview" nonVisual="true" @@ -262,7 +272,6 @@ nonVisual="true" nonVisualImagePath="icons/palette/JSFHTML/small/JSF_MESSAGES.gif" widget="true" - /> <tag-decorate-info id="vpd-decorate-preview" nonVisual="true" @@ -391,7 +400,11 @@ <entity id="panelGrid" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.PanelGridOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.PanelGridOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" needBorderDecorator="true" @@ -426,7 +439,11 @@ <entity id="selectBooleanCheckbox" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectBooleanCheckboxOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectBooleanCheckboxOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" widget="true" @@ -438,7 +455,11 @@ <entity id="selectManyCheckbox" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectManyCheckboxOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectManyCheckboxOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" widget="true" @@ -451,7 +472,11 @@ <entity id="selectManyListbox" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectManyListboxOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectManyListboxOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" widget="true" @@ -463,7 +488,11 @@ <entity id="selectManyMenu" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectManyMenuOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectManyMenuOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" widget="true" @@ -475,7 +504,11 @@ <entity id="selectOneListbox" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectOneListboxOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectOneListboxOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" widget="true" @@ -487,7 +520,11 @@ <entity id="selectOneMenu" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectOneMenuOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectOneMenuOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" widget="true" @@ -499,7 +536,11 @@ <entity id="selectOneRadio" type="tag"> <trait id="dt-info"> <value xsi:type="dti:DTInfo"> - <tag-convert-info classname="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectOneRadioOperation"/> + <tag-convert-info> + <operation id="CustomTransformOperation"> + <parameter value="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectOneRadioOperation"/> + </operation> + </tag-convert-info> <tag-decorate-info id="vpd-decorate-design" multiLevel="true" widget="true" diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.ecore b/jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.ecore index 6c25fd281..9ccb9251c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.ecore +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.ecore @@ -27,7 +27,6 @@ <details key="name" value="operation"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="classname" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Operation"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTHTMLOutputRenderer.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTHTMLOutputRenderer.java index 003902a9d..b1ecc15dc 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTHTMLOutputRenderer.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTHTMLOutputRenderer.java @@ -42,6 +42,19 @@ import org.w3c.dom.Element; */ public class DTHTMLOutputRenderer implements IOutputRenderer { + private static final String OP_AppendChildElementOperation = "AppendChildElementOperation"; + private static final String OP_AppendChildTextOperation = "AppendChildTextOperation"; + private static final String OP_ConvertAttributeToTextOperation = "ConvertAttributeToTextOperation"; + private static final String OP_CopyAllAttributesOperation = "CopyAllAttributesOperation"; + private static final String OP_CopyAttributeOperation = "CopyAttributeOperation"; + private static final String OP_CopyChildrenOperation = "CopyChildrenOperation"; + private static final String OP_CreateAttributeOperation = "CreateAttributeOperation"; + private static final String OP_CreateElementOperation = "CreateElementOperation"; + private static final String OP_MakeParentElementCurrentOperation = "MakeParentElementCurrentOperation"; + private static final String OP_RemoveAttributeOperation = "RemoveAttributeOperation"; + private static final String OP_RenameAttributeOperation = "RenameAttributeOperation"; + private static final String OP_CustomTransformOperation = "CustomTransformOperation"; + private ITagConverterContext tagConverterContext; private Logger log = PDPlugin.getLogger(DTHTMLOutputRenderer.class); @@ -80,141 +93,151 @@ public class DTHTMLOutputRenderer implements IOutputRenderer { if (tcInfo != null) { transformer = new DefaultTransformer(); transformer.setTagConverterContext(tagConverterContext); - String classname = tcInfo.getClassname(); - if (classname != null && classname.length() > 0) { + EList operations = tcInfo.getOperations(); + if (!appendOperations(transformer, operations, dtInfo)) { + transformer = null; + } + } + } + return transformer; + } + + private boolean appendOperations(ITransformer transformer, EList operations, IDTInfo dtInfo) { + Iterator itOperations = operations.iterator(); + while (itOperations.hasNext()) { + Operation operation = (Operation)itOperations.next(); + String opID = operation.getId(); + if (opID != null) { + if (opID.equals(OP_AppendChildElementOperation)) { + EList parameters = operation.getParameters(); + if (parameters.size() < 1) { + log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); + return false; + } + if (parameters.size() < 2) { + String elementName = ((Parameter)parameters.get(0)).getValue(); + transformer.appendTransformOperation(new AppendChildElementOperation(elementName)); + } else { + String elementName = ((Parameter)parameters.get(0)).getValue(); + boolean makeChildCurrent = Boolean.valueOf(((Parameter)parameters.get(1)).getValue()).booleanValue(); + transformer.appendTransformOperation(new AppendChildElementOperation(elementName, makeChildCurrent)); + } + } else if (opID.equals(OP_AppendChildTextOperation)) { + EList parameters = operation.getParameters(); + if (parameters.size() < 1) { + log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); + return false; + } + String content = ((Parameter)parameters.get(0)).getValue(); + transformer.appendTransformOperation(new AppendChildTextOperation(content)); + } else if (opID.equals(OP_ConvertAttributeToTextOperation)) { + EList parameters = operation.getParameters(); + if (parameters.size() < 1) { + log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); + return false; + } + if (parameters.size() < 2) { + String attributeName = ((Parameter)parameters.get(0)).getValue(); + transformer.appendTransformOperation(new ConvertAttributeToTextOperation(attributeName)); + } else { + String attributeName = ((Parameter)parameters.get(0)).getValue(); + boolean removeAttribute = Boolean.valueOf(((Parameter)parameters.get(1)).getValue()).booleanValue(); + transformer.appendTransformOperation(new ConvertAttributeToTextOperation(attributeName, removeAttribute)); + } + } else if (opID.equals(OP_CopyAllAttributesOperation)) { + transformer.appendTransformOperation(new CopyAllAttributesOperation()); + } else if (opID.equals(OP_CopyAttributeOperation)) { + EList parameters = operation.getParameters(); + if (parameters.size() < 1) { + log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); + return false; + } + if (parameters.size() < 3) { + String attributeName = ((Parameter)parameters.get(0)).getValue(); + transformer.appendTransformOperation(new CopyAttributeOperation(attributeName)); + } else { + String attributeName = ((Parameter)parameters.get(0)).getValue(); + boolean create = Boolean.valueOf(((Parameter)parameters.get(1)).getValue()).booleanValue(); + String newAttributeValue = ((Parameter)parameters.get(2)).getValue(); + transformer.appendTransformOperation(new CopyAttributeOperation(attributeName, create, newAttributeValue)); + } + } else if (opID.equals(OP_CopyChildrenOperation)) { + transformer.appendTransformOperation(new CopyChildrenOperation()); + } else if (opID.equals(OP_CreateAttributeOperation)) { + EList parameters = operation.getParameters(); + if (parameters.size() < 2) { + log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); + return false; + } + String attributeName = ((Parameter)parameters.get(0)).getValue(); + String attributeValue = ((Parameter)parameters.get(1)).getValue(); + transformer.appendTransformOperation(new CreateAttributeOperation(attributeName, attributeValue)); + } else if (opID.equals(OP_CreateElementOperation)) { + EList parameters = operation.getParameters(); + if (parameters.size() < 1) { + log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); + return false; + } + String elementName = ((Parameter)parameters.get(0)).getValue(); + transformer.appendTransformOperation(new CreateElementOperation(elementName)); + } else if (opID.equals(OP_MakeParentElementCurrentOperation)) { + transformer.appendTransformOperation(new MakeParentElementCurrentOperation()); + } else if (opID.equals(OP_RemoveAttributeOperation)) { + EList parameters = operation.getParameters(); + if (parameters.size() < 1) { + log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); + return false; + } + String attributeName = ((Parameter)parameters.get(0)).getValue(); + transformer.appendTransformOperation(new RemoveAttributeOperation(attributeName)); + } else if (opID.equals(OP_RenameAttributeOperation)) { + EList parameters = operation.getParameters(); + if (parameters.size() < 2) { + log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); + return false; + } + String oldAttributeName = ((Parameter)parameters.get(0)).getValue(); + String newAttributeName = ((Parameter)parameters.get(1)).getValue(); + transformer.appendTransformOperation(new RenameAttributeOperation(oldAttributeName, newAttributeName)); + } else if (opID.equals(OP_CustomTransformOperation)) { + EList parameters = operation.getParameters(); + if (parameters.size() < 1) { + log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); + } + String className = ((Parameter)parameters.get(0)).getValue(); try { Trait trait = dtInfo.getTrait(); IClassLoaderProvider classLoaderProvider = (IClassLoaderProvider)trait.getSourceModelProvider().getAdapter(IClassLoaderProvider.class); if (classLoaderProvider != null) { - Class opClass = classLoaderProvider.loadClass(classname); + Class opClass = classLoaderProvider.loadClass(className); if (opClass != null) { Object opObject = opClass.newInstance(); if (opObject instanceof ITransformOperation) { transformer.appendTransformOperation((ITransformOperation)opObject); } else { - log.error("Warning.DTHTMLOutputRenderer.NotITransformOperation", classname); - return null; + log.error("Warning.DTHTMLOutputRenderer.NotITransformOperation", className); + return false; } } else { - log.error("Warning.DTHTMLOutputRenderer.ClassNotFound", classname); - return null; + log.error("Warning.DTHTMLOutputRenderer.ClassNotFound", className); + return false; } } } catch(IllegalAccessException iae) { - log.error("Warning.DTHTMLOutputRenderer.IllegalAccess", classname, iae); - return null; + log.error("Warning.DTHTMLOutputRenderer.IllegalAccess", className, iae); + return false; } catch(InstantiationException ie) { - log.error("Warning.DTHTMLOutputRenderer.Instantiation", classname, ie); - return null; + log.error("Warning.DTHTMLOutputRenderer.Instantiation", className, ie); + return false; } + } else { - EList operations = tcInfo.getOperations(); - Iterator itOperations = operations.iterator(); - while (itOperations.hasNext()) { - Operation operation = (Operation)itOperations.next(); - String opID = operation.getId(); - if (opID != null) { - if (opID.equals("AppendChildElementOperation")) { - EList parameters = operation.getParameters(); - if (parameters.size() < 1) { - log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); - return null; - } - if (parameters.size() < 2) { - String elementName = ((Parameter)parameters.get(0)).getValue(); - transformer.appendTransformOperation(new AppendChildElementOperation(elementName)); - } else { - String elementName = ((Parameter)parameters.get(0)).getValue(); - boolean makeChildCurrent = Boolean.valueOf(((Parameter)parameters.get(1)).getValue()).booleanValue(); - transformer.appendTransformOperation(new AppendChildElementOperation(elementName, makeChildCurrent)); - } - } else if (opID.equals("AppendChildTextOperation")) { - EList parameters = operation.getParameters(); - if (parameters.size() < 1) { - log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); - return null; - } - String content = ((Parameter)parameters.get(0)).getValue(); - transformer.appendTransformOperation(new AppendChildTextOperation(content)); - } else if (opID.equals("ConvertAttributeToTextOperation")) { - EList parameters = operation.getParameters(); - if (parameters.size() < 1) { - log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); - return null; - } - if (parameters.size() < 2) { - String attributeName = ((Parameter)parameters.get(0)).getValue(); - transformer.appendTransformOperation(new ConvertAttributeToTextOperation(attributeName)); - } else { - String attributeName = ((Parameter)parameters.get(0)).getValue(); - boolean removeAttribute = Boolean.valueOf(((Parameter)parameters.get(1)).getValue()).booleanValue(); - transformer.appendTransformOperation(new ConvertAttributeToTextOperation(attributeName, removeAttribute)); - } - } else if (opID.equals("CopyAllAttributesOperation")) { - transformer.appendTransformOperation(new CopyAllAttributesOperation()); - } else if (opID.equals("CopyAttributeOperation")) { - EList parameters = operation.getParameters(); - if (parameters.size() < 1) { - log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); - return null; - } - if (parameters.size() < 3) { - String attributeName = ((Parameter)parameters.get(0)).getValue(); - transformer.appendTransformOperation(new CopyAttributeOperation(attributeName)); - } else { - String attributeName = ((Parameter)parameters.get(0)).getValue(); - boolean create = Boolean.valueOf(((Parameter)parameters.get(1)).getValue()).booleanValue(); - String newAttributeValue = ((Parameter)parameters.get(2)).getValue(); - transformer.appendTransformOperation(new CopyAttributeOperation(attributeName, create, newAttributeValue)); - } - } else if (opID.equals("CopyChildrenOperation")) { - transformer.appendTransformOperation(new CopyChildrenOperation()); - } else if (opID.equals("CreateAttributeOperation")) { - EList parameters = operation.getParameters(); - if (parameters.size() < 2) { - log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); - return null; - } - String attributeName = ((Parameter)parameters.get(0)).getValue(); - String attributeValue = ((Parameter)parameters.get(1)).getValue(); - transformer.appendTransformOperation(new CreateAttributeOperation(attributeName, attributeValue)); - } else if (opID.equals("CreateElementOperation")) { - EList parameters = operation.getParameters(); - if (parameters.size() < 1) { - log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); - return null; - } - String elementName = ((Parameter)parameters.get(0)).getValue(); - transformer.appendTransformOperation(new CreateElementOperation(elementName)); - } else if (opID.equals("MakeParentElementCurrentOperation")) { - transformer.appendTransformOperation(new MakeParentElementCurrentOperation()); - } else if (opID.equals("RemoveAttributeOperation")) { - EList parameters = operation.getParameters(); - if (parameters.size() < 1) { - log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); - return null; - } - String attributeName = ((Parameter)parameters.get(0)).getValue(); - transformer.appendTransformOperation(new RemoveAttributeOperation(attributeName)); - } else if (opID.equals("RenameAttributeOperation")) { - EList parameters = operation.getParameters(); - if (parameters.size() < 2) { - log.error("Warning.DTHTMLOutputRenderer.TooFewParameters", opID); - return null; - } - String oldAttributeName = ((Parameter)parameters.get(0)).getValue(); - String newAttributeName = ((Parameter)parameters.get(1)).getValue(); - transformer.appendTransformOperation(new RenameAttributeOperation(oldAttributeName, newAttributeName)); - } else { - log.error("Warning.DTHTMLOutputRenderer.UnknownOperationID", opID); - return null; - } - } - } + log.error("Warning.DTHTMLOutputRenderer.UnknownOperationID", opID); + return false; } } } - return transformer; + return true; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoPackageImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoPackageImpl.java index 5a2eed22f..12c9f0091 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoPackageImpl.java @@ -196,15 +196,6 @@ public class DTInfoPackageImpl extends EPackageImpl implements DTInfoPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTagConvertInfo_Classname() { - return (EAttribute)tagConvertInfoEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public EClass getOperation() { return operationEClass; } @@ -414,7 +405,6 @@ public class DTInfoPackageImpl extends EPackageImpl implements DTInfoPackage { tagConvertInfoEClass = createEClass(TAG_CONVERT_INFO); createEReference(tagConvertInfoEClass, TAG_CONVERT_INFO__OPERATIONS); - createEAttribute(tagConvertInfoEClass, TAG_CONVERT_INFO__CLASSNAME); operationEClass = createEClass(OPERATION); createEAttribute(operationEClass, OPERATION__ID); @@ -473,7 +463,6 @@ public class DTInfoPackageImpl extends EPackageImpl implements DTInfoPackage { initEClass(tagConvertInfoEClass, TagConvertInfo.class, "TagConvertInfo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getTagConvertInfo_Operations(), this.getOperation(), null, "operations", null, 0, -1, TagConvertInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTagConvertInfo_Classname(), ecorePackage.getEString(), "classname", null, 0, 1, TagConvertInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(operationEClass, Operation.class, "Operation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getOperation_Id(), ecorePackage.getEString(), "id", null, 1, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagConvertInfoImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagConvertInfoImpl.java index 1175579c9..fb3351372 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagConvertInfoImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagConvertInfoImpl.java @@ -8,20 +8,13 @@ package org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.impl; import java.util.Collection; -import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage; import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation; import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo; @@ -34,7 +27,6 @@ import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagCon * The following features are implemented: * <ul> * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.impl.TagConvertInfoImpl#getOperations <em>Operations</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.impl.TagConvertInfoImpl#getClassname <em>Classname</em>}</li> * </ul> * </p> * @@ -59,26 +51,6 @@ public class TagConvertInfoImpl extends EObjectImpl implements TagConvertInfo { protected EList operations = null; /** - * The default value of the '{@link #getClassname() <em>Classname</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getClassname() - * @generated - * @ordered - */ - protected static final String CLASSNAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getClassname() <em>Classname</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getClassname() - * @generated - * @ordered - */ - protected String classname = CLASSNAME_EDEFAULT; - - /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -113,27 +85,6 @@ public class TagConvertInfoImpl extends EObjectImpl implements TagConvertInfo { * <!-- end-user-doc --> * @generated */ - public String getClassname() { - return classname; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setClassname(String newClassname) { - String oldClassname = classname; - classname = newClassname; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, DTInfoPackage.TAG_CONVERT_INFO__CLASSNAME, oldClassname, classname)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case DTInfoPackage.TAG_CONVERT_INFO__OPERATIONS: @@ -151,8 +102,6 @@ public class TagConvertInfoImpl extends EObjectImpl implements TagConvertInfo { switch (featureID) { case DTInfoPackage.TAG_CONVERT_INFO__OPERATIONS: return getOperations(); - case DTInfoPackage.TAG_CONVERT_INFO__CLASSNAME: - return getClassname(); } return super.eGet(featureID, resolve, coreType); } @@ -168,9 +117,6 @@ public class TagConvertInfoImpl extends EObjectImpl implements TagConvertInfo { getOperations().clear(); getOperations().addAll((Collection)newValue); return; - case DTInfoPackage.TAG_CONVERT_INFO__CLASSNAME: - setClassname((String)newValue); - return; } super.eSet(featureID, newValue); } @@ -185,9 +131,6 @@ public class TagConvertInfoImpl extends EObjectImpl implements TagConvertInfo { case DTInfoPackage.TAG_CONVERT_INFO__OPERATIONS: getOperations().clear(); return; - case DTInfoPackage.TAG_CONVERT_INFO__CLASSNAME: - setClassname(CLASSNAME_EDEFAULT); - return; } super.eUnset(featureID); } @@ -201,25 +144,8 @@ public class TagConvertInfoImpl extends EObjectImpl implements TagConvertInfo { switch (featureID) { case DTInfoPackage.TAG_CONVERT_INFO__OPERATIONS: return operations != null && !operations.isEmpty(); - case DTInfoPackage.TAG_CONVERT_INFO__CLASSNAME: - return CLASSNAME_EDEFAULT == null ? classname != null : !CLASSNAME_EDEFAULT.equals(classname); } return super.eIsSet(featureID); } - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (classname: "); - result.append(classname); - result.append(')'); - return result.toString(); - } - } //TagConvertInfoImpl diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfoPackage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfoPackage.java index 0911fb7d7..05638fdf9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfoPackage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfoPackage.java @@ -123,22 +123,13 @@ public interface DTInfoPackage extends EPackage { int TAG_CONVERT_INFO__OPERATIONS = 0; /** - * The feature id for the '<em><b>Classname</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int TAG_CONVERT_INFO__CLASSNAME = 1; - - /** * The number of structural features of the '<em>Tag Convert Info</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TAG_CONVERT_INFO_FEATURE_COUNT = 2; + int TAG_CONVERT_INFO_FEATURE_COUNT = 1; /** * The meta object id for the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.impl.OperationImpl <em>Operation</em>}' class. @@ -415,17 +406,6 @@ public interface DTInfoPackage extends EPackage { EReference getTagConvertInfo_Operations(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo#getClassname <em>Classname</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Classname</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo#getClassname() - * @see #getTagConvertInfo() - * @generated - */ - EAttribute getTagConvertInfo_Classname(); - - /** * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation <em>Operation</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -708,14 +688,6 @@ public interface DTInfoPackage extends EPackage { EReference TAG_CONVERT_INFO__OPERATIONS = eINSTANCE.getTagConvertInfo_Operations(); /** - * The meta object literal for the '<em><b>Classname</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute TAG_CONVERT_INFO__CLASSNAME = eINSTANCE.getTagConvertInfo_Classname(); - - /** * The meta object literal for the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.impl.OperationImpl <em>Operation</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/TagConvertInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/TagConvertInfo.java index 265c2c191..60a6d150b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/TagConvertInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/TagConvertInfo.java @@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EObject; * The following features are supported: * <ul> * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo#getOperations <em>Operations</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo#getClassname <em>Classname</em>}</li> * </ul> * </p> * @@ -52,30 +51,4 @@ public interface TagConvertInfo extends EObject { */ EList getOperations(); - /** - * Returns the value of the '<em><b>Classname</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Classname</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Classname</em>' attribute. - * @see #setClassname(String) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagConvertInfo_Classname() - * @model - * @generated - */ - String getClassname(); - - /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo#getClassname <em>Classname</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Classname</em>' attribute. - * @see #getClassname() - * @generated - */ - void setClassname(String value); - } // TagConvertInfo |