[jbosstools-commits] JBoss Tools SVN: r17728 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools: common/model and 1 other directories.

Author: scabanovich Date: 2009-09-25 08:36:36 -0400 (Fri, 25 Sep 2009) New Revision: 17728 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/java/jsp/ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TLDToPaletteHelper.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/URIConstants.java Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelObjectConstants.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelObjectConstants.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelObjectConstants.java 2009-09-25 12:09:16 UTC (rev 17727) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelObjectConstants.java 2009-09-25 12:36:36 UTC (rev 17728) @@ -63,4 +63,9 @@ // "" // "setModified" use ENUM for compare + + //drop & palette related + public static final String START_TEXT = "start text"; //$NON-NLS-1$ + public static final String END_TEXT = "end text"; //$NON-NLS-1$ + public static final String REFORMAT = "automatically reformat tag body"; //$NON-NLS-1$ } Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TLDToPaletteHelper.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TLDToPaletteHelper.java 2009-09-25 12:09:16 UTC (rev 17727) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TLDToPaletteHelper.java 2009-09-25 12:36:36 UTC (rev 17728) @@ -1,180 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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 - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.web.tld; - -import java.util.*; -import org.jboss.tools.common.model.*; - -public class TLDToPaletteHelper { - public static final String START_TEXT = "start text"; //$NON-NLS-1$ - public static final String END_TEXT = "end text"; //$NON-NLS-1$ - public static final String REFORMAT = "automatically reformat tag body"; //$NON-NLS-1$ - public static final String DESCRIPTION = "description"; //$NON-NLS-1$ - public static final String URI = URIConstants.LIBRARY_URI; - public static final String DEFAULT_PREFIX = URIConstants.DEFAULT_PREFIX; - public static final String ADD_TAGLIB = "add taglib"; //$NON-NLS-1$ - - public TLDToPaletteHelper() {} - - public XModelObject createMacroByTag(XModelObject tag, XModel model) { - Properties p = new Properties(); - String parentname = getTldName(tag.getParent()); - String prefix = (parentname.length() == 0) ? "" : parentname + ":"; //$NON-NLS-1$ //$NON-NLS-2$ - String shortname = tag.getAttributeValue(XModelObjectConstants.ATTR_NAME); - String name = prefix + shortname; - String tagname = shortname; ///name; - p.setProperty(XModelObjectConstants.ATTR_NAME, shortname); - boolean empty = "empty".equals(tag.getAttributeValue("bodycontent")); //$NON-NLS-1$ //$NON-NLS-2$ - if(!empty) p.setProperty(END_TEXT, "</" + tagname + ">"); //$NON-NLS-1$ //$NON-NLS-2$ - p.setProperty(START_TEXT, getStartText(tag, empty, tagname)); - p.setProperty(DESCRIPTION, getTagDescription(tag, empty, name)); - if(!empty) p.setProperty(REFORMAT, XModelObjectConstants.YES); - return model.createModelObject("SharableMacroHTML", p); //$NON-NLS-1$ - } - - public static String getTldName(XModelObject tld) { - if(tld == null) return ""; //$NON-NLS-1$ - String n = tld.getAttributeValue("shortname"); //$NON-NLS-1$ - if(n == null) return ""; //$NON-NLS-1$ - if(n.length() == 0) { - n = tld.getAttributeValue(XModelObjectConstants.ATTR_NAME); - int q = n.lastIndexOf('-'); - if(q >= 0) n = n.substring(q + 1); - } - int s = n.lastIndexOf(' '); - if(s >= 0) n = n.substring(s + 1); - return n.toLowerCase(); - } - - private String getStartText(XModelObject tag, boolean empty, String name) { - StringBuffer sb = new StringBuffer(); - sb.append("<").append(name); //$NON-NLS-1$ - XModelObject[] as = tag.getChildren(); - boolean found = false; - for (int i = 0; i < as.length; i++) { - if(!TLDUtil.isAttribute(as[i])) continue; - String required = as[i].getAttributeValue("required"); //$NON-NLS-1$ - if(!XModelObjectConstants.TRUE.equals(required) && !XModelObjectConstants.YES.equals(required)) continue; - sb.append(' ').append(as[i].getAttributeValue(XModelObjectConstants.ATTR_NAME)).append("=\""); //$NON-NLS-1$ - if(!found) { - sb.append('|'); - found = true; - } - sb.append('"'); - } - if(empty) sb.append(XModelObjectConstants.SEPARATOR); - sb.append(">"); //$NON-NLS-1$ - return sb.toString(); - } - - private String getTagDescription(XModelObject tag, boolean empty, String name) { -// String info = TLDUtil.getTagDescription(tag); - StringBuffer sb = new StringBuffer(); - sb.append("<b>Syntax:</b><br><code>"); - if (empty) - sb.append("&lt;").append(name).append(" /&gt;"); //$NON-NLS-1$ //$NON-NLS-2$ - else - sb.append("&lt;").append(name).append("&gt;</code><br><code>&lt;/").append(name).append("&gt;"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - sb.append("</code><br><b>Attributes:</b><br><code>"); - int k = 0; - XModelObject[] as = tag.getChildren(); - for (int i = 0; i < as.length; i++) { - if(!TLDUtil.isAttribute(as[i])) continue; - if(!isRequired(as[i])) continue; - sb.append("<b>").append(as[i].getAttributeValue(XModelObjectConstants.ATTR_NAME)).append("</b>"); //$NON-NLS-1$ //$NON-NLS-2$ - ++k; - if(k < as.length) sb.append(", "); //$NON-NLS-1$ - } - for (int i = 0; i < as.length; i++) { - if(isRequired(as[i])) continue; - sb.append(as[i].getAttributeValue(XModelObjectConstants.ATTR_NAME)); - ++k; - if(k < as.length) sb.append(", "); //$NON-NLS-1$ - } - - sb.append("</code>"); //$NON-NLS-1$ - -/* - sb.append("<html>").append("\n "); - sb.append("<table width=\"300\">").append("\n "); - if(info.length() > 0) { - sb.append("<tr>").append("\n "); - sb.append("<td><i><b>").append(info).append("</b></i></td>").append("\n "); - sb.append("</tr>").append("\n "); - } - sb.append("<tr>").append("\n "); - sb.append("<td>").append("\n "); - sb.append("<font color=\"OLIVE\"><strong>Syntax:</strong></font> <code><br>"); - if(empty) sb.append("&lt;" + name + " /&gt;"); else sb.append("&lt;" + name + "&gt;<br>&lt;/" + name + "&gt;"); - sb.append("</code>").append("\n "); - sb.append("<br>").append("\n "); - sb.append("<font color=\"OLIVE\"><strong>Atributes:</strong></font>").append("\n "); - sb.append("<code><br>").append("\n "); - int k = 0; - XModelObject[] as = tag.getChildren(); - for (int i = 0; i < as.length; i++) { - if(!TLDUtil.isAttribute(as[i])) continue; - if(!isRequired(as[i])) continue; - sb.append("<b>").append(as[i].getAttributeValue(XModelObjectConstants.ATTR_NAME)).append("</b>"); - ++k; - if(k < as.length) sb.append(','); - sb.append("\n "); - } - for (int i = 0; i < as.length; i++) { - if(isRequired(as[i])) continue; - sb.append(as[i].getAttributeValue(XModelObjectConstants.ATTR_NAME)); - ++k; - if(k < as.length) sb.append(','); - sb.append("\n "); - } - sb.append("</code>").append("\n "); - sb.append("</td>").append("\n "); - sb.append("</tr>").append("\n "); - sb.append("</table>").append('\n'); - sb.append("</html>").append('\n'); -*/ - - return sb.toString();///XModelObjectLoaderUtil.saveToXMLAttribute(sb.toString()); - } - - private boolean isRequired(XModelObject attr) { - String required = attr.getAttributeValue("required"); //$NON-NLS-1$ - return (XModelObjectConstants.TRUE.equals(required) || XModelObjectConstants.YES.equals(required)); - } - - public XModelObject createTabByTLD(XModelObject tld, XModel model) { - return createGroupByTLD(tld, model, "SharablePageTabHTML"); //$NON-NLS-1$ - } - - public XModelObject createGroupByTLD(XModelObject tld, XModel model) { - return createGroupByTLD(tld, model, "SharableGroupHTML"); //$NON-NLS-1$ - } - - private XModelObject createGroupByTLD(XModelObject tld, XModel model, String entity) { - Properties p = new Properties(); - p.setProperty(XModelObjectConstants.ATTR_NAME, capitalize(getTldName(tld))); - p.setProperty(DESCRIPTION, TLDUtil.getTagDescription(tld)); - p.setProperty(DEFAULT_PREFIX, getTldName(tld)); - p.setProperty(URIConstants.LIBRARY_URI, "" + tld.getAttributeValue("uri")); //$NON-NLS-1$ //$NON-NLS-2$ - XModelObject tab = model.createModelObject(entity, p); - XModelObject[] tags = tld.getChildren(); - for (int i = 0; i < tags.length; i++) - if(TLDUtil.isTag(tags[i])) tab.addChild(createMacroByTag(tags[i], model)); - return tab; - } - - - private String capitalize(String s) { - return (s.length() == 0) ? s : Character.toUpperCase(s.charAt(0)) + s.substring(1); - } - -} - Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/URIConstants.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/URIConstants.java 2009-09-25 12:09:16 UTC (rev 17727) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/URIConstants.java 2009-09-25 12:36:36 UTC (rev 17728) @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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 - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.web.tld; - -public interface URIConstants { - public String LIBRARY_URI = "library uri"; //$NON-NLS-1$ - public String LIBRARY_VERSION = "library version"; //$NON-NLS-1$ - public String DEFAULT_PREFIX = "default prefix"; //$NON-NLS-1$ -}