Author: mareshkau
Date: 2008-09-17 10:12:27 -0400 (Wed, 17 Sep 2008)
New Revision: 10334
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
Log:
=JBIDE-2521
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-17
13:44:33 UTC (rev 10333)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-17
14:12:27 UTC (rev 10334)
@@ -14,7 +14,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.context.VpePageContext;
@@ -44,6 +43,7 @@
static final String VAL_DISPLAY_NONE = "none";
private boolean caseSensitive;
+ private VpeExpression tagForDisplayExpr;
private VpeExpression displayExpr;
private VpeExpression valueExpr;
private VpeExpression borderExpr;
@@ -56,6 +56,7 @@
private List propertyCreators;
private Set dependencySet;
+ private String tagForDisplayStr;
private String displayStr;
private String valueStr;
private String borderStr;
@@ -71,6 +72,19 @@
}
private void build(Element element, VpeDependencyMap dependencyMap) {
+ Attr tagForDisplay =
element.getAttributeNode(VpeTemplateManager.ATTR_ANY_TAG_FOR_DISPLAY);
+ if (tagForDisplay != null) {
+ try {
+ tagForDisplayStr = tagForDisplay.getNodeValue();
+ VpeExpressionInfo info =
VpeExpressionBuilder.buildCompletedExpression(tagForDisplayStr,caseSensitive);
+ tagForDisplayExpr = info.getExpression();
+ dependencySet = info.getDependencySet();
+ dependencyMap.setCreator(this, info.getDependencySet());
+ } catch(VpeExpressionBuilderException ex) {
+ VpePlugin.reportProblem(ex);
+ }
+ }
+
Attr displayAttr = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_DISPLAY);
if (displayAttr != null) {
try {
@@ -277,7 +291,7 @@
public VpeAnyData getAnyData() {
return new VpeAnyData(
displayStr,
- "",
+ tagForDisplayStr,
valueStr,
borderStr,
valueColorStr,
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2008-09-17
13:44:33 UTC (rev 10333)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2008-09-17
14:12:27 UTC (rev 10334)
@@ -13,6 +13,8 @@
public class VpeAnyData extends VpeTemplateData {
private String uri;
private String tagForDisplay;
+ private boolean showIcon;
+
private String display;
private String value;
private String border;
@@ -20,8 +22,9 @@
private String valueBackgroundColor;
private String backgroundColor;
private String borderColor;
- private boolean showIcon;
+
+
public VpeAnyData(String name) {
super(name);
}
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-09-17
13:44:33 UTC (rev 10333)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-09-17
14:12:27 UTC (rev 10334)
@@ -56,6 +56,7 @@
private Combo cbDisplay;
private Combo cbTagForDisplay;
private int displayIndexMem;
+ private int tagNameItemIndex;
private Text txtValue;
private Text txtBorder;
private ColorControl ctlValueColor;
@@ -117,7 +118,11 @@
gd.horizontalSpan=2;
cbTagForDisplay.setLayoutData(gd);
cbTagForDisplay.setItems(displayTags.toArray(new String[displayTags.size()]));
- cbTagForDisplay.select(0);
+ tagNameItemIndex = displayTags.indexOf(data.getTagForDisplay());
+ if(tagNameItemIndex==-1) {
+ tagNameItemIndex=0;
+ }
+ cbTagForDisplay.select(tagNameItemIndex);
// ctlCaseSensitive = new CheckControl(composite, "Case sensitive",
data.isCaseSensitive());
@@ -202,7 +207,10 @@
data.setChanged(true);
data.setDisplay(display);
}
-
+ if(tagNameItemIndex!=cbTagForDisplay.getSelectionIndex()) {
+ data.setChanged(true);
+ data.setTagForDisplay(displayTags.get(cbTagForDisplay.getSelectionIndex()));
+ }
data.setChanged(isChanged(data, data.getValue(), txtValue.getText()));
data.setValue(txtValue.getText().trim());
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-09-17
13:44:33 UTC (rev 10333)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-09-17
14:12:27 UTC (rev 10334)
@@ -184,6 +184,7 @@
};
static final String ATTR_ANY_DISPLAY = "display"; //$NON-NLS-1$
+ static final String ATTR_ANY_TAG_FOR_DISPLAY="tag-for-display"; //$NON-NLS-1$
static final String ATTR_ANY_ICON = "icon"; //$NON-NLS-1$
static final String ATTR_ANY_VALUE = "value"; //$NON-NLS-1$
static final String ATTR_ANY_BORDER = "border"; //$NON-NLS-1$
@@ -602,6 +603,11 @@
Element anyNode = getChildNode(templateNode, TAG_ANY);
if (anyNode != null) {
+ attr = anyNode.getAttributeNode(ATTR_ANY_TAG_FOR_DISPLAY);
+ if(attr!=null) {
+ anyData.setTagForDisplay(attr.getNodeValue());
+ }
+
attr = anyNode.getAttributeNode(ATTR_TEMPLATE_CHILDREN);
if (attr != null) {
anyData.setChildren(ATTR_VALUE_YES.equalsIgnoreCase(attr.getNodeValue()));
@@ -729,6 +735,9 @@
newTagElement.appendChild(newTemplateElement);
Element newAnyElement = document.createElement(TAG_ANY);
+
+ if(data.getTagForDisplay()!=null&& data.getTagForDisplay().length() > 0)
+ newAnyElement.setAttribute(ATTR_ANY_TAG_FOR_DISPLAY, data.getTagForDisplay());
if (data.getDisplay() != null && data.getDisplay().length() > 0)
newAnyElement.setAttribute(ATTR_ANY_DISPLAY, data.getDisplay());
if (data.getValue() != null && data.getValue().length() > 0)
Show replies by date