[jbosstools-commits] JBoss Tools SVN: r18232 - in branches/jbosstools-3.1.0.M4/hibernatetools: plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions and 2 other directories.

Author: vyemialyanchyk Date: 2009-10-22 07:45:00 -0400 (Thu, 22 Oct 2009) New Revision: 18232 Modified: branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/DiagramEditorInput.java branches/jbosstools-3.1.0.M4/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-5076 - fix Modified: branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java =================================================================== --- branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-10-22 11:42:58 UTC (rev 18231) +++ branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-10-22 11:45:00 UTC (rev 18232) @@ -111,7 +111,7 @@ public void doSaveAs() { SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getWorkbenchWindow().getShell()); - saveAsDialog.setOriginalName(getDiagramName()); + saveAsDialog.setOriginalName(getStoreFileName()); saveAsDialog.open(); final IPath pathSave = saveAsDialog.getResult(); if (pathSave == null) { @@ -313,14 +313,21 @@ } public String getDiagramName() { - IEditorInput input = getEditorInput(); - if (input instanceof DiagramEditorInput) { - DiagramEditorInput objectEditorInput = (DiagramEditorInput)input; - return objectEditorInput.getName(); + DiagramEditorInput diagramInput = getDiagramInput(); + if (diagramInput != null) { + return diagramInput.getName(); } return ""; //$NON-NLS-1$ } + public String getStoreFileName() { + DiagramEditorInput diagramInput = getDiagramInput(); + if (diagramInput != null) { + return diagramInput.getStoreFileName(); + } + return ""; //$NON-NLS-1$ + } + public void refresh() { getOrmDiagram().refresh(); setPartName(DiagramViewerMessages.DiagramViewer_diagram_for + " " + getDiagramInput().getName()); //$NON-NLS-1$ Modified: branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java =================================================================== --- branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-10-22 11:42:58 UTC (rev 18231) +++ branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-10-22 11:45:00 UTC (rev 18232) @@ -10,13 +10,14 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.diagram.editors.actions; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.draw2d.Graphics; @@ -81,18 +82,17 @@ saveDialog = new SaveAsDialog(getDiagramViewer().getSite().getWorkbenchWindow().getShell()); createdSaveDialog = true; } - saveDialog.setOriginalName(getDiagramViewer().getDiagramName()); + saveDialog.setOriginalName(getDiagramViewer().getStoreFileName()); saveDialog.open(); - final IPath pathSave = saveDialog.getResult(); + final IPath pathSave = saveDialog.getResult(); + saveDialog = null; if (pathSave == null) { return; } - final IFigure fig = ((ScalableFreeformRootEditPart) getDiagramViewer() .getEditPartViewer().getRootEditPart()) .getLayer(LayerConstants.PRINTABLE_LAYERS); int imageTypeTmp = SWT.IMAGE_BMP; - IWorkspace workspace = ResourcesPlugin.getWorkspace(); String ext = pathSave.getFileExtension(); if (ext != null) { ext = ext.toLowerCase(); @@ -106,23 +106,31 @@ imageTypeTmp = SWT.IMAGE_BMP; } } - IPath pathTmp = workspace.getRoot().getFullPath().append(pathSave); - pathTmp = workspace.getRoot().getLocation().append(pathTmp); + IPath pathTmp = pathSave; if (ext == null) { pathTmp = pathTmp.addFileExtension("bmp"); //$NON-NLS-1$ } final IPath path = pathTmp; final int imageType = imageTypeTmp; + + final IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path); WorkspaceModifyOperation op = new WorkspaceModifyOperation() { public void execute(final IProgressMonitor monitor) { - FileOutputStream outStream = null; + ByteArrayInputStream inputStream = null; try { - byte[] imageData = createImage(fig, imageType); - outStream = new FileOutputStream(path.toString()); - outStream.write(imageData); - outStream.flush(); - } catch (IOException e) { + if (file != null) { + byte[] imageData = createImage(fig, imageType); + if (file.exists()) { + file.delete(true, null); + } + if (!file.exists()) { + inputStream = new ByteArrayInputStream(imageData); + file.create(inputStream, true, null); + } + } + + } catch (CoreException e) { HibernateConsolePlugin.getDefault().logErrorMessage("ExportImageAction", e); //$NON-NLS-1$ if (showErrDialog) { MessageDialog.openInformation(getDiagramViewer().getSite().getShell(), @@ -130,9 +138,9 @@ } } finally { - if (outStream != null) { + if (inputStream != null) { try { - outStream.close(); + inputStream.close(); } catch (IOException e) { // ignore } Modified: branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/DiagramEditorInput.java =================================================================== --- branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/DiagramEditorInput.java 2009-10-22 11:42:58 UTC (rev 18231) +++ branches/jbosstools-3.1.0.M4/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/DiagramEditorInput.java 2009-10-22 11:45:00 UTC (rev 18232) @@ -91,6 +91,10 @@ return ormDiagram.getDiagramName(); } + public String getStoreFileName() { + return ormDiagram.getStoreFileName(); + } + public IPersistableElement getPersistable() { return this; } Modified: branches/jbosstools-3.1.0.M4/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.java =================================================================== --- branches/jbosstools-3.1.0.M4/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.java 2009-10-22 11:42:58 UTC (rev 18231) +++ branches/jbosstools-3.1.0.M4/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.java 2009-10-22 11:45:00 UTC (rev 18232) @@ -25,6 +25,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.SaveAsDialog; +import org.hibernate.eclipse.console.test.project.TestProject; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExportImageAction; import org.jmock.Expectations; @@ -39,7 +40,20 @@ * @author Vitali Yemialyanchyk */ public class ExportImageActionTest extends TestCase { + + public static final String PROJECT_NAME = "TestProject"; //$NON-NLS-1$ + protected TestProject project = null; + + protected void setUp() throws Exception { + project = new TestProject(PROJECT_NAME); + } + + protected void tearDown() throws Exception { + project.deleteIProject(); + project = null; + } + public Mockery context = new Mockery() { { setImposteriser(ClassImposteriser.INSTANCE); @@ -56,12 +70,12 @@ final Control control = context.mock(Control.class); final Display display = context.mock(Display.class); final Rectangle rectangle = new Rectangle(0, 0, 20, 10); - final String filePath = "test.jpg"; //$NON-NLS-1$ + final String filePath = PROJECT_NAME + File.separator + "test.jpg"; //$NON-NLS-1$ final IPath resPath = new Path(filePath); context.checking(new Expectations() { { - allowing(editor).getDiagramName(); + allowing(editor).getStoreFileName(); will(returnValue(filePath)); allowing(saveDialog).setOriginalName(filePath); @@ -120,7 +134,6 @@ // GENERAL TEST: // check for all expectations context.assertIsSatisfied(); - }