Author: vyemialyanchyk Date: 2009-08-12 12:03:32 -0400 (Wed, 12 Aug 2009) New Revision: 17063 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/ComponentFigure.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleFigure.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleLabel.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-4756 - add common font height property for all diagram figures Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/ComponentFigure.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/ComponentFigure.java 2009-08-12 15:59:31 UTC (rev 17062) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/ComponentFigure.java 2009-08-12 16:03:32 UTC (rev 17063) @@ -38,9 +38,9 @@ setLayoutManager(new ToolbarLayout()); } - public void createTitle(String text, Image icon, Color bg) { + public void createTitle(String text, Image icon, Color bg, float fontHeight) { removeTitle(); - TitleLabel label = new TitleLabel(); + TitleLabel label = new TitleLabel(fontHeight); label.setText(text); label.setBackgroundColor(bg); label.setOpaque(true); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleFigure.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleFigure.java 2009-08-12 15:59:31 UTC (rev 17062) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleFigure.java 2009-08-12 16:03:32 UTC (rev 17063) @@ -55,13 +55,13 @@ * @param icon * @param bg */ - public void createTitle(String text, Image icon, Color bg) { + public void createTitle(String text, Image icon, Color bg, float fontHeight) { removeTitle(); - TitleLabel label = new TitleLabel(); + TitleLabel label = new TitleLabel(fontHeight); label.setText(text); FontData fontData[] = Display.getCurrent().getSystemFont().getFontData(); fontData[0].setStyle(SWT.BOLD); - //fontData[0].height++; + fontData[0].height = fontHeight; label.setFont(ResourceManager.getInstance().getFont(fontData[0])); label.setBackgroundColor(bg); label.setIcon(icon); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleLabel.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleLabel.java 2009-08-12 15:59:31 UTC (rev 17062) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleLabel.java 2009-08-12 16:03:32 UTC (rev 17063) @@ -14,8 +14,11 @@ import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.Label; import org.eclipse.draw2d.geometry.Dimension; +import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Display; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; +import org.jboss.tools.hibernate.ui.diagram.editors.parts.ResourceManager; import org.jboss.tools.hibernate.ui.view.ImageBundle; /** @@ -31,7 +34,13 @@ /** * to represent expanded/collapsed state */ - protected boolean expanded = true; + protected boolean expanded = true; + + public TitleLabel(float fontHeight) { + FontData fontData[] = Display.getCurrent().getSystemFont().getFontData(); + fontData[0].height = fontHeight; + setFont(ResourceManager.getInstance().getFont(fontData[0])); + } /** * @see Label#calculateLabelSize(Dimension) Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-08-12 15:59:31 UTC (rev 17062) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-08-12 16:03:32 UTC (rev 17063) @@ -31,6 +31,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.draw2d.PositionConstants; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.swt.graphics.FontData; +import org.eclipse.swt.widgets.Display; import org.hibernate.cfg.Configuration; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.eclipse.console.HibernateConsolePlugin; @@ -69,11 +71,13 @@ private boolean snapToGeometry = false; private boolean gridEnabled = false; private double zoom = 1.0; + private float fontHeight = 8.5f; // private boolean fileLoadSuccessfull = false; public OrmDiagram(ConsoleConfiguration consoleConfig, RootClass ioe) { + initFontHeight(); createRulers(); this.consoleConfig = consoleConfig; labelProvider.setConfig(consoleConfig.getConfiguration()); @@ -89,6 +93,7 @@ } public OrmDiagram(ConsoleConfiguration consoleConfig, RootClass[] ioe) { + initFontHeight(); createRulers(); this.consoleConfig = consoleConfig; labelProvider.setConfig(consoleConfig.getConfiguration()); @@ -475,7 +480,22 @@ public double getZoom() { return zoom; } + + protected void initFontHeight() { + FontData fontData[] = Display.getCurrent().getSystemFont().getFontData(); + if (fontData.length > 0) { + fontHeight = fontData[0].height; + } + } + public void setFontHeight(float fontHeight) { + this.fontHeight = fontHeight; + } + + public float getFontHeight() { + return fontHeight; + } + @Override public String getKey() { return null; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java 2009-08-12 15:59:31 UTC (rev 17062) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java 2009-08-12 16:03:32 UTC (rev 17063) @@ -44,7 +44,8 @@ protected IFigure createFigure() { ComponentFigure figure = new ComponentFigure(); figure.createTitle(getOrmDiagram().getLabelProvider().getText(getElement()), - getOrmDiagram().getLabelProvider().getImage(getElement()), getColor()); + getOrmDiagram().getLabelProvider().getImage(getElement()), getColor(), + getOrmDiagram().getFontHeight()); figure.setBorder(new FocusBorder()); figure.setSize(-1, -1); return figure; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeEditPart.java 2009-08-12 15:59:31 UTC (rev 17062) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeEditPart.java 2009-08-12 16:03:32 UTC (rev 17063) @@ -46,7 +46,7 @@ */ @Override protected IFigure createFigure() { - Label label = new TitleLabel(); + Label label = new TitleLabel(getOrmDiagram().getFontHeight()); label.setText(getOrmDiagram().getLabelProvider().getText(getElement())); label.setBackgroundColor(getColor()); label.setIcon(getOrmDiagram().getLabelProvider().getImage(getElement())); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2009-08-12 15:59:31 UTC (rev 17062) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2009-08-12 16:03:32 UTC (rev 17063) @@ -64,7 +64,8 @@ TitleFigure figure = new TitleFigure(); figure.setLayoutManager(new ToolbarLayout()); String text = getOrmDiagram().getLabelProvider().getText(element); - figure.createTitle(text, getOrmDiagram().getLabelProvider().getImage(element), getColor()); + figure.createTitle(text, getOrmDiagram().getLabelProvider().getImage(element), + getColor(), getOrmDiagram().getFontHeight()); figure.setBackgroundColor(getBackgroundColor()); return figure; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2009-08-12 15:59:31 UTC (rev 17062) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2009-08-12 16:03:32 UTC (rev 17063) @@ -30,7 +30,9 @@ import org.eclipse.gef.editparts.AbstractEditPart; import org.eclipse.gef.editpolicies.SelectionEditPolicy; import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.RGB; +import org.eclipse.swt.widgets.Display; import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; import org.hibernate.mapping.DependantValue; @@ -67,6 +69,9 @@ @Override protected IFigure createFigure() { Label label = new Label(); + FontData fontData[] = Display.getCurrent().getSystemFont().getFontData(); + fontData[0].height = getOrmDiagram().getFontHeight(); + label.setFont(ResourceManager.getInstance().getFont(fontData[0])); label.setText(getOrmDiagram().getLabelProvider().getText(getElement())); label.setBackgroundColor(getColor()); label.setIcon(getOrmDiagram().getLabelProvider().getImage(getElement()));