[jbosstools-commits] JBoss Tools SVN: r35180 - trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template.

Author: dgolovin Date: 2011-09-29 17:53:19 -0400 (Thu, 29 Sep 2011) New Revision: 35180 Added: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringConstant.java Removed: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/ Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringFormSelectTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java Log: code cleanup: renamed and moved Spring class up one level Copied: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringConstant.java (from rev 35122, trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringConstant.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringConstant.java 2011-09-29 21:53:19 UTC (rev 35180) @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 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.vpe.spring.template; + + +/** + * @author Yahor Radtsevich (yradtsevich) + * + */ +public class SpringConstant { + + private SpringConstant() { + } + + public static final String ATTR_CSS_CLASS = "cssClass"; //$NON-NLS-1$ + public static final String ATTR_CSS_STYLE = "cssStyle"; //$NON-NLS-1$ + public static final String ATTR_DISABLED = "disabled"; //$NON-NLS-1$ + public static final String ATTR_ID = "id"; //$NON-NLS-1$ + public static final String ATTR_ITEMS = "items"; //$NON-NLS-1$ + public static final String ATTR_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$ + public static final String ATTR_PATH = "path"; //$NON-NLS-1$ + public static final String ATTR_MULTIPLE = "multiple"; //$NON-NLS-1$ + public static final String ATTR_NAME = "name"; //$NON-NLS-1$ + public static final String ATTR_VALUE = "value"; //$NON-NLS-1$ + public static final String ATTR_VAR = "var"; //$NON-NLS-1$ + + public static final String VALUE_TRUE = "true"; //$NON-NLS-1$ + public static final String VALUE_FALSE = "false"; //$NON-NLS-1$ + + public static final String TAG_SPRING_PARAM = "spring:param"; //$NON-NLS-1$ +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringFormSelectTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringFormSelectTemplate.java 2011-09-29 21:52:55 UTC (rev 35179) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringFormSelectTemplate.java 2011-09-29 21:53:19 UTC (rev 35180) @@ -18,7 +18,6 @@ import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.VisualDomUtil; -import org.jboss.tools.vpe.spring.template.util.Spring; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.w3c.dom.Element; @@ -33,9 +32,9 @@ public class SpringFormSelectTemplate extends VpeAbstractTemplate { public static final Map<String, String> COMMON_SPRING_FORM_ATTRIBUTES_MAP = new HashMap<String, String>() {{ - put(Spring.ATTR_ID, HTML.ATTR_ID); - put(Spring.ATTR_CSS_STYLE, HTML.ATTR_STYLE); - put(Spring.ATTR_CSS_CLASS, HTML.ATTR_CLASS); + put(SpringConstant.ATTR_ID, HTML.ATTR_ID); + put(SpringConstant.ATTR_CSS_STYLE, HTML.ATTR_STYLE); + put(SpringConstant.ATTR_CSS_CLASS, HTML.ATTR_CLASS); put(HTML.ATTR_SIZE, HTML.ATTR_SIZE); }}; @@ -50,19 +49,19 @@ VisualDomUtil.copyAttributes(sourceElement, select, COMMON_SPRING_FORM_ATTRIBUTES_MAP); - if (Spring.VALUE_TRUE.equals(sourceElement.getAttribute(Spring.ATTR_DISABLED))) { + if (SpringConstant.VALUE_TRUE.equals(sourceElement.getAttribute(SpringConstant.ATTR_DISABLED))) { select.setAttribute(HTML.ATTR_DISABLED, HTML.ATTR_DISABLED); } - if (!Spring.VALUE_FALSE.equals(sourceElement.getAttribute(Spring.ATTR_MULTIPLE))) { + if (!SpringConstant.VALUE_FALSE.equals(sourceElement.getAttribute(SpringConstant.ATTR_MULTIPLE))) { select.setAttribute(HTML.ATTR_MULTIPLE, HTML.ATTR_MULTIPLE); } - if (sourceElement.hasAttribute(Spring.ATTR_ITEMS)) { + if (sourceElement.hasAttribute(SpringConstant.ATTR_ITEMS)) { // an inner 'option' tag has to be generated - String optionBody = sourceElement.getAttribute(Spring.ATTR_ITEMS); - if (sourceElement.hasAttribute(Spring.ATTR_ITEM_LABEL)) { - optionBody += '.' + sourceElement.getAttribute(Spring.ATTR_ITEM_LABEL); + String optionBody = sourceElement.getAttribute(SpringConstant.ATTR_ITEMS); + if (sourceElement.hasAttribute(SpringConstant.ATTR_ITEM_LABEL)) { + optionBody += '.' + sourceElement.getAttribute(SpringConstant.ATTR_ITEM_LABEL); } nsIDOMElement option = visualDocument.createElement(HTML.TAG_OPTION); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java 2011-09-29 21:52:55 UTC (rev 35179) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java 2011-09-29 21:53:19 UTC (rev 35180) @@ -18,7 +18,6 @@ import org.jboss.tools.vpe.editor.util.Constants; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.VisualDomUtil; -import org.jboss.tools.vpe.spring.template.util.Spring; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -44,21 +43,21 @@ */ textarea.setAttribute( HTML.ATTR_CLASS, - (sourceElement.hasAttribute(Spring.ATTR_CSS_CLASS) - ? sourceElement.getAttribute(Spring.ATTR_CSS_CLASS) + (sourceElement.hasAttribute(SpringConstant.ATTR_CSS_CLASS) + ? sourceElement.getAttribute(SpringConstant.ATTR_CSS_CLASS) : Constants.EMPTY)); textarea.setAttribute( HTML.ATTR_STYLE, - (sourceElement.hasAttribute(Spring.ATTR_CSS_STYLE) - ? sourceElement.getAttribute(Spring.ATTR_CSS_STYLE) + (sourceElement.hasAttribute(SpringConstant.ATTR_CSS_STYLE) + ? sourceElement.getAttribute(SpringConstant.ATTR_CSS_STYLE) : Constants.EMPTY)); /* * Add value of the 'path' attribute to the textarea. * No children are allowed for the form:textarea. */ - if (sourceElement.hasAttribute(Spring.ATTR_PATH)) { + if (sourceElement.hasAttribute(SpringConstant.ATTR_PATH)) { textarea.appendChild(visualDocument.createTextNode(sourceElement - .getAttribute(Spring.ATTR_PATH))); + .getAttribute(SpringConstant.ATTR_PATH))); } final VpeCreationData creationData = new VpeCreationData(textarea); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java 2011-09-29 21:52:55 UTC (rev 35179) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java 2011-09-29 21:53:19 UTC (rev 35180) @@ -13,7 +13,6 @@ import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.util.VisualDomUtil; -import org.jboss.tools.vpe.spring.template.util.Spring; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.w3c.dom.Element; @@ -34,9 +33,9 @@ nsIDOMDocument visualDocument) { Element sourceElement = (Element) sourceNode; nsIDOMElement urlContainer = VisualDomUtil.createBorderlessContainer(visualDocument); - if (sourceElement.hasAttribute(Spring.ATTR_VALUE) && - !sourceElement.hasAttribute(Spring.ATTR_VAR)) { - String valueAttribute = sourceElement.getAttribute(Spring.ATTR_VALUE); + if (sourceElement.hasAttribute(SpringConstant.ATTR_VALUE) && + !sourceElement.hasAttribute(SpringConstant.ATTR_VAR)) { + String valueAttribute = sourceElement.getAttribute(SpringConstant.ATTR_VALUE); StringBuilder url = new StringBuilder(valueAttribute); boolean hasParams = valueAttribute.contains("?"); //$NON-NLS-1$ @@ -45,7 +44,7 @@ Node childNode = childNodes.item(i); String childTemplateName = VpeTemplateManager.getInstance() .getTemplateName(pageContext, childNode); - if (Spring.TAG_SPRING_PARAM.equals(childTemplateName)) { + if (SpringConstant.TAG_SPRING_PARAM.equals(childTemplateName)) { url.append(hasParams ? '&' : '?'); hasParams = true; appendParam(url, (Element) childNode); @@ -60,10 +59,10 @@ * @param paramElement */ private void appendParam(StringBuilder url, Element paramElement) { - if (paramElement.hasAttribute(Spring.ATTR_NAME)) { - url.append(paramElement.getAttribute(Spring.ATTR_NAME)); - if (paramElement.hasAttribute(Spring.ATTR_VALUE)) { - url.append('=').append(paramElement.getAttribute(Spring.ATTR_VALUE)); + if (paramElement.hasAttribute(SpringConstant.ATTR_NAME)) { + url.append(paramElement.getAttribute(SpringConstant.ATTR_NAME)); + if (paramElement.hasAttribute(SpringConstant.ATTR_VALUE)) { + url.append('=').append(paramElement.getAttribute(SpringConstant.ATTR_VALUE)); } } }