Author: dmaliarevich Date: 2009-06-25 05:46:27 -0400 (Thu, 25 Jun 2009) New Revision: 16200 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlAbstractForEachTemplate.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlForEachTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlForTokensTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-4526, JSTL forEach and forTokens templates were updated. Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlAbstractForEachTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlAbstractForEachTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlAbstractForEachTemplate.java 2009-06-25 09:46:27 UTC (rev 16200) @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jstl.template; + +import java.util.List; + +import org.jboss.tools.jsf.vpe.jstl.template.util.JstlUtil; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * Abstract Class with common logic for JSTL forEach/forTokens tags. + * + * @author dmaliarevich + * + */ +public abstract class JstlAbstractForEachTemplate extends VpeAbstractTemplate { + + protected final int TIMES_TO_ITERATE = 3; + + public JstlAbstractForEachTemplate() { + super(); + } + + public VpeCreationData createStub(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + Element sourceElement = (Element) sourceNode; + nsIDOMElement span = VisualDomUtil.createBorderlessContainer(visualDocument); + List<Node> children = JstlUtil.getChildren(sourceElement); + VpeCreationData creationData = new VpeCreationData(span); + + VpeChildrenInfo spanInfo = new VpeChildrenInfo(span); + creationData.addChildrenInfo(spanInfo); + for(int i = 0; i < TIMES_TO_ITERATE; i++) { + for (Node child : children) { + spanInfo.addSourceChild(child); + } + } + return creationData; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlAbstractForEachTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlForEachTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlForEachTemplate.java 2009-06-25 09:11:43 UTC (rev 16199) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlForEachTemplate.java 2009-06-25 09:46:27 UTC (rev 16200) @@ -10,17 +10,10 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jstl.template; -import java.util.List; -import org.jboss.tools.jsf.vpe.jstl.template.util.JstlUtil; import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; -import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.w3c.dom.Element; import org.w3c.dom.Node; /** @@ -29,29 +22,15 @@ * @author dmaliarevich * */ -public class JstlForEachTemplate extends VpeAbstractTemplate { +public class JstlForEachTemplate extends JstlAbstractForEachTemplate { - private final int TIMES_TO_ITERATE = 3; - public JstlForEachTemplate() { super(); } public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - Element sourceElement = (Element) sourceNode; - nsIDOMElement span = VisualDomUtil.createBorderlessContainer(visualDocument); - List<Node> children = JstlUtil.getChildren(sourceElement); - VpeCreationData creationData = new VpeCreationData(span); - - VpeChildrenInfo spanInfo = new VpeChildrenInfo(span); - creationData.addChildrenInfo(spanInfo); - for(int i = 0; i < TIMES_TO_ITERATE; i++) { - for (Node child : children) { - spanInfo.addSourceChild(child); - } - } - return creationData; + return createStub(pageContext, sourceNode, visualDocument); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlForTokensTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlForTokensTemplate.java 2009-06-25 09:11:43 UTC (rev 16199) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlForTokensTemplate.java 2009-06-25 09:46:27 UTC (rev 16200) @@ -10,17 +10,9 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jstl.template; -import java.util.List; - -import org.jboss.tools.jsf.vpe.jstl.template.util.JstlUtil; import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; -import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.w3c.dom.Element; import org.w3c.dom.Node; /** @@ -29,28 +21,15 @@ * @author dmaliarevich * */ -public class JstlForTokensTemplate extends VpeAbstractTemplate { +public class JstlForTokensTemplate extends JstlAbstractForEachTemplate { - private final int TIMES_TO_ITERATE = 3; - public JstlForTokensTemplate() { - super(); + super(); } public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - Element sourceElement = (Element) sourceNode; - nsIDOMElement span = VisualDomUtil.createBorderlessContainer(visualDocument); - List<Node> children = JstlUtil.getChildren(sourceElement); - VpeCreationData creationData = new VpeCreationData(span); - VpeChildrenInfo spanInfo = new VpeChildrenInfo(span); - creationData.addChildrenInfo(spanInfo); - for(int i = 0; i < TIMES_TO_ITERATE; i++) { - for (Node child : children) { - spanInfo.addSourceChild(child); - } - } - return creationData; + return createStub(pageContext, sourceNode, visualDocument); } }