February 2008 - jbosstools-commits

JBoss Tools SVN: r6502 - trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-02-21 10:04:33 -0500 (Thu, 21 Feb 2008) New Revision: 6502 Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml Log: Fixed vpe.test extension point Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml 2008-02-21 14:22:22 UTC (rev 6501) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml 2008-02-21 15:04:33 UTC (rev 6502) @@ -2,7 +2,7 @@ <?eclipse version="3.3"?> <plugin> <extension - point="org.jboss.tools.jsf.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.tests"> <tests description="Unit tests for Struts support in VPE" name="Struts Tests"

18 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r6501 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-02-21 09:22:22 -0500 (Thu, 21 Feb 2008) New Revision: 6501 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties Log: http://jira.jboss.com/jira/browse/JBIDE-518 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-02-21 14:16:24 UTC (rev 6500) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-02-21 14:22:22 UTC (rev 6501) @@ -199,6 +199,6 @@ OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME=Open Seam Component OPEN_SEAM_COMPONENT_ACTION_DESCRIPTION=Open Seam Component OPEN_SEAM_COMPONENT_ACTION_TOOL_TIP=Open Seam Component -OPEN_SEAM_COMPONENT_ACTION_MESSAGE=&Choose a name of the seam component or pattern (? = any character, * = any string): +OPEN_SEAM_COMPONENT_ACTION_MESSAGE=Enter seam component name prefix or pattern (? = any character, * = any string): OPEN_SEAM_COMPONENT_DIALOG_LOADING=Seam components loading OPEN_SEAM_COMPONENT_DIALOG_NAME=OpenSeamComponentDialog

18 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r6500 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-02-21 09:16:24 -0500 (Thu, 21 Feb 2008) New Revision: 6500 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java Log: http://jira.jboss.com/jira/browse/JBIDE-518 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-02-21 13:45:55 UTC (rev 6499) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-02-21 14:16:24 UTC (rev 6500) @@ -50,9 +50,14 @@ */ public class OpenSeamComponentDialog extends FilteredItemsSelectionDialog { private static final String FILE_NAME = "OpenSeamComponentHistory.xml"; //$NON-NLS-1$ + private static final String ROOT_NODE = "historyRootNode"; //$NON-NLS-1$ + private static final String INFO_NODE = "infoNode"; //$NON-NLS-1$ private static final String PROJECT_NAME = "ProjectName"; //$NON-NLS-1$ private static final String COMPONENT_NAME = "ComponentName"; //$NON-NLS-1$ - private static final String COMPONENT_DELETED = "ComponentDeleted"; //$NON-NLS-1$ + private static final String DELETED = "Deleted"; //$NON-NLS-1$ + private static final String SEPARATOR = " - "; //$NON-NLS-1$ + private static final String YES = "yes"; //$NON-NLS-1$ + private static final String NO = "no"; //$NON-NLS-1$ public OpenSeamComponentDialog(Shell shell) { super(shell); @@ -266,8 +271,8 @@ String componentName = mem.getString(COMPONENT_NAME); if (componentName == null) return null; - String componentDeleted = mem.getString(COMPONENT_DELETED); - if (componentDeleted != null && "yes".equals(componentDeleted)) + String componentDeleted = mem.getString(DELETED); + if (componentDeleted != null && YES.equals(componentDeleted)) return null; return new SeamComponentWrapper(componentName, projectName); @@ -300,7 +305,7 @@ if (element instanceof SeamComponentWrapper) { SeamComponentWrapper componentWrapper = (SeamComponentWrapper) element; return componentWrapper.getComponentName() - + " - " + componentWrapper.getProjectName(); //$NON-NLS-1$ + + SEPARATOR + componentWrapper.getProjectName(); //$NON-NLS-1$ } return null; } @@ -382,25 +387,25 @@ XMLMemento memento = loadMemento(); if(memento != null){ XMLMemento historyMemento = (XMLMemento) memento - .getChild("historyRootNode"); + .getChild(ROOT_NODE); if (historyMemento == null) { return; } IMemento[] mementoElements = historyMemento - .getChildren("infoNode"); + .getChildren(INFO_NODE); for (int i = 0; i < mementoElements.length; ++i) { IMemento mem = mementoElements[i]; String projectName = mem.getString(PROJECT_NAME); if (projectName == null){ - mem.putString(COMPONENT_DELETED, "yes"); + mem.putString(DELETED, YES); continue; } if(projectName.equals(seamProjectName)){ String componentName = mem.getString(COMPONENT_NAME); if (componentName == null){ - mem.putString(COMPONENT_DELETED, "yes"); + mem.putString(DELETED, YES); continue; } IProject project = ResourcesPlugin.getWorkspace().getRoot() @@ -412,13 +417,13 @@ ISeamComponent component = cSeamProject .getComponent(componentName); if(component == null) - mem.putString(COMPONENT_DELETED, "yes"); + mem.putString(DELETED, YES); else - mem.putString(COMPONENT_DELETED, "no"); + mem.putString(DELETED, NO); }else - mem.putString(COMPONENT_DELETED, "yes"); + mem.putString(DELETED, YES); }else - mem.putString(COMPONENT_DELETED, "yes"); + mem.putString(DELETED, YES); } } saveMemento(memento);

18 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r6499 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-02-21 08:45:55 -0500 (Thu, 21 Feb 2008) New Revision: 6499 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java Log: http://jira.jboss.com/jira/browse/JBIDE-788 test adjustment Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-02-21 13:26:52 UTC (rev 6498) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-02-21 13:45:55 UTC (rev 6499) @@ -199,7 +199,8 @@ TestUtil.waitForJobs(); TestUtil.delay(2000); SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor)part.getSourceEditor()).getSourceViewerConfigurationForTest(); - + //errase errors which can be on start of editor(for example xuklunner not found) + setException(null); StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration; IContentAssistant iContentAssistant = stvc.getContentAssistant((ISourceViewer) part.getSourceEditor().getAdapter(ISourceViewer.class)); assertNotNull(iContentAssistant);

18 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r6498 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-02-21 08:26:52 -0500 (Thu, 21 Feb 2008) New Revision: 6498 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java Log: http://jira.jboss.com/jira/browse/JBIDE-788 test adjustment Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-02-21 13:23:32 UTC (rev 6497) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-02-21 13:26:52 UTC (rev 6498) @@ -91,7 +91,7 @@ setException(null); //Tests CA - baseCheckofCA(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml", 1245, 2); + baseCheckofCA(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml", 1245, 13); // check exception if (getException() != null) { @@ -110,7 +110,7 @@ // set exception setException(null); //Tests CA - baseCheckofCA(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml", 1200, 101); + baseCheckofCA(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml", 1200, 112); // check exception if (getException() != null) {

18 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r6497 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dsakovich Date: 2008-02-21 08:23:32 -0500 (Thu, 21 Feb 2008) New Revision: 6497 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelBar/background.gif Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelBar/panelBar.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java 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/util/VpeStyleUtil.java Log: http://jira.jboss.com/jira/browse/JBIDE-1713 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelBar/background.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelBar/background.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelBar/panelBar.css =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelBar/panelBar.css 2008-02-21 13:07:03 UTC (rev 6496) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelBar/panelBar.css 2008-02-21 13:23:32 UTC (rev 6497) @@ -16,6 +16,9 @@ vertical-align: middle; color: #000000; background-color: #D4CFC7; + background-image: url(background.gif); + background-position : left top; + background-repeat: repeat-x; font-size: 11px; font-weight: bold; font-family: Arial, Verdana, sans-serif; @@ -25,6 +28,8 @@ border: 0px solid red; padding: 0px 1px 1px 5px; cursor: pointer; + background-color: #D4CFC7; + background-image: url(background.gif); background-position: top left; background-repeat: repeat-x; vertical-align: middle; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-02-21 13:07:03 UTC (rev 6496) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-02-21 13:23:32 UTC (rev 6497) @@ -12,7 +12,6 @@ import java.io.File; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.core.resources.IFile; @@ -34,478 +33,496 @@ public class ComponentUtil { - /** - * Gets child of Facet element by name. If facet has a few children the - * method will return first one. - * - * @param sourceElement - * @param facetName - * @param returnTextNode - * return child text node if facet doesn't have any child - * elements; - * @return - */ - public static Node getFacet(Element sourceElement, String facetName, - boolean returnTextNode) { - NodeList children = sourceElement.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { - Node node = children.item(i); - if (node instanceof Element && node.getNodeName() != null - && node.getNodeName().indexOf(":facet") > 0) { - Element element = (Element) node; - String name = element.getAttribute("name"); - if (facetName.equals(name)) { - NodeList childNodes = element.getChildNodes(); - Text textNode = null; - for (int j = 0; j < childNodes.getLength(); j++) { - Node child = childNodes.item(j); - if (child instanceof Element) { - return child; - } else if (child instanceof Text) { - textNode = (Text) child; - } - } - if (returnTextNode) { - return textNode; - } - } + /** + * Gets child of Facet element by name. If facet has a few children the + * method will return first one. + * + * @param sourceElement + * @param facetName + * @param returnTextNode + * return child text node if facet doesn't have any child + * elements; + * @return + */ + public static Node getFacet(Element sourceElement, String facetName, + boolean returnTextNode) { + NodeList children = sourceElement.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) { + Node node = children.item(i); + if (node instanceof Element && node.getNodeName() != null + && node.getNodeName().indexOf(":facet") > 0) { + Element element = (Element) node; + String name = element.getAttribute("name"); + if (facetName.equals(name)) { + NodeList childNodes = element.getChildNodes(); + Text textNode = null; + for (int j = 0; j < childNodes.getLength(); j++) { + Node child = childNodes.item(j); + if (child instanceof Element) { + return child; + } else if (child instanceof Text) { + textNode = (Text) child; } + } + if (returnTextNode) { + return textNode; + } } - return null; + } } + return null; + } - /** - * Gets all facets of sourceElement. If facet has a few children the method - * will return first one. - * - * @param sourceElement - * @param facetName - * @param returnTextNode - * return child text node if facet doesn't have any child - * elements; - * @return - */ - public static ArrayList<Node> getFacets(Element sourceElement, - boolean returnTextNode) { - ArrayList<Node> facets = new ArrayList<Node>(); - NodeList children = sourceElement.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { - Node node = children.item(i); - if (node instanceof Element && "f:facet".equals(node.getNodeName())) { - Element element = (Element) node; - NodeList childNodes = element.getChildNodes(); - Text textNode = null; - for (int j = 0; j < childNodes.getLength(); j++) { - Node child = childNodes.item(j); - if (child instanceof Element) { - facets.add(child); - break; - } else if (child instanceof Text) { - textNode = (Text) child; - } - } - if (returnTextNode && facets.isEmpty()) { - facets.add(textNode); - } - } + /** + * Gets all facets of sourceElement. If facet has a few children the method + * will return first one. + * + * @param sourceElement + * @param facetName + * @param returnTextNode + * return child text node if facet doesn't have any child + * elements; + * @return + */ + public static ArrayList<Node> getFacets(Element sourceElement, + boolean returnTextNode) { + ArrayList<Node> facets = new ArrayList<Node>(); + NodeList children = sourceElement.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) { + Node node = children.item(i); + if (node instanceof Element && "f:facet".equals(node.getNodeName())) { + Element element = (Element) node; + NodeList childNodes = element.getChildNodes(); + Text textNode = null; + for (int j = 0; j < childNodes.getLength(); j++) { + Node child = childNodes.item(j); + if (child instanceof Element) { + facets.add(child); + break; + } else if (child instanceof Text) { + textNode = (Text) child; + } } - return facets; + if (returnTextNode && facets.isEmpty()) { + facets.add(textNode); + } + } } + return facets; + } - /** - * Gets child of Facet element by name. If facet has a few children the - * method will return first one. - * - * @param sourceElement - * @param facetName - * @return - */ - public static Element getFacet(Element sourceElement, String facetName) { - return (Element) getFacet(sourceElement, facetName, false); - } + /** + * Gets child of Facet element by name. If facet has a few children the + * method will return first one. + * + * @param sourceElement + * @param facetName + * @return + */ + public static Element getFacet(Element sourceElement, String facetName) { + return (Element) getFacet(sourceElement, facetName, false); + } - /** - * Returns true if "rendered" attribute of source element does not contain - * "false" value. - * - * @param sourceElement - * @return - */ - public static boolean isRendered(Element sourceElement) { - return !"false" - .equalsIgnoreCase(sourceElement.getAttribute("rendered")); - } + /** + * Returns true if "rendered" attribute of source element does not contain + * "false" value. + * + * @param sourceElement + * @return + */ + public static boolean isRendered(Element sourceElement) { + return !"false" + .equalsIgnoreCase(sourceElement.getAttribute("rendered")); + } - /** - * Sets CSS link in visual html document. - * - * @param pageContext - * @param cssHref - */ - public static void setCSSLink(VpePageContext pageContext, String cssHref, - String ext) { - String pluginPath = RichFacesTemplatesActivator.getPluginResourcePath(); - IPath pluginFile = new Path(pluginPath); - File cssFile = pluginFile.append(cssHref).toFile(); - if (cssFile.exists()) { - String cssPath = "file:///" + cssFile.getPath(); - pageContext.getVisualBuilder().replaceLinkNodeToHead(cssPath, ext); - } + /** + * Sets CSS link in visual html document. + * + * @param pageContext + * @param cssHref + */ + public static void setCSSLink(VpePageContext pageContext, String cssHref, + String ext) { + String pluginPath = RichFacesTemplatesActivator.getPluginResourcePath(); + IPath pluginFile = new Path(pluginPath); + File cssFile = pluginFile.append(cssHref).toFile(); + if (cssFile.exists()) { + String cssPath = "file:///" + cssFile.getPath(); + pageContext.getVisualBuilder().replaceLinkNodeToHead(cssPath, ext); } + } - public static String getAbsoluteResourcePath(String resourcePathInPlugin) { - String pluginPath = RichFacesTemplatesActivator.getPluginResourcePath(); - IPath pluginFile = new Path(pluginPath); - File file = pluginFile.append(resourcePathInPlugin).toFile(); - if (file.exists()) { - return file.getAbsolutePath(); - } else { - throw new RuntimeException("Can't get path for " - + resourcePathInPlugin); - } + public static String getAbsoluteResourcePath(String resourcePathInPlugin) { + String pluginPath = RichFacesTemplatesActivator.getPluginResourcePath(); + IPath pluginFile = new Path(pluginPath); + File file = pluginFile.append(resourcePathInPlugin).toFile(); + if (file.exists()) { + return file.getAbsolutePath(); + } else { + throw new RuntimeException("Can't get path for " + + resourcePathInPlugin); } + } - /** - * Adds image as attribute to IMG tag - * - * @param img - * @param fileImageName - */ - public static void setImg(nsIDOMElement img, String fileImageName) { - img.setAttribute("src", "file://" - + getAbsoluteResourcePath(fileImageName)); - } + /** + * Adds image as attribute to IMG tag + * + * @param img + * @param fileImageName + */ + public static void setImg(nsIDOMElement img, String fileImageName) { + img.setAttribute("src", "file://" + + getAbsoluteResourcePath(fileImageName)); + } - /** - * Returns all child source elements of component but facets. - * - * @param sourceElement - * @param returnTextNodes - * return child text nodes and elements or elements only; - * @return - */ - public static List<Node> getChildren(Element sourceElement, - boolean returnTextNodes) { - ArrayList<Node> children = new ArrayList<Node>(); - NodeList nodeList = sourceElement.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - Node child = nodeList.item(i); - if ((child instanceof Element || returnTextNodes) - && (!child.getNodeName().equals("f:facet"))) { - children.add(child); - } - } - return children; + /** + * Returns all child source elements of component but facets. + * + * @param sourceElement + * @param returnTextNodes + * return child text nodes and elements or elements only; + * @return + */ + public static List<Node> getChildren(Element sourceElement, + boolean returnTextNodes) { + ArrayList<Node> children = new ArrayList<Node>(); + NodeList nodeList = sourceElement.getChildNodes(); + for (int i = 0; i < nodeList.getLength(); i++) { + Node child = nodeList.item(i); + if ((child instanceof Element || returnTextNodes) + && (!child.getNodeName().equals("f:facet"))) { + children.add(child); + } } + return children; + } - /** - * Returns all child source elements of component but facets. - * - * @param sourceElement - * @return - */ - public static List<Node> getChildren(Element sourceElement) { - return getChildren(sourceElement, false); - } + /** + * Returns all child source elements of component but facets. + * + * @param sourceElement + * @return + */ + public static List<Node> getChildren(Element sourceElement) { + return getChildren(sourceElement, false); + } - /** - * Returns all child visual elements of component but facets. - * - * @param visualElement - * @param - * @return returnTextNodes return child text nodes and elements or elements - * only; - */ - public static List<nsIDOMNode> getChildren(nsIDOMElement visualElement, - boolean returnTextNodes) { - ArrayList<nsIDOMNode> children = new ArrayList<nsIDOMNode>(); - nsIDOMNodeList nodeList = visualElement.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - nsIDOMNode child = nodeList.item(i); - if ((child instanceof nsIDOMElement || returnTextNodes) - && (!child.getNodeName().equals("f:facet"))) { - children.add(child); - } - } - return children; + /** + * Returns all child visual elements of component but facets. + * + * @param visualElement + * @param + * @return returnTextNodes return child text nodes and elements or elements + * only; + */ + public static List<nsIDOMNode> getChildren(nsIDOMElement visualElement, + boolean returnTextNodes) { + ArrayList<nsIDOMNode> children = new ArrayList<nsIDOMNode>(); + nsIDOMNodeList nodeList = visualElement.getChildNodes(); + for (int i = 0; i < nodeList.getLength(); i++) { + nsIDOMNode child = nodeList.item(i); + if ((child instanceof nsIDOMElement || returnTextNodes) + && (!child.getNodeName().equals("f:facet"))) { + children.add(child); + } } + return children; + } - /** - * Returns all child visual elements of component but facets. - * - * @param visualElement - * @return - */ - public static List<nsIDOMNode> getChildren(nsIDOMElement visualElement) { - return getChildren(visualElement, false); - } + /** + * Returns all child visual elements of component but facets. + * + * @param visualElement + * @return + */ + public static List<nsIDOMNode> getChildren(nsIDOMElement visualElement) { + return getChildren(visualElement, false); + } - /** - * Copies all attributes from source node to visual node. - * - * @param sourceNode - * @param visualNode - */ - public static void copyAttributes(Node sourceNode, - nsIDOMElement visualElement) { - NamedNodeMap namedNodeMap = sourceNode.getAttributes(); - for (int i = 0; i < namedNodeMap.getLength(); i++) { - Node attribute = namedNodeMap.item(i); - // added by Max Areshkau fix for JBIDE-1568 - try { + /** + * Copies all attributes from source node to visual node. + * + * @param sourceNode + * @param visualNode + */ + public static void copyAttributes(Node sourceNode, + nsIDOMElement visualElement) { + NamedNodeMap namedNodeMap = sourceNode.getAttributes(); + for (int i = 0; i < namedNodeMap.getLength(); i++) { + Node attribute = namedNodeMap.item(i); + // added by Max Areshkau fix for JBIDE-1568 + try { - visualElement.setAttribute(attribute.getNodeName(), attribute - .getNodeValue()); - } catch (XPCOMException ex) { - // if error-code not equals error for incorrect name throws - // exception - // error code is NS_ERROR_DOM_INVALID_CHARACTER_ERR=0x80530005 - if (ex.errorcode != 2152923141L) { - throw ex; - } - // else we ignore this exception - } + visualElement.setAttribute(attribute.getNodeName(), attribute + .getNodeValue()); + } catch (XPCOMException ex) { + // if error-code not equals error for incorrect name throws + // exception + // error code is NS_ERROR_DOM_INVALID_CHARACTER_ERR=0x80530005 + if (ex.errorcode != 2152923141L) { + throw ex; } + // else we ignore this exception + } } + } - /** - * Copies attributes from source node to visual node. - * - * @param attributes - - * list names of attributes which will copy - * @param sourceNode - * @param visualNode - */ - public static void copyAttributes(Element sourceElement, - List<String> attributes, nsIDOMElement visualElement) { + /** + * Copies attributes from source node to visual node. + * + * @param attributes - + * list names of attributes which will copy + * @param sourceNode + * @param visualNode + */ + public static void copyAttributes(Element sourceElement, + List<String> attributes, nsIDOMElement visualElement) { - if (attributes == null) - return; + if (attributes == null) + return; - for (String attributeName : attributes) { + for (String attributeName : attributes) { - String attributeValue = sourceElement.getAttribute(attributeName); - if (attributeValue != null) - visualElement.setAttribute(attributeName, attributeValue); - } - + String attributeValue = sourceElement.getAttribute(attributeName); + if (attributeValue != null) + visualElement.setAttribute(attributeName, attributeValue); } - /** - * Returns true if sourceNode is Facet - * - * @param sourceNode - * @param facetName - * @return - */ - public static boolean isFacet(Node sourceNode, String facetName) { - if (sourceNode != null && sourceNode instanceof Element - && sourceNode.getNodeName().equals("f:facet")) { - String name = ((Element) sourceNode).getAttribute("name"); - if (facetName.equals(name)) { - return true; - } - } - return false; - } + } - /** - * Returns Style with default background image for default RichFaces skin. - * - * @return - */ - public static String getHeaderBackgoundImgStyle() { - return getBackgoundImgStyle("common/background.gif"); + /** + * Returns true if sourceNode is Facet + * + * @param sourceNode + * @param facetName + * @return + */ + public static boolean isFacet(Node sourceNode, String facetName) { + if (sourceNode != null && sourceNode instanceof Element + && sourceNode.getNodeName().equals("f:facet")) { + String name = ((Element) sourceNode).getAttribute("name"); + if (facetName.equals(name)) { + return true; + } } + return false; + } - /** - * Returns Style with background image for default RichFaces skin. - * - * @return - */ - public static String getBackgoundImgStyle(String imagePath) { - String imgPath = ComponentUtil.getAbsoluteResourcePath(imagePath); - String style = "background-image: url(file:///" - + imgPath.replace('\\', '/') + ");"; - return style; + /** + * Returns Style with default background image for default RichFaces skin. + * + * @return + */ + public static String getHeaderBackgoundImgStyle() { + return getBackgoundImgStyle("common/background.gif"); + } + + /** + * Returns Style with background image for default RichFaces skin. + * + * @return + */ + public static String getBackgoundImgStyle(String imagePath) { + String imgPath = ComponentUtil.getAbsoluteResourcePath(imagePath); + String style = "background-image: url(file:///" + + imgPath.replace('\\', '/') + ");"; + return style; + } + + // public static createStyleClass(String content){ + // + // } + + /** + * Returns value of attribute. + * + * @param sourceElement + * @param attributeName + * @return + */ + public static String getAttribute(Element sourceElement, + String attributeName) { + String attribute = sourceElement.getAttribute(attributeName); + if (attribute == null) { + attribute = ""; } - -// public static createStyleClass(String content){ -// -// } + return attribute; + } - /** - * Returns value of attribute. - * - * @param sourceElement - * @param attributeName - * @return - */ - public static String getAttribute(Element sourceElement, - String attributeName) { - String attribute = sourceElement.getAttribute(attributeName); - if (attribute == null) { - attribute = ""; - } - return attribute; + /** + * Returns value of attribute. + * + * @param sourceElement + * @param attributeName + * @return + */ + public static String getAttribute(nsIDOMElement sourceElement, + String attributeName) { + String attribute = sourceElement.getAttribute(attributeName); + if (attribute == null) { + attribute = ""; } + return attribute; + } - /** - * Returns value of attribute. - * - * @param sourceElement - * @param attributeName - * @return - */ - public static String getAttribute(nsIDOMElement sourceElement, - String attributeName) { - String attribute = sourceElement.getAttribute(attributeName); - if (attribute == null) { - attribute = ""; + /** + * @param style + * @param name + * @return + */ + public static boolean parameterPresent(String style, String name) { + if (style != null && style.length() > 0) { + String[] styles = style.split(";"); + for (int i = 0; i < styles.length; i++) { + String[] pair = styles[i].split(":"); + if (pair[0].trim().equals(name)) { + return true; } - return attribute; + } } + return false; + } - /** - * @param style - * @param name - * @return - */ - public static boolean parameterPresent(String style, String name) { - if (style != null && style.length() > 0) { - String[] styles = style.split(";"); - for (int i = 0; i < styles.length; i++) { - String[] pair = styles[i].split(":"); - if (pair[0].trim().equals(name)) { - return true; - } - } + /** + * @param style + * @param name + * @return + */ + public static String getStyleParametr(String style, String name) { + if (style != null && style.length() > 0) { + String[] styles = style.split(";"); + for (int i = 0; i < styles.length; i++) { + String[] pair = styles[i].split(":"); + if (pair[0].trim().equals(name)) { + return pair[1].trim(); } - return false; + } } + return null; + } - /** - * - * @param style - * @param element - * @return - */ - public static String addParameter(String style, String element) { - String s = style.trim(); - return style + (s.length() == 0 || s.endsWith(";") ? "" : ";") - + element; - } + /** + * + * @param style + * @param element + * @return + */ + public static String addParameter(String style, String element) { + String s = style.trim(); + return style + (s.length() == 0 || s.endsWith(";") ? "" : ";") + + element; + } - /** - * Adds image as attribute to IMG tag from users worcpace - * - * @param pageContext - * Page Context - * @param img - * img element to which set picture - * @param fileImageName - * image name - * @param undefinedImgName - * default image when image is undefined - */ - public static void setImgFromResources(VpePageContext pageContext, - nsIDOMElement img, String fileImageName, String undefinedImgName) { - IEditorInput input = pageContext.getEditPart().getEditorInput(); - IPath inputPath = getInputParentPath(input); - File file = new File(inputPath.toOSString() + File.separator - + fileImageName); - if (file.exists()) { - img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, - HtmlComponentUtil.FILE_PROTOCOL + inputPath.toOSString() - + File.separator + fileImageName); - } else { - img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, undefinedImgName); - } + /** + * Adds image as attribute to IMG tag from users worcpace + * + * @param pageContext + * Page Context + * @param img + * img element to which set picture + * @param fileImageName + * image name + * @param undefinedImgName + * default image when image is undefined + */ + public static void setImgFromResources(VpePageContext pageContext, + nsIDOMElement img, String fileImageName, String undefinedImgName) { + IEditorInput input = pageContext.getEditPart().getEditorInput(); + IPath inputPath = getInputParentPath(input); + File file = new File(inputPath.toOSString() + File.separator + + fileImageName); + if (file.exists()) { + img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, + HtmlComponentUtil.FILE_PROTOCOL + inputPath.toOSString() + + File.separator + fileImageName); + } else { + img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, undefinedImgName); } + } - /** - * Open file - * - * @param pageContext - * Page Context - * @param fileName - * file name - * @return file - */ - public static File openFile(VpePageContext pageContext, String fileName) { - IEditorInput input = pageContext.getEditPart().getEditorInput(); - IPath inputPath = getInputParentPath(input); - File file = new File(inputPath.toOSString() + File.separator + fileName); - return file; - } + /** + * Open file + * + * @param pageContext + * Page Context + * @param fileName + * file name + * @return file + */ + public static File openFile(VpePageContext pageContext, String fileName) { + IEditorInput input = pageContext.getEditPart().getEditorInput(); + IPath inputPath = getInputParentPath(input); + File file = new File(inputPath.toOSString() + File.separator + fileName); + return file; + } - /** - * Returns locale of user input - * - * @param input - * @return - */ - public static IPath getInputParentPath(IEditorInput input) { - IPath inputPath = null; - if (input instanceof ILocationProvider) { - inputPath = ((ILocationProvider) input).getPath(input); - } else if (input instanceof IFileEditorInput) { - IFile inputFile = ((IFileEditorInput) input).getFile(); - if (inputFile != null) { - inputPath = inputFile.getLocation(); - } - } - if (inputPath != null && !inputPath.isEmpty()) { - inputPath = inputPath.removeLastSegments(1); - } - return inputPath; + /** + * Returns locale of user input + * + * @param input + * @return + */ + public static IPath getInputParentPath(IEditorInput input) { + IPath inputPath = null; + if (input instanceof ILocationProvider) { + inputPath = ((ILocationProvider) input).getPath(input); + } else if (input instanceof IFileEditorInput) { + IFile inputFile = ((IFileEditorInput) input).getFile(); + if (inputFile != null) { + inputPath = inputFile.getLocation(); + } } + if (inputPath != null && !inputPath.isEmpty()) { + inputPath = inputPath.removeLastSegments(1); + } + return inputPath; + } - /** - * Move attributes from sourceNode to html - * - * @param sourceNode - * @param visualNode - * @param attrName - * @param htmlAttrName - * @param prefValue - * @param defValue - */ - public static void correctAttribute(Element sourceNode, - nsIDOMElement visualNode, String attrName, String htmlAttrName, - String prefValue, String defValue) { - String attrValue = ((Element) sourceNode).getAttribute(attrName); - if (prefValue != null && prefValue.trim().length() > 0 - && attrValue != null) { - attrValue = prefValue.trim() + " " + attrValue; - } - if (attrValue != null) { - visualNode.setAttribute(htmlAttrName, attrValue); - } else if (defValue != null) { - visualNode.setAttribute(htmlAttrName, defValue); - } else - visualNode.removeAttribute(attrName); + /** + * Move attributes from sourceNode to html + * + * @param sourceNode + * @param visualNode + * @param attrName + * @param htmlAttrName + * @param prefValue + * @param defValue + */ + public static void correctAttribute(Element sourceNode, + nsIDOMElement visualNode, String attrName, String htmlAttrName, + String prefValue, String defValue) { + String attrValue = ((Element) sourceNode).getAttribute(attrName); + if (prefValue != null && prefValue.trim().length() > 0 + && attrValue != null) { + attrValue = prefValue.trim() + " " + attrValue; } + if (attrValue != null) { + visualNode.setAttribute(htmlAttrName, attrValue); + } else if (defValue != null) { + visualNode.setAttribute(htmlAttrName, defValue); + } else + visualNode.removeAttribute(attrName); + } - /** - * Parses string value retrieved from sourceElement.getAttribure(..) method - * to its boolean value. - * <p> - * <code>false</code> is returned only if it specified explicitly, - * otherwise <code>true</code> is returned. - * - * @param str - * the string to parse - * @return boolean value from string - */ - public static boolean string2boolean(String str) { - if ((str == null) || ("".equals(str))) { - return true; - } else if (("true".equalsIgnoreCase(str)) - || ("false".equalsIgnoreCase(str))) { - return new Boolean(str).booleanValue(); - } - return true; + /** + * Parses string value retrieved from sourceElement.getAttribure(..) method + * to its boolean value. + * <p> + * <code>false</code> is returned only if it specified explicitly, + * otherwise <code>true</code> is returned. + * + * @param str + * the string to parse + * @return boolean value from string + */ + public static boolean string2boolean(String str) { + if ((str == null) || ("".equals(str))) { + return true; + } else if (("true".equalsIgnoreCase(str)) + || ("false".equalsIgnoreCase(str))) { + return new Boolean(str).booleanValue(); } + return true; + } } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java 2008-02-21 13:07:03 UTC (rev 6496) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java 2008-02-21 13:23:32 UTC (rev 6497) @@ -32,19 +32,26 @@ private static Map toggleMap = new HashMap(); + private final static String CONTENT_CLASS = "contentClass"; + private final static String CONTENT_STYLE = "contentStyle"; + private final static String HEADER_CLASS = "headerClass"; + private final static String HEADER_STYLE = "headerStyle"; + private final static String HEADER_ACTIVE_CLASS = "headerClassActive"; + private final static String HEADER_ACTIVE_STYLE = "headerStyleActive"; + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - + Element sourceElement = (Element) sourceNode; + nsIDOMElement table = visualDocument.createElement("table"); - nsIDOMElement div = visualDocument.createElement("table"); + VpeCreationData creationData = new VpeCreationData(table); - VpeCreationData creationData = new VpeCreationData(div); - ComponentUtil.setCSSLink(pageContext, "panelBar/panelBar.css", "richFacesPanelBar"); String styleClass = sourceElement.getAttribute("styleClass"); - div.setAttribute("class", "dr-pnlbar rich-panelbar dr-pnlbar-b " + table.setAttribute("class", "dr-pnlbar rich-panelbar dr-pnlbar-b " + (styleClass == null ? "" : styleClass)); // Set style attribute @@ -57,30 +64,69 @@ List<Node> children = ComponentUtil.getChildren(sourceElement); int activeId = getActiveId(sourceElement, children); int i = 0; + + String style = ComponentUtil.getAttribute(sourceElement, + HtmlComponentUtil.HTML_STYLE_ATTR); + + String contentClass = ComponentUtil.getAttribute(sourceElement, + CONTENT_CLASS); + String contentStyle = ComponentUtil.getAttribute(sourceElement, + CONTENT_STYLE); + String headerClass = ComponentUtil.getAttribute(sourceElement, + HEADER_CLASS); + String headerStyle = ComponentUtil.getAttribute(sourceElement, + HEADER_STYLE); + String headerActiveStyle = ComponentUtil.getAttribute(sourceElement, + HEADER_ACTIVE_STYLE); + String headerActiveClass = ComponentUtil.getAttribute(sourceElement, + HEADER_ACTIVE_CLASS); + for (Node child : children) { boolean active = (i == activeId); if (child.getNodeName().endsWith(":panelBarItem")) { - RichFacesPanelItemTemplate.encode(creationData, - (Element) child, visualDocument, div, active, - ComponentUtil.getAttribute((Element) child, - "styleClass"), ComponentUtil.getAttribute( - (Element) child, "style"), ComponentUtil - .getAttribute((Element) child, "headerClass"), - ComponentUtil.getAttribute((Element) child, - "headerStyle"), ComponentUtil.getAttribute( - (Element) child, "headerClassActive"), - ComponentUtil.getAttribute((Element) child, - "headerStyleActive"), ComponentUtil - .getAttribute((Element) child, "contentClass"), - ComponentUtil.getAttribute((Element) child, - "contentStyle"), String.valueOf(i)); + String internContentClass = ComponentUtil.getAttribute( + (Element) child, CONTENT_CLASS); + String internContentStyle = ComponentUtil.getAttribute( + (Element) child, CONTENT_STYLE); + String internHeaderClass = ComponentUtil.getAttribute( + (Element) child, HEADER_CLASS); + String internHeaderStyle = ComponentUtil.getAttribute( + (Element) child, HEADER_STYLE); + String internHeaderActiveStyle = ComponentUtil.getAttribute( + (Element) child, HEADER_ACTIVE_STYLE); + String internHeaderActiveClass = ComponentUtil.getAttribute( + (Element) child, HEADER_ACTIVE_CLASS); + + RichFacesPanelItemTemplate + .encode( + creationData, + (Element) child, + visualDocument, + table, + active, + ComponentUtil.getAttribute(sourceElement, + HtmlComponentUtil.HTML_STYLECLASS_ATTR), + style, + (internHeaderClass.length() == 0) ? headerClass + : internHeaderClass, + (internHeaderStyle.length() == 0) ? headerStyle + : internHeaderStyle, + (internHeaderActiveClass.length() == 0) ? headerActiveClass + : internHeaderActiveClass, + (internHeaderActiveStyle.length() == 0) ? headerActiveStyle + : internHeaderActiveStyle, + (internContentClass.length() == 0) ? contentClass + : internContentClass, + (internContentStyle.length() == 0) ? contentStyle + : internContentStyle, String.valueOf(i)); + i++; } } - div.setAttribute("style", styleValue.toString()); + table.setAttribute("style", styleValue.toString()); return creationData; } @@ -91,7 +137,8 @@ */ private String height(Element sourceElement) { String height = sourceElement.getAttribute("height"); - if (height == null || height.length() == 0 || height.equals("100%")) { + if (height == null || height.length() == 0 ) { + height = "100%"; } return "height: " + height + ";"; @@ -175,4 +222,5 @@ return true; return false; } + } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java 2008-02-21 13:07:03 UTC (rev 6496) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java 2008-02-21 13:23:32 UTC (rev 6497) @@ -25,6 +25,8 @@ public class RichFacesPanelItemTemplate extends VpeAbstractTemplate { + private static final String DEFAULT_LABEL = "auto generated label"; + /** * * @param creationData @@ -60,13 +62,13 @@ parentVisualElement.appendChild(div); } - div.setAttribute("class", "dr-pnlbar rich-panelbar dr-pnlbar-ext " - + barStyleClass); + div.setAttribute("class", barStyleClass + + " dr-pnlbar rich-panelbar dr-pnlbar-ext "); div.setAttribute("style", barStyle); div.setAttribute("vpe-user-toggle-id", toggleId); // Encode Header - String headerActivetStyleClass = "dr-pnlbar-h-act rich-panelbar-header-act " + String headerActivetStyleClass = "dr-pnlbar-h rich-panelbar-header " + barHeaderActiveStyleClass + " " + ComponentUtil @@ -78,20 +80,18 @@ + barHeaderActiveStyle + " " + ComponentUtil - .getAttribute(sourceElement, "headerStyleActive") + " " - + ComponentUtil.getHeaderBackgoundImgStyle(); + .getAttribute(sourceElement, "headerStyleActive"); String headerStyleClass = "dr-pnlbar-h rich-panelbar-header " - + barHeaderStyleClass + " " - + ComponentUtil.getAttribute(sourceElement, "headerClass"); + + ComponentUtil.getAttribute(sourceElement, "headerClass") + + barHeaderStyleClass; String headerStyle = barHeaderStyle + " " - + ComponentUtil.getAttribute(sourceElement, "headerStyle") - + " " + ComponentUtil.getHeaderBackgoundImgStyle(); + + ComponentUtil.getAttribute(sourceElement, "headerStyle"); if (active) { - encodeHeader(sourceElement, visualDocument, div, + encodeHeader(creationData, sourceElement, visualDocument, div, headerActivetStyleClass, headerActivetStyle, toggleId); } else { - encodeHeader(sourceElement, visualDocument, div, headerStyleClass, - headerStyle, toggleId); + encodeHeader(creationData, sourceElement, visualDocument, div, + headerStyleClass, headerStyle, toggleId); } // Encode Body @@ -110,16 +110,17 @@ parentVisualElement.appendChild(tr2); } - nsIDOMElement table = visualDocument + nsIDOMElement contentTable = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TABLE); - td2.appendChild(table); - table.setAttribute("cellpadding", "0"); - table.setAttribute(HtmlComponentUtil.HTML_WIDTH_ATTR, "100%"); - table.setAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR, "100%"); + td2.appendChild(contentTable); + contentTable.setAttribute("cellpadding", "0"); + contentTable.setAttribute(HtmlComponentUtil.HTML_WIDTH_ATTR, "100%"); + contentTable.setAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR, "100%"); + nsIDOMElement tbody = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TBODY); - table.appendChild(tbody); + contentTable.appendChild(tbody); nsIDOMElement tr = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TR); @@ -164,9 +165,10 @@ * @param style * @param toggleId */ - private static void encodeHeader(Element sourceElement, - nsIDOMDocument visualDocument, nsIDOMElement parentDiv, - String styleClass, String style, String toggleId) { + private static void encodeHeader(VpeCreationData vpeCreationData, + Element sourceElement, nsIDOMDocument visualDocument, + nsIDOMElement parentDiv, String styleClass, String style, + String toggleId) { nsIDOMElement div = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_DIV); @@ -176,9 +178,15 @@ div.setAttribute("vpe-user-toggle-id", toggleId); String label = sourceElement.getAttribute("label"); - if (label != null) { - div.appendChild(visualDocument.createTextNode(label)); + Element facet = ComponentUtil.getFacet(sourceElement, "label"); + if (facet == null) { + div.appendChild(visualDocument + .createTextNode((label == null) ? DEFAULT_LABEL : label)); + } else { + VpeChildrenInfo facetInfo = new VpeChildrenInfo(div); + facetInfo.addSourceChild(facet); + vpeCreationData.addChildrenInfo(facetInfo); } + } - } } \ No newline at end of file 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 2008-02-21 13:07:03 UTC (rev 6496) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-02-21 13:23:32 UTC (rev 6497) @@ -16,10 +16,10 @@ import java.io.IOException; import java.net.URL; import java.util.ArrayList; -import java.util.Collection; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -34,7 +34,7 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IFileEditorInput; import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; -import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; +import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.document.NodeImpl; @@ -57,7 +57,7 @@ import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.jboss.tools.vpe.editor.template.VpeCreatorUtil; +import org.jboss.tools.vpe.editor.template.VpeCreatorUtil; import org.jboss.tools.vpe.editor.template.VpeDefaultPseudoContentCreator; import org.jboss.tools.vpe.editor.template.VpeTagDescription; import org.jboss.tools.vpe.editor.template.VpeTemplate; @@ -86,7 +86,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IDocument; + public class VpeVisualDomBuilder extends VpeDomBuilder { /** REGEX_EL */ private static final Pattern REGEX_EL = Pattern.compile( @@ -113,8 +114,8 @@ private VpeDnD dnd; private nsIDOMNode headNode; private List includeStack; - //TODO Max Areshkau JBIDE-1457 -// boolean rebuildFlag = false; + // TODO Max Areshkau JBIDE-1457 + // boolean rebuildFlag = false; /** faceletFile */ private boolean faceletFile = false; @@ -158,9 +159,9 @@ unborderedVisualNodes.add(HTML.TAG_BR); } private VpeDnd dropper; - - private Map<IFile,Document> includeDocuments = new HashMap<IFile, Document>(); + private Map<IFile, Document> includeDocuments = new HashMap<IFile, Document>(); + public VpeVisualDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager, MozillaEditor visualEditor, VpePageContext pageContext) { @@ -184,11 +185,11 @@ } public void buildDom(Document sourceDocument) { - VpeSourceDomBuilder sourceBuilder = pageContext.getSourceBuilder(); - IDocument document = sourceBuilder.getStructuredTextViewer() - .getDocument(); - if (document == null) - return; + VpeSourceDomBuilder sourceBuilder = pageContext.getSourceBuilder(); + IDocument document = sourceBuilder.getStructuredTextViewer() + .getDocument(); + if (document == null) + return; includeStack = new ArrayList(); IEditorInput input = pageContext.getEditPart().getEditorInput(); if (input instanceof IFileEditorInput) { @@ -205,11 +206,11 @@ } public void rebuildDom(Document sourceDocument) { - //clearIncludeDocuments(); + // clearIncludeDocuments(); cleanHead(); domMapping.clear(visualContentArea); - super.dispose(); - + super.dispose(); + pageContext.clearAll(); refreshExternalLinks(); pageContext.getBundle().refreshRegisteredBundles(); @@ -372,22 +373,24 @@ boolean registerFlag = isCurrentMainDocument(); switch (sourceNode.getNodeType()) { case Node.ELEMENT_NODE: -// Map<?, ?> xmlnsMap = createXmlns((Element) sourceNode); + // Map<?, ?> xmlnsMap = createXmlns((Element) sourceNode); Set<Node> ifDependencySet = new HashSet<Node>(); - pageContext.setCurrentVisualNode(visualOldContainer); + pageContext.setCurrentVisualNode(visualOldContainer); VpeTemplate template = templateManager.getTemplate(pageContext, (Element) sourceNode, ifDependencySet); VpeCreationData creationData = null; - //FIX FOR JBIDE-1568, added by Max Areshkau - try { - creationData = template.create(getPageContext(), sourceNode, getVisualDocument()); - }catch (XPCOMException ex) { - VpePlugin.getPluginLog().logError(ex); - VpeTemplate defTemplate = templateManager.getDefTemplate(); - creationData = defTemplate.create(getPageContext(), sourceNode, getVisualDocument()); - } - pageContext.setCurrentVisualNode(null); + // FIX FOR JBIDE-1568, added by Max Areshkau + try { + creationData = template.create(getPageContext(), sourceNode, + getVisualDocument()); + } catch (XPCOMException ex) { + VpePlugin.getPluginLog().logError(ex); + VpeTemplate defTemplate = templateManager.getDefTemplate(); + creationData = defTemplate.create(getPageContext(), sourceNode, + getVisualDocument()); + } + pageContext.setCurrentVisualNode(null); nsIDOMElement visualNewElement = (nsIDOMElement) creationData .getNode(); @@ -413,7 +416,7 @@ VpeElementMapping elementMapping = new VpeElementMapping( (Element) sourceNode, visualNewElement, border, template, ifDependencySet, creationData.getData()); -// elementMapping.setXmlnsMap(xmlnsMap); + // elementMapping.setXmlnsMap(xmlnsMap); registerNodes(elementMapping); } if (template.isChildren()) { @@ -427,10 +430,10 @@ childrenInfoList); } } - pageContext.setCurrentVisualNode(visualOldContainer); + pageContext.setCurrentVisualNode(visualOldContainer); template.validate(pageContext, (Element) sourceNode, visualDocument, creationData); - pageContext.setCurrentVisualNode(null); + pageContext.setCurrentVisualNode(null); if (border != null) return border; else @@ -809,10 +812,10 @@ } } nsIDOMNode visualOldNode = domMapping.remove(sourceNode); - getSourceNodes().remove(sourceNode); - if (sourceNode instanceof INodeNotifier) { - ((INodeNotifier) sourceNode).removeAdapter(getSorceAdapter()); - } + getSourceNodes().remove(sourceNode); + if (sourceNode instanceof INodeNotifier) { + ((INodeNotifier) sourceNode).removeAdapter(getSorceAdapter()); + } if (visualOldNode != null) { if (elementMapping != null) { nsIDOMElement border = elementMapping.getBorder(); @@ -827,8 +830,9 @@ addNode(sourceNode, visualNextNode, visualContainer); } } else { - //Max Areshkau Why we need update parent node when we update text node? - //lookd like we haven't need do it. + // Max Areshkau Why we need update parent node when we update text + // node? + // lookd like we haven't need do it. if (sourceNode.getNodeType() == Node.TEXT_NODE) { updateNode(sourceNode.getParentNode()); } @@ -837,10 +841,10 @@ public void removeNode(Node sourceNode) { domMapping.remove(sourceNode); - getSourceNodes().remove(sourceNode); - if (sourceNode instanceof INodeNotifier) { - ((INodeNotifier) sourceNode).removeAdapter(getSorceAdapter()); - } + getSourceNodes().remove(sourceNode); + if (sourceNode instanceof INodeNotifier) { + ((INodeNotifier) sourceNode).removeAdapter(getSorceAdapter()); + } } private Node getParentTable(Node sourceNode, int depth) { @@ -864,46 +868,46 @@ return null; } -// public void setText(Node sourceText) { -// Node sourceParent = sourceText.getParentNode(); -// if (sourceParent != null && sourceParent.getLocalName() != null) { -// String sourceParentName = sourceParent.getLocalName(); -// if (HTML.TAG_TEXTAREA.equalsIgnoreCase(sourceParentName) -// || HTML.TAG_OPTION.equalsIgnoreCase(sourceParentName)) { -// updateNode(sourceText.getParentNode()); -// return; -// } -// } -// nsIDOMNode visualText = domMapping.getVisualNode(sourceText); -// if (visualText != null) { -// String visualValue = TextUtil.visualText(sourceText.getNodeValue()); -// visualText.setNodeValue(visualValue); -// }else { -// VpeNodeMapping nodeMapping = domMapping -// .getNodeMapping(sourceParent); -// if (nodeMapping != null -// && nodeMapping.getType() == VpeNodeMapping.ELEMENT_MAPPING) { -// VpeTemplate template = ((VpeElementMapping) nodeMapping) -// .getTemplate(); -// if (template != null) { -// if (!template.containsText()) { -// return; -// } - public boolean setText(Node sourceText) { + // public void setText(Node sourceText) { + // Node sourceParent = sourceText.getParentNode(); + // if (sourceParent != null && sourceParent.getLocalName() != null) { + // String sourceParentName = sourceParent.getLocalName(); + // if (HTML.TAG_TEXTAREA.equalsIgnoreCase(sourceParentName) + // || HTML.TAG_OPTION.equalsIgnoreCase(sourceParentName)) { + // updateNode(sourceText.getParentNode()); + // return; + // } + // } + // nsIDOMNode visualText = domMapping.getVisualNode(sourceText); + // if (visualText != null) { + // String visualValue = TextUtil.visualText(sourceText.getNodeValue()); + // visualText.setNodeValue(visualValue); + // }else { + // VpeNodeMapping nodeMapping = domMapping + // .getNodeMapping(sourceParent); + // if (nodeMapping != null + // && nodeMapping.getType() == VpeNodeMapping.ELEMENT_MAPPING) { + // VpeTemplate template = ((VpeElementMapping) nodeMapping) + // .getTemplate(); + // if (template != null) { + // if (!template.containsText()) { + // return; + // } + public boolean setText(Node sourceText) { Node sourceParent = sourceText.getParentNode(); if (sourceParent != null && sourceParent.getLocalName() != null) { String sourceParentName = sourceParent.getLocalName(); if (HTML.TAG_TEXTAREA.equalsIgnoreCase(sourceParentName) || HTML.TAG_OPTION.equalsIgnoreCase(sourceParentName)) { updateNode(sourceText.getParentNode()); - return true; + return true; } } nsIDOMNode visualText = domMapping.getVisualNode(sourceText); if (visualText != null) { String visualValue = TextUtil.visualText(sourceText.getNodeValue()); visualText.setNodeValue(visualValue); - }else { + } else { VpeNodeMapping nodeMapping = domMapping .getNodeMapping(sourceParent); if (nodeMapping != null @@ -912,20 +916,21 @@ .getTemplate(); if (template != null) { if (!template.containsText()) { - return false; + return false; } } } updateNode(sourceText); - return true; + return true; } - - // } - // updateNode(sourceText); - return false; + + // } + // updateNode(sourceText); + return false; } -// } + // } + public void setAttribute(Element sourceElement, String name, String value) { VpeElementMapping elementMapping = (VpeElementMapping) domMapping .getNodeMapping(sourceElement); @@ -956,17 +961,17 @@ } else if (HTML.TAG_INPUT .equalsIgnoreCase(visualElementName)) { updateElement(sourceElement); - // Fixes JBIDE-1744 author dmaliarevich - // unified h:dataTable border lookup - // after attribute change and - // after visual editor refresh + // Fixes JBIDE-1744 author dmaliarevich + // unified h:dataTable border lookup + // after attribute change and + // after visual editor refresh } else if (HTML.TAG_TABLE - .equalsIgnoreCase(visualElementName)) { - updateElement(sourceElement); + .equalsIgnoreCase(visualElementName)) { + updateElement(sourceElement); } // End of fix } -// setXmlnsAttribute(elementMapping, name, value); + // setXmlnsAttribute(elementMapping, name, value); template.setAttribute(pageContext, sourceElement, visualDocument, visualElement, elementMapping .getData(), name, value); @@ -1023,10 +1028,20 @@ toggleLookup = "true".equals(toggleLookupAttr.getNodeValue()); } + nsIDOMElement selectedElem = getLastSelectedElement(); + VpeElementMapping elementMapping = (VpeElementMapping) domMapping - .getNodeMapping(getLastSelectedElement()); - Node sourceNode = (Node) domMapping - .getSourceNode(getLastSelectedElement()); + .getNodeMapping(selectedElem); + if (elementMapping == null) { + // may be toggle with facet + while (!selectedElem.getNodeName().equals(HTML.TAG_TABLE)) { + selectedElem = (nsIDOMElement) selectedElem.getParentNode() + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + } + elementMapping = (VpeElementMapping) domMapping + .getNodeMapping(selectedElem); + } + Node sourceNode = (Node) domMapping.getSourceNode(selectedElem); if (sourceNode == null) return false; @@ -1071,16 +1086,16 @@ .getVisualNode(), elementMapping.getData(), name, null)) { updateElement(sourceElement); - } -// else { -// removeXmlnsAttribute(elementMapping, name); -// template.removeAttribute(pageContext, sourceElement, -// visualDocument, (nsIDOMElement) elementMapping -// .getVisualNode(), elementMapping.getData(), -// name); -// resetTooltip(sourceElement, (nsIDOMElement) elementMapping -// .getVisualNode()); -// } + } + // else { + // removeXmlnsAttribute(elementMapping, name); + // template.removeAttribute(pageContext, sourceElement, + // visualDocument, (nsIDOMElement) elementMapping + // .getVisualNode(), elementMapping.getData(), + // name); + // resetTooltip(sourceElement, (nsIDOMElement) elementMapping + // .getVisualNode()); + // } } } } @@ -1116,7 +1131,11 @@ public nsIDOMNode addLinkNodeToHead(String href_val, String ext_val) { nsIDOMElement newNode = createLinkNode(href_val, ATTR_REL_STYLESHEET_VALUE, ext_val); - headNode.appendChild(newNode); + + //TODO Dzmitry Sakovich + // Fix priority CSS classes JBIDE-1713 + nsIDOMNode firstNode = headNode.getFirstChild(); + headNode.insertBefore(newNode, firstNode); return newNode; } @@ -1936,77 +1955,78 @@ return (VpeIncludeInfo) includeStack.get(1); } - public void dispose() { - clearIncludeDocuments(); - includeDocuments=null; + public void dispose() { + clearIncludeDocuments(); + includeDocuments = null; cleanHead(); domMapping.clear(visualContentArea); pageContext.dispose(); - super.dispose(); + super.dispose(); } - - private void clearIncludeDocuments() { - Collection<Document> documents = includeDocuments.values(); - for (Iterator iterator = documents.iterator(); iterator.hasNext();) { - Document document = (Document) iterator.next(); - VpeCreatorUtil.releaseDocumentFromRead(document); - } - includeDocuments.clear(); + + private void clearIncludeDocuments() { + Collection<Document> documents = includeDocuments.values(); + for (Iterator iterator = documents.iterator(); iterator.hasNext();) { + Document document = (Document) iterator.next(); + VpeCreatorUtil.releaseDocumentFromRead(document); } -// protected Map createXmlns(Element sourceNode) { -// NamedNodeMap attrs = ((Element) sourceNode).getAttributes(); -// if (attrs != null) { -// Map xmlnsMap = new HashMap(); -// for (int i = 0; i < attrs.getLength(); i++) { -// addTaglib(sourceNode, xmlnsMap, attrs.item(i).getNodeName(), -// true); -// } -// if (xmlnsMap.size() > 0) { -// return xmlnsMap; -// } -// } -// return null; -// } + includeDocuments.clear(); + } -// 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(); -// addTaglib(sourceElement, xmlnsMap, name, true); -// elementMapping.setXmlnsMap(xmlnsMap.size() > 0 ? xmlnsMap : null); -// } -// } + // protected Map createXmlns(Element sourceNode) { + // NamedNodeMap attrs = ((Element) sourceNode).getAttributes(); + // if (attrs != null) { + // Map xmlnsMap = new HashMap(); + // for (int i = 0; i < attrs.getLength(); i++) { + // addTaglib(sourceNode, xmlnsMap, attrs.item(i).getNodeName(), + // true); + // } + // if (xmlnsMap.size() > 0) { + // return xmlnsMap; + // } + // } + // return null; + // } -// private void removeXmlnsAttribute(VpeElementMapping elementMapping, -// String name) { -// Element sourceElement = (Element) elementMapping.getSourceNode(); -// if (sourceElement != null) { -// Map xmlnsMap = elementMapping.getXmlnsMap(); -// if (xmlnsMap != null) { -// Object id = xmlnsMap.remove(name); -// if (id != null) { -// pageContext.setTaglib(((Integer) id).intValue(), null, -// null, true); -// elementMapping.setXmlnsMap(xmlnsMap.size() > 0 ? xmlnsMap -// : null); -// } -// } -// } -// } -// -// private void addTaglib(Element sourceElement, Map xmlnsMap, -// String attrName, boolean ns) { -// Attr attr = sourceElement.getAttributeNode(attrName); -// if (ATTR_XMLNS.equals(attr.getPrefix())) { -// xmlnsMap.put(attr.getNodeName(), Integer.valueOf(attr.hashCode())); -// pageContext.setTaglib(attr.hashCode(), attr.getNodeValue(), attr -// .getLocalName(), ns); -// } -// } + // 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(); + // addTaglib(sourceElement, xmlnsMap, name, true); + // elementMapping.setXmlnsMap(xmlnsMap.size() > 0 ? xmlnsMap : null); + // } + // } + // private void removeXmlnsAttribute(VpeElementMapping elementMapping, + // String name) { + // Element sourceElement = (Element) elementMapping.getSourceNode(); + // if (sourceElement != null) { + // Map xmlnsMap = elementMapping.getXmlnsMap(); + // if (xmlnsMap != null) { + // Object id = xmlnsMap.remove(name); + // if (id != null) { + // pageContext.setTaglib(((Integer) id).intValue(), null, + // null, true); + // elementMapping.setXmlnsMap(xmlnsMap.size() > 0 ? xmlnsMap + // : null); + // } + // } + // } + // } + // + // private void addTaglib(Element sourceElement, Map xmlnsMap, + // String attrName, boolean ns) { + // Attr attr = sourceElement.getAttributeNode(attrName); + // if (ATTR_XMLNS.equals(attr.getPrefix())) { + // xmlnsMap.put(attr.getNodeName(), Integer.valueOf(attr.hashCode())); + // pageContext.setTaglib(attr.hashCode(), attr.getNodeValue(), attr + // .getLocalName(), ns); + // } + // } + /** * @return the dnd */ @@ -2098,15 +2118,16 @@ protected nsIDOMNode createTextNode(Node sourceNode, boolean registerFlag) { String sourceText = sourceNode.getNodeValue(); - - //Max Areshkau this code causes very slow work of visual editor - //when we editing in big files txt nodes.For example exmployee.xhtml from JBIDE1105 -// if (sourceText.trim().length() <= 0) { -// if (registerFlag) -// registerNodes(new VpeNodeMapping(sourceNode, null)); -// return null; -// } + // Max Areshkau this code causes very slow work of visual editor + // when we editing in big files txt nodes.For example exmployee.xhtml + // from JBIDE1105 + // if (sourceText.trim().length() <= 0) { + // if (registerFlag) + // registerNodes(new VpeNodeMapping(sourceNode, null)); + // return null; + // } + if (faceletFile) { Matcher matcher_EL = REGEX_EL.matcher(sourceText); if (matcher_EL.find()) { @@ -2145,9 +2166,9 @@ */ public void setXulRunnerEditor(XulRunnerEditor xulRunnerEditor) { this.xulRunnerEditor = xulRunnerEditor; - } - - public Map<IFile, Document> getIncludeDocuments() { - return includeDocuments; } + + public Map<IFile, Document> getIncludeDocuments() { + return includeDocuments; + } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2008-02-21 13:07:03 UTC (rev 6496) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2008-02-21 13:23:32 UTC (rev 6497) @@ -23,467 +23,472 @@ public class VpeStyleUtil { - public static final String ATTRIBUTE_STYLE = "style"; + public static final String ATTRIBUTE_STYLE = "style"; - public static final String PARAMETER_POSITION = "position"; - public static final String PARAMETER_TOP = "top"; - public static final String PARAMETER_LEFT = "left"; - public static final String PARAMETER_WIDTH = "width"; - public static final String PARAMETER_HEIGHT = "height"; - public static final String PARAMETR_BACKGROND = "background"; + public static final String PARAMETER_POSITION = "position"; + public static final String PARAMETER_TOP = "top"; + public static final String PARAMETER_LEFT = "left"; + public static final String PARAMETER_WIDTH = "width"; + public static final String PARAMETER_HEIGHT = "height"; + public static final String PARAMETR_BACKGROND = "background"; - public static final String VALUE_ABSOLUTE = "absolute"; + public static final String VALUE_ABSOLUTE = "absolute"; - public static final String DOT_STRING = "."; - public static final String COLON_STRING = ":"; - public static final String SEMICOLON_STRING = ";"; - public static final String PX_STRING = "px"; - public static final String SPACE_STRING = " "; - public static final String EMPTY_STRING = ""; + public static final String DOT_STRING = "."; + public static final String COLON_STRING = ":"; + public static final String SEMICOLON_STRING = ";"; + public static final String PX_STRING = "px"; + public static final String SPACE_STRING = " "; + public static final String EMPTY_STRING = ""; - public static String ATTR_URL = "url"; - public static String OPEN_BRACKET = "("; - public static String CLOSE_BRACKET = ")"; - public static String FILE_PRTOCOL = "file://"; - public static String FILE_STR = "file:"; - public static String FILE_SEPARAROT = "/"; + public static String ATTR_URL = "url"; + public static String OPEN_BRACKET = "("; + public static String CLOSE_BRACKET = ")"; + public static String FILE_PRTOCOL = "file://"; + public static String FILE_STR = "file:"; + public static String FILE_SEPARAROT = "/"; - // sets parameter position in atribute style to absolute value - public static void setAbsolute(Element sourceElement) { - String style = sourceElement.getAttribute(ATTRIBUTE_STYLE); - if (style == null) { - style = EMPTY_STRING; - } else { // remove old sizes - style = deleteFromString(style, PARAMETER_POSITION, - SEMICOLON_STRING); - } - if (style.length() > 0) { - if (!style.endsWith(SEMICOLON_STRING)) - style += SEMICOLON_STRING; - } + // sets parameter position in atribute style to absolute value + public static void setAbsolute(Element sourceElement) { + String style = sourceElement.getAttribute(ATTRIBUTE_STYLE); + if (style == null) { + style = EMPTY_STRING; + } else { // remove old sizes + style = deleteFromString(style, PARAMETER_POSITION, + SEMICOLON_STRING); + } + if (style.length() > 0) { + if (!style.endsWith(SEMICOLON_STRING)) + style += SEMICOLON_STRING; + } - style += SPACE_STRING + PARAMETER_POSITION + SPACE_STRING - + COLON_STRING + SPACE_STRING + VALUE_ABSOLUTE - + SEMICOLON_STRING; + style += SPACE_STRING + PARAMETER_POSITION + SPACE_STRING + + COLON_STRING + SPACE_STRING + VALUE_ABSOLUTE + + SEMICOLON_STRING; - sourceElement.setAttribute(ATTRIBUTE_STYLE, style); + sourceElement.setAttribute(ATTRIBUTE_STYLE, style); + } + + // sets parameter position in absolute value + public static String setAbsolute(String styleString) { + String style = new String(styleString); + if (style == null) { + style = EMPTY_STRING; + } else { // remove old sizes + style = deleteFromString(style, PARAMETER_POSITION, + SEMICOLON_STRING); } + if (style.length() > 0) { + if (!style.endsWith(SEMICOLON_STRING)) + style += SEMICOLON_STRING; + } - // sets parameter position in absolute value - public static String setAbsolute(String styleString) { - String style = new String(styleString); - if (style == null) { - style = EMPTY_STRING; - } else { // remove old sizes - style = deleteFromString(style, PARAMETER_POSITION, - SEMICOLON_STRING); - } - if (style.length() > 0) { - if (!style.endsWith(SEMICOLON_STRING)) - style += SEMICOLON_STRING; - } + style += SPACE_STRING + PARAMETER_POSITION + SPACE_STRING + + COLON_STRING + SPACE_STRING + VALUE_ABSOLUTE + + SEMICOLON_STRING; - style += SPACE_STRING + PARAMETER_POSITION + SPACE_STRING - + COLON_STRING + SPACE_STRING + VALUE_ABSOLUTE - + SEMICOLON_STRING; + return style; + } - return style; + // return true if parameter position was set to absolute + public static boolean getAbsolute(Element sourceElement) { + String style = sourceElement.getAttribute(ATTRIBUTE_STYLE); + if (style == null) { + return false; + } else { // remove old sizes + if (style.indexOf(VALUE_ABSOLUTE) >= 0) + return true; } + return false; + } - // return true if parameter position was set to absolute - public static boolean getAbsolute(Element sourceElement) { - String style = sourceElement.getAttribute(ATTRIBUTE_STYLE); - if (style == null) { - return false; - } else { // remove old sizes - if (style.indexOf(VALUE_ABSOLUTE) >= 0) - return true; - } - return false; + // return true if parameter position was set to absolute + public static boolean getAbsolute(String style) { + if (style == null) { + return false; + } else { // remove old sizes + if (style.indexOf(VALUE_ABSOLUTE) >= 0) + return true; } + return false; + } - // return true if parameter position was set to absolute - public static boolean getAbsolute(String style) { - if (style == null) { - return false; - } else { // remove old sizes - if (style.indexOf(VALUE_ABSOLUTE) >= 0) - return true; - } - return false; - } + // return value of parameter described in sizeAttribute, for example + // "style.width" + public static int getSizeFromStyle(Element sourceElement, + String sizeAttribute) { + int dotPosition = sizeAttribute.indexOf(DOT_STRING); + String attribute = sizeAttribute.substring(0, dotPosition); + String parameter = sizeAttribute.substring(dotPosition + 1, + sizeAttribute.length()); - // return value of parameter described in sizeAttribute, for example - // "style.width" - public static int getSizeFromStyle(Element sourceElement, - String sizeAttribute) { - int dotPosition = sizeAttribute.indexOf(DOT_STRING); - String attribute = sizeAttribute.substring(0, dotPosition); - String parameter = sizeAttribute.substring(dotPosition + 1, - sizeAttribute.length()); + String style = sourceElement.getAttribute(attribute); + if (style == null || EMPTY_STRING.equals(style)) + return -1; - String style = sourceElement.getAttribute(attribute); - if (style == null || EMPTY_STRING.equals(style)) - return -1; - - int parameterPosition = style.indexOf(parameter); - if (parameterPosition >= 0) { - int valuePosition = style.indexOf(COLON_STRING, parameterPosition); - if (valuePosition >= 0) { - int endPosition = style.indexOf(PX_STRING, valuePosition); - if (endPosition >= 0) { - return Integer.parseInt(style.substring(valuePosition + 1, - endPosition).trim()); - } - } + int parameterPosition = style.indexOf(parameter); + if (parameterPosition >= 0) { + int valuePosition = style.indexOf(COLON_STRING, parameterPosition); + if (valuePosition >= 0) { + int endPosition = style.indexOf(PX_STRING, valuePosition); + if (endPosition >= 0) { + return Integer.parseInt(style.substring(valuePosition + 1, + endPosition).trim()); } - return -1; + } } + return -1; + } - // return value of parameter described in sizeAttribute, for example - // "style.width" - public static String getParameterFromStyle(Element sourceElement, - String sizeAttribute) { - int dotPosition = sizeAttribute.indexOf(DOT_STRING); - String attribute = sizeAttribute.substring(0, dotPosition); - String parameter = sizeAttribute.substring(dotPosition + 1, - sizeAttribute.length()); + // return value of parameter described in sizeAttribute, for example + // "style.width" + public static String getParameterFromStyle(Element sourceElement, + String sizeAttribute) { + int dotPosition = sizeAttribute.indexOf(DOT_STRING); + String attribute = sizeAttribute.substring(0, dotPosition); + String parameter = sizeAttribute.substring(dotPosition + 1, + sizeAttribute.length()); - String style = sourceElement.getAttribute(attribute); - if (style == null || EMPTY_STRING.equals(style)) - return null; + String style = sourceElement.getAttribute(attribute); + if (style == null || EMPTY_STRING.equals(style)) + return null; - int parameterPosition = style.indexOf(parameter); - if (parameterPosition >= 0) { - int valuePosition = style.indexOf(COLON_STRING, parameterPosition); - if (valuePosition >= 0) { - int endPosition = style.indexOf(PX_STRING, valuePosition); - if (endPosition >= 0) { - return style.substring(valuePosition + 1, endPosition) - .trim(); - } - } + int parameterPosition = style.indexOf(parameter); + if (parameterPosition >= 0) { + int valuePosition = style.indexOf(COLON_STRING, parameterPosition); + if (valuePosition >= 0) { + int endPosition = style.indexOf(PX_STRING, valuePosition); + if (endPosition >= 0) { + return style.substring(valuePosition + 1, endPosition) + .trim(); } - return null; + } } + return null; + } - // sets value of parameter described in sizeAttribute, for example - // "style.width" - public static void setSizeInStyle(Element sourceElement, - String sizeAttribute, int size) { - int dotPosition = sizeAttribute.indexOf(DOT_STRING); - String attribute = sizeAttribute.substring(0, dotPosition); - String parameter = sizeAttribute.substring(dotPosition + 1, - sizeAttribute.length()); + // sets value of parameter described in sizeAttribute, for example + // "style.width" + public static void setSizeInStyle(Element sourceElement, + String sizeAttribute, int size) { + int dotPosition = sizeAttribute.indexOf(DOT_STRING); + String attribute = sizeAttribute.substring(0, dotPosition); + String parameter = sizeAttribute.substring(dotPosition + 1, + sizeAttribute.length()); - String style = sourceElement.getAttribute(attribute); - if (style == null) { - style = EMPTY_STRING; - } else { // remove old sizes - style = deleteFromString(style, parameter, SEMICOLON_STRING); - } - if (style.length() > 0) { - if (!style.endsWith(SEMICOLON_STRING)) - style += SEMICOLON_STRING; - } - - style += SPACE_STRING + parameter + SPACE_STRING + COLON_STRING - + SPACE_STRING + size + PX_STRING + SEMICOLON_STRING; - - sourceElement.setAttribute(attribute, style); + String style = sourceElement.getAttribute(attribute); + if (style == null) { + style = EMPTY_STRING; + } else { // remove old sizes + style = deleteFromString(style, parameter, SEMICOLON_STRING); } + if (style.length() > 0) { + if (!style.endsWith(SEMICOLON_STRING)) + style += SEMICOLON_STRING; + } - // sets value of parameter described in sizeAttribute, for example - // "style.width" - public static void setParameterInStyle(Element sourceElement, - String sizeAttribute, String value) { - int dotPosition = sizeAttribute.indexOf(DOT_STRING); - String attribute = sizeAttribute.substring(0, dotPosition); - String parameter = sizeAttribute.substring(dotPosition + 1, - sizeAttribute.length()); + style += SPACE_STRING + parameter + SPACE_STRING + COLON_STRING + + SPACE_STRING + size + PX_STRING + SEMICOLON_STRING; - String style = sourceElement.getAttribute(attribute); - if (style == null) { - style = EMPTY_STRING; - } else { // remove old sizes - style = deleteFromString(style, parameter, SEMICOLON_STRING); - } - if (style.length() > 0) { - if (!style.endsWith(SEMICOLON_STRING)) - style += SEMICOLON_STRING; - } + sourceElement.setAttribute(attribute, style); + } - style += SPACE_STRING + parameter + SPACE_STRING + COLON_STRING - + SPACE_STRING + value + SEMICOLON_STRING; + // sets value of parameter described in sizeAttribute, for example + // "style.width" + public static void setParameterInStyle(Element sourceElement, + String sizeAttribute, String value) { + int dotPosition = sizeAttribute.indexOf(DOT_STRING); + String attribute = sizeAttribute.substring(0, dotPosition); + String parameter = sizeAttribute.substring(dotPosition + 1, + sizeAttribute.length()); - sourceElement.setAttribute(attribute, style); + String style = sourceElement.getAttribute(attribute); + if (style == null) { + style = EMPTY_STRING; + } else { // remove old sizes + style = deleteFromString(style, parameter, SEMICOLON_STRING); } + if (style.length() > 0) { + if (!style.endsWith(SEMICOLON_STRING)) + style += SEMICOLON_STRING; + } - public static String setSizeInStyle(String style, String parameter, int size) { - if (style == null) { - style = EMPTY_STRING; - } else { // remove old sizes - style = deleteFromString(style, parameter, SEMICOLON_STRING); - } - if (style.length() > 0) { - if (!style.endsWith(SEMICOLON_STRING)) - style += SEMICOLON_STRING; - } + style += SPACE_STRING + parameter + SPACE_STRING + COLON_STRING + + SPACE_STRING + value + SEMICOLON_STRING; - style += SPACE_STRING + parameter + SPACE_STRING + COLON_STRING - + SPACE_STRING + size + PX_STRING + SEMICOLON_STRING; + sourceElement.setAttribute(attribute, style); + } - return style; + public static String setSizeInStyle(String style, String parameter, int size) { + if (style == null) { + style = EMPTY_STRING; + } else { // remove old sizes + style = deleteFromString(style, parameter, SEMICOLON_STRING); } + if (style.length() > 0) { + if (!style.endsWith(SEMICOLON_STRING)) + style += SEMICOLON_STRING; + } - public static String setParameterInStyle(String style, String parameter, - String value) { - if (style == null) { - style = EMPTY_STRING; - } else { // remove old sizes - style = deleteFromString(style, parameter, SEMICOLON_STRING); - } - if (style.length() > 0) { - if (!style.endsWith(SEMICOLON_STRING)) - style += SEMICOLON_STRING; - } + style += SPACE_STRING + parameter + SPACE_STRING + COLON_STRING + + SPACE_STRING + size + PX_STRING + SEMICOLON_STRING; - style += SPACE_STRING + parameter + SPACE_STRING + COLON_STRING - + SPACE_STRING + value + SEMICOLON_STRING; + return style; + } - return style; + public static String setParameterInStyle(String style, String parameter, + String value) { + if (style == null) { + style = EMPTY_STRING; + } else { // remove old sizes + style = deleteFromString(style, parameter, SEMICOLON_STRING); } - - // selets parameter from atribute style - public static void deleteFromStyle(Element sourceElement, String begin, - String end) { - String style = sourceElement.getAttribute(ATTRIBUTE_STYLE); - style = deleteFromString(style, begin, end); - sourceElement.setAttribute(ATTRIBUTE_STYLE, style); + if (style.length() > 0) { + if (!style.endsWith(SEMICOLON_STRING)) + style += SEMICOLON_STRING; } - // selets parameter from atribute style - public static String deleteFromString(String data, String begin, String end) { - int startPosition = data.indexOf(begin); + style += SPACE_STRING + parameter + SPACE_STRING + COLON_STRING + + SPACE_STRING + value + SEMICOLON_STRING; - if (startPosition < 0) - return data; + return style; + } - int endPosition = data.indexOf(end, startPosition); + // selets parameter from atribute style + public static void deleteFromStyle(Element sourceElement, String begin, + String end) { + String style = sourceElement.getAttribute(ATTRIBUTE_STYLE); + style = deleteFromString(style, begin, end); + sourceElement.setAttribute(ATTRIBUTE_STYLE, style); + } - String result = data.substring(0, startPosition).trim(); - if (endPosition > 0) { - result += data.substring(endPosition + 1, data.length()).trim(); - } + // selets parameter from atribute style + public static String deleteFromString(String data, String begin, String end) { + int startPosition = data.indexOf(begin); - return result; + if (startPosition < 0) + return data; + + int endPosition = data.indexOf(end, startPosition); + + String result = data.substring(0, startPosition).trim(); + if (endPosition > 0) { + result += data.substring(endPosition + 1, data.length()).trim(); } - /** - * - * @param value - * Css string - * @param input - * The editor input - * @return format style string - */ - public static String addFullPathIntoBackgroundValue(String value, - IEditorInput input) { + return result; + } - if (value.indexOf(FILE_STR) != -1) - return value; + /** + * + * @param value + * Css string + * @param input + * The editor input + * @return format style string + */ + public static String addFullPathIntoBackgroundValue(String value, + IEditorInput input) { - if (!new File(value).isAbsolute()) - value = getFilePath(input, value); + if (value.indexOf(FILE_STR) != -1) + return value; - value = FILE_PRTOCOL + value; - URL url = null; - try { - url = new URL(value); - } catch (MalformedURLException e) { - return value; - } + if (!new File(value).isAbsolute()) + value = getFilePath(input, value); - return url.toString(); + value = FILE_PRTOCOL + value; + URL url = null; + try { + url = new URL(value); + } catch (MalformedURLException e) { + return value; } - /** - * - * @param value - * Css string - * @param input - * The editor input - * @return format style string - */ - public static String addFullPathIntoURLValue(String value, - IEditorInput input) { + return url.toString(); + } - String urls[] = value.split(ATTR_URL); + /** + * + * @param value + * Css string + * @param input + * The editor input + * @return format style string + */ + public static String addFullPathIntoURLValue(String value, + IEditorInput input) { - if (urls.length == 1) - return value; + String urls[] = value.split(ATTR_URL); - String finalStr = EMPTY_STRING; - for (int i = 1; i < urls.length; i++) { + if (urls.length == 1) + return value; - urls[i] = urls[i].replace("\'", EMPTY_STRING); - urls[i] = ATTR_URL + urls[i]; + String finalStr = EMPTY_STRING; + for (int i = 1; i < urls.length; i++) { - int startAttr = urls[i].indexOf(ATTR_URL); + urls[i] = urls[i].replace("\'", EMPTY_STRING); + urls[i] = ATTR_URL + urls[i]; - int startPathIndex = urls[i].indexOf(OPEN_BRACKET, startAttr); - int endPathIndex = urls[i].indexOf(CLOSE_BRACKET, - startPathIndex + 1); + int startAttr = urls[i].indexOf(ATTR_URL); - if (startPathIndex == -1 || endPathIndex == -1) - continue; + int startPathIndex = urls[i].indexOf(OPEN_BRACKET, startAttr); + int endPathIndex = urls[i].indexOf(CLOSE_BRACKET, + startPathIndex + 1); - String filePath = urls[i].substring(startPathIndex + 1, - endPathIndex); - if (filePath.indexOf(FILE_STR) != -1) - continue; + if (startPathIndex == -1 || endPathIndex == -1) + continue; - if (!new File(filePath).isAbsolute()) - filePath = getFilePath(input, filePath); + String filePath = urls[i].substring(startPathIndex + 1, + endPathIndex); + if (filePath.indexOf(FILE_STR) != -1) + continue; - filePath = FILE_PRTOCOL + filePath; - URL url = null; - try { - url = new URL(filePath); - } catch (MalformedURLException e) { - continue; - } - filePath = url.toString(); + if (!new File(filePath).isAbsolute()) + filePath = getFilePath(input, filePath); - String firstPartValue = urls[i].substring(0, startPathIndex + 1); - String secondPartValue = urls[i].substring(endPathIndex, urls[i] - .length()); + filePath = FILE_PRTOCOL + filePath; + URL url = null; + try { + url = new URL(filePath); + } catch (MalformedURLException e) { + continue; + } + filePath = url.toString(); - urls[i] = firstPartValue + filePath + secondPartValue; - } - for (int i = 0; i < urls.length; i++) - finalStr += urls[i]; - return finalStr; - } + String firstPartValue = urls[i].substring(0, startPathIndex + 1); + String secondPartValue = urls[i].substring(endPathIndex, urls[i] + .length()); - /** - * - * @param nput - * The editor input - * @param fileName - * Relative path file - * @return Absolute path file - */ - public static String getFilePath(IEditorInput input, String fileName) { - IPath inputPath = getInputParentPath(input); - return inputPath.toOSString() + File.separator + fileName; + urls[i] = firstPartValue + filePath + secondPartValue; } + for (int i = 0; i < urls.length; i++) + finalStr += urls[i]; + return finalStr; + } - /** - * - * @param input - * The editor input - * @return Path - */ - public static IPath getInputParentPath(IEditorInput input) { - IPath inputPath = null; - if (input instanceof ILocationProvider) { - inputPath = ((ILocationProvider) input).getPath(input); - } else if (input instanceof IFileEditorInput) { - IFile inputFile = ((IFileEditorInput) input).getFile(); - if (inputFile != null) { - inputPath = inputFile.getLocation(); - } - } - if (inputPath != null && !inputPath.isEmpty()) { - inputPath = inputPath.removeLastSegments(1); - } - return inputPath; + /** + * + * @param nput + * The editor input + * @param fileName + * Relative path file + * @return Absolute path file + */ + public static String getFilePath(IEditorInput input, String fileName) { + IPath inputPath = getInputParentPath(input); + return inputPath.toOSString() + File.separator + fileName; + } + + /** + * + * @param input + * The editor input + * @return Path + */ + public static IPath getInputParentPath(IEditorInput input) { + IPath inputPath = null; + if (input instanceof ILocationProvider) { + inputPath = ((ILocationProvider) input).getPath(input); + } else if (input instanceof IFileEditorInput) { + IFile inputFile = ((IFileEditorInput) input).getFile(); + if (inputFile != null) { + inputPath = inputFile.getLocation(); + } } + if (inputPath != null && !inputPath.isEmpty()) { + inputPath = inputPath.removeLastSegments(1); + } + return inputPath; + } - /** - * - * @param value - * Css string - * @param href_val - * Path of css file - * @return Format style string - */ - public static String addFullPathIntoURLValue(String value, String href_val) { + /** + * + * @param value + * Css string + * @param href_val + * Path of css file + * @return Format style string + */ + public static String addFullPathIntoURLValue(String value, String href_val) { - String urls[] = value.split(ATTR_URL); + String urls[] = value.split(ATTR_URL); - if (urls.length == 1) - return value; + if (urls.length == 1) + return value; - String finalStr = EMPTY_STRING; + String finalStr = EMPTY_STRING; - for (int i = 1; i < urls.length; i++) { + for (int i = 1; i < urls.length; i++) { - urls[i] = urls[i].replace("\'", EMPTY_STRING); - urls[i] = ATTR_URL + urls[i]; + urls[i] = urls[i].replace("\'", EMPTY_STRING); + urls[i] = ATTR_URL + urls[i]; - int startAttr = urls[i].indexOf(ATTR_URL); + int startAttr = urls[i].indexOf(ATTR_URL); - int startPathIndex = urls[i].indexOf(OPEN_BRACKET, startAttr); - int endPathIndex = urls[i].indexOf(CLOSE_BRACKET, - startPathIndex + 1); + int startPathIndex = urls[i].indexOf(OPEN_BRACKET, startAttr); + int endPathIndex = urls[i].indexOf(CLOSE_BRACKET, + startPathIndex + 1); - String filePath = urls[i].substring(startPathIndex + 1, - endPathIndex); - if (filePath.indexOf(FILE_STR) != -1) - continue; + String filePath = urls[i].substring(startPathIndex + 1, + endPathIndex); + if (filePath.indexOf(FILE_STR) != -1) + continue; - if (!new File(filePath).isAbsolute()) - filePath = getAbsolutePathImage(filePath, href_val); - else - filePath = FILE_PRTOCOL + filePath; + if (!new File(filePath).isAbsolute()) + filePath = getAbsolutePathImage(filePath, href_val); + else + filePath = FILE_PRTOCOL + filePath; - URL url = null; - try { - url = new URL(filePath); - } catch (MalformedURLException e) { - continue; - } - filePath = url.toString(); + try { + new URL(filePath); + } catch (MalformedURLException e) { + continue; + } - String firstPartValue = urls[i].substring(0, startPathIndex + 1); - String secondPartValue = urls[i].substring(endPathIndex, urls[i] - .length()); + // Dzmitry Sakovich + // Fix for Linux + // filePath = url.toString(); - urls[i] = firstPartValue + filePath + secondPartValue; - } - for (int i = 0; i < urls.length; i++) - finalStr += urls[i]; - return finalStr; + String firstPartValue = urls[i].substring(0, startPathIndex + 1); + String secondPartValue = urls[i].substring(endPathIndex, urls[i] + .length()); + + urls[i] = firstPartValue + filePath + secondPartValue; } + for (int i = 0; i < urls.length; i++) + finalStr += urls[i]; + return finalStr; + } - /** - * - * @param pathImgRelative - * Relative path img file - * @param pathCssAbsolute - * Absolute path css file - * @return Absolute path img file - */ - private static String getAbsolutePathImage(String pathImgRelative, - String pathCssAbsolute) { + /** + * + * @param pathImgRelative + * Relative path img file + * @param pathCssAbsolute + * Absolute path css file + * @return Absolute path img file + */ + private static String getAbsolutePathImage(String pathImgRelative, + String pathCssAbsolute) { - int k = 0; - int j = 0; - URL url = null; - try { - url = new URL(pathCssAbsolute); - } catch (MalformedURLException e) { - return pathImgRelative; - } - pathCssAbsolute = url.toString(); - while (j != -1) { - j = pathCssAbsolute.indexOf(FILE_SEPARAROT, j + 1); - if (j == -1) - break; - k = j; - } - return pathCssAbsolute.substring(0, k + 1) + pathImgRelative; + int k = 0; + int j = 0; + try { + new URL(pathCssAbsolute); + } catch (MalformedURLException e) { + return pathImgRelative; } + + // TODO Dzmitry Sakovich + // Fix for Linux + // pathCssAbsolute = url.toString(); + + while (j != -1) { + j = pathCssAbsolute.indexOf(FILE_SEPARAROT, j + 1); + if (j == -1) + break; + k = j; + } + return pathCssAbsolute.substring(0, k + 1) + pathImgRelative; + } } \ No newline at end of file

18 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r6496 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test and 18 other directories.

by jbosstools-commits＠lists.jboss.org

Author: svasilyev Date: 2008-02-21 08:07:03 -0500 (Thu, 21 Feb 2008) New Revision: 6496 Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPTestPlugin.java Removed: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/jsf/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/jsf/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPTestPlugin.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml trunk/tests/features/org.jboss.tools.test.feature/feature.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java Log: JSP and HTML tests were updated according to their new location trunk\vpe\test. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml 2008-02-21 13:07:03 UTC (rev 6496) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.jsf.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.tests"> <tests description="Facelets Tests" name="Facelets Tests" Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml 2008-02-21 13:07:03 UTC (rev 6496) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.jsf.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.tests"> <tests name="JSf Tests" testSuite="org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests"> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml 2008-02-21 13:07:03 UTC (rev 6496) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.jsf.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.tests"> <tests name="MyFaces Tests" testSuite="org.jboss.tools.jsf.vpe.myfaces.test.MyFacesAllTests"> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml 2008-02-21 13:07:03 UTC (rev 6496) @@ -2,7 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.jsf.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.tests"> <tests testSuite="org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests" name="Tests For Rich Faces Components"/> </extension> Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml =================================================================== --- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-02-21 13:07:03 UTC (rev 6496) @@ -1,24 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.test_feature" - label="Tools Tests" - version="2.0.0"> - - <description url="http://www.jboss.org/tools"> - JBossTools unit tests feature - </description> - - <copyright> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.test_feature" + label="Tools Tests" + version="2.0.0"> + + <description url="http://www.jboss.org/tools"> + JBossTools unit tests feature + </description> + + <copyright> 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 - </copyright> - - <license url="http://www.eclipse.org/legal/epl-v10.html"> +Exadel, Inc. and Red Hat, Inc. - initial API and implementation + </copyright> + + <license url="http://www.eclipse.org/legal/epl-v10.html"> Eclipse Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR @@ -214,160 +214,160 @@ No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting -litigation. - </license> - - <plugin - id="org.jboss.tools.common.kb.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.model.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.verification.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.text.ext.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.verification.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.tests" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.ui.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.seam.core.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.seam.ui.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.xulrunner.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.richfaces.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.facelets.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.jsf.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.seam.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.html.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.struts.vpe.struts.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.model.ui.test" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jst.jsp.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.jsp.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.ui.test" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.struts.vpe.struts" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +litigation. + </license> + + <plugin + id="org.jboss.tools.common.kb.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.model.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.verification.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.text.ext.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.verification.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.tests" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.ui.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.seam.core.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.seam.ui.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.xulrunner.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.richfaces.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.facelets.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jsf.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.seam.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.struts.vpe.struts.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.model.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.jsp.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.struts.vpe.struts" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.vpe.html.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.jsp.test" + download-size="0" + install-size="0" + version="0.0.0"/> + +</feature> Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2008-02-21 13:07:03 UTC (rev 6496) @@ -3,7 +3,7 @@ Bundle-Name: Test Html Plug-in Bundle-SymbolicName: org.jboss.tools.vpe.html.test;singleton:=true Bundle-Version: 1.0.0 -Bundle-Activator: org.jboss.tools.jsf.vpe.html.test.HtmlTestPlugin +Bundle-Activator: org.jboss.tools.vpe.html.test.HtmlTestPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.vpe, Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2008-02-21 13:07:03 UTC (rev 6496) @@ -2,11 +2,11 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.jsf.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.tests"> <tests description="Tests for Html templates" name="Tests for Html templates" - testSuite="org.jboss.tools.jsf.vpe.html.test.HtmlAllTests"> + testSuite="org.jboss.tools.vpe.html.test.HtmlAllTests"> </tests> </extension> Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test (from rev 6493, trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/jsf/vpe/html/test) Deleted: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/jsf/vpe/html/test/HtmlAllTests.java 2008-02-21 11:46:49 UTC (rev 6493) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jsf.vpe.html.test; - -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.jboss.tools.vpe.ui.test.VpeTestSetup; -import org.jboss.tools.vpe.ui.test.beans.ImportBean; - - -/** - * Class for testing all Html components - * - * @author sdzmitrovich - * - */ - -public class HtmlAllTests { - - public static Test suite() { - - TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); // $NON-NLS-1$ - // $JUnit-BEGIN$ - suite.addTestSuite(HtmlComponentTest.class); - - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(HtmlComponentTest.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(HtmlTestPlugin.getPluginResourcePath()); - projectToImport.add(importBean); - return new VpeTestSetup(suite,projectToImport); - } - -} Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java (from rev 6495, trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/jsf/vpe/html/test/HtmlAllTests.java) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2007 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.html.test; + +import java.util.ArrayList; +import java.util.List; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.ui.test.beans.ImportBean; + + +/** + * Class for testing all Html components + * + * @author sdzmitrovich + * + */ + +public class HtmlAllTests { + + public static Test suite() { + + TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); // $NON-NLS-1$ + // $JUnit-BEGIN$ + suite.addTestSuite(HtmlComponentTest.class); + + List<ImportBean> projectToImport = new ArrayList<ImportBean>(); + ImportBean importBean = new ImportBean(); + importBean.setImportProjectName(HtmlComponentTest.IMPORT_PROJECT_NAME); + importBean.setImportProjectPath(HtmlTestPlugin.getPluginResourcePath()); + projectToImport.add(importBean); + return new VpeTestSetup(suite,projectToImport); + } + +} Deleted: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/jsf/vpe/html/test/HtmlComponentTest.java 2008-02-21 11:46:49 UTC (rev 6493) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -1,311 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jsf.vpe.html.test; - -import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; - -/** - * Class for testing all html components - * - * @author Sergey Dzmitrovich - * - */ -public class HtmlComponentTest extends VpeTest { - - // import project name - public static final String IMPORT_PROJECT_NAME = "htmlTest"; - - public HtmlComponentTest(String name) { - super(name); - setCheckWarning(false); - } - - /* - * test for block html tags - */ - - public void testDiv() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/block/div.html", IMPORT_PROJECT_NAME)); - } - - public void testDl() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/block/dl.html", IMPORT_PROJECT_NAME)); - } - - public void testLists() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/block/lists.html", IMPORT_PROJECT_NAME)); - } - - public void testSpan() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/block/span.html", IMPORT_PROJECT_NAME)); - } - - /* - * test for core html tags - */ - - public void testA() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/a.html", IMPORT_PROJECT_NAME)); - } - - public void testAddress() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/address.html", IMPORT_PROJECT_NAME)); - } - - public void testBasic() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/basic.html", IMPORT_PROJECT_NAME)); - } - - public void testImg() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/img.html", IMPORT_PROJECT_NAME)); - } - - public void testLink() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/link.html", IMPORT_PROJECT_NAME)); - } - - public void testMap() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/map.html", IMPORT_PROJECT_NAME)); - } - - public void testObject() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/object.html", IMPORT_PROJECT_NAME)); - } - - public void testStyle() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/style.html", IMPORT_PROJECT_NAME)); - } - - public void testTitle() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/core/title.html", IMPORT_PROJECT_NAME)); - } - - /* - * test for form html tags - */ - - public void testButton() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/button.html", IMPORT_PROJECT_NAME)); - } - - public void testFieldset() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/fieldset.html", IMPORT_PROJECT_NAME)); - } - - public void testForm() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/form.html", IMPORT_PROJECT_NAME)); - } - - public void testInput() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/input.html", IMPORT_PROJECT_NAME)); - } - - public void testLabel() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/label.html", IMPORT_PROJECT_NAME)); - } - - public void testSelect() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/select.html", IMPORT_PROJECT_NAME)); - } - - public void testTextArea() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/form/textArea.html", IMPORT_PROJECT_NAME)); - } - - /* - * test for frames html tags - */ - - public void testFrameset() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/frames/frameset.html", IMPORT_PROJECT_NAME)); - } - - public void testIframe() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/frames/iframe.html", IMPORT_PROJECT_NAME)); - } - - /* - * test for scripts html tags - */ - - public void testScript() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/scripts/script.html", IMPORT_PROJECT_NAME)); - } - - /* - * test for table html tags - */ - - public void testComplexTable() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/table/complex_table.html", IMPORT_PROJECT_NAME)); - } - - public void testTable() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/table/table.html", IMPORT_PROJECT_NAME)); - } - - /* - * test for text html tags - */ - - public void testAbbr() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/abbr.html", IMPORT_PROJECT_NAME)); - } - - public void testAcronym() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/acronym.html", IMPORT_PROJECT_NAME)); - } - - public void testB() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/b.html", IMPORT_PROJECT_NAME)); - } - - public void testBig() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/big.html", IMPORT_PROJECT_NAME)); - } - - public void testBlockquote() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/blockquote.html", IMPORT_PROJECT_NAME)); - } - - public void testBr() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/br.html", IMPORT_PROJECT_NAME)); - } - - public void testCite() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/cite.html", IMPORT_PROJECT_NAME)); - } - - public void testCode() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/code.html", IMPORT_PROJECT_NAME)); - } - - public void testDel() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/del.html", IMPORT_PROJECT_NAME)); - } - - public void testDfn() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/dfn.html", IMPORT_PROJECT_NAME)); - } - - public void testEm() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/em.html", IMPORT_PROJECT_NAME)); - } - - public void testHr() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/hr.html", IMPORT_PROJECT_NAME)); - } - - public void testI() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/i.html", IMPORT_PROJECT_NAME)); - } - - public void testIns() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/ins.html", IMPORT_PROJECT_NAME)); - } - - public void testKbd() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/kbd.html", IMPORT_PROJECT_NAME)); - } - - public void testP() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/p.html", IMPORT_PROJECT_NAME)); - } - - public void testPre() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/pre.html", IMPORT_PROJECT_NAME)); - } - - public void testQ() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/q.html", IMPORT_PROJECT_NAME)); - } - - public void testSamp() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/samp.html", IMPORT_PROJECT_NAME)); - } - - public void testSmall() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/small.html", IMPORT_PROJECT_NAME)); - } - - public void testStrong() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/strong.html", IMPORT_PROJECT_NAME)); - } - - public void testSub() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/sub.html", IMPORT_PROJECT_NAME)); - } - - public void testSup() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/sup.html", IMPORT_PROJECT_NAME)); - } - - public void testTt() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/tt.html", IMPORT_PROJECT_NAME)); - } - - public void testVar() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text/var.html", IMPORT_PROJECT_NAME)); - } - -} Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java (from rev 6495, trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/jsf/vpe/html/test/HtmlComponentTest.java) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentTest.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -0,0 +1,311 @@ +/******************************************************************************* + * Copyright (c) 2007 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.html.test; + +import org.eclipse.core.resources.IFile; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; + +/** + * Class for testing all html components + * + * @author Sergey Dzmitrovich + * + */ +public class HtmlComponentTest extends VpeTest { + + // import project name + public static final String IMPORT_PROJECT_NAME = "htmlTest"; + + public HtmlComponentTest(String name) { + super(name); + setCheckWarning(false); + } + + /* + * test for block html tags + */ + + public void testDiv() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/block/div.html", IMPORT_PROJECT_NAME)); + } + + public void testDl() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/block/dl.html", IMPORT_PROJECT_NAME)); + } + + public void testLists() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/block/lists.html", IMPORT_PROJECT_NAME)); + } + + public void testSpan() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/block/span.html", IMPORT_PROJECT_NAME)); + } + + /* + * test for core html tags + */ + + public void testA() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/core/a.html", IMPORT_PROJECT_NAME)); + } + + public void testAddress() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/core/address.html", IMPORT_PROJECT_NAME)); + } + + public void testBasic() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/core/basic.html", IMPORT_PROJECT_NAME)); + } + + public void testImg() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/core/img.html", IMPORT_PROJECT_NAME)); + } + + public void testLink() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/core/link.html", IMPORT_PROJECT_NAME)); + } + + public void testMap() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/core/map.html", IMPORT_PROJECT_NAME)); + } + + public void testObject() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/core/object.html", IMPORT_PROJECT_NAME)); + } + + public void testStyle() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/core/style.html", IMPORT_PROJECT_NAME)); + } + + public void testTitle() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/core/title.html", IMPORT_PROJECT_NAME)); + } + + /* + * test for form html tags + */ + + public void testButton() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/form/button.html", IMPORT_PROJECT_NAME)); + } + + public void testFieldset() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/form/fieldset.html", IMPORT_PROJECT_NAME)); + } + + public void testForm() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/form/form.html", IMPORT_PROJECT_NAME)); + } + + public void testInput() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/form/input.html", IMPORT_PROJECT_NAME)); + } + + public void testLabel() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/form/label.html", IMPORT_PROJECT_NAME)); + } + + public void testSelect() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/form/select.html", IMPORT_PROJECT_NAME)); + } + + public void testTextArea() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/form/textArea.html", IMPORT_PROJECT_NAME)); + } + + /* + * test for frames html tags + */ + + public void testFrameset() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/frames/frameset.html", IMPORT_PROJECT_NAME)); + } + + public void testIframe() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/frames/iframe.html", IMPORT_PROJECT_NAME)); + } + + /* + * test for scripts html tags + */ + + public void testScript() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/scripts/script.html", IMPORT_PROJECT_NAME)); + } + + /* + * test for table html tags + */ + + public void testComplexTable() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/table/complex_table.html", IMPORT_PROJECT_NAME)); + } + + public void testTable() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/table/table.html", IMPORT_PROJECT_NAME)); + } + + /* + * test for text html tags + */ + + public void testAbbr() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/abbr.html", IMPORT_PROJECT_NAME)); + } + + public void testAcronym() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/acronym.html", IMPORT_PROJECT_NAME)); + } + + public void testB() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/b.html", IMPORT_PROJECT_NAME)); + } + + public void testBig() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/big.html", IMPORT_PROJECT_NAME)); + } + + public void testBlockquote() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/blockquote.html", IMPORT_PROJECT_NAME)); + } + + public void testBr() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/br.html", IMPORT_PROJECT_NAME)); + } + + public void testCite() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/cite.html", IMPORT_PROJECT_NAME)); + } + + public void testCode() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/code.html", IMPORT_PROJECT_NAME)); + } + + public void testDel() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/del.html", IMPORT_PROJECT_NAME)); + } + + public void testDfn() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/dfn.html", IMPORT_PROJECT_NAME)); + } + + public void testEm() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/em.html", IMPORT_PROJECT_NAME)); + } + + public void testHr() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/hr.html", IMPORT_PROJECT_NAME)); + } + + public void testI() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/i.html", IMPORT_PROJECT_NAME)); + } + + public void testIns() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/ins.html", IMPORT_PROJECT_NAME)); + } + + public void testKbd() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/kbd.html", IMPORT_PROJECT_NAME)); + } + + public void testP() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/p.html", IMPORT_PROJECT_NAME)); + } + + public void testPre() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/pre.html", IMPORT_PROJECT_NAME)); + } + + public void testQ() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/q.html", IMPORT_PROJECT_NAME)); + } + + public void testSamp() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/samp.html", IMPORT_PROJECT_NAME)); + } + + public void testSmall() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/small.html", IMPORT_PROJECT_NAME)); + } + + public void testStrong() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/strong.html", IMPORT_PROJECT_NAME)); + } + + public void testSub() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/sub.html", IMPORT_PROJECT_NAME)); + } + + public void testSup() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/sup.html", IMPORT_PROJECT_NAME)); + } + + public void testTt() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/tt.html", IMPORT_PROJECT_NAME)); + } + + public void testVar() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text/var.html", IMPORT_PROJECT_NAME)); + } + +} Deleted: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/jsf/vpe/html/test/HtmlTestPlugin.java 2008-02-21 11:46:49 UTC (rev 6493) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -1,79 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2007 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: -* Red Hat, Inc. - initial API and implementation -******************************************************************************/ -package org.jboss.tools.jsf.vpe.html.test; - -import java.net.URL; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class HtmlTestPlugin extends Plugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.html.test"; - - // The shared instance - private static HtmlTestPlugin plugin; - - /** - * The constructor - */ - public HtmlTestPlugin() { - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static HtmlTestPlugin getDefault() { - return plugin; - } - - public static String getPluginResourcePath() { - Bundle bundle = Platform.getBundle(PLUGIN_ID); - URL url = null; - try { - url = bundle == null ? null : FileLocator.resolve(bundle - .getEntry("/resources")); // $NON-NLS-1$ - } catch (Exception e) { - url = bundle.getEntry("/resources"); // $NON-NLS-1$ - } - return (url == null) ? null : url.getPath(); - } - -} Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java (from rev 6495, trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/jsf/vpe/html/test/HtmlTestPlugin.java) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -0,0 +1,79 @@ +/******************************************************************************* +* Copyright (c) 2007 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: +* Red Hat, Inc. - initial API and implementation +******************************************************************************/ +package org.jboss.tools.vpe.html.test; + +import java.net.URL; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Plugin; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class HtmlTestPlugin extends Plugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.vpe.html.test"; //$NON-NLS-1$ + + // The shared instance + private static HtmlTestPlugin plugin; + + /** + * The constructor + */ + public HtmlTestPlugin() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static HtmlTestPlugin getDefault() { + return plugin; + } + + public static String getPluginResourcePath() { + Bundle bundle = Platform.getBundle(PLUGIN_ID); + URL url = null; + try { + url = bundle == null ? null : FileLocator.resolve(bundle + .getEntry("/resources")); // $NON-NLS-1$ + } catch (Exception e) { + url = bundle.getEntry("/resources"); // $NON-NLS-1$ + } + return (url == null) ? null : url.getPath(); + } + +} Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2008-02-21 13:07:03 UTC (rev 6496) @@ -3,7 +3,7 @@ Bundle-Name: Test Plug-in Bundle-SymbolicName: org.jboss.tools.vpe.jsp.test;singleton:=true Bundle-Version: 1.0.0 -Bundle-Activator: org.jboss.tools.jsf.vpe.jsp.test.JSPTestPlugin +Bundle-Activator: org.jboss.tools.vpe.jsp.test.JSPTestPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.vpe, @@ -16,5 +16,5 @@ org.jboss.tools.vpe.xulrunner, org.mozilla.xpcom Eclipse-LazyStart: true -Export-Package: org.jboss.tools.jsf.vpe.jsp.test +Export-Package: org.jboss.tools.vpe.jsp.test Bundle-ClassPath: jsp-tests.jar Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2008-02-21 13:07:03 UTC (rev 6496) @@ -2,11 +2,11 @@ <?eclipse version="3.2"?> <plugin> <extension - point="org.jboss.tools.jsf.vpe.ui.tests"> + point="org.jboss.tools.vpe.ui.tests"> <tests description="JSP Tests" name="JSP Tests" - testSuite="org.jboss.tools.jsf.vpe.jsp.test.JSPAllTests"> + testSuite="org.jboss.tools.vpe.jsp.test.JSPAllTests"> </tests> </extension> Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test (from rev 6493, trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/jsf/vpe/jsp/test) Deleted: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/jsf/vpe/jsp/test/JSPAllTests.java 2008-02-21 11:46:49 UTC (rev 6493) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -1,39 +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.jsf.vpe.jsp.test; - -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.jboss.tools.vpe.ui.test.VpeTestSetup; -import org.jboss.tools.vpe.ui.test.beans.ImportBean; - -public class JSPAllTests { - public static Test suite() { - - TestSuite suite = new TestSuite("Tests for Vpe JSP components"); //$NON-NLS-1$ - // $JUnit-BEGIN$ - - suite.addTestSuite(JSPComponentTest.class); - - // $JUnit-END$ - List<ImportBean> importProjects = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(JSPComponentTest.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(JSPTestPlugin.getPluginResourcePath()); - importProjects.add(importBean); - return new VpeTestSetup(suite,importProjects); - - } -} Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java (from rev 6495, trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/jsf/vpe/jsp/test/JSPAllTests.java) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -0,0 +1,39 @@ +/******************************************************************************* + * 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.vpe.jsp.test; + +import java.util.ArrayList; +import java.util.List; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.jboss.tools.vpe.ui.test.VpeTestSetup; +import org.jboss.tools.vpe.ui.test.beans.ImportBean; + +public class JSPAllTests { + public static Test suite() { + + TestSuite suite = new TestSuite("Tests for Vpe JSP components"); //$NON-NLS-1$ + // $JUnit-BEGIN$ + + suite.addTestSuite(JSPComponentTest.class); + + // $JUnit-END$ + List<ImportBean> importProjects = new ArrayList<ImportBean>(); + ImportBean importBean = new ImportBean(); + importBean.setImportProjectName(JSPComponentTest.IMPORT_PROJECT_NAME); + importBean.setImportProjectPath(JSPTestPlugin.getPluginResourcePath()); + importProjects.add(importBean); + return new VpeTestSetup(suite,importProjects); + + } +} Deleted: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/jsf/vpe/jsp/test/JSPComponentTest.java 2008-02-21 11:46:49 UTC (rev 6493) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -1,289 +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.jsf.vpe.jsp.test; - -import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; - -/** - * - * Class for testing all jsp components - * - * @author dsakovich(a)exadel.com - * - */ -public class JSPComponentTest extends VpeTest { - - // import project name - public static final String IMPORT_PROJECT_NAME = "jspTest"; //$NON-NLS-1$ - - public JSPComponentTest(String name) { - super(name); - setCheckWarning(false); - } - - /** - * Test for jsp:declaration - * - * @throws Throwable - */ - public void testDeclaration() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/declaration.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /** - * Test for jsp:expression - * - * @throws Throwable - */ - public void testExpression() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/expression.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /** - * Test for jsp:scriptlet - * - * @throws Throwable - */ - public void testScriptlet() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/scriptlet.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /** - * Test for jsp:directive.attribute - * - * @throws Throwable - */ - public void testDirectiveAttribute() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - /** - * Test for jsp:directive.include - * - * @throws Throwable - */ - public void testDirectiveInclude() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_include_absolute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_include_relative.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:include - * - * @throws Throwable - */ - public void testInclude() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/include_absolute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/include_relative.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:directive.page - * - * @throws Throwable - */ - public void testDirectivePage() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_page.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:directive.tag - * - * @throws Throwable - */ - public void testDirectiveTag() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_tag.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:directive.taglib - * - * @throws Throwable - */ - public void testDirectiveTaglib() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/directive_taglib.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:directive.variable - * - * @throws Throwable - */ - public void testDirectiveVariable() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:attribute - * - * @throws Throwable - */ - public void testAttribute() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/attribute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:body - * - * @throws Throwable - */ - public void testBody() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/body.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:element - * - * @throws Throwable - */ - public void testElement() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/element.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:doBody - * - * @throws Throwable - */ - public void testDoBody() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "../WEB-INF/tags/double.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:forward - * - * @throws Throwable - */ - public void testForward() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/forward.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:getProperty - * - * @throws Throwable - */ - public void testGetProperty() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/get_property.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:invoke - * - * @throws Throwable - */ - public void testInvoke() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:output - * - * @throws Throwable - */ - public void testOutput() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/output.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:plugin - * - * @throws Throwable - */ - public void testPlugin() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/plugin.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:root - * - * @throws Throwable - */ - public void testRoot() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/root.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:setProperty - * - * @throws Throwable - */ - public void testSetProperty() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/set_property.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:text - * - * @throws Throwable - */ - public void testText() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/text.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - - /** - * Test for jsp:useBean - * - * @throws Throwable - */ - public void testUseBean() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/useBean.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - - } - -} Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java (from rev 6495, trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/jsf/vpe/jsp/test/JSPComponentTest.java) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPComponentTest.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -0,0 +1,289 @@ +/******************************************************************************* + * 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.vpe.jsp.test; + +import org.eclipse.core.resources.IFile; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; + +/** + * + * Class for testing all jsp components + * + * @author dsakovich(a)exadel.com + * + */ +public class JSPComponentTest extends VpeTest { + + // import project name + public static final String IMPORT_PROJECT_NAME = "jspTest"; //$NON-NLS-1$ + + public JSPComponentTest(String name) { + super(name); + setCheckWarning(false); + } + + /** + * Test for jsp:declaration + * + * @throws Throwable + */ + public void testDeclaration() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/declaration.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } + + /** + * Test for jsp:expression + * + * @throws Throwable + */ + public void testExpression() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/expression.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } + + /** + * Test for jsp:scriptlet + * + * @throws Throwable + */ + public void testScriptlet() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/scriptlet.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } + + /** + * Test for jsp:directive.attribute + * + * @throws Throwable + */ + public void testDirectiveAttribute() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } + + /** + * Test for jsp:directive.include + * + * @throws Throwable + */ + public void testDirectiveInclude() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/directive_include_absolute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/directive_include_relative.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:include + * + * @throws Throwable + */ + public void testInclude() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/include_absolute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/include_relative.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:directive.page + * + * @throws Throwable + */ + public void testDirectivePage() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/directive_page.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:directive.tag + * + * @throws Throwable + */ + public void testDirectiveTag() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/directive_tag.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:directive.taglib + * + * @throws Throwable + */ + public void testDirectiveTaglib() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/directive_taglib.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:directive.variable + * + * @throws Throwable + */ + public void testDirectiveVariable() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:attribute + * + * @throws Throwable + */ + public void testAttribute() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/attribute.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:body + * + * @throws Throwable + */ + public void testBody() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/body.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:element + * + * @throws Throwable + */ + public void testElement() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/element.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:doBody + * + * @throws Throwable + */ + public void testDoBody() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "../WEB-INF/tags/double.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:forward + * + * @throws Throwable + */ + public void testForward() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/forward.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:getProperty + * + * @throws Throwable + */ + public void testGetProperty() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/get_property.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:invoke + * + * @throws Throwable + */ + public void testInvoke() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "../WEB-INF/tags/catalog.tag", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:output + * + * @throws Throwable + */ + public void testOutput() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/output.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:plugin + * + * @throws Throwable + */ + public void testPlugin() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/plugin.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:root + * + * @throws Throwable + */ + public void testRoot() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/root.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:setProperty + * + * @throws Throwable + */ + public void testSetProperty() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/set_property.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:text + * + * @throws Throwable + */ + public void testText() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/text.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + + /** + * Test for jsp:useBean + * + * @throws Throwable + */ + public void testUseBean() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/useBean.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + + } + +} Deleted: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPTestPlugin.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/jsf/vpe/jsp/test/JSPTestPlugin.java 2008-02-21 11:46:49 UTC (rev 6493) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPTestPlugin.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -1,79 +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.jsf.vpe.jsp.test; - -import java.net.URL; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.Platform; -import org.jboss.tools.common.log.BaseUIPlugin; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class JSPTestPlugin extends BaseUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.jsp.test"; //$NON-NLS-1$ - - // The shared instance - private static JSPTestPlugin plugin; - - /** - * The constructor - */ - public JSPTestPlugin() { - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static JSPTestPlugin getDefault() { - return plugin; - } - - public static String getPluginResourcePath() { - Bundle bundle = Platform.getBundle(PLUGIN_ID); - URL url = null; - try { - url = bundle == null ? null : FileLocator.resolve(bundle - .getEntry("/resources")); //$NON-NLS-1$ - } catch (Exception e) { - url = bundle.getEntry("/resources"); //$NON-NLS-1$ - } - return (url == null) ? null : url.getPath(); - } - -} Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPTestPlugin.java (from rev 6495, trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/jsf/vpe/jsp/test/JSPTestPlugin.java) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPTestPlugin.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPTestPlugin.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -0,0 +1,79 @@ +/******************************************************************************* + * 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.vpe.jsp.test; + +import java.net.URL; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.common.log.BaseUIPlugin; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class JSPTestPlugin extends BaseUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.vpe.jsp.test"; //$NON-NLS-1$ + + // The shared instance + private static JSPTestPlugin plugin; + + /** + * The constructor + */ + public JSPTestPlugin() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static JSPTestPlugin getDefault() { + return plugin; + } + + public static String getPluginResourcePath() { + Bundle bundle = Platform.getBundle(PLUGIN_ID); + URL url = null; + try { + url = bundle == null ? null : FileLocator.resolve(bundle + .getEntry("/resources")); //$NON-NLS-1$ + } catch (Exception e) { + url = bundle.getEntry("/resources"); //$NON-NLS-1$ + } + return (url == null) ? null : url.getPath(); + } + +} Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2008-02-21 13:07:03 UTC (rev 6496) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.2"?> <plugin> - <extension-point id="org.jboss.tools.jsf.vpe.ui.tests" name="Visual Page Editor Junit Test" schema="schema/vpe.tests.exsd"/> + <extension-point id="org.jboss.tools.vpe.ui.tests" name="Visual Page Editor Junit Test" schema="schema/vpe.tests.exsd"/> </plugin> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd 2008-02-21 13:07:03 UTC (rev 6496) @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='UTF-8'?>  -<schema targetNamespace="org.jboss.tools.jsf.vpe.ui.test"> +<schema targetNamespace="org.jboss.tools.vpe.ui.test"> <annotation> <appInfo> - <meta.schema plugin="org.jboss.tools.jsf.vpe.ui.test" id="vpe.tests" name="Visual Editor Tests"/> + <meta.schema plugin="org.jboss.tools.vpe.ui.test" id="vpe.tests" name="Visual Editor Tests"/> </appInfo> <documentation> [Enter description of this extension point.] Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -37,9 +37,9 @@ */ public class TestUtil { - private static final String COMPONENTS_PATH = "WebContent/pages"; // $NON-NLS-1$ + private static final String COMPONENTS_PATH = "WebContent/pages"; //$NON-NLS-1$ - private static final String WEBCONTENT_PATH = "WebContent"; // $NON-NLS-1$ + private static final String WEBCONTENT_PATH = "WebContent"; //$NON-NLS-1$ @SuppressWarnings("restriction") static void importProjectIntoWorkspace(String path, String projectName) { @@ -59,7 +59,7 @@ // need to remove from imported project "svn" files List<String> unimportedFiles = new ArrayList<String>(); - unimportedFiles.add(".svn"); + unimportedFiles.add(".svn"); //$NON-NLS-1$ importProvider.setUnimportedFiles(unimportedFiles); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2008-02-21 12:59:53 UTC (rev 6495) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2008-02-21 13:07:03 UTC (rev 6496) @@ -28,7 +28,7 @@ */ public class VpeAllTests { - public static final String VPE_TEST_EXTENTION_POINT_ID = "org.jboss.tools.jsf.vpe.ui.tests"; //$NON-NLS-1$ + public static final String VPE_TEST_EXTENTION_POINT_ID = "org.jboss.tools.vpe.ui.tests"; //$NON-NLS-1$ public static final String TEST_SUITE_PARAM = "testSuite"; //$NON-NLS-1$

18 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r6495 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-02-21 07:59:53 -0500 (Thu, 21 Feb 2008) New Revision: 6495 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java Log: http://jira.jboss.com/jira/browse/JBIDE-518 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-02-21 12:19:25 UTC (rev 6494) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-02-21 12:59:53 UTC (rev 6495) @@ -14,6 +14,7 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; +import java.io.IOException; import java.util.Comparator; import java.util.Iterator; @@ -32,6 +33,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IMemento; +import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.XMLMemento; import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog; import org.jboss.tools.seam.core.ISeamComponent; @@ -60,8 +62,6 @@ setListLabelProvider(new SeamComponentLabelProvider()); setDetailsLabelProvider(new SeamComponentLabelProvider()); - //validateHistory(); - XMLMemento memento = loadMemento(); if (memento != null) getSelectionHistory().load(memento); @@ -131,9 +131,16 @@ reader = new FileReader(file); memento = XMLMemento.createReadRoot(reader); - reader.close(); - } catch (Exception ex) { - ex.printStackTrace(); + }catch (IOException ex) { + SeamCorePlugin.getPluginLog().logError(ex); + }catch (WorkbenchException ex){ + SeamCorePlugin.getPluginLog().logError(ex); + }finally{ + try{ + reader.close(); + }catch(IOException ex){ + SeamCorePlugin.getPluginLog().logError(ex); + } } } return memento; @@ -148,9 +155,14 @@ writer = new FileWriter(file); xmlMemento.save(writer); - writer.close(); - } catch (Exception ex) { - ex.printStackTrace(); + }catch (IOException ex) { + SeamCorePlugin.getPluginLog().logError(ex); + }finally{ + try{ + writer.close(); + }catch(IOException ex){ + SeamCorePlugin.getPluginLog().logError(ex); + } } }

18 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r6494 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-02-21 07:19:25 -0500 (Thu, 21 Feb 2008) New Revision: 6494 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java Log: http://jira.jboss.com/jira/browse/JBIDE-1742, license text added Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java 2008-02-21 11:46:49 UTC (rev 6493) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java 2008-02-21 12:19:25 UTC (rev 6494) @@ -1,6 +1,13 @@ -/** - * - */ +/******************************************************************************* + * Copyright (c) 2007-2008 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.jsf.template; import java.util.ArrayList; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java 2008-02-21 11:46:49 UTC (rev 6493) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java 2008-02-21 12:19:25 UTC (rev 6494) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 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.jsf.template; import java.util.ArrayList; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java 2008-02-21 11:46:49 UTC (rev 6493) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java 2008-02-21 12:19:25 UTC (rev 6494) @@ -1,6 +1,13 @@ -/** - * - */ +/******************************************************************************* + * Copyright (c) 2007-2008 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.jsf.template; import java.util.ArrayList;

18 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r6493 - in trunk/vpe/tests: org.jboss.tools.vpe.html.test and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: svasilyev Date: 2008-02-21 06:46:49 -0500 (Thu, 21 Feb 2008) New Revision: 6493 Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/.classpath trunk/vpe/tests/org.jboss.tools.vpe.html.test/.project trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/about.html trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.classpath trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.project trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/about.html trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/ Removed: trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/ trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/.classpath trunk/vpe/tests/org.jboss.tools.vpe.html.test/.project trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/about.html trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.classpath trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.project trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/about.html trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources/ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/ Log: Folders with tests that had been replaced were renamed. Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test (from rev 6490, trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test) Deleted: trunk/vpe/tests/org.jboss.tools.vpe.html.test/.classpath =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/.classpath 2008-02-21 11:21:27 UTC (rev 6490) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/.classpath 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/.classpath (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/.classpath) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/.classpath (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/.classpath 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> Deleted: trunk/vpe/tests/org.jboss.tools.vpe.html.test/.project =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/.project 2008-02-21 11:21:27 UTC (rev 6490) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/.project 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.jboss.tools.vpe.html.test</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/.project (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/.project) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/.project (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/.project 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.vpe.html.test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/META-INF) Deleted: trunk/vpe/tests/org.jboss.tools.vpe.html.test/about.html =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/about.html 2008-02-21 11:21:27 UTC (rev 6490) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/about.html 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>©2007 Red Hat, Inc. All rights reserved</P> - -<H3>License</H3> - -<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from Red Hat Inc., the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor's license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at - <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P> - -</BODY> -</HTML> \ No newline at end of file Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/about.html (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/about.html) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/about.html (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/about.html 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,34 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<HTML> + +<head> +<title>About</title> +<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +</head> + +<BODY lang="EN-US"> + +<H3>About This Content</H3> + +<P>©2007 Red Hat, Inc. All rights reserved</P> + +<H3>License</H3> + +<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in +("Content"). Unless otherwise indicated below, the Content is provided to you +under the terms and conditions of the Eclipse Public License Version 1.0 +("EPL"). A copy of the EPL is available at +<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. +For purposes of the EPL, "Program" will mean the Content.</P> + +<P>If you did not receive this Content directly from Red Hat Inc., the +Content is being redistributed by another party ("Redistributor") and different +terms and conditions may apply to your use of any object code in the Content. +Check the Redistributor's license that was provided with the Content. If no such +license exists, contact the Redistributor. Unless otherwise indicated below, the +terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at + <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P> + +</BODY> +</HTML> \ No newline at end of file Deleted: trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/build.properties 2008-02-21 11:21:27 UTC (rev 6490) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,11 +0,0 @@ -bin.includes = META-INF/,\ - html-test.jar,\ - resources/,\ - plugin.xml -src.includes = META-INF/,\ - build.properties,\ - src/,\ - resources/ -jars.compile.order = html-test.jar -source.html-test.jar = src/ -output.html-test.jar = bin/ Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/build.properties) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,11 @@ +bin.includes = META-INF/,\ + html-test.jar,\ + resources/,\ + plugin.xml +src.includes = META-INF/,\ + build.properties,\ + src/,\ + resources/ +jars.compile.order = html-test.jar +source.html-test.jar = src/ +output.html-test.jar = bin/ Deleted: trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/plugin.xml 2008-02-21 11:21:27 UTC (rev 6490) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.2"?> -<plugin> - <extension - point="org.jboss.tools.jsf.vpe.ui.tests"> - <tests - description="Tests for Html templates" - name="Tests for Html templates" - testSuite="org.jboss.tools.jsf.vpe.html.test.HtmlAllTests"> - </tests> - </extension> - -</plugin> Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/plugin.xml) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.2"?> +<plugin> + <extension + point="org.jboss.tools.jsf.vpe.ui.tests"> + <tests + description="Tests for Html templates" + name="Tests for Html templates" + testSuite="org.jboss.tools.jsf.vpe.html.test.HtmlAllTests"> + </tests> + </extension> + +</plugin> Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/resources) Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.html.test/src) Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test (from rev 6491, trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test) Deleted: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.classpath =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/.classpath 2008-02-21 11:39:16 UTC (rev 6491) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.classpath 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.classpath (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/.classpath) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.classpath (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.classpath 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> Deleted: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.project =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/.project 2008-02-21 11:39:16 UTC (rev 6491) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.project 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.jboss.tools.vpe.jsp.test</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.project (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/.project) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.project (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/.project 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.vpe.jsp.test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/META-INF) Deleted: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/about.html =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/about.html 2008-02-21 11:39:16 UTC (rev 6491) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/about.html 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>©2007 Red Hat, Inc. All rights reserved</P> - -<H3>License</H3> - -<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from Red Hat Inc., the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor's license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at - <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P> - -</BODY> -</HTML> \ No newline at end of file Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/about.html (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/about.html) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/about.html (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/about.html 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,34 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<HTML> + +<head> +<title>About</title> +<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +</head> + +<BODY lang="EN-US"> + +<H3>About This Content</H3> + +<P>©2007 Red Hat, Inc. All rights reserved</P> + +<H3>License</H3> + +<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in +("Content"). Unless otherwise indicated below, the Content is provided to you +under the terms and conditions of the Eclipse Public License Version 1.0 +("EPL"). A copy of the EPL is available at +<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. +For purposes of the EPL, "Program" will mean the Content.</P> + +<P>If you did not receive this Content directly from Red Hat Inc., the +Content is being redistributed by another party ("Redistributor") and different +terms and conditions may apply to your use of any object code in the Content. +Check the Redistributor's license that was provided with the Content. If no such +license exists, contact the Redistributor. Unless otherwise indicated below, the +terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at + <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P> + +</BODY> +</HTML> \ No newline at end of file Deleted: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/build.properties 2008-02-21 11:39:16 UTC (rev 6491) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,11 +0,0 @@ -bin.includes = META-INF/,\ - jsp-tests.jar,\ - plugin.xml,\ - resources/ -jars.compile.order = jsp-tests.jar -source.jsp-tests.jar = src/ -output.jsp-tests.jar = bin/ -src.includes = META-INF/,\ - build.properties,\ - src/,\ - resources/ Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/build.properties) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,11 @@ +bin.includes = META-INF/,\ + jsp-tests.jar,\ + plugin.xml,\ + resources/ +jars.compile.order = jsp-tests.jar +source.jsp-tests.jar = src/ +output.jsp-tests.jar = bin/ +src.includes = META-INF/,\ + build.properties,\ + src/,\ + resources/ Deleted: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/plugin.xml 2008-02-21 11:39:16 UTC (rev 6491) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2008-02-21 11:46:49 UTC (rev 6493) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.2"?> -<plugin> - <extension - point="org.jboss.tools.jsf.vpe.ui.tests"> - <tests - description="JSP Tests" - name="JSP Tests" - testSuite="org.jboss.tools.jsf.vpe.jsp.test.JSPAllTests"> - </tests> - </extension> - -</plugin> Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/plugin.xml) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2008-02-21 11:46:49 UTC (rev 6493) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.2"?> +<plugin> + <extension + point="org.jboss.tools.jsf.vpe.ui.tests"> + <tests + description="JSP Tests" + name="JSP Tests" + testSuite="org.jboss.tools.jsf.vpe.jsp.test.JSPAllTests"> + </tests> + </extension> + +</plugin> Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/resources (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/resources) Copied: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src (from rev 6492, trunk/vpe/tests/org.jboss.tools.jsf.vpe.jsp.test/src)

18 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits February 2008