Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1

1 files changed, 12 insertions, 6 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
index 4133c835..bd8a6728 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
@@ -13,6 +13,8 @@ import javax.swing.SwingUtilities;
 import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.awt.SWT_AWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.layout.GridData;
@@ -45,7 +47,6 @@ public abstract class ImageListWindowLayout extends CompositePage {
 	// buttons
 	protected Button newButton;
 	protected Button deleteButton;
-	protected Button editButton;
 	protected Button downloadButton;
 	protected Button backButton;
 
@@ -83,8 +84,8 @@ public abstract class ImageListWindowLayout extends CompositePage {
 		infoTitle.setText(infoTitleString);
 		// set the fond
 		FontData fontData = infoTitle.getFont().getFontData()[0];
-		Font font = new Font(Gui.display, new FontData(fontData.getName(), fontData.getHeight(), SWT.BOLD));
-		infoTitle.setFont(font);
+		final Font titleFont = new Font(Gui.display, new FontData(fontData.getName(), fontData.getHeight(), SWT.BOLD));
+		infoTitle.setFont(titleFont);
 		// the infotext
 		Label infoText = new Label(infoComposite, SWT.NONE);
 		infoText.setText(infoTextString);
@@ -160,9 +161,6 @@ public abstract class ImageListWindowLayout extends CompositePage {
 		newButton = new Button(buttonComposite, SWT.PUSH);
 		newButton.setText(newButtonLabel);
 
-		editButton = new Button(buttonComposite, SWT.PUSH);
-		editButton.setText(editButtonLabel);
-
 		deleteButton = new Button(buttonComposite, SWT.PUSH);
 		deleteButton.setText(deleteButtonLabel);
 
@@ -191,6 +189,14 @@ public abstract class ImageListWindowLayout extends CompositePage {
 		templateInfo = createCaptionAndTextfield("Vorlage:", vmInfoGroup);
 		// -- end group of details --
 
+		// Dispose of stuff we allocated
+		this.addDisposeListener(new DisposeListener() {
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				titleFont.dispose();
+			}
+		});
+
 
 	}