Author: svasilyev
Date: 2008-02-26 11:17:00 -0500 (Tue, 26 Feb 2008)
New Revision: 6579
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionInfo.java
Log:
Code adjustment.
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java 2008-02-26
15:31:08 UTC (rev 6578)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java 2008-02-26
16:17:00 UTC (rev 6579)
@@ -40,19 +40,19 @@
if (templAttrs != null) {
int len = templAttrs.getLength();
if (len > 0) {
- List creatorAttrs = new ArrayList(len);
+ List<VpeCreator> creatorAttrs = new ArrayList<VpeCreator>(len);
for (int i = 0; i < len; i++) {
Attr templAttr = (Attr)templAttrs.item(i);
creatorAttrs.add(new VpeAttributeCreator(templAttr.getName(), templAttr.getValue(),
dependencyMap, caseSensitive));
}
- attrs = (VpeCreator[]) creatorAttrs.toArray(new VpeCreator[len]);
+ attrs = creatorAttrs.toArray(new VpeCreator[len]);
}
}
NodeList htmlChildren = htmlElement.getChildNodes();
if (htmlChildren != null) {
int len = htmlChildren.getLength();
if (len > 0) {
- List creatorNodes = new ArrayList(len);
+ List<VpeCreator> creatorNodes = new ArrayList<VpeCreator>(len);
for (int i = 0; i < len; i++) {
Node innerNode = htmlChildren.item(i);
switch (innerNode.getNodeType()) {
@@ -73,7 +73,7 @@
}
}
}
- nodes = (VpeCreator[]) creatorNodes.toArray(new VpeCreator[creatorNodes.size()]);
+ nodes = creatorNodes.toArray(new VpeCreator[creatorNodes.size()]);
}
}
}
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilder.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilder.java 2008-02-26
15:31:08 UTC (rev 6578)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilder.java 2008-02-26
16:17:00 UTC (rev 6579)
@@ -41,7 +41,7 @@
private String originalText;
private String text;
private boolean caseSensitive;
- private Set dependencySet;
+ private Set<String> dependencySet;
public VpeExpressionInfo buildPlainExpression(String text, boolean caseSensitive) throws
VpeExpressionBuilderException {
if (text == null) {
@@ -53,7 +53,7 @@
return new VpeExpressionInfo();
}
this.caseSensitive = caseSensitive;
- dependencySet = new HashSet();
+ dependencySet = new HashSet<String>();
return new VpeExpressionInfo(build(), dependencySet.size() > 0 ? dependencySet :
null);
}
@@ -62,8 +62,8 @@
return new VpeExpressionInfo();
}
VpeExpressionBuilder builder = new VpeExpressionBuilder();
- Set dependencySet = new HashSet();
- List expressions = new ArrayList();
+ Set<String> dependencySet = new HashSet<String>();
+ List<VpeExpression> expressions = new ArrayList<VpeExpression>();
int len = text.length();
int startIndex = 0;
while (startIndex < len) {
@@ -101,9 +101,9 @@
}
VpeExpression expression;
if (expressions.size() == 1) {
- expression = (VpeExpression)expressions.get(0);
+ expression = expressions.get(0);
} else {
- expression = new VpeCompletedExpression((VpeExpression[])expressions.toArray(new
VpeExpression[expressions.size()]));
+ expression = new VpeCompletedExpression(expressions.toArray(new
VpeExpression[expressions.size()]));
}
return new VpeExpressionInfo(expression, dependencySet);
}
@@ -190,10 +190,10 @@
private VpeOperand buildFunction(String name, int namePos) throws
VpeExpressionBuilderException {
VpeFunction function = VpeFunctionFactory.getFunction(name);
if (function == null) {
- error("Function \'" + name + "\' is not found", namePos);
+ error("Function \'" + name + "\' is not found", namePos);
//$NON-NLS-1$ //$NON-NLS-2$
}
int bracketPos = currentPosition();
- List params = new ArrayList();
+ List<VpeOperand> params = new ArrayList<VpeOperand>();
text = text.substring(1);
text = text.trim();
while (!end() && nextChar() != FUNC_BRACKET_RIGHT) {
@@ -212,7 +212,7 @@
}
text = text.substring(1);
if (params.size() > 0) {
- function.setParameters((VpeOperand[])params.toArray(new VpeOperand[params.size()]));
+ function.setParameters(params.toArray(new VpeOperand[params.size()]));
}
String[] signatures = function.getSignatures();
if (signatures != null) {
@@ -258,7 +258,7 @@
String token;
if (pos == -1) {
token = text;
- text = "";
+ text = ""; //$NON-NLS-1$
} else {
token = text.substring(0, pos);
text = text.substring(pos);
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionInfo.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionInfo.java 2008-02-26
15:31:08 UTC (rev 6578)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionInfo.java 2008-02-26
16:17:00 UTC (rev 6579)
@@ -14,13 +14,13 @@
public class VpeExpressionInfo {
private VpeExpression expression;
- private Set dependencySet;
+ private Set<String> dependencySet;
VpeExpressionInfo() {
this(null, null);
}
- VpeExpressionInfo(VpeExpression expression, Set dependencySet) {
+ VpeExpressionInfo(VpeExpression expression, Set<String> dependencySet) {
this.expression = expression;
this.dependencySet = dependencySet;
}
@@ -29,7 +29,7 @@
return expression;
}
- public Set getDependencySet() {
+ public Set<String> getDependencySet() {
return dependencySet;
}
}
Show replies by date