Author: svasilyev Date: 2007-08-23 02:56:01 -0400 (Thu, 23 Aug 2007) New Revision: 3282 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeElementMapping.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.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/VpeExpressionBuilderException.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionInfo.java Log: Some warnings about using collections with raw types were fixed Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-08-22 16:43:07 UTC (rev 3281) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-08-23 06:56:01 UTC (rev 3282) @@ -11,7 +11,6 @@ package org.jboss.tools.vpe.editor; import java.io.BufferedReader; -import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; @@ -23,7 +22,6 @@ import java.util.Set; import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; @@ -87,7 +85,7 @@ private VpePageContext pageContext; private VpeDnD dnd; private Node headNode; - private List includeStack; + private List<VpeIncludeInfo> includeStack; boolean rebuildFlag = false; private static final String EMPTY_STRING = ""; @@ -131,14 +129,14 @@ private static final String DOTTED_BORDER_STYLE_FOR_SPAN = "border : 1px solid #0051DD; color:#0051DD; background-color:#ECF3FF; padding-left: 3px; padding-right: 3px; line-height : 10px; font-family : arial; font-size : 10px; text-align:top; margin : 1px; -moz-user-modify : read-only"; - static private HashSet unborderedSourceNodes = new HashSet(); + static private HashSet<String> unborderedSourceNodes = new HashSet<String>(); static{ unborderedSourceNodes.add(TAG_HTML); unborderedSourceNodes.add(TAG_HEAD); unborderedSourceNodes.add(TAG_BODY); } - static private HashSet unborderedVisualNodes = new HashSet(); + static private HashSet<String> unborderedVisualNodes = new HashSet<String>(); static{ unborderedVisualNodes.add(TAG_TBODY); unborderedVisualNodes.add(TAG_THEAD); @@ -167,7 +165,7 @@ } public void buildDom(Document sourceDocument) { - includeStack = new ArrayList(); + includeStack = new ArrayList<VpeIncludeInfo>(); IEditorInput input = pageContext.getEditPart().getEditorInput(); if (input instanceof IFileEditorInput) { IFile file = ((IFileEditorInput)input).getFile(); @@ -310,7 +308,7 @@ boolean registerFlag = isCurrentMainDocument(); switch (sourceNode.getNodeType()) { case Node.ELEMENT_NODE: - Map xmlnsMap = createXmlns((Element)sourceNode); + Map<String, Integer> xmlnsMap = createXmlns((Element)sourceNode); Set ifDependencySet = new HashSet(); pageContext.setCurrentVisualNode(visualOldContainer); VpeTemplate template = templateManager.getTemplate(pageContext, (Element)sourceNode, ifDependencySet); @@ -336,7 +334,7 @@ registerNodes(elementMapping); } if (template.isChildren()) { - List childrenInfoList = creationData.getChildrenInfoList(); + List<VpeChildrenInfo> childrenInfoList = creationData.getChildrenInfoList(); if (childrenInfoList == null) { addChildren(template, sourceNode, visualNewElement != null ? visualNewElement : visualOldContainer); } else { @@ -397,12 +395,12 @@ } } - private void addChildren(VpeTemplate containerTemplate, Node sourceContainer, Node visualOldContainer, List childrenInfoList) { + private void addChildren(VpeTemplate containerTemplate, Node sourceContainer, Node visualOldContainer, List<VpeChildrenInfo> childrenInfoList) { for (int i = 0; i < childrenInfoList.size(); i++) { - VpeChildrenInfo info = (VpeChildrenInfo)childrenInfoList.get(i); + VpeChildrenInfo info = childrenInfoList.get(i); Node visualParent = info.getVisualParent(); if (visualParent == null) visualParent = visualOldContainer; - List sourceChildren = info.getSourceChildren(); + List<Node> sourceChildren = info.getSourceChildren(); int childrenCount = 0; if (sourceChildren != null) { for (int j = 0; j < sourceChildren.size(); j++) { @@ -1601,10 +1599,10 @@ pageContext.dispose(); } - private Map createXmlns(Element sourceNode) { + private Map<String, Integer> createXmlns(Element sourceNode) { NamedNodeMap attrs = ((Element)sourceNode).getAttributes(); if (attrs != null) { - Map xmlnsMap = new HashMap(); + Map<String, Integer> xmlnsMap = new HashMap<String, Integer>(); for (int i = 0; i < attrs.getLength(); i++) { addTaglib(sourceNode, xmlnsMap, attrs.item(i).getNodeName(), true); } @@ -1618,8 +1616,8 @@ private void setXmlnsAttribute(VpeElementMapping elementMapping, String name, String value) { Element sourceElement = (Element)elementMapping.getSourceNode(); if (sourceElement != null) { - Map xmlnsMap = elementMapping.getXmlnsMap(); - if (xmlnsMap == null) xmlnsMap = new HashMap(); + Map<String, Integer> xmlnsMap = elementMapping.getXmlnsMap(); + if (xmlnsMap == null) xmlnsMap = new HashMap<String, Integer>(); addTaglib(sourceElement, xmlnsMap, name, true); elementMapping.setXmlnsMap(xmlnsMap.size() > 0 ? xmlnsMap : null); } @@ -1628,7 +1626,7 @@ private void removeXmlnsAttribute(VpeElementMapping elementMapping, String name) { Element sourceElement = (Element)elementMapping.getSourceNode(); if (sourceElement != null) { - Map xmlnsMap = elementMapping.getXmlnsMap(); + Map<String, Integer> xmlnsMap = elementMapping.getXmlnsMap(); if (xmlnsMap != null) { Object id = xmlnsMap.remove(name); if (id != null) { @@ -1639,7 +1637,7 @@ } } - private void addTaglib(Element sourceElement, Map xmlnsMap, String attrName, boolean ns) { + private void addTaglib(Element sourceElement, Map<String, Integer> xmlnsMap, String attrName, boolean ns) { Attr attr = sourceElement.getAttributeNode(attrName); if (ATTR_XMLNS.equals(attr.getPrefix())) { xmlnsMap.put(attr.getNodeName(), new Integer(attr.hashCode())); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeElementMapping.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeElementMapping.java 2007-08-22 16:43:07 UTC (rev 3281) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeElementMapping.java 2007-08-23 06:56:01 UTC (rev 3282) @@ -22,12 +22,12 @@ public class VpeElementMapping extends VpeNodeMapping { private VpeTemplate template; - private Set ifDependencySet; - private Map xmlnsMap; + private Set<String> ifDependencySet; + private Map<String, Integer> xmlnsMap; private Object data; private Element border; - public VpeElementMapping(Element sourceElement, Element visualElement, Element border, VpeTemplate template, Set ifDependencySet, Object data) { + public VpeElementMapping(Element sourceElement, Element visualElement, Element border, VpeTemplate template, Set<String> ifDependencySet, Object data) { super(sourceElement, visualElement); this.template = template; if (ifDependencySet != null && ifDependencySet.size() > 0) { @@ -41,11 +41,11 @@ return template; } - public Map getXmlnsMap() { + public Map<String, Integer> getXmlnsMap() { return xmlnsMap; } - public void setXmlnsMap(Map xmlnsMap) { + public void setXmlnsMap(Map<String, Integer> xmlnsMap) { this.xmlnsMap = xmlnsMap; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2007-08-22 16:43:07 UTC (rev 3281) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2007-08-23 06:56:01 UTC (rev 3282) @@ -19,7 +19,7 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; public class VpeTemplateSet { - private List templates = new ArrayList(); + private List<VpeTemplateSet> templates = new ArrayList<VpeTemplateSet>(); private VpeTemplate defTemplate; VpeTemplateSet(){ @@ -37,7 +37,7 @@ VpeTemplate getTemplate(VpePageContext pageContext, Node sourceNode, Set ifDependencySet) { for (int i = 0; i < templates.size(); i++) { - VpeTemplateSet set = (VpeTemplateSet)templates.get(i); + VpeTemplateSet set = templates.get(i); VpeTemplate template = set.getTemplate(pageContext, sourceNode, ifDependencySet); if (template != null) { return template; 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 2007-08-22 16:43:07 UTC (rev 3281) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilder.java 2007-08-23 06:56:01 UTC (rev 3282) @@ -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) { @@ -193,7 +193,7 @@ error("Function \'" + name + "\' is not found", namePos); } 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) { @@ -315,9 +315,10 @@ throw new VpeExpressionBuilderException(originalText, message, pos); } - private void error(String message) throws VpeExpressionBuilderException { - error(message, currentPosition()); - } + // Remove comment if need +// private void error(String message) throws VpeExpressionBuilderException { +// error(message, currentPosition()); +// } private void undefinedCharacter(int pos) throws VpeExpressionBuilderException { error("Undefined character \'" + originalText.charAt(pos) + '\'', pos); @@ -343,7 +344,7 @@ if (value.length() <= 1) { return null; } - boolean exprBracket; + if (value.charAt(0) == COMPL_EXPR_LEFT_BRACKET) { if (value.charAt(value.length() - 1) == COMPL_EXPR_RIGHT_BRACKET) { value = value.substring(1, value.length() - 1); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilderException.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilderException.java 2007-08-22 16:43:07 UTC (rev 3281) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilderException.java 2007-08-23 06:56:01 UTC (rev 3282) @@ -11,6 +11,7 @@ package org.jboss.tools.vpe.editor.template.expression; public class VpeExpressionBuilderException extends Exception { + private static final long serialVersionUID = 2506700447659526980L; public VpeExpressionBuilderException(String expression, String message, int pos) { super("Expression: \"" + expression + "\" pos=" + pos + " " + message); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java 2007-08-22 16:43:07 UTC (rev 3281) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java 2007-08-23 06:56:01 UTC (rev 3282) @@ -12,6 +12,8 @@ public class VpeExpressionError extends Error { + private static final long serialVersionUID = 3620963302559253556L; + VpeExpressionError(String message) { super(message); } 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 2007-08-22 16:43:07 UTC (rev 3281) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionInfo.java 2007-08-23 06:56:01 UTC (rev 3282) @@ -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; } }