Author: DartPeng Date: 2009-07-14 12:08:15 -0400 (Tue, 14 Jul 2009) New Revision: 16570 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java Log: JBIDE-4592 Add EDI mapping transform result dialog Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-14 15:53:36 UTC (rev 16569) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-14 16:08:15 UTC (rev 16570) @@ -27,7 +27,6 @@ import javax.xml.transform.stream.StreamSource; import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.geometry.Point; @@ -58,7 +57,6 @@ import org.eclipse.gef.ui.actions.UpdateAction; import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler; import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer; -import org.eclipse.jdt.core.JavaCore; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -91,7 +89,6 @@ import org.eclipse.ui.forms.widgets.Section; import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.ModelPanelCreator; -import org.jboss.tools.smooks.configuration.editors.uitls.ProjectClassLoader; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.configuration.editors.xml.TagList; import org.jboss.tools.smooks.configuration.editors.xml.TagObject; @@ -196,6 +193,8 @@ descriptionCreator.markPropertyUI(modelProvider.getDiagnosticList()); } if (segmentsCreator != null) { + if (getGraphicalViewer() == null) + return; IStructuredSelection selection = (IStructuredSelection) getGraphicalViewer().getSelection(); if (selection.size() > 1) return; @@ -544,7 +543,7 @@ this.description = root.getEdimap().getDescription(); this.segments = root.getEdimap().getSegments(); - if(segments.getXmltag() == null){ + if (segments.getXmltag() == null) { segments.setXmltag("root"); } @@ -633,7 +632,7 @@ } Hyperlink showTransformResultLink = toolkit.createHyperlink(desciptorContainer, "Test EDI transform", SWT.NONE); - showTransformResultLink.setVisible(false); + // showTransformResultLink.setVisible(false); showTransformResultLink.addHyperlinkListener(new IHyperlinkListener() { /* @@ -1073,7 +1072,6 @@ } protected void testEDITransform() { - ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); try { if (this.getEditor().isDirty()) { MessageDialog.openInformation(getEditorSite().getShell(), "Info", @@ -1097,17 +1095,19 @@ return; } - IPath path1 = file.getFullPath().removeFirstSegments(1); + // IPath path1 = file.getFullPath().removeFirstSegments(1); - ProjectClassLoader classLoader = new ProjectClassLoader(JavaCore.create(file.getProject())); - - Thread.currentThread().setContextClassLoader(classLoader); + // ProjectClassLoader classLoader = new + // ProjectClassLoader(JavaCore.create(file.getProject())); + // + // Thread.currentThread().setContextClassLoader(classLoader); Smooks smooks = new Smooks(); SmooksResourceConfiguration readerConfig = new SmooksResourceConfiguration("org.xml.sax.driver", SmooksEDIReader.class.getName()); + File f = new File(file.getLocation().toOSString()); - readerConfig.setParameter("mapping-model", path1.toString()); + readerConfig.setParameter("mapping-model", f.toURI().toString()); readerConfig.setParameter("encoding", "UTF-8"); SmooksUtil.registerResource(readerConfig, smooks); @@ -1120,6 +1120,7 @@ // Filter the message through Smooks and capture the result as a DOM // in // the domResult instance... + // FileInputStream stream smooks.filter(new StreamSource(new FileInputStream(ediFile)), domResult); // Get the Document object from the domResult. This is the message @@ -1134,10 +1135,13 @@ StringWriter modelWriter = new StringWriter(); XmlUtil.serialize(model, true, modelWriter); System.out.println(modelWriter); + EDIMappingResultDialog dialog = new EDIMappingResultDialog(getSite().getShell()); + dialog.setText(modelWriter.toString()); + dialog.open(); + modelWriter.close(); } catch (Throwable t) { SmooksUIUtils.showErrorDialog(getEditorSite().getShell(), SmooksUIUtils.createErrorStatus(t)); } finally { - Thread.currentThread().setContextClassLoader(oldClassLoader); } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java 2009-07-14 16:08:15 UTC (rev 16570) @@ -0,0 +1,83 @@ +/******************************************************************************* + * 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.smooks.edimap.editor; + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.window.IShellProvider; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class EDIMappingResultDialog extends Dialog { + + private Text text; + + public EDIMappingResultDialog(IShellProvider parentShell) { + super(parentShell); + // TODO Auto-generated constructor stub + } + + public EDIMappingResultDialog(Shell parentShell) { + super(parentShell); + + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse + * .swt.widgets.Composite) + */ + @Override + protected void createButtonsForButtonBar(Composite parent) { + createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets + * .Composite) + */ + @Override + protected Control createDialogArea(Composite parent) { + // TODO Auto-generated method stub + Composite mainComposite = (Composite) super.createDialogArea(parent); + org.eclipse.swt.layout.GridData gd = new GridData(GridData.FILL_BOTH); + + text = new Text(mainComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.READ_ONLY | SWT.BORDER); + gd.heightHint = 400; + gd.widthHint = 400; + text.setLayoutData(gd); + if (content != null) { + text.setText(content); + } + this.getShell().setText("EDI Mapping Result"); + return mainComposite; + } + + private String content = null; + + public void setText(String content) { + this.content = content; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java 2009-07-14 15:53:36 UTC (rev 16569) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java 2009-07-14 16:08:15 UTC (rev 16570) @@ -46,7 +46,7 @@ } private void loadFile(File file) throws IOException { - if (file.exists() && file.isDirectory()) { + if (file.exists() && file.isDirectory() && !file.getName().equals(".svn")) { File[] configFiles = file.listFiles(); for (int i = 0; i < configFiles.length; i++) { File configFile = configFiles[i];