Merge pull request #2 from LittleRolf/feature/gui

Feature/gui

Author: jhbruhn

.gitignore

@@ -1,5 +1,4 @@
 *target*
-*.jar
 *.war
 *.ear
 *.class
@@ -26,3 +25,4 @@ local.properties
 # Locally stored "Eclipse launch configurations"
 *.launch
 
+Thumbs.db

libs/jsyntaxpane-0.9.5-b29.jar

@@ -0,0 +1,42 @@
+package de.littlerolf.sav.gui;
+
+import java.awt.BorderLayout;
+
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JScrollPane;
+
+public class CodeEditorFrame extends JFrame {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 738669143009851723L;
+	private JEditorPane codeEditor = new JEditorPane();
+
+	public CodeEditorFrame() {
+		setTitle("Code Editor");
+		getContentPane().setLayout(new BorderLayout());
+
+		JScrollPane scrPane = new JScrollPane(codeEditor);
+		getContentPane().add(scrPane, BorderLayout.CENTER);
+		getContentPane().doLayout();
+		codeEditor.setContentType("text/java");
+		codeEditor.setText("public static void main(String[] args) {\n}");
+
+		setSize(800, 600);
+
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+
+		JMenu mnDatei = new JMenu("Datei");
+		menuBar.add(mnDatei);
+
+		JMenuItem mntmSpeichern = new JMenuItem("Speichern");
+		mnDatei.add(mntmSpeichern);
+
+	}
+}

src/de/littlerolf/sav/gui/CodeEditorFrame.java

@@ -1,5 +1,8 @@
 package de.littlerolf.sav.gui;
 
+import java.awt.Dimension;
+import java.awt.Toolkit;
+
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
@@ -9,12 +12,17 @@
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 
+import jsyntaxpane.DefaultSyntaxKit;
+
 public class SAVFrame extends JFrame {
 	public SAVFrame() {
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		setResizable(false);
 		setTitle("SortAlgorithmVisualizer");
-		setSize(800, 420);
+		setSize(906, 400);
+		Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
+		this.setLocation(dim.width / 2 - this.getSize().width / 2, dim.height
+				/ 2 - this.getSize().height / 2);
 		getContentPane().setLayout(null);
 
 		JButton btnSimulieren = new JButton("Simulieren");
@@ -26,23 +34,25 @@ public SAVFrame() {
 		getContentPane().add(btnAbspielen);
 
 		JComboBox comboBox = new JComboBox();
-		comboBox.setBounds(596, 333, 178, 20);
+		comboBox.setBounds(596, 333, 294, 20);
 		getContentPane().add(comboBox);
 
 		JSlider slider = new JSlider();
+		slider.setToolTipText("gemessen in Fischbr\u00F6tchen pro Sekunde");
 		slider.setBounds(430, 332, 156, 23);
 		getContentPane().add(slider);
 
 		JLabel lblGeschwindigkeit = new JLabel("Geschwindigkeit:");
-		lblGeschwindigkeit.setBounds(430, 294, 89, 14);
+		lblGeschwindigkeit.setBounds(430, 307, 89, 14);
 		getContentPane().add(lblGeschwindigkeit);
 
 		JLabel lblImplementation = new JLabel("Implementation:");
-		lblImplementation.setBounds(596, 294, 89, 14);
+		lblImplementation.setBounds(596, 307, 89, 14);
 		getContentPane().add(lblImplementation);
 
 		JLabel lblKontrolle = new JLabel("Kontrolle:");
-		lblKontrolle.setBounds(10, 294, 89, 14);
+		lblKontrolle.setToolTipText("oder auch \"Cockpit\"... h\u00F6h\u00F6, \"Cock\"...");
+		lblKontrolle.setBounds(10, 307, 89, 14);
 		getContentPane().add(lblKontrolle);
 
 		JLabel lblSchritte = new JLabel("Schritte:");
@@ -74,14 +84,24 @@ public SAVFrame() {
 		getContentPane().add(lblSpeed);
 
 		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(10, 11, 774, 272);
+		scrollPane.setBounds(10, 11, 880, 272);
 		getContentPane().add(scrollPane);
 
 		SAVHistoryComponent historyComponent = new SAVHistoryComponent();
 		scrollPane.setViewportView(historyComponent);
+
+		JButton btnNew = new JButton("Neu...");
+		btnNew.setBounds(710, 303, 75, 23);
+		getContentPane().add(btnNew);
+
+		JButton btnEdit = new JButton("Bearbeiten...");
+		btnEdit.setBounds(787, 303, 103, 23);
+		getContentPane().add(btnEdit);
 	}
 
 	public static void main(String[] args) {
+		DefaultSyntaxKit.initKit();
+
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (UnsupportedLookAndFeelException e) {
@@ -90,6 +110,7 @@ public static void main(String[] args) {
 		} catch (IllegalAccessException e) {
 		}
 		new SAVFrame().setVisible(true);
+		new CodeEditorFrame().setVisible(true);
 	}
 
 	/**

src/de/littlerolf/sav/gui/SAVFrame.java

@@ -1,6 +1,8 @@
 package de.littlerolf.sav.gui;
 
 import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -15,9 +17,10 @@ public class SAVHistoryComponent extends JComponent {
 
 	private static final long serialVersionUID = 1099284147258735099L;
 
-	private static final int PLAYING_CARD_AMOUNT = 52;
+	public static final int PLAYING_CARD_AMOUNT = 52;
 
 	private BufferedImage[] cardImages;
+
 	{
 		cardImages = new BufferedImage[PLAYING_CARD_AMOUNT];
 		String[] names = new String[] { "2", "3", "4", "5", "6", "7", "8", "9",
@@ -51,7 +54,7 @@ public class SAVHistoryComponent extends JComponent {
 
 	public SAVHistoryComponent() {
 		HistoryItem i = new HistoryItem();
-		i.values = new int[] { 4, 50, 42, 3 };
+		i.values = new int[] { 4, 10, 5, 20, 50, 10, 3, 48 };
 		getHistoryItems().add(i);
 	}
 
@@ -68,8 +71,13 @@ public void reset() {
 	}
 
 	@Override
-	protected void paintComponent(Graphics g) {
-		super.paintComponent(g);
+	protected void paintComponent(Graphics g1) {
+		super.paintComponent(g1);
+		Graphics2D g = (Graphics2D) g1;
+		g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+				RenderingHints.VALUE_ANTIALIAS_ON);
+		g.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+				RenderingHints.VALUE_INTERPOLATION_BILINEAR);
 
 		HistoryItem currentItem = getHistoryItems().get(currentIndex);
 		if (currentItem == null)
@@ -78,15 +86,18 @@ protected void paintComponent(Graphics g) {
 		int valueAmount = currentItem.values.length;
 		int width = getWidth();
 		int height = getHeight();
-		int x = 0;
+		int i = 0;
+		int diff = width / 2 / valueAmount;
 		for (int value : currentItem.values) {
 			if (value > cardImages.length || value < 0)
 				continue;
+
 			BufferedImage cardImage = cardImages[value];
 			g.drawImage(cardImage,
-					x + width / 2 - (valueAmount * cardImage.getWidth()) / 2,
-					height / 2 - cardImage.getHeight() / 2, null);
-			x += cardImage.getWidth();
+					(width / 4) + (i * diff) - cardImage.getWidth() / 8, height
+							/ 2 - cardImage.getHeight() / 2 / 2,
+					cardImage.getWidth() / 2, cardImage.getHeight() / 2, null);
+			i++;
 		}
 	}