summaryrefslogtreecommitdiff
path: root/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls
diff options
context:
space:
mode:
authortkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:24:12 +0000
committertkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:24:12 +0000
commitcda57f2454ded9fc57489c6d160a9ed25d95d201 (patch)
tree089d72d1ef651f21233413ae8cbd6ef2f93f04c5 /pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls
parent9e81f6d5ea6e4f4b22ba1c767b05b6bb09471bf1 (diff)
downloadmocca-cda57f2454ded9fc57489c6d160a9ed25d95d201.tar.gz
mocca-cda57f2454ded9fc57489c6d160a9ed25d95d201.tar.bz2
mocca-cda57f2454ded9fc57489c6d160a9ed25d95d201.zip
Rework ErrorMarker
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@301 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls')
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorMarker.java110
1 files changed, 32 insertions, 78 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorMarker.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorMarker.java
index 01505895..655a0975 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorMarker.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorMarker.java
@@ -18,11 +18,12 @@ package at.asit.pdfover.gui.controls;
// Imports
import java.io.InputStream;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
/**
*
*/
-public class ErrorMarker {
+public class ErrorMarker extends Label {
/**
* SLF4J Logger instance
@@ -39,89 +40,42 @@ public class ErrorMarker {
private static final Logger log = LoggerFactory
.getLogger(ErrorMarker.class);
- private Label lbl;
-
- /**
- * @param parent
- * @param style
- * @param exception
- * @param message
- * @param control
- */
- public ErrorMarker(Composite parent, int style, Throwable exception,
- String message, Control control) {
- //super(parent, style);
-
- this.lbl = new Label(parent, style);
-
- String imgPath = "/img/error.png"; //$NON-NLS-1$
-
- InputStream stream = this.getClass().getResourceAsStream(imgPath);
-
- Point size = control.getSize();
+ private static final String IMG_PATH = "/img/error.png"; //$NON-NLS-1$
- int width = size.x == 0 ? 32 : size.x;
- int height = size.y == 0 ? 32 : size.y;
-
- this.lbl.setSize(new Point(width, height));
-
- this.orig = new Image(this.lbl.getDisplay(), new ImageData(stream).scaledTo(width, height));
+ Image errorImg;
- this.lbl.setToolTipText(message);
-
- this.lbl.setImage(this.orig);
- }
-
- /**
- * Sets the layout data
- * @param object the layout data
- */
- public void setLayoutData(Object object) {
- this.lbl.setLayoutData(object);
- }
-
/**
- * Sets the visibilty
- * @param visible the visibilty
+ * Draw an error marker for a faulty entry
+ * @param parent the parent composite
+ * @param style the SWT style
+ * @param message a message describing the error (can be set later through setToolTipText)
*/
- public void setVisible(boolean visible) {
- this.lbl.setVisible(visible);
- }
+ public ErrorMarker(Composite parent, int style,
+ String message) {
+ super(parent, style);
+
+ InputStream stream = this.getClass().getResourceAsStream(IMG_PATH);
- /**
- * Sets the tooltip text
- * @param msg the tooltip text
- */
- public void setToolTipText(String msg) {
- this.lbl.setToolTipText(msg);
- }
-
-
- /**
- * Scales the image to the new size
- * @param size
- */
- public void resize(Point size) {
- String imgPath = "/img/error.png"; //$NON-NLS-1$
+ this.errorImg = new Image(getDisplay(), new ImageData(stream));
+ this.addPaintListener(new PaintListener() {
+ @Override
+ public void paintControl(PaintEvent e) {
+ Image img = ErrorMarker.this.errorImg;
+ Rectangle imgSize = img.getBounds();
+ Rectangle dstSize = ErrorMarker.this.getBounds();
+ e.gc.fillRectangle(0, 0, dstSize.width, dstSize.height);
+ e.gc.drawImage(img, 0, 0, imgSize.width, imgSize.height,
+ 0, 0, dstSize.width, dstSize.height);
+ }
+ });
- InputStream stream = this.getClass().getResourceAsStream(imgPath);
-
- int width = size.x == 0 ? 32 : size.x;
- int height = size.y == 0 ? 32 : size.y;
+ setToolTipText(message);
- this.orig = new Image(this.lbl.getDisplay(), new ImageData(stream).scaledTo(width, height));
-
- this.lbl.setSize(size);
- this.lbl.setImage(this.orig);
+ setImage(this.errorImg);
}
- /**
- * Gets the size of the underlying label
- * @return the size
- */
- public Point getSize() {
- return this.lbl.getSize();
+ @Override
+ protected void checkSubclass() {
+ // Allow subclassing
}
-
- private Image orig;
}