Author: mareshkau
Date: 2008-09-19 06:12:56 -0400 (Fri, 19 Sep 2008)
New Revision: 10377
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/VpeTemplateManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.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-19
09:48:39 UTC (rev 10376)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-19
10:12:56 UTC (rev 10377)
@@ -77,7 +77,47 @@
Attr styleAttr = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_STYLE);
if (styleAttr!=null) {
try {
- styleStr = styleAttr.getValue();
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBorder = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_BORDER);
+ StringBuffer stringBuffer = new StringBuffer();
+
+ if (attrBorder != null) {
+ stringBuffer.append("border-width:").append(attrBorder.getNodeValue())
//$NON-NLS-1$
+ .append(";"); //$NON-NLS-1$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrValueColor =
element.getAttributeNode(VpeTemplateManager.ATTR_ANY_VALUE_COLOR);
+ if (attrValueColor != null) {
+ stringBuffer.append("color:").append(attrValueColor.getNodeValue()).append(";");
//$NON-NLS-1$//$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrValueBackgroundColor =
element.getAttributeNode(VpeTemplateManager.ATTR_ANY_VALUE_BACKGROUND_COLOR);
+ if (attrValueBackgroundColor != null) {
+ stringBuffer.append("background-color:").append(attrValueBackgroundColor.getNodeValue()).append(";");
//$NON-NLS-1$//$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBachkgroundColor =
element.getAttributeNode(VpeTemplateManager.ATTR_ANY_BACKGROUND_COLOR);
+ if (attrBachkgroundColor != null) {
+ //early for displaying any tag was used
<div><span></span></div>
+ //and this property was for inner span, now used only one element
+ //and this property duplicates
+ stringBuffer.append("background-color:").append(attrBachkgroundColor.getNodeValue()).append(";");
//$NON-NLS-1$ //$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBorderColor =
element.getAttributeNode(VpeTemplateManager.ATTR_ANY_BORDER_COLOR);
+ if (attrBorderColor != null) {
+ stringBuffer.append("border-color:").append(attrBorderColor.getNodeValue()).append(";");
//$NON-NLS-1$ //$NON-NLS-2$
+ }
+ //-----------END
+ if(stringBuffer.toString().length()>0) {
+ styleStr = stringBuffer.toString();
+ } else {
+ styleStr = styleAttr.getValue();
+ }
VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(styleStr,
true);
styleExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
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-19
09:48:39 UTC (rev 10376)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-09-19
10:12:56 UTC (rev 10377)
@@ -22,6 +22,8 @@
import java.util.Map;
import java.util.Set;
+import javax.swing.text.Style;
+
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
@@ -193,23 +195,23 @@
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_BORDER = "border"; //$NON-NLS-1$
+ static final String ATTR_ANY_BORDER = "border"; //$NON-NLS-1$
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_VALUE_COLOR = "value-color";
//$NON-NLS-1$
+ static final String ATTR_ANY_VALUE_COLOR = "value-color"; //$NON-NLS-1$
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_VALUE_BACKGROUND_COLOR =
"value-background-color"; //$NON-NLS-1$
+ static final String ATTR_ANY_VALUE_BACKGROUND_COLOR =
"value-background-color"; //$NON-NLS-1$
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_BACKGROUND_COLOR = "background-color";
//$NON-NLS-1$
+ static final String ATTR_ANY_BACKGROUND_COLOR = "background-color";
//$NON-NLS-1$
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_BORDER_COLOR = "border-color";
//$NON-NLS-1$
+ static final String ATTR_ANY_BORDER_COLOR = "border-color"; //$NON-NLS-1$
static final String[] ATTR_ANY_PROPERTIES = {"title"}; //$NON-NLS-1$
@@ -636,12 +638,14 @@
if (attr != null) {
anyData.setChildren(ATTR_VALUE_YES.equalsIgnoreCase(attr.getNodeValue()));
}
-
-// attr = anyNode.getAttributeNode(ATTR_ANY_DISPLAY);
-// if (attr != null) {
-// anyData.setDisplay(attr.getNodeValue());
-// }
-
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ StringBuffer stringBuffer = new StringBuffer();
+ Node attrDisplay = anyNode.getAttributeNode(ATTR_ANY_DISPLAY);
+ if (attr != null) {
+ stringBuffer.append(HTML.ATTR_DISPLAY).append(":") //$NON-NLS-1$
+ .append(attrDisplay.getNodeValue()).append(";"); //$NON-NLS-1$
+ }
+ //-----------END
attr = anyNode.getAttributeNode(ATTR_ANY_ICON);
if (attr != null){
anyData.setShowIcon(ATTR_VALUE_YES.equalsIgnoreCase(attr.getNodeValue()));
@@ -654,33 +658,46 @@
attr = anyNode.getAttributeNode(ATTR_ANY_STYLE);
if (attr !=null) {
- anyData.setValue(attr.getNodeValue());
+ anyData.setStyle(attr.getNodeValue());
}
-// attr = anyNode.getAttributeNode(ATTR_ANY_BORDER);
-// if (attr != null) {
-// anyData.setBorder(attr.getNodeValue());
-// }
-//
-// attr = anyNode.getAttributeNode(ATTR_ANY_VALUE_COLOR);
-// if (attr != null) {
-// anyData.setValueColor(attr.getNodeValue());
-// }
-//
-// attr = anyNode.getAttributeNode(ATTR_ANY_VALUE_BACKGROUND_COLOR);
-// if (attr != null) {
-// anyData.setValueBackgroundColor(attr.getNodeValue());
-// }
-//
-// attr = anyNode.getAttributeNode(ATTR_ANY_BACKGROUND_COLOR);
-// if (attr != null) {
-// anyData.setBackgroundColor(attr.getNodeValue());
-// }
-//
-// attr = anyNode.getAttributeNode(ATTR_ANY_BORDER_COLOR);
-// if (attr != null) {
-// anyData.setBorderColor(attr.getNodeValue());
-// }
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBorder = anyNode.getAttributeNode(ATTR_ANY_BORDER);
+ if (attrBorder != null) {
+ stringBuffer.append("border-width:").append(attrBorder.getNodeValue())
//$NON-NLS-1$
+ .append(";"); //$NON-NLS-1$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrValueColor = anyNode.getAttributeNode(ATTR_ANY_VALUE_COLOR);
+ if (attrValueColor != null) {
+ stringBuffer.append("color:").append(attrValueColor.getNodeValue()).append(";");
//$NON-NLS-1$//$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrValueBackgroundColor =
anyNode.getAttributeNode(ATTR_ANY_VALUE_BACKGROUND_COLOR);
+ if (attrValueBackgroundColor != null) {
+ stringBuffer.append("background-color:").append(attrValueBackgroundColor.getNodeValue()).append(";");
//$NON-NLS-1$//$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBachkgroundColor = anyNode.getAttributeNode(ATTR_ANY_BACKGROUND_COLOR);
+ if (attrBachkgroundColor != null) {
+ //early for displaying any tag was used
<div><span></span></div>
+ //and this property was for inner span, now used only one element
+ //and this property duplicates
+ stringBuffer.append("background-color:").append(attrBachkgroundColor.getNodeValue()).append(";");
//$NON-NLS-1$ //$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBorderColor = anyNode.getAttributeNode(ATTR_ANY_BORDER_COLOR);
+ if (attrBorderColor != null) {
+ stringBuffer.append("border-color:").append(attrBorderColor.getNodeValue()).append(";");
//$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if(stringBuffer.toString().length()>0) {
+ anyData.setStyle(stringBuffer.toString());
+ }
+ //-----------END
}
}
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-09-19
09:48:39 UTC (rev 10376)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-09-19
10:12:56 UTC (rev 10377)
@@ -87,6 +87,7 @@
public static final String ATTR_SRC = "src"; //$NON-NLS-1$
public static final String ATTR_ALT = "alt"; //$NON-NLS-1$
public static final String ATTR_JSFC = "jsfc"; //$NON-NLS-1$
+ public static final String ATTR_DISPLAY = "display"; //$NON-NLS-1$
public static final String VALUE_TOP_ALIGN = "top"; //$NON-NLS-1$
public static final String VALUE_MIDDLE_ALIGN = "middle"; //$NON-NLS-1$