[387157] gmf-R1_4_maintenance ahunter 120824 [ImageSupport] Labels are missing on diagrams exported to PNG and JPEG images
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/META-INF/MANIFEST.MF
index b0f54f0..ad4a40c 100644
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.gmf.runtime.draw2d.ui.render.awt;singleton:=true
-Bundle-Version: 1.4.2.qualifier
+Bundle-Version: 1.4.3.qualifier
Bundle-Activator: org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.Draw2dRenderPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/GraphicsToGraphics2DAdaptor.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/GraphicsToGraphics2DAdaptor.java
index de0e4e4..bb411e6 100644
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/GraphicsToGraphics2DAdaptor.java
+++ b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/GraphicsToGraphics2DAdaptor.java
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
+ * Copyright (c) 2004, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -765,7 +765,7 @@
*/
public void drawString(String s, int x, int y) {
- if (s == null)
+ if (s == null || s.length() == 0)
return;
java.awt.FontMetrics metrics = getGraphics2D().getFontMetrics();
@@ -800,6 +800,7 @@
}
}
}
+ checkState();
getGraphics2D().drawImage(
ImageConverter.convertFromImageData(data),
new AffineTransform(1f, 0f, 0f, 1f, xpos, ypos), null);
