Author: vyemialyanchyk Date: 2009-11-19 12:21:15 -0500 (Thu, 19 Nov 2009) New Revision: 18752 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/PrintPreViewDiagramViewerAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/print/PrintPreviewHelper.java Log: https://jira.jboss.org/jira/browse/JBIDE-5147 & https://jira.jboss.org/jira/browse/JBIDE-5148 - fix server build Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2009-11-19 16:47:45 UTC (rev 18751) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2009-11-19 17:21:15 UTC (rev 18752) @@ -16,9 +16,6 @@ org.hibernate.eclipse, org.eclipse.jdt.core, org.eclipse.jdt.ui, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.gmf.runtime.diagram.ui.printing, - org.eclipse.gmf.runtime.draw2d.ui.render, org.hibernate.eclipse.console Bundle-Version: 3.3.0.qualifier Export-Package: org.jboss.tools.hibernate.ui.diagram, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/PrintPreViewDiagramViewerAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/PrintPreViewDiagramViewerAction.java 2009-11-19 16:47:45 UTC (rev 18751) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/PrintPreViewDiagramViewerAction.java 2009-11-19 17:21:15 UTC (rev 18752) @@ -13,7 +13,7 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.gmf.runtime.common.ui.action.actions.IPrintActionHelper; +//import org.eclipse.gmf.runtime.common.ui.action.actions.IPrintActionHelper; /** * Initial test implementation for Print preview for Mapping Diagram @@ -24,11 +24,11 @@ private org.jboss.tools.hibernate.ui.diagram.editors.print.PrintPreviewHelper printPreviewHelper = new org.jboss.tools.hibernate.ui.diagram.editors.print.PrintPreviewHelper(); - private IPrintActionHelper helper = null; +// private IPrintActionHelper helper = null; //new org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.EnhancedPrintActionHelper(); public Object execute(ExecutionEvent event) throws ExecutionException { - printPreviewHelper.doPrintPreview(helper); +// printPreviewHelper.doPrintPreview(helper); return null; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/print/PrintPreviewHelper.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/print/PrintPreviewHelper.java 2009-11-19 16:47:45 UTC (rev 18751) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/print/PrintPreviewHelper.java 2009-11-19 17:21:15 UTC (rev 18752) @@ -11,6 +11,7 @@ import org.eclipse.draw2d.SWTGraphics; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.LayerConstants; +/** / import org.eclipse.gmf.runtime.common.ui.action.actions.IPrintActionHelper; import org.eclipse.gmf.runtime.common.ui.util.WindowUtil; import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper.PageMargins; @@ -24,6 +25,7 @@ import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil; import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics; import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedScaledGraphics; +/**/ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.SWTError; @@ -61,7 +63,7 @@ * Action helper for print. This must be passed in to have something happen * when print is pressed */ - protected IPrintActionHelper printActionHelper; +// protected IPrintActionHelper printActionHelper; /** * Increment userX everytime the user moves right, decrement userX everytime @@ -268,6 +270,7 @@ /** * Initialize all toolbar images */ + /** / protected void initializeToolbarImages() { printImage = DiagramUIPrintingPluginImages.DESC_PRINT.createImage(); @@ -737,12 +740,10 @@ diagramEditPart = getDiagramEditorPart().getDiagramEditPart(); } if (diagramEditPart == null) { - /** / - Diagram diagram = getDiagramEditorPart().getDiagram(); //do not getDiagramEditPart - PreferencesHint preferencesHint = getPreferencesHint(getDiagramEditorPart()); - diagramEditPart = PrintHelperUtil.createDiagramEditPart(diagram, preferencesHint, getTempShell()); - PrintHelperUtil.initializePreferences(diagramEditPart, preferencesHint); - /**/ + //Diagram diagram = getDiagramEditorPart().getDiagram(); //do not getDiagramEditPart + //PreferencesHint preferencesHint = getPreferencesHint(getDiagramEditorPart()); + //diagramEditPart = PrintHelperUtil.createDiagramEditPart(diagram, preferencesHint, getTempShell()); + //PrintHelperUtil.initializePreferences(diagramEditPart, preferencesHint); } return diagramEditPart; } @@ -981,14 +982,12 @@ g.scale(scale); //vit - /** / - String headerOrFooter = - HeaderAndFooterHelper.makeHeaderOrFooterString( - WorkspaceViewerProperties.HEADER_PREFIX, - 1 + userY + row, - 1 + userX + col, - getDiagramEditPart()); - /**/ + //String headerOrFooter = + // HeaderAndFooterHelper.makeHeaderOrFooterString( + // WorkspaceViewerProperties.HEADER_PREFIX, + // 1 + userY + row, + // 1 + userX + col, + // getDiagramEditPart()); String headerOrFooter = "headerOrFooter"; g.drawText( @@ -997,14 +996,12 @@ getMapMode().DPtoLP(HeaderAndFooterHelper.TOP_MARGIN_DP)); //vit - /** / - headerOrFooter = - HeaderAndFooterHelper.makeHeaderOrFooterString( - WorkspaceViewerProperties.FOOTER_PREFIX, - 1 + userY + row, - 1 + userX + col, - getDiagramEditPart()); - /**/ + //headerOrFooter = + // HeaderAndFooterHelper.makeHeaderOrFooterString( + // WorkspaceViewerProperties.FOOTER_PREFIX, + // 1 + userY + row, + // 1 + userX + col, + // getDiagramEditPart()); headerOrFooter = "headerOrFooter"; g.drawText( @@ -1079,4 +1076,5 @@ public void setPercentScaling(int userScale){ setUserScale(userScale); } + /**/ }