October 2008 - jbosstools-commits

JBoss Tools SVN: r10733 - trunk/jsf/docs/userguide/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2008-10-08 05:54:13 -0400 (Wed, 08 Oct 2008) New Revision: 10733 Modified: trunk/jsf/docs/userguide/en/modules/Visual_Web_Tools.xml trunk/jsf/docs/userguide/en/modules/editors.xml Log: https://jira.jboss.org/jira/browse/JBDS-368 info on content assist is updated Modified: trunk/jsf/docs/userguide/en/modules/Visual_Web_Tools.xml =================================================================== --- trunk/jsf/docs/userguide/en/modules/Visual_Web_Tools.xml 2008-10-08 08:33:35 UTC (rev 10732) +++ trunk/jsf/docs/userguide/en/modules/Visual_Web_Tools.xml 2008-10-08 09:54:13 UTC (rev 10733) @@ -109,7 +109,7 @@ <row> <entry>Content Assist</entry> - <entry>Code completion proposals while working in java, xml, jsp, xhtml, xhtml, seam project + <entry>Code completion proposals while working with html, java, JavaScript , xml, jsp, xhtml, xhtml, seam project and jsf configuration files. Content assist based on project data (dynamic code assist); with graphical editor. Code completion for values from property files, beans attributes and methods, navigation rule outcomes and jsf variables.</entry> Modified: trunk/jsf/docs/userguide/en/modules/editors.xml =================================================================== --- trunk/jsf/docs/userguide/en/modules/editors.xml 2008-10-08 08:33:35 UTC (rev 10732) +++ trunk/jsf/docs/userguide/en/modules/editors.xml 2008-10-08 09:54:13 UTC (rev 10733) @@ -155,7 +155,6 @@ <section id="CodeAssistAndDynamicCodeAssist42BasedOnProjectData"> - <title>Content Assist</title> <para><property>Content assist</property> is available when working with</para> @@ -186,6 +185,11 @@ <link linkend="ContentAssistForRF">RichFaces components</link> </para> </listitem> + <listitem> + <para> + <ulink url="&esblinklink;#ESBContentAssist">ESB XML files</ulink> + </para> + </listitem> </itemizedlist>

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10732 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-08 04:33:35 -0400 (Wed, 08 Oct 2008) New Revision: 10732 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java Log: JBIDE-2846 Add subtitle and description on the wizard page and add a description label under the treeviewer to describe the data type. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java 2008-10-08 08:27:25 UTC (rev 10731) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java 2008-10-08 08:33:35 UTC (rev 10732) @@ -111,7 +111,7 @@ // IWizardNode node = (IWizardNode) iterator.next(); // node. // } - this.setControl(viewer.getControl()); + this.setControl(main); } public IWizardPage getNextPage() {

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10731 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui/schema and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-08 04:27:25 -0400 (Wed, 08 Oct 2008) New Revision: 10731 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml trunk/smooks/plugins/org.jboss.tools.smooks.ui/schema/viewerInitor.exsd trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BaseViewerInitor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IViewerInitor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ViewerInitorStore.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformSelectWizardNode.java trunk/smooks/plugins/org.jboss.tools.smooks.xml/plugin.xml Log: JBIDE-2846 Add subtitle and description on the wizard page and add a description label under the treeviewer to describe the data type. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-10-08 08:11:10 UTC (rev 10730) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-10-08 08:27:25 UTC (rev 10731) @@ -6,8 +6,9 @@ <viewerInitor contentProvider="org.jboss.tools.smooks.javabean.model.BeanContentProvider" creationWizard="org.jboss.tools.smooks.javabean.ui.NewJavaBeanStrucutredDataWizard" + description="This data type can get from any Java .class." labelProvider="org.jboss.tools.smooks.javabean.model.BeanlabelProvider" - name="JavaBean" + name="JavaBean Data Type" typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> </viewerInitor> </extension> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/schema/viewerInitor.exsd =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/schema/viewerInitor.exsd 2008-10-08 08:11:10 UTC (rev 10730) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/schema/viewerInitor.exsd 2008-10-08 08:27:25 UTC (rev 10731) @@ -1,146 +1,153 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<schema targetNamespace="org.jboss.tools.smooks.ui"> -<annotation> - <appInfo> - <meta.schema plugin="org.jboss.tools.smooks.ui" id="viewerInitor" name="viewerInitor"/> - </appInfo> - <documentation> - [Enter description of this extension point.] - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence> - <element ref="viewerInitor" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="viewerInitor"> - <complexType> - <attribute name="typeID" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="labelProvider" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn=":org.eclipse.jface.viewers.ILabelProvider"/> - </appInfo> - </annotation> - </attribute> - <attribute name="contentProvider" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn=":org.eclipse.jface.viewers.ITreeContentProvider"/> - </appInfo> - </annotation> - </attribute> - <attribute name="creationWizard" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn=":org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard"/> - </appInfo> - </annotation> - </attribute> - <attribute name="icon" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - [Enter the first release in which this extension point appears.] - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - [Enter extension point usage example here.] - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - [Enter API information here.] - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - [Enter information about supplied implementation of this extension point.] - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - -</schema> +<?xml version='1.0' encoding='UTF-8'?> + +<schema targetNamespace="org.jboss.tools.smooks.ui"> +<annotation> + <appInfo> + <meta.schema plugin="org.jboss.tools.smooks.ui" id="viewerInitor" name="viewerInitor"/> + </appInfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <complexType> + <sequence> + <element ref="viewerInitor" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="viewerInitor"> + <complexType> + <attribute name="typeID" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="labelProvider" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute kind="java" basedOn=":org.eclipse.jface.viewers.ILabelProvider"/> + </appInfo> + </annotation> + </attribute> + <attribute name="contentProvider" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute kind="java" basedOn=":org.eclipse.jface.viewers.ITreeContentProvider"/> + </appInfo> + </annotation> + </attribute> + <attribute name="creationWizard" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute kind="java" basedOn=":org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard"/> + </appInfo> + </annotation> + </attribute> + <attribute name="icon" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="description" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="examples"/> + </appInfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="apiInfo"/> + </appInfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="implementation"/> + </appInfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="copyright"/> + </appInfo> + <documentation> + + </documentation> + </annotation> + +</schema> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BaseViewerInitor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BaseViewerInitor.java 2008-10-08 08:11:10 UTC (rev 10730) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BaseViewerInitor.java 2008-10-08 08:27:25 UTC (rev 10731) @@ -25,6 +25,7 @@ protected String name = "nonamed"; protected String wizardIconPath = null; IConfigurationElement configurationElement = null; + protected String description; /** * @return the name @@ -127,4 +128,12 @@ IConfigurationElement configurationElement) { this.configurationElement = configurationElement; } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IViewerInitor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IViewerInitor.java 2008-10-08 08:11:10 UTC (rev 10730) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IViewerInitor.java 2008-10-08 08:27:25 UTC (rev 10731) @@ -30,4 +30,6 @@ String getName(); String getWizardIconPath(); + + String getDescription(); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ViewerInitorStore.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ViewerInitorStore.java 2008-10-08 08:11:10 UTC (rev 10730) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ViewerInitorStore.java 2008-10-08 08:27:25 UTC (rev 10731) @@ -138,10 +138,11 @@ String iconPath = element.getAttribute(SmooksExtensionPointConstants.EXTENTION_POINT_ATTRIBUTE_ICON); + String description = element.getAttribute(SmooksExtensionPointConstants.EXTENTION_POINT_ATTRIBUTE_DESCRIPTION); BaseViewerInitor initor = new BaseViewerInitor(); initor.setName(name); - + initor.setDescription(description); initor.setWizardIconPath(iconPath); initor.setTypeID(typeID); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java 2008-10-08 08:11:10 UTC (rev 10730) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformDataWizardSelectionPage.java 2008-10-08 08:27:25 UTC (rev 10731) @@ -31,7 +31,10 @@ import org.eclipse.jface.wizard.WizardSelectionPage; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; import org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard; import org.jboss.tools.smooks.ui.IViewerInitor; import org.jboss.tools.smooks.ui.ViewerInitorStore; @@ -44,6 +47,7 @@ List registedWizard = new ArrayList(); TreeViewer viewer = null; + private Label desLabel; /* * (non-Javadoc) @@ -52,12 +56,22 @@ */ public void createControl(Composite parent) { // parent.setLayout(new FillLayout()); - viewer = new TreeViewer(parent, SWT.NONE); + Composite main = new Composite(parent, SWT.NONE); + + GridLayout gridLayout = new GridLayout(); + main.setLayout(gridLayout); + + viewer = new TreeViewer(main, SWT.NONE); viewer.setContentProvider(new WizardNodeContentProvider()); viewer.setLabelProvider(new WizardNodeLabelProvider()); - + GridData gd = new GridData(GridData.FILL_BOTH); + viewer.getTree().setLayoutData(gd); createAllExtentionWizard(); + desLabel = new Label(main, SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + desLabel.setLayoutData(gd); + viewer.setInput(registedWizard); if (!registedWizard.isEmpty()) { this.setSelectedNode((IWizardNode) registedWizard.get(0)); @@ -68,8 +82,13 @@ IStructuredSelection selection = (IStructuredSelection) event .getSelection(); IWizardNode node = (IWizardNode) selection.getFirstElement(); + desLabel.setText(""); if (node != null) { setSelectedNode(node); + if(node instanceof TransformSelectWizardNode){ + String des = ((TransformSelectWizardNode)node).getDescription(); + desLabel.setText(des); + } IStrucutredDataCreationWizard wizard = (IStrucutredDataCreationWizard) node .getWizard(); TransformDataSelectionWizard pw = (TransformDataSelectionWizard) getWizard(); @@ -129,12 +148,17 @@ wn.setWizard(wizard); wn.setName(viewerInitor.getName()); wn.setIconPath(viewerInitor.getWizardIconPath()); + wn.setDescription(viewerInitor.getDescription()); this.registedWizard.add(wn); } } public TransformDataWizardSelectionPage(String pageName) { super(pageName); + + setDescription("Select the transform data type"); + setTitle("Data Type Selection"); + } public void activeSelectionWizard() { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformSelectWizardNode.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformSelectWizardNode.java 2008-10-08 08:11:10 UTC (rev 10730) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/TransformSelectWizardNode.java 2008-10-08 08:27:25 UTC (rev 10731) @@ -24,6 +24,15 @@ String name = ""; String iconPath = null; String pluginID = null; + String description = ""; + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + public String getPluginID() { return pluginID; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-10-08 08:11:10 UTC (rev 10730) +++ trunk/smooks/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-10-08 08:27:25 UTC (rev 10731) @@ -6,8 +6,9 @@ <viewerInitor contentProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataContentProvider" creationWizard="org.jboss.tools.smooks.xml.ui.XMLStructuredDataWizard" + description="XML data type comes from any .xml file." labelProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataLabelProvider" - name="XML" + name="XML Data Type" typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> </viewerInitor> </extension>

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10730 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-08 04:11:10 -0400 (Wed, 08 Oct 2008) New Revision: 10730 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java Log: JBIDE-2836 Change the new smooks file wizard page Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-08 07:42:08 UTC (rev 10729) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-08 08:11:10 UTC (rev 10730) @@ -1,22 +1,27 @@ package org.jboss.tools.smooks.ui.wizards; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; -import org.eclipse.core.runtime.*; -import org.eclipse.jface.operation.*; -import java.lang.reflect.InvocationTargetException; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.CoreException; -import java.io.*; -import org.eclipse.ui.*; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; import org.jboss.tools.smooks.graphical.util.GraphicalInformationSaver; import org.jboss.tools.smooks.ui.editors.TypeIDSelectionWizardPage; -import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; /** * This is a sample new wizard. Its role is to create a new file resource in the @@ -29,9 +34,12 @@ public class SmooksConfigFileNewWizard extends Wizard implements INewWizard { private SmooksConfigFileNewWizardPage page; - private ISelection selection; private TypeIDSelectionWizardPage typeIDPage; + private IStructuredSelection selection; + + private IWorkbench workbench; + /** * Constructor for SmooksConfigFileNewWizard. */ @@ -43,9 +51,9 @@ /** * Adding the page to the wizard. */ - public void addPages() { - page = new SmooksConfigFileNewWizardPage(selection); + page = new SmooksConfigFileNewWizardPage("newSmooksFile1", + getSelection()); addPage(page); typeIDPage = new TypeIDSelectionWizardPage(""); addPage(typeIDPage); @@ -56,13 +64,14 @@ * will create an operation and run it using wizard as execution context. */ public boolean performFinish() { - final String containerName = page.getContainerName(); - final String fileName = page.getFileName(); + // final String containerName = page.getContainerName(); + // final String fileName = page.getFileName(); + final IFile file = page.createNewFile(); IRunnableWithProgress op = new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException { try { - doFinish(containerName, fileName, monitor); + doFinish(file, monitor); } catch (CoreException e) { throw new InvocationTargetException(e); } finally { @@ -89,21 +98,12 @@ * file. */ - private void doFinish(String containerName, String fileName, - IProgressMonitor monitor) throws CoreException { + private void doFinish(final IFile file, IProgressMonitor monitor) + throws CoreException { // create a sample file - monitor.beginTask("Creating " + fileName, 2); String sourceTypeID = typeIDPage.getSourceID(); String targetTypeID = typeIDPage.getTargetID(); - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - IResource resource = root.findMember(new Path(containerName)); - if (!resource.exists() || !(resource instanceof IContainer)) { - throwCoreException("Container \"" + containerName - + "\" does not exist."); - } - IContainer container = (IContainer) resource; - final IFile file = container.getFile(new Path(fileName)); try { InputStream stream = openContentStream(); if (file.exists()) { @@ -137,8 +137,8 @@ */ private InputStream openContentStream() { - String contents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+ - " <smooks-resource-list xmlns=\"http://www.milyn.org/xsd/smooks-1.0.xsd\"/>"; + String contents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + " <smooks-resource-list xmlns=\"http://www.milyn.org/xsd/smooks-1.0.xsd\"/>"; return new ByteArrayInputStream(contents.getBytes()); } @@ -148,13 +148,16 @@ throw new CoreException(status); } - /** - * We will accept the selection in the workbench to see if we can initialize - * from it. - * - * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection) - */ public void init(IWorkbench workbench, IStructuredSelection selection) { + this.workbench = workbench; this.selection = selection; } + + public IStructuredSelection getSelection() { + return selection; + } + + public void setSelection(IStructuredSelection selection) { + this.selection = selection; + } } \ No newline at end of file Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-10-08 07:42:08 UTC (rev 10729) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-10-08 08:11:10 UTC (rev 10730) @@ -1,186 +1,37 @@ package org.jboss.tools.smooks.ui.wizards; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.dialogs.ContainerSelectionDialog; +import org.eclipse.ui.dialogs.WizardNewFileCreationPage; /** - * The "New" wizard page allows setting the container for the new file as well - * as the file name. The page will only accept file name without the extension - * OR with the extension that matches the expected one (smooks). + * + * @author dart + * */ - -public class SmooksConfigFileNewWizardPage extends WizardPage { - private Text containerText; - - private Text fileText; - - private ISelection selection; - - /** - * Constructor for SampleNewWizardPage. - * - * @param pageName - */ - public SmooksConfigFileNewWizardPage(ISelection selection) { - super("wizardPage"); - setTitle("Smooks Configuration File"); - setDescription("This wizard creates a new smooks configuration file with *.smooks extension that can be opened by a Smooks editor."); - this.selection = selection; +public class SmooksConfigFileNewWizardPage extends WizardNewFileCreationPage { + public SmooksConfigFileNewWizardPage(String pageName, + IStructuredSelection selection) { + super(pageName, selection); + setFileExtension("smooks"); } - /** - * @see IDialogPage#createControl(Composite) - */ - public void createControl(Composite parent) { - Composite container = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - container.setLayout(layout); - layout.numColumns = 3; - layout.verticalSpacing = 9; - Label label = new Label(container, SWT.NULL); - label.setText("&Container:"); + @Override + protected boolean validatePage() { + boolean flag = super.validatePage(); + String name = this.getFileName(); + if (name.indexOf(".") == -1) + return flag; + String extensionName = name.substring(name.indexOf(".") + 1, name + .length()); + String error = null; + if (extensionName.equalsIgnoreCase(this.getFileExtension())) { - containerText = new Text(container, SWT.BORDER | SWT.SINGLE); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - containerText.setLayoutData(gd); - containerText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - dialogChanged(); - } - }); - - Button button = new Button(container, SWT.PUSH); - button.setText("Browse..."); - button.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - handleBrowse(); - } - }); - label = new Label(container, SWT.NULL); - label.setText("&File name:"); - - fileText = new Text(container, SWT.BORDER | SWT.SINGLE); - gd = new GridData(GridData.FILL_HORIZONTAL); - fileText.setLayoutData(gd); - fileText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - dialogChanged(); - } - }); - initialize(); - dialogChanged(); - setControl(container); - } - - /** - * Tests if the current workbench selection is a suitable container to use. - */ - - private void initialize() { - if (selection != null && selection.isEmpty() == false - && selection instanceof IStructuredSelection) { - IStructuredSelection ssel = (IStructuredSelection) selection; - if (ssel.size() > 1) - return; - Object obj = ssel.getFirstElement(); - if (obj instanceof IResource) { - IContainer container; - if (obj instanceof IContainer) - container = (IContainer) obj; - else - container = ((IResource) obj).getParent(); - containerText.setText(container.getFullPath().toString()); - } + } else { + error = "file extension must be \"smooks\""; } - fileText.setText("SmooksConfigurationFile.smooks"); - } - - - /** - * Uses the standard container selection dialog to choose the new value for - * the container field. - */ - - private void handleBrowse() { - ContainerSelectionDialog dialog = new ContainerSelectionDialog( - getShell(), ResourcesPlugin.getWorkspace().getRoot(), false, - "Select new file container"); - if (dialog.open() == ContainerSelectionDialog.OK) { - Object[] result = dialog.getResult(); - if (result.length == 1) { - containerText.setText(((Path) result[0]).toString()); - } + if (error != null) { + this.setErrorMessage(error); } + return (error == null); } - - /** - * Ensures that both text fields are set. - */ - - private void dialogChanged() { - IResource container = ResourcesPlugin.getWorkspace().getRoot() - .findMember(new Path(getContainerName())); - String fileName = getFileName(); - - if (getContainerName().length() == 0) { - updateStatus("File container must be specified"); - return; - } - if (container == null - || (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) { - updateStatus("File container must exist"); - return; - } - if (!container.isAccessible()) { - updateStatus("Project must be writable"); - return; - } - if (fileName.length() == 0) { - updateStatus("File name must be specified"); - return; - } - if (fileName.replace('\\', '/').indexOf('/', 1) > 0) { - updateStatus("File name must be valid"); - return; - } - int dotLoc = fileName.lastIndexOf('.'); - if (dotLoc != -1) { - String ext = fileName.substring(dotLoc + 1); - if (ext.equalsIgnoreCase("smooks") == false) { - updateStatus("File extension must be \"smooks\""); - return; - } - } - updateStatus(null); - } - - private void updateStatus(String message) { - setErrorMessage(message); - setPageComplete(message == null); - } - - public String getContainerName() { - return containerText.getText(); - } - - public String getFileName() { - return fileText.getText(); - } } \ No newline at end of file

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10729 - in workspace/grid/org.jboss.tools.bpmnTo: META-INF and 8 other directories.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2008-10-08 03:42:08 -0400 (Wed, 08 Oct 2008) New Revision: 10729 Added: workspace/grid/org.jboss.tools.bpmnTo/icons/ workspace/grid/org.jboss.tools.bpmnTo/icons/sample.gif workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BPMNResourcesChoicePage.java Removed: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/action/ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/action/ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizardDialog.java Modified: workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF workspace/grid/org.jboss.tools.bpmnTo/plugin.properties workspace/grid/org.jboss.tools.bpmnTo/plugin.xml workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnPoolsChoicePage.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/ErrorMessagesPage.java workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java Log: JBIDE-2842: create export wizard for bpmn -> jpdl Modified: workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF 2008-10-08 07:42:08 UTC (rev 10729) @@ -14,8 +14,9 @@ lib/dom4j-1.6.1.jar, bin/ Bundle-Vendor: %PLUGIN_PROVIDER -Import-Package: org.eclipse.core.resources +Import-Package: org.eclipse.core.resources, + org.eclipse.ui.model Export-Package: org.jboss.tools.bpmnto, - org.jboss.tools.bpmnto.action, org.jboss.tools.bpmnto.translate, - org.jboss.tools.bpmnto.util + org.jboss.tools.bpmnto.util, + org.jboss.tools.bpmnto.wizard Added: workspace/grid/org.jboss.tools.bpmnTo/icons/sample.gif =================================================================== (Binary files differ) Property changes on: workspace/grid/org.jboss.tools.bpmnTo/icons/sample.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: workspace/grid/org.jboss.tools.bpmnTo/plugin.properties =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/plugin.properties 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/plugin.properties 2008-10-08 07:42:08 UTC (rev 10729) @@ -1,4 +1,5 @@ -b2jaction=BPMN -> JPDL -bpmnto=BPMN TO -PLUGIN_NAME=BPMNTO +wizard.name=BPMN -> JPDL +wizard.description = Export a BPMN file to JPDL +category.name=BPMN Export +PLUGIN_NAME=BPMNExport PLUGIN_PROVIDER=Red Hat, Inc. \ No newline at end of file Modified: workspace/grid/org.jboss.tools.bpmnTo/plugin.xml =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/plugin.xml 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/plugin.xml 2008-10-08 07:42:08 UTC (rev 10729) @@ -1,32 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.2"?> -<plugin> -<extension - point="org.eclipse.ui.popupMenus"> - - - <objectContribution - id="org.jboss.tools.b2j.objectContribution.bpmnfile" - nameFilter="*.bpmn" - objectClass="org.eclipse.core.resources.IFile"> +<plugin> + <extension point="org.eclipse.ui.exportWizards"> + <category name="%category.name" + id="org.jboss.tools.flow.convert.export.category"/> + <wizard name="%wizard.name" + icon="icons/sample.gif" + category="org.jboss.tools.flow.convert.export.category" + class="org.jboss.tools.b2j.wizard.B2JExportWizard" + id="org.jboss.tools.flow.convert.export.b2jexportwizard"> + <description>%wizard.description</description> + <selection name="*.bpmn" class="org.eclipse.core.resources.IFile"/> + </wizard> + </extension> - <menu - label="%bpmnto" - id="org.jboss.tools.bpmnTo.ActionSet" - path="additions"> - <separator - name="group"> - </separator> - </menu> - - <action - label="%b2jaction" - class="org.jboss.tools.b2j.action.B2JAction" - menubarPath="org.jboss.tools.bpmnTo.ActionSet/group" - enablesFor="+" - id="org.jboss.tools.b2j.B2JAction"> - </action> - </objectContribution> - </extension> - </plugin> Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties 2008-10-08 07:42:08 UTC (rev 10729) @@ -25,12 +25,23 @@ Bpmn_FlowTarget_Attribute_Name=target Bpmn_FlowDefault_Attribute_Name=isDefault Bpmn_Element_ID=iD -Bpmn_Pool_Choose_Dialog_Message=Available BPMN Pools -Bpmn_Pool_Choose_Dialog_Title=Select BPMN pools to translate -Bpmn_GeneratedFile_Location_Dialog_Message=Please choose the generated files location. If click Cancel, the generated files will be put under the project -Bpmn_GeneratedFile_Location_Dialog_Title=Select the generated files location -Bpmn_Translate_Message_Dialog_Title=Warnings and Errors -Bpmn_Translate_Message_Dialog_Message=The messages are errors and warnings during the translation: +Bpmn_Wizard_Title=BPMN to jPDL Conversion +Bpmn_File_Choose_WizardPage_Name=FileChoosePage +Bpmn_File_Choose_WizardPage_Title=BPMN Resources +Bpmn_File_Choose_WizardPage_ViewerTitle=BPMN resources +Bpmn_File_Choose_WizardPage_Message=Select BPMN resources to convert +Bpmn_Pool_Choose_WizardPage_Name=PoolPage +Bpmn_Pool_Choose_WizardPage_Message=Available BPMN Pools +Bpmn_Pool_Choose_WizardPage_Title=Select BPMN pools to translate +Bpmn_GeneratedFile_Location_WizardPage_Name=LocationPage +Bpmn_GeneratedFile_Location_WizardPage_Message=Select the target location +Bpmn_GeneratedFile_Location_WizardPage_Title=Target Location +Bpmn_GeneratedFile_Location_WizardPage_ViewerTitle=Target location +Bpmn_GeneratedFile_Location_WizardPage_CheckBox=Overwrite existing resources +Bpmn_Translate_Message_WizardPage_Name=MessagePage +Bpmn_Translate_Message_WizardPage_Title=Conversion Warnings and Errors +Bpmn_Translate_Message_WizardPage_Message=Warnings and Errors that occured during conversion +Bpmn_Translate_Message_WizardpageViewer_Title=Warnings and Errors Bpmn_EAnnotations_Element_Name=eAnnotations Bpmn_Details_Element_Name=details Bpmn_Value_Attribute_Name=value @@ -38,6 +49,7 @@ Jpdl_Element_Decision_Suffix=Decision Jpdl_Element_Complete_Suffix=Complete Jpdl_Element_Cancel_Suffix=Cancel +Jpdl_Element_Successful_Name=Successful? Jpdl_Process_Definition_Name=processdefinition.xml Jpdl_32_Namespace_Url=urn:jbpm.org:jpdl-3.2 Jpdl_Process_Definition_Element_Name=process-definition Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -49,12 +49,23 @@ public static String Bpmn_FlowSource_Attribute_Name; public static String Bpmn_FlowTarget_Attribute_Name; public static String Bpmn_FlowDefault_Attribute_Name; - public static String Bpmn_Pool_Choose_Dialog_Message; - public static String Bpmn_Pool_Choose_Dialog_Title; - public static String Bpmn_GeneratedFile_Location_Dialog_Message; - public static String Bpmn_GeneratedFile_Location_Dialog_Title; - public static String Bpmn_Translate_Message_Dialog_Title; - public static String Bpmn_Translate_Message_Dialog_Message; + public static String Bpmn_Wizard_Title; + public static String Bpmn_File_Choose_WizardPage_Name; + public static String Bpmn_File_Choose_WizardPage_Title; + public static String Bpmn_File_Choose_WizardPage_Message; + public static String Bpmn_File_Choose_WizardPage_ViewerTitle; + public static String Bpmn_Pool_Choose_WizardPage_Name; + public static String Bpmn_Pool_Choose_WizardPage_Message; + public static String Bpmn_Pool_Choose_WizardPage_Title; + public static String Bpmn_GeneratedFile_Location_WizardPage_Name; + public static String Bpmn_GeneratedFile_Location_WizardPage_Message; + public static String Bpmn_GeneratedFile_Location_WizardPage_Title; + public static String Bpmn_GeneratedFile_Location_WizardPage_ViewerTitle; + public static String Bpmn_GeneratedFile_Location_WizardPage_CheckBox; + public static String Bpmn_Translate_Message_WizardPage_Name; + public static String Bpmn_Translate_Message_WizardPage_Title; + public static String Bpmn_Translate_Message_WizardPage_Message; + public static String Bpmn_Translate_Message_WizardpageViewer_Title; public static String Bpmn_EAnnotations_Element_Name; public static String Bpmn_Details_Element_Name; public static String Bpmn_Value_Attribute_Name; Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -33,6 +33,7 @@ Document bpmnDocument; List<Document> processDefs = new ArrayList<Document>(); + Map<String, Element> map = new HashMap<String, Element>(); public Map<String, Element> getMap() { @@ -452,5 +453,13 @@ .attributeValue(B2JMessages.Dom_Element_Name)); } + + public List<Document> getProcessDefs() { + return processDefs; + } + public void setProcessDefs(List<Document> processDefs) { + this.processDefs = processDefs; + } + } Added: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java (rev 0) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -0,0 +1,157 @@ +/******************************************************************************* + * Copyright (c) 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.b2j.wizard; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.dom4j.Document; +import org.eclipse.core.resources.IContainer; +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.b2j.messages.B2JMessages; +import org.jboss.tools.b2j.translate.BPMN2JPDL; +import org.jboss.tools.b2j.translate.GraphicalFileGenerator; +import org.jboss.tools.b2j.translate.TranslateHelper; +import org.jboss.tools.bpmnto.BpmnToPlugin; +import org.jboss.tools.bpmnto.wizard.BpmnToWizard; + +/** + * @author Grid Qian + * + * the wizard for bpmn to jpdl translation + */ +public class B2JExportWizard extends BpmnToWizard { + + private List<String> strForProcessList = new ArrayList<String>(); + private List<String> strForGpdList = new ArrayList<String>(); + private List<String> generatedFoldersList = new ArrayList<String>(); + + public void createGeneratedFile() { + String[] jpdlFolderNames = new String[this.generatedFoldersList.size()]; + + int i = 0; + for (String name : this.generatedFoldersList) { + jpdlFolderNames[i] = name; + i++; + } + + String location = super.getContainerPath((IContainer) super + .getTargetLocationSelection().getFirstElement()); + + if (this.strForProcessList.size() > 0) { + i = 0; + String[] strs = new String[strForProcessList.size()]; + for (String pro : this.strForProcessList) { + strs[i] = pro; + i++; + } + try { + TranslateHelper.createFiles(location, bpmnFileName, strs, + jpdlFolderNames, + B2JMessages.Jpdl_Process_Definition_Name); + } catch (Exception e) { + BpmnToPlugin.getDefault().logError(e.getMessage()); + } + } + + if (this.strForGpdList.size() > 0) { + i = 0; + String[] strs = new String[strForGpdList.size()]; + for (String pro : this.strForGpdList) { + strs[i] = pro; + i++; + } + try { + TranslateHelper.createFiles(location, bpmnFileName, strs, + jpdlFolderNames, B2JMessages.Gpd_Definition_Name); + } catch (Exception e) { + BpmnToPlugin.getDefault().logError(e.getMessage()); + } + } + + } + + public List<String> translateBpmnToStrings() { + List<String> warningList = new ArrayList<String>(); + List<String> errorList = new ArrayList<String>(); + + Document bpmnDocument = null; + try { + bpmnDocument = getDocument(bpmnFileParentPath, bpmnFileName); + } catch (Exception e) { + errorList.add(NLS.bind(B2JMessages.Translate_Error_File_CanNotRead, + bpmnFileName)); + } + + BPMN2JPDL translator = new BPMN2JPDL(bpmnFileName, bpmnFileParentPath, + poolIdList, bpmnDocument); + + this.setStrForProcessList(Arrays + .asList(translator.translateToStrings())); + + for (Document def : translator.getProcessDefs()) { + this.generatedFoldersList.add(def.getName()); + } + + warningList.addAll(translator.getWarnings()); + errorList.addAll(translator.getErrors()); + + // generate jpdl gpd file from *.bpmn_diagram + Document bpmnDiagramDocument = null; + try { + bpmnDiagramDocument = getDocument(bpmnFileParentPath, + TranslateHelper.getBpmnDiagramName(bpmnFileName)); + } catch (Exception e) { + errorList.add(NLS.bind(B2JMessages.Translate_Error_File_CanNotRead, + TranslateHelper.getBpmnDiagramName(bpmnFileName))); + } + GraphicalFileGenerator generator = new GraphicalFileGenerator( + bpmnDiagramDocument, translator.getMap(), bpmnFileParentPath, + bpmnFileName); + + this.setStrForGpdList(Arrays.asList(generator.translateToStrings())); + + warningList.addAll(generator.getWarnings()); + errorList.addAll(generator.getErrors()); + + List<String> list = new ArrayList<String>(); + list.addAll(errorList); + list.addAll(warningList); + + return list; + } + + public List<String> getStrForProcessList() { + return strForProcessList; + } + + public void setStrForProcessList(List<String> strForProcessList) { + this.strForProcessList = strForProcessList; + } + + public List<String> getStrForGpdList() { + return strForGpdList; + } + + public void setStrForGpdList(List<String> strForGpdList) { + this.strForGpdList = strForGpdList; + } + + public List<String> getGeneratedFoldersList() { + return generatedFoldersList; + } + + public void setGeneratedFoldersList(List<String> generatedFoldersList) { + this.generatedFoldersList = generatedFoldersList; + } +} Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -19,6 +19,7 @@ import java.io.InputStream; import java.io.PrintWriter; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import javax.xml.parsers.SAXParser; @@ -27,6 +28,13 @@ import org.dom4j.Document; import org.dom4j.Element; import org.dom4j.io.SAXReader; +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; import org.jboss.tools.b2j.messages.B2JMessages; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; @@ -149,4 +157,39 @@ } return poolIDMap; } + + + public static Composite createComposite(Composite parent, int numColumns) { + Composite composite = new Composite(parent, SWT.NULL); + + GridLayout layout = new GridLayout(); + layout.numColumns = numColumns; + composite.setLayout(layout); + composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + return composite; + } + + @SuppressWarnings("unchecked") + public static boolean checkSelectedResources(ISelection selectedResources) { + boolean res = true; + if (selectedResources instanceof IStructuredSelection + && !selectedResources.isEmpty()) { + IStructuredSelection ss = (IStructuredSelection)selectedResources; + for (Iterator it = ss.iterator(); it.hasNext(); ){ + Object o = it.next(); + if (o instanceof IFile) { + if (!((IFile)o).getFileExtension().equalsIgnoreCase("bpmn")) { + res = false; + break; + } + } else { + res = false; + break; + } + } + } else { + res = false; + } + return res; + } } Added: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BPMNResourcesChoicePage.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BPMNResourcesChoicePage.java (rev 0) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BPMNResourcesChoicePage.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -0,0 +1,147 @@ +/******************************************************************************* + * Copyright (c) 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.bpmnto.wizard; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerFilter; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.model.WorkbenchContentProvider; +import org.eclipse.ui.model.WorkbenchLabelProvider; +import org.jboss.tools.b2j.messages.B2JMessages; +import org.jboss.tools.bpmnto.util.BPMNToUtil; + +/** + * @author Grid Qian + * + * the wizardpage used by user to choose the bpmn file + */ +public class BPMNResourcesChoicePage extends WizardPage { + + private TreeViewer viewer; + private ISelection currentSelection; + private IWizard wizard; + + public BPMNResourcesChoicePage(String pageName, String title, + String description) { + super(pageName); + this.setTitle(title); + this.setDescription(description); + } + + public void createControl(Composite parent) { + Composite composite = createDialogArea(parent); + + createListTitleArea(composite); + createListViewer(composite); + super.setControl(composite); + + initializePage(); + } + + private Label createListTitleArea(Composite composite) { + Label label = new Label(composite, SWT.NONE); + label.setText(B2JMessages.Bpmn_File_Choose_WizardPage_ViewerTitle); + label.setFont(composite.getFont()); + return label; + } + + private void createListViewer(Composite composite) { + viewer = new TreeViewer(composite, SWT.BORDER | SWT.MULTI + | SWT.H_SCROLL | SWT.V_SCROLL); + viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH)); + viewer.setLabelProvider(new WorkbenchLabelProvider()); + WorkbenchContentProvider cp = new WorkbenchContentProvider(); + viewer.setContentProvider(cp); + viewer.setFilters(new ViewerFilter[] { new ProjectFilter() }); + viewer.addPostSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + updateControls(); + currentSelection = viewer.getSelection(); + ((BpmnToWizard) wizard) + .setSelection((IStructuredSelection) currentSelection); + + } + }); + } + + private void initializePage() { + wizard = this.getWizard(); + viewer.setInput(ResourcesPlugin.getWorkspace()); + if (this.currentSelection != null) { + viewer.setSelection(currentSelection, true); + } + } + + @Override + public boolean isPageComplete() { + if (viewer != null) { + return BPMNToUtil.checkSelectedResources(viewer.getSelection()); + } + return super.isPageComplete(); + } + + private void updateControls() { + super.getWizard().getContainer().updateButtons(); + } + + private Composite createDialogArea(Composite parent) { + // create a composite with standard margins and spacing + Composite composite = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.marginHeight = 7; + layout.marginWidth = 7; + layout.verticalSpacing = 4; + layout.horizontalSpacing = 4; + composite.setLayout(layout); + composite.setLayoutData(new GridData(GridData.FILL_BOTH)); + return composite; + } + + public void setSelection(ISelection selection) { + this.currentSelection = selection; + } + + public ISelection getSelection() { + return currentSelection; + } +} + +class ProjectFilter extends ViewerFilter { + @Override + public boolean select(Viewer viewer, Object parent, Object element) { + boolean res = false; + if (element instanceof IFile) { + IFile file = (IFile) element; + if (file.getFileExtension().equalsIgnoreCase("bpmn")) { + res = true; + } + } + if (element instanceof IContainer) { + res = true; + } + return res; + } +} Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnPoolsChoicePage.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -45,54 +45,60 @@ CheckboxTableViewer listViewer; String listTitle; private Map<String, String> idMap; + private IWizard wizard; - public BpmnPoolsChoicePage(String pageName, String listTitle, - Map<String, String> idMap) { + public BpmnPoolsChoicePage(String pageName, String title, String listTitle) { super(pageName); this.listTitle = listTitle; - this.idMap = idMap; - this.setTitle(pageName); + this.setTitle(title); } public void createControl(Composite parent) { Composite composite = createDialogArea(parent); + createListTitleArea(composite); - createListViewer(composite); - addSelectionButtons(composite); + setControl(composite); - setControl(composite); initializePage(); - initializeViewerSelection(); + initializeViewer(); } - private void initializeViewerSelection() { - wizard = this.getWizard(); - List<String> poolIdList = ((BpmnToWizard) wizard).getPoolIdList(); - if (poolIdList.size() == 0) { - listViewer.setAllChecked(false); - } else { - for (String id : poolIdList) { - Set<Entry<String, String>> set = idMap.entrySet(); - Entry<String, String> selectedEntry = null; - for (Entry<String, String> entry : set) { - if (entry.getKey().equals(id)) { - selectedEntry = entry; - break; - } + private Label createListTitleArea(Composite composite) { + Label label = new Label(composite, SWT.NONE); + label.setText(listTitle); + label.setFont(composite.getFont()); + return label; + } + + private void createListViewer(Composite composite) { + listViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER); + GridData data = new GridData(GridData.FILL_BOTH); + data.heightHint = 250; + data.widthHint = 300; + listViewer.getTable().setLayoutData(data); + + listViewer.setLabelProvider(new LabelProvider()); + listViewer.setContentProvider(new ArrayContentProvider()); + listViewer.addCheckStateListener(new ICheckStateListener() { + @SuppressWarnings("unchecked") + public void checkStateChanged(CheckStateChangedEvent event) { + if (event.getChecked()) { + (((BpmnToWizard) wizard)).getPoolIdList().add( + ((Entry<String, String>) event.getElement()) + .getKey()); + } else { + (((BpmnToWizard) wizard)).getPoolIdList().remove( + ((Entry<String, String>) event.getElement()) + .getKey()); } - listViewer.setChecked(selectedEntry, true); + changeComplete(); } - } + }); } - private void initializePage() { - setPageComplete(false); - listViewer.setInput(idMap.entrySet()); - } - private void addSelectionButtons(Composite composite) { Composite buttonComposite = new Composite(composite, SWT.NONE); GridLayout layout = new GridLayout(); @@ -103,8 +109,8 @@ buttonComposite.setLayoutData(new GridData(SWT.END, SWT.TOP, true, false)); - Button selectButton = createButton(buttonComposite, B2JMessages.Label_Select_All, - false); + Button selectButton = createButton(buttonComposite, + B2JMessages.Label_Select_All, false); SelectionListener listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -145,39 +151,34 @@ return button; } - private void createListViewer(Composite composite) { - listViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER); - GridData data = new GridData(GridData.FILL_BOTH); - data.heightHint = 250; - data.widthHint = 300; - listViewer.getTable().setLayoutData(data); + private void initializePage() { + setPageComplete(false); + } - listViewer.setLabelProvider(new LabelProvider()); - listViewer.setContentProvider(new ArrayContentProvider()); - listViewer.addCheckStateListener(new ICheckStateListener() { - @SuppressWarnings("unchecked") - public void checkStateChanged(CheckStateChangedEvent event) { - if (event.getChecked()) { - (((BpmnToWizard) wizard)).getPoolIdList().add( - ((Entry<String, String>) event.getElement()) - .getKey()); - } else { - (((BpmnToWizard) wizard)).getPoolIdList().remove( - ((Entry<String, String>) event.getElement()) - .getKey()); + private void initializeViewer() { + if (listViewer == null) { + return; + } + listViewer.setInput(idMap.entrySet()); + wizard = this.getWizard(); + List<String> poolIdList = ((BpmnToWizard) wizard).getPoolIdList(); + if (poolIdList.size() == 0) { + listViewer.setAllChecked(false); + } else { + for (String id : poolIdList) { + Set<Entry<String, String>> set = idMap.entrySet(); + Entry<String, String> selectedEntry = null; + for (Entry<String, String> entry : set) { + if (entry.getKey().equals(id)) { + selectedEntry = entry; + break; + } } - changeComplete(); + listViewer.setChecked(selectedEntry, true); } - }); + } } - private Label createListTitleArea(Composite composite) { - Label label = new Label(composite, SWT.NONE); - label.setText(listTitle); - label.setFont(composite.getFont()); - return label; - } - private Composite createDialogArea(Composite parent) { // create a composite with standard margins and spacing Composite composite = new Composite(parent, SWT.NONE); @@ -199,4 +200,13 @@ } } + public Map<String, String> getIdMap() { + return idMap; + } + + public void setIdMap(Map<String, String> idMap) { + this.idMap = idMap; + initializeViewer(); + } + } Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -15,47 +15,176 @@ import java.util.List; import java.util.Map; +import org.dom4j.Document; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.osgi.util.NLS; +import org.eclipse.ui.IExportWizard; +import org.eclipse.ui.IWorkbench; import org.jboss.tools.b2j.messages.B2JMessages; +import org.jboss.tools.bpmnto.util.BPMNToUtil; +import org.jboss.tools.bpmnto.wizard.BPMNResourcesChoicePage; /** * @author Grid Qian * * the wizard for bpmn translation */ -public class BpmnToWizard extends Wizard{ +public abstract class BpmnToWizard extends Wizard implements IExportWizard { - BpmnPoolsChoicePage poolsPage; - GeneratedFileLocationPage locationPage; - ErrorMessagesPage errorPage; - + private BPMNResourcesChoicePage bpmnResPage; + private BpmnPoolsChoicePage poolsPage; + private GeneratedFileLocationPage locationPage; + private ErrorMessagesPage errorPage; + + // the selected *.bpmn file + private IStructuredSelection selection; + // the selected folder to save these generated files + private IStructuredSelection targetLocationSelection; // bpmn pool id:name map - Map<String, String> idMap; - List<String> poolIdList = new ArrayList<String>(); - String location; - List<String> errorList = new ArrayList<String>(); + private Map<String, String> idMap; - public BpmnToWizard(String title,Map<String, String> idMap){ + protected String bpmnFileName; + protected String bpmnFileParentPath; + protected List<String> poolIdList = new ArrayList<String>(); + // the list contains errors or warnings when generating + protected List<String> errorList = new ArrayList<String>(); + + public BpmnToWizard() { super(); - super.setWindowTitle(title); - this.idMap = idMap; + super.setWindowTitle(B2JMessages.Bpmn_Wizard_Title); } - - public void addPages(){ + + public void addPages() { super.addPages(); - poolsPage = new BpmnPoolsChoicePage(B2JMessages.Bpmn_Pool_Choose_Dialog_Title, B2JMessages.Bpmn_Pool_Choose_Dialog_Message,idMap); - locationPage = new GeneratedFileLocationPage(B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Title,B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Message); - errorPage = new ErrorMessagesPage(B2JMessages.Bpmn_Translate_Message_Dialog_Title,B2JMessages.Bpmn_Translate_Message_Dialog_Message); + + bpmnResPage = new BPMNResourcesChoicePage( + B2JMessages.Bpmn_File_Choose_WizardPage_Name, + B2JMessages.Bpmn_File_Choose_WizardPage_Title, + B2JMessages.Bpmn_File_Choose_WizardPage_Message); + bpmnResPage.setSelection(selection); + poolsPage = new BpmnPoolsChoicePage( + B2JMessages.Bpmn_Pool_Choose_WizardPage_Name, + B2JMessages.Bpmn_Pool_Choose_WizardPage_Title, + B2JMessages.Bpmn_Pool_Choose_WizardPage_Message); + errorPage = new ErrorMessagesPage( + B2JMessages.Bpmn_Translate_Message_WizardPage_Name, + B2JMessages.Bpmn_Translate_Message_WizardPage_Title, + B2JMessages.Bpmn_Translate_Message_WizardPage_Message); + locationPage = new GeneratedFileLocationPage( + B2JMessages.Bpmn_GeneratedFile_Location_WizardPage_Name, + B2JMessages.Bpmn_GeneratedFile_Location_WizardPage_Title, + B2JMessages.Bpmn_GeneratedFile_Location_WizardPage_Message); + locationPage.setSelection(selection); + addPage(bpmnResPage); addPage(poolsPage); + addPage(errorPage); addPage(locationPage); - addPage(errorPage); } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, + * org.eclipse.jface.viewers.IStructuredSelection) + */ + public void init(IWorkbench workbench, IStructuredSelection selection) { + this.selection = selection; + initialize(); + } + + /* + * do some initial tasks + */ + private void initialize() { + if (selection.getFirstElement() instanceof IFile) { + IFile bpmnFile = (IFile) selection.getFirstElement(); + bpmnFileName = bpmnFile.getName(); + bpmnFileParentPath = bpmnFile.getParent().getLocation() + .toOSString(); + try { + idMap = BPMNToUtil.getPoolIDsFromDocument(getDocument( + bpmnFileParentPath, bpmnFileName)); + } catch (Exception e) { + errorList.add(0, NLS.bind( + B2JMessages.Translate_Error_File_CanNotRead, + bpmnFileName)); + e.printStackTrace(); + } + } + if (poolsPage != null) { + poolsPage.setIdMap(idMap); + } + } + + public IWizardPage getNextPage(IWizardPage page) { + if (page.getName() + .equals(B2JMessages.Bpmn_Pool_Choose_WizardPage_Name)) { + errorList = translateBpmnToStrings(); + if (errorList.size() == 0) { + return locationPage; + } + errorPage.getListViewer().setInput(errorList); + return super.getNextPage(page); + } else { + return super.getNextPage(page); + } + + } + public boolean performFinish() { - + createGeneratedFile(); + refreshWorkspace(); return true; } - - + + /* + * do the translation from bpmn to string list the sub class need to create + * a string list to reserve these strings the return list is error or + * warning messages + */ + public abstract List<String> translateBpmnToStrings(); + + /* + * write the generated strings to the files + */ + public abstract void createGeneratedFile(); + + /* + * get the path of the eclipse workspace container + */ + protected String getContainerPath(IContainer container) { + return container.getLocation().toOSString(); + } + + /* + * get the dom document from a given path and file name + */ + public Document getDocument(String bpmnFileParentPath, String bpmnFileName) + throws Exception { + Document bpmnDocument = null; + bpmnDocument = BPMNToUtil.parse(bpmnFileParentPath, bpmnFileName); + return bpmnDocument; + } + + /* + * refresh eclipse workspace + */ + public void refreshWorkspace() { + try { + ResourcesPlugin.getWorkspace().getRoot().refreshLocal( + IResource.DEPTH_INFINITE, null); + } catch (CoreException e) { + e.printStackTrace(); + } + } + public List<String> getPoolIdList() { return poolIdList; } @@ -63,15 +192,7 @@ public void setPoolIdList(List<String> poolIdList) { this.poolIdList = poolIdList; } - - public String getLocation() { - return location; - } - public void setLocation(String location) { - this.location = location; - } - public List<String> getErrorList() { return errorList; } @@ -80,4 +201,37 @@ this.errorList = errorList; } + public IStructuredSelection getSelection() { + return selection; + } + + public void setSelection(IStructuredSelection selection) { + this.selection = selection; + initialize(); + } + + public String getBpmnFileName() { + return bpmnFileName; + } + + public void setBpmnFileName(String bpmnFileName) { + this.bpmnFileName = bpmnFileName; + } + + public String getBpmnFileParentPath() { + return bpmnFileParentPath; + } + + public void setBpmnFileParentPath(String bpmnFileParentPath) { + this.bpmnFileParentPath = bpmnFileParentPath; + } + + public IStructuredSelection getTargetLocationSelection() { + return targetLocationSelection; + } + + public void setTargetLocationSelection( + IStructuredSelection targetLocationSelection) { + this.targetLocationSelection = targetLocationSelection; + } } Deleted: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizardDialog.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizardDialog.java 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizardDialog.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.bpmnto.wizard; - -import java.util.List; - -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IActionDelegate; -import org.jboss.tools.bpmnto.action.BpmnToAction; - -/** - * @author Grid Qian - * - * wizard dialog for bpmn tranlation - */ -public class BpmnToWizardDialog extends WizardDialog { - - IActionDelegate action; - - public BpmnToWizardDialog(Shell parentShell, IWizard newWizard, - IActionDelegate action) { - super(parentShell, newWizard); - this.action = action; - } - - public void nextPressed() { - IWizardPage page = this.getCurrentPage(); - if (page instanceof GeneratedFileLocationPage) { - List<String> list = ((BpmnToAction) action).errorList; - String location = ((BpmnToWizard) this.getWizard()).getLocation(); - if (location == null || "".equals(location)) { - location = ((BpmnToAction) action).bpmnFile.getParent() - .getLocation().toOSString(); - } - list.addAll(((BpmnToAction) action).translateBpmn( - ((BpmnToAction) action).bpmnFile.getParent().getLocation() - .toOSString(), ((BpmnToAction) action).bpmnFile - .getName(), ((BpmnToWizard) this.getWizard()) - .getPoolIdList(), location)); - ((BpmnToWizard) this.getWizard()).setErrorList(list); - ((ErrorMessagesPage) page.getNextPage()).listViewer - .setInput(((BpmnToWizard) this.getWizard()).getErrorList()); - } - showPage(page.getNextPage()); - } - -} Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/ErrorMessagesPage.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/ErrorMessagesPage.java 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/ErrorMessagesPage.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -20,40 +20,43 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import org.jboss.tools.b2j.messages.B2JMessages; /** * @author Grid Qian * * the wizardpage for showing the error and warning messages from translating */ -public class ErrorMessagesPage extends WizardPage{ - - TableViewer listViewer; - String listTitle; - - protected ErrorMessagesPage(String pageName, String listTitle) { +public class ErrorMessagesPage extends WizardPage { + + private TableViewer listViewer; + + protected ErrorMessagesPage(String pageName, String title, String description) { super(pageName); - this.listTitle = listTitle; - this.setTitle(pageName); + this.setDescription(description); + this.setTitle(title); } public void createControl(Composite parent) { Composite composite = createDialogArea(parent); - + createListTitleArea(composite); createListViewer(composite); setControl(composite); - initializeViewer(); - } - private void initializeViewer() { - listViewer.setInput(((BpmnToWizard)this.getWizard()).getErrorList()); + private Label createListTitleArea(Composite composite) { + Label label = new Label(composite, SWT.NONE); + label + .setText(B2JMessages.Bpmn_Translate_Message_WizardpageViewer_Title); + label.setFont(composite.getFont()); + return label; } private void createListViewer(Composite composite) { - listViewer = new TableViewer(composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); + listViewer = new TableViewer(composite, SWT.SINGLE | SWT.H_SCROLL + | SWT.V_SCROLL | SWT.BORDER); GridData data = new GridData(GridData.FILL_BOTH); data.heightHint = 250; data.widthHint = 300; @@ -63,13 +66,6 @@ listViewer.setContentProvider(new ArrayContentProvider()); } - private Label createListTitleArea(Composite composite) { - Label label = new Label(composite, SWT.NONE); - label.setText(listTitle); - label.setFont(composite.getFont()); - return label; - } - private Composite createDialogArea(Composite parent) { // create a composite with standard margins and spacing Composite composite = new Composite(parent, SWT.NONE); @@ -86,5 +82,14 @@ public boolean isPageComplete() { return true; } + + public TableViewer getListViewer() { + return listViewer; + } + + public void setListViewer(TableViewer listViewer) { + this.listViewer = listViewer; + } + } Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java =================================================================== --- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-08 07:40:58 UTC (rev 10728) +++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-08 07:42:08 UTC (rev 10729) @@ -11,19 +11,28 @@ package org.jboss.tools.bpmnto.wizard; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TreePath; +import org.eclipse.jface.viewers.TreeSelection; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.DirectoryDialog; -import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.model.WorkbenchContentProvider; +import org.eclipse.ui.model.WorkbenchLabelProvider; import org.jboss.tools.b2j.messages.B2JMessages; /** @@ -31,74 +40,87 @@ * * the wizardpage for the generated file location */ -public class GeneratedFileLocationPage extends WizardPage{ - - String message; - Text pathText; +public class GeneratedFileLocationPage extends WizardPage { + + private TreeViewer viewer; + private ISelection currentSelection; + private Button button; private IWizard wizard; - protected GeneratedFileLocationPage(String pageName, String message) { + protected GeneratedFileLocationPage(String pageName, String title, + String description) { super(pageName); - this.message = message; - this.setTitle(pageName); + this.setDescription(description); + this.setTitle(title); } public void createControl(Composite parent) { Composite composite = createDialogArea(parent); - createMessageArea(composite); - createLocationArea(composite); - - setControl(composite); - + + createListTitleArea(composite); + createListViewer(composite); + createCheckbox(composite); + super.setControl(composite); + + initializePage(); + } - - private void createLocationArea(Composite parent) { - Group composite = new Group(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 3; - composite.setLayout(layout); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - - Label label = new Label(composite, SWT.NONE); - label.setText("Location:"); + + private Label createListTitleArea(Composite parent) { + Label label = new Label(parent, SWT.NONE); + label + .setText(B2JMessages.Bpmn_GeneratedFile_Location_WizardPage_ViewerTitle); label.setFont(parent.getFont()); - - - pathText = new Text(composite, SWT.BORDER); - pathText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - pathText.setEditable(false); - - Button browse = new Button(composite, SWT.PUSH); - browse.setText(B2JMessages.Label_Button_Browse); - browse.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.OPEN); - dialog.setText(B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Title); - dialog.setMessage(B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Message); - String path = dialog.open(); - if (path != null && path.length() > 0) { - pathText.setText(path); - ((BpmnToWizard)wizard).setLocation(path); - } + return label; + } + + private void createListViewer(Composite composite) { + viewer = new TreeViewer(composite, SWT.BORDER | SWT.MULTI + | SWT.H_SCROLL | SWT.V_SCROLL); + viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH)); + viewer.setLabelProvider(new WorkbenchLabelProvider()); + WorkbenchContentProvider cp = new WorkbenchContentProvider(); + viewer.setContentProvider(cp); + viewer.setFilters(new ViewerFilter[] { new ProFilter() }); + viewer.addPostSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + updateControls(); + currentSelection = viewer.getSelection(); + ((BpmnToWizard) wizard) + .setTargetLocationSelection((IStructuredSelection) currentSelection); + } }); - - initializePage(); + } - + private Button createCheckbox(Composite parent) { + button = new Button(parent, SWT.CHECK | SWT.NONE); + button + .setText(B2JMessages.Bpmn_GeneratedFile_Location_WizardPage_CheckBox); + button.setFont(parent.getFont()); + return button; } private void initializePage() { wizard = this.getWizard(); - pathText.setText(((BpmnToWizard)wizard).getLocation() == null ?"" : ((BpmnToWizard)wizard).getLocation()); - + viewer.setInput(ResourcesPlugin.getWorkspace()); + if (this.currentSelection != null) { + if (currentSelection != null + && currentSelection instanceof ITreeSelection) { + // Select the parent project of this first bpmn file chosen + ITreeSelection node = (ITreeSelection) currentSelection; + TreePath[] paths = node.getPaths(); + TreePath projPath = new TreePath(new Object[] { paths[0] + .getFirstSegment() }); + TreeSelection projSel = new TreeSelection(projPath); + viewer.setSelection(projSel, true); + } + } + button.setSelection(true); } - private Label createMessageArea(Composite parent) { - Label label = new Label(parent, SWT.NONE); - label.setText(message); - label.setFont(parent.getFont()); - return label; + private void updateControls() { + super.getWizard().getContainer().updateButtons(); } private Composite createDialogArea(Composite parent) { @@ -113,9 +135,27 @@ composite.setLayoutData(new GridData(GridData.FILL_BOTH)); return composite; } - + public boolean isPageComplete() { + if (viewer != null && viewer.getSelection() == null) { + return false; + } return true; } + public ISelection getSelection() { + return currentSelection; + } + + public void setSelection(ISelection currentSelection) { + this.currentSelection = currentSelection; + } + } + +class ProFilter extends ViewerFilter { + @Override + public boolean select(Viewer viewer, Object parent, Object element) { + return element instanceof IContainer; + } +}

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10728 - in trunk/esb/plugins/org.jboss.tools.esb.project.ui: src/org/jboss/tools/esb/project/ui/preference/controls and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-10-08 03:40:58 -0400 (Wed, 08 Oct 2008) New Revision: 10728 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossLibraryListFieldEditor.java Log: JBIDE-2865: fix the bug that the preference page has a invalid category Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-08 07:22:25 UTC (rev 10727) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-08 07:40:58 UTC (rev 10728) @@ -25,7 +25,7 @@ <extension point="org.eclipse.ui.preferencePages"> <page - category="org.jboss.tools.common.model.ui.MainPreferencePage" + category="org.jboss.ide.eclipse.ui.MainPreferencePage" class="org.jboss.tools.esb.project.ui.preference.controls.JBossESBRuntimePreferencePage" id="org.jboss.tools.esb.project.runtime.preference" name="JBoss ESB Runtimes"> Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossLibraryListFieldEditor.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossLibraryListFieldEditor.java 2008-10-08 07:22:25 UTC (rev 10727) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossLibraryListFieldEditor.java 2008-10-08 07:40:58 UTC (rev 10728) @@ -177,6 +177,11 @@ tempJbesb.setUserConfigClasspath(btnDefault.getSelection()); setJarGroupStatus(); setValue(null); + if(btnDefault.getSelection()){ + jarGroup.setVisible(true); + }else{ + jarGroup.setVisible(false); + } } }); @@ -188,6 +193,7 @@ jarGroup.setEnabled(isUserConfig); listView.getTree().setEnabled(isUserConfig); actionPanel.setEnabled(isUserConfig); + jarGroup.setVisible(isUserConfig); } protected void createListView(Composite parent) {

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10727 - trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-08 03:22:25 -0400 (Wed, 08 Oct 2008) New Revision: 10727 Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF Log: fix version number in test dependencies Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF 2008-10-08 06:52:49 UTC (rev 10726) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF 2008-10-08 07:22:25 UTC (rev 10727) @@ -12,7 +12,7 @@ org.eclipse.ui.ide, org.eclipse.core.runtime, org.jboss.tools.jst.web, - org.eclipse.jface.text;bundle-version="3.4.1", - org.jboss.tools.common.model.ui;bundle-version="2.0.0" + org.eclipse.jface.text, + org.jboss.tools.common.model.ui Export-Package: org.jboss.tools.common.text.ext.test Bundle-ClassPath: common-text-ext-test.jar

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10726 - trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-08 02:52:49 -0400 (Wed, 08 Oct 2008) New Revision: 10726 Removed: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/tldHyperLinkTest.jsp Log: empty file removed Deleted: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/tldHyperLinkTest.jsp ===================================================================

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10725 - trunk/tests/features/org.jboss.tools.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-08 02:52:29 -0400 (Wed, 08 Oct 2008) New Revision: 10725 Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml Log: ext.text JUnit tests has been added to build Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml =================================================================== --- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-10-08 06:48:33 UTC (rev 10724) +++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-10-08 06:52:29 UTC (rev 10725) @@ -394,4 +394,10 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.jboss.tools.common.text.ext.test" + download-size="0" + install-size="0" + version="0.0.0"/> + </feature>

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r10724 - in trunk/common/tests/org.jboss.tools.common.text.ext.test: META-INF and 22 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-08 02:48:33 -0400 (Wed, 08 Oct 2008) New Revision: 10724 Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/.classpath trunk/common/tests/org.jboss.tools.common.text.ext.test/.project trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/ trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.text.ext.test/build.properties trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.classpath trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.project trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/.jsdtscope trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jdt.core.prefs trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.common.component trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.validation.prefs trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/ChangeListenerInstance.java trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/META-INF/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/faces-config.xml trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/jsf-api.jar trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/jsf-impl.jar trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/jsf-tlds.jar trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/web.xml trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/classHyperlinkTests.jsp trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/styleHyperlinkTests.jsp trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style1.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style10.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style11.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style12.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style13.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style14.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style2.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style3.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style4.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style5.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style6.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style7.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style8.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style9.css trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/jsf-api.jar trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/jsf-impl.jar trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/jsf-tlds.jar trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/tldHyperLinkTest.jsp trunk/common/tests/org.jboss.tools.common.text.ext.test/src/ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/CommonExtAllTests.java trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2858 JUnit Test Plug-in has been added Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/.classpath =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/.classpath (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/.classpath 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/.project =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/.project (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/.project 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.common.text.ext.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> Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,18 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Text Ext Test Plug-in +Bundle-SymbolicName: org.jboss.tools.common.text.ext.test +Bundle-Version: 1.0.0 +Require-Bundle: org.jboss.tools.common.text.ext, + org.junit, + org.jboss.tools.tests, + org.eclipse.core.resources, + org.eclipse.ui, + org.jboss.tools.jst.jsp, + org.eclipse.ui.ide, + org.eclipse.core.runtime, + org.jboss.tools.jst.web, + org.eclipse.jface.text;bundle-version="3.4.1", + org.jboss.tools.common.model.ui;bundle-version="2.0.0" +Export-Package: org.jboss.tools.common.text.ext.test +Bundle-ClassPath: common-text-ext-test.jar Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/build.properties =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/build.properties (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/build.properties 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,9 @@ +output.. = bin/ +bin.includes = META-INF/,\ + projects/,\ + common-text-ext-test.jar +source.common-text-ext-test.jar = src/ +src.includes = projects/,\ + src/,\ + META-INF/,\ + build.properties Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.classpath =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.classpath (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.classpath 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="JavaSource"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.preview.runtimeTarget/J2EE Preview"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.5.0-sun-1.5.0.15"/> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.project =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.project (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.project 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>HiperlinksTestProject</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/.jsdtscope =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/.jsdtscope (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/.jsdtscope 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jdt.core.prefs 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,7 @@ +#Thu Oct 02 15:53:16 PDT 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,4 @@ +#Thu Oct 02 15:53:16 PDT 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:java-1.5.0-sun-1.5.0.15/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.preview.runtimeTarget\:\:J2EE\ Preview/owners=jst.web\:2.4 +eclipse.preferences.version=1 Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.common.component 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="HiperlinksTestProject"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="HiperlinksTestProject"/> +<property name="java-output-path"/> +</wb-module> +</project-modules> Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="J2EE Preview"/> + <fixed facet="jst.java"/> + <fixed facet="jst.web"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.web" version="2.4"/> +</faceted-project> Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.validation.prefs =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.validation.prefs (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.validation.prefs 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,9 @@ +#Thu Oct 02 16:44:50 PDT 2008 +DELEGATES_PREFERENCE=delegateValidatorList +USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator; +USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator; +USER_PREFERENCE=overrideGlobalPreferencesfalse +eclipse.preferences.version=1 +override=false +suspend=false +vf.version=3 Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.settings/org.eclipse.wst.validation.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/ChangeListenerInstance.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/ChangeListenerInstance.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/ChangeListenerInstance.java 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,9 @@ +package org.jboss.tools.test; +/** + * Test class to verify Java Class hyperlink + * @author eskimo + * + */ +public class ChangeListenerInstance { + +} Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/ChangeListenerInstance.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/META-INF/MANIFEST.MF 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/faces-config.xml 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC + "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> + +<faces-config> + +</faces-config> Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/jsf-api.jar =================================================================== (Binary files differ) Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/jsf-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/jsf-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/jsf-impl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/lib/jsf-tlds.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/web.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/web.xml 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name>HiperlinksTestProject</display-name> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/classHyperlinkTests.jsp =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/classHyperlinkTests.jsp (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/classHyperlinkTests.jsp 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,35 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> + +<html> + <head> + <title>Input User Name Page</title> + <style> + .style-class9 { + /* in style comment 1 */ + color: #0D5AAA; + border: 1px solid #EEE000; + /* in style comment 2 */ + font-size: 24px; + background: #F0A8FF; + /* in style comment 3 */ + } + .style-class10 { + /* in style comment 1 */ + color: #0D5AAA; + border: 1px solid #EEE000; + /* in style comment 2 */ + font-size: 24px; + background: #F0A8FF; + /* in style comment 3 */ + } + </style> + </head> + <body> + <f:view> + <h1 class="style-class1"> + <f:valueChangeListener type="org.jboss.tools.test.ChangeListenerInstance"/> + </h1> + </f:view> + </body> +</html> \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/classHyperlinkTests.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/styleHyperlinkTests.jsp =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/styleHyperlinkTests.jsp (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/styleHyperlinkTests.jsp 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,67 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> + +<html> + <head> + <title>Input User Name Page</title> + <link href="stylesheet/style15.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style14.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style13.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style12.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style11.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style10.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style9.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style8.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style7.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style6.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style5.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style4.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style3.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style2.css" rel="stylesheet" type="text/css" /> + <link href="stylesheet/style1.css" rel="stylesheet" type="text/css" /> + <style> + .style-class9 { + /* in style comment 1 */ + color: #0D5AAA; + border: 1px solid #EEE000; + /* in style comment 2 */ + font-size: 24px; + background: #F0A8FF; + /* in style comment 3 */ + } + .style-class10 { + /* in style comment 1 */ + color: #0D5AAA; + border: 1px solid #EEE000; + /* in style comment 2 */ + font-size: 24px; + background: #F0A8FF; + /* in style comment 3 */ + } + </style> + </head> + <body> + <f:view> + <h1> + <h:outputText value="Title1" styleClass="style-class1"/> + </h1> + <h1> + <h:outputText value="Title2" styleClass="style-class2"/> + </h1> + <h1> + <h:outputText value="Title3" styleClass="style-class3"/> + </h1> + <h1> + <h:outputText value="Title4" styleClass="style-class4"/> + </h1> + <h:dataTable> + <h:column><h:outputText value="Title5" styleClass="style-class5"/></h:column> + <h:column><h:outputText value="Title6" styleClass="style-class6"/></h:column> + <h:column><h:outputText value="Title7" styleClass="style-class7"/></h:column> + <h:column><h:outputText value="Title8" styleClass="style-class8"/></h:column> + <h:column><h:outputText value="Title9" styleClass="style-class9"/></h:column> + <h:column><h:outputText value="Title10" styleClass="style-class10"/></h:column> + </h:dataTable> + </f:view> + </body> +</html> \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/styleHyperlinkTests.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style1.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style1.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style1.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,46 @@ + \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style1.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style10.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style10.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style10.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1 @@ +.style-class1< \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style10.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style11.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style11.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style11.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,7 @@ + \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style11.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style12.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style12.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style12.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,5 @@ + \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style13.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style14.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style14.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style14.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,3 @@ +cla$$1, &class2 { + color: green; +} \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style14.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style2.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style2.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style2.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,34 @@ + \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style2.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style3.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style3.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style3.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,10 @@ + +/* Comment */ +.style-class12 { + color: #0D5798; + border: 1px solid #CCCBBB; + font-size: 16px; + background: #F0FAFF; +} + +/* Comment \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style3.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style4.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style4.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style4.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,8 @@ + +/* Comment */ + .style-class14 , .style-class15 { + color: #0D5798; + border: 1px solid #CCCBBB; + font-size: 16px; + background: #F0FAFF; + /* commnet error * \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style4.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style5.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style5.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style5.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,2 @@ +/ + Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style5.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style6.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style6.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style6.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,4 @@ +.style-class16 { + color: red; +} +//comment with error \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style6.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style7.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style7.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style7.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,8 @@ + +/* Comment */ + .style-class14 , .style-class15 { + color: #0D5798; + border: 1px solid #CCCBBB; + font-size: 16px; + background: #F0FAFF; + / \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style7.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style8.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style8.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style8.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,8 @@ + +/* Comment */ + .style-class14 , .style-class15 { + color: #0D5798; + border: 1px solid #CCCBBB; + font-size: 16px; + background: #F0FAFF; + // bad comment \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style8.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style9.css =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style9.css (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style9.css 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,2 @@ +/* Comment */ +.style-class1 \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/stylesheet/style9.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/jsf-api.jar =================================================================== (Binary files differ) Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/jsf-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/jsf-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/jsf-impl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/lib/jsf-tlds.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/tldHyperLinkTest.jsp =================================================================== Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/tldHyperLinkTest.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/CommonExtAllTests.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/CommonExtAllTests.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/CommonExtAllTests.java 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,22 @@ +package org.jboss.tools.common.text.ext.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.jboss.tools.test.util.ProjectImportTestSetup; + + +public class CommonExtAllTests { + public static Test suite() { + TestSuite suite = new TestSuite("Test for default package"); + //$JUnit-BEGIN$ + + suite.addTest(new ProjectImportTestSetup(new TestSuite(OpenOnsTest.class), + "org.jboss.tools.common.text.ext.test", + new String[]{"projects/HiperlinksTestProject"}, + new String[]{"HiperlinksTestProject"})); + + //$JUnit-END$ + return suite; + } +} Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/CommonExtAllTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java 2008-10-08 06:48:33 UTC (rev 10724) @@ -0,0 +1,189 @@ +package org.jboss.tools.common.text.ext.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.FindReplaceDocumentAdapter; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.ui.IEditorDescriptor; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.texteditor.DocumentProviderRegistry; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.jboss.tools.common.model.ui.editor.EditorPartWrapper; +import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor; +import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorStandAlone; +import org.jboss.tools.common.text.ext.hyperlink.CSSClassHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.ClassHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.test.util.WorkbenchUtils; + +public class OpenOnsTest extends TestCase { + + public static final String STYLE_OPENON_PROJECT = "HiperlinksTestProject"; + + + public IProject project = null; + + protected void setUp() { + project = ResourcesPlugin.getWorkspace().getRoot().getProject( + STYLE_OPENON_PROJECT); + } + + public OpenOnsTest() { + super("styleClass OpenOn tests"); + } + + public static final String WEB_XML_FILE_PATH = "WebContent/WEB-INF/web.xml"; + + public void testServletNameOpenOn() throws PartInitException, BadLocationException { + IFile webXml = project.getFile(WEB_XML_FILE_PATH); + IEditorDescriptor descriptor = IDE.getEditorDescriptor(webXml); + IEditorPart editor = WorkbenchUtils.openEditor(webXml, descriptor.getId()); + editor = ((EditorPartWrapper)editor).getEditor(); + JobUtils.waitForIdle(); + DefaultMultipageEditor xmlMultyPageEditor = (DefaultMultipageEditor) editor; + xmlMultyPageEditor.selectPageByName("Source"); + ISourceViewer viewer = xmlMultyPageEditor.getSourceEditor().getTextViewer(); + + IDocument document = viewer.getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + "Faces Servlet", true, true, false, false); + reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset()+reg.getLength()+1, + "Faces Servlet", true, true, false, false); + reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset()+reg.getLength()+1, + "Faces Servlet", true, true, false, false); + reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset()+reg.getLength()+1, + "Faces Servlet", true, true, false, false); + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false); + links[0].open(); + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + System.out.println(editor.getSite().getSelectionProvider().getSelection().toString()); + } + + public void testTagAttributeOpenOn() throws BadLocationException { + IEditorPart editor = WorkbenchUtils.openEditor(project + .getFile(STYLE_TEST_FILE), JSPMultiPageEditor.EDITOR_ID); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + "value", true, true, false, false); + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false); + links[0].open(); + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + String fileName = editor.getEditorInput().getName(); + System.out.println(fileName); + assertTrue("style1.css".equals(fileName)); + } + + public static final String STYLE_TEST_FILE = "WebContent/styleHyperlinkTests.jsp"; + public static final String CSS1_TEST_FILE = "WebContent/stylesheet/style1.css"; + public static final String CSS2_TEST_FILE = "WebContent/stylesheet/style2.css"; + + public void testStylesheetOpenOn() throws BadLocationException { + IEditorPart editor = WorkbenchUtils.openEditor(project + .getFile(STYLE_TEST_FILE), JSPMultiPageEditor.EDITOR_ID); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + "stylesheet/style1.css", true, true, false, false); + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false); + links[0].open(); + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + String fileName = editor.getEditorInput().getName(); + assertTrue("style1.css".equals(fileName)); + } + + public void testStyleClassOpenOns() throws CoreException, BadLocationException { + IEditorPart editor = WorkbenchUtils.openEditor(project + .getFile(STYLE_TEST_FILE), JSPMultiPageEditor.EDITOR_ID); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + "style-class9\"", true, true, false, false); + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false); + links[0].open(); + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + String fileName = editor.getEditorInput().getName(); + assertTrue("styleHyperlinkTests.jsp".equals(fileName)); + + reg = new FindReplaceDocumentAdapter(document).find(0, + "style-class3", true, true, false, false); + links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false); + links[0].open(); + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + fileName = editor.getEditorInput().getName(); + assertTrue("style1.css".equals(fileName)); + + reg = new FindReplaceDocumentAdapter(document).find(0, + "style-class6", true, true, false, false); + links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false); + links[0].open(); + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + fileName = editor.getEditorInput().getName(); + assertTrue("style2.css".equals(fileName)); + } + + public void testFilterNameOpenOn() { + + } + + public static final String CLASS_TEST_FILE = "WebContent/classHyperlinkTests.jsp"; + public static final String CLASS1_TEST_FILE = "JavaSource/org/jboss/test/ChangeListenerInstance.java"; + + public void testClassNameOpenOn() throws CoreException, BadLocationException { + IEditorPart editor = WorkbenchUtils.openEditor(project + .getFile(CLASS_TEST_FILE), JSPMultiPageEditor.EDITOR_ID); + assertTrue(editor instanceof JSPMultiPageEditor); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + +// IEditorInput fileInput = new FileEditorInput(project +// .getFile(CLASS_TEST_FILE)); +// IDocumentProvider documentProvider = DocumentProviderRegistry +// .getDefault().getDocumentProvider(fileInput); +// +// documentProvider.connect(fileInput); +// IDocument document = documentProvider.getDocument(fileInput); + IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0, + "org.jboss.tools.test.ChangeListenerInstance", true, true, false, false); + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false); +// ClassHyperlink classHyper = new ClassHyperlink(); +// classHyper.setOffset(reg.getOffset()); +// classHyper.setDocument(document); +// classHyper.open(); + links[0].open(); + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + String fileName = editor.getEditorInput().getName(); + assertTrue("ChangeListenerInstance.java".equals(fileName)); + } +} Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

16 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2008