Author: dsakovich
Date: 2008-09-22 08:48:08 -0400 (Mon, 22 Sep 2008)
New Revision: 10394
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java
Log:
code adjustment
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-09-22
12:37:01 UTC (rev 10393)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-09-22
12:48:08 UTC (rev 10394)
@@ -278,8 +278,12 @@
</vpe:textFormatting>
</vpe:template>
</vpe:if>
- <vpe:if test="tld_version('max=1.2')" >
- <vpe:template children="yes" modify="yes"
class="org.jboss.tools.jsf.vpe.jsf.template.JsfOutputLinkTemplate">
+ <vpe:if test="tld_version('min=1.2')">
+ <vpe:template children="yes" modify="yes">
+ <vpe:a class="{@styleClass}"
+ style="{@style}"
+ dir="{@dir}"
+ title="{tagstring()}"/>
<vpe:textFormatting use-default-formats="yes">
<vpe:format type="UnderlineFormat" setDefault="true">
<vpe:formatAttribute type="style" />
@@ -287,18 +291,13 @@
</vpe:textFormatting>
</vpe:template>
</vpe:if>
- <vpe:template children="yes" modify="yes">
- <vpe:a class="{@styleClass}"
- style="{@style}"
- dir="{@dir}"
- title="{tagstring()}"/>
+ <vpe:template children="yes" modify="yes"
class="org.jboss.tools.jsf.vpe.jsf.template.JsfOutputLinkTemplate">
<vpe:textFormatting use-default-formats="yes">
<vpe:format type="UnderlineFormat" setDefault="true">
<vpe:formatAttribute type="style" />
</vpe:format>
</vpe:textFormatting>
</vpe:template>
-
</vpe:tag>
<vpe:tag name="h:outputLabel" case-sensitive="yes">
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2008-09-22
12:37:01 UTC (rev 10393)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2008-09-22
12:48:08 UTC (rev 10394)
@@ -127,18 +127,14 @@
private double getStartVersion(String tagValue) {
- DecimalFormat decimalFormat = new DecimalFormat("#*.#*"); //$NON-NLS-1$
-
try {
if(tagValue.indexOf(MIN_VERSION_KEYWORD)!=-1){
-
- return (-1)*decimalFormat.parse(tagValue.
- substring(tagValue.indexOf(MIN_VERSION_KEYWORD)+4)).doubleValue();
+ return
Double.parseDouble(tagValue.substring(tagValue.indexOf(MIN_VERSION_KEYWORD)+4));
} else {
return (-1)*Double.MAX_VALUE;
}
- } catch (ParseException e) {
+ } catch (NumberFormatException e) {
VpePlugin.getPluginLog().logError(e);
}
@@ -147,18 +143,13 @@
private double getEndVersion(String tagValue) {
- DecimalFormat decimalFormat = new DecimalFormat("#*.#*"); //$NON-NLS-1$
-
try{
if(tagValue.indexOf(MAX_VERSION_KEYWORD)!=-1) {
-
- return (-1)*decimalFormat.parse(tagValue.substring(tagValue.
- indexOf(MAX_VERSION_KEYWORD)+4)).doubleValue();
+ return
Double.parseDouble(tagValue.substring(tagValue.indexOf(MAX_VERSION_KEYWORD)+4));
}else {
return Double.MAX_VALUE;
}
- } catch (ParseException e) {
-
+ } catch (NumberFormatException e) {
VpePlugin.getPluginLog().logError(e);
}
return Double.MAX_VALUE;