X-Git-Url: https://git.pterodactylus.net/?p=jkeytool.git;a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjkeytool%2Fgui%2FMainFrame.java;h=cd6052a943109610d0b6bbf2c2d07d3f9fc940a9;hp=d47772601a55972b9d525eab85aeef09c47087cb;hb=a472334662c884abba8d2c1d47bed9f0c11525d3;hpb=ef96023a38c8d148103212c5196f771a847f58f5

diff --git a/src/net/pterodactylus/jkeytool/gui/MainFrame.java b/src/net/pterodactylus/jkeytool/gui/MainFrame.java
index d477726..cd6052a 100644
--- a/src/net/pterodactylus/jkeytool/gui/MainFrame.java
+++ b/src/net/pterodactylus/jkeytool/gui/MainFrame.java
@@ -24,13 +24,16 @@ import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
+import java.beans.PropertyVetoException;
 import java.io.File;
 import java.security.KeyStore;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.JDesktopPane;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JOptionPane;
@@ -53,6 +56,9 @@ public class MainFrame implements CoreListener, WindowListener {
 	/** The main frame. */
 	private final JFrame mainFrame;
 
+	/** The main frame’s desktop. */
+	private final JDesktopPane desktop;
+
 	/** The jkeytool core. */
 	private final Core core;
 
@@ -77,6 +83,8 @@ public class MainFrame implements CoreListener, WindowListener {
 		constructActions();
 		mainFrame.setJMenuBar(constructMenuBar());
 		mainFrame.addWindowListener(this);
+		desktop = new JDesktopPane();
+		mainFrame.setContentPane(desktop);
 		mainFrame.pack();
 	}
 
@@ -190,6 +198,19 @@ public class MainFrame implements CoreListener, WindowListener {
 		return keystoreTypeMenu;
 	}
 
+	private void constructKeyStoreWindow(KeyStore keyStore) {
+		JInternalFrame internalFrame = new JInternalFrame("Key Store (" + keyStore.getType() + ")", true, true, true, true);
+		internalFrame.getContentPane().add(new ListKeyStorePanel(keyStore));
+		internalFrame.setBounds(10, 10, 200, 200);
+		desktop.add(internalFrame);
+		internalFrame.setVisible(true);
+		try {
+			internalFrame.setSelected(true);
+		} catch (PropertyVetoException pve1) {
+			pve1.printStackTrace();
+		}
+	}
+
 	//
 	// PRIVATE ACTIONS
 	//
@@ -245,7 +266,7 @@ public class MainFrame implements CoreListener, WindowListener {
 	 * {@inheritDoc}
 	 */
 	public void keyStoreCreated(KeyStore keyStore) {
-		/* TODO */
+		constructKeyStoreWindow(keyStore);
 	}
 
 	/**
@@ -259,14 +280,14 @@ public class MainFrame implements CoreListener, WindowListener {
 	 * {@inheritDoc}
 	 */
 	public void keyStoreLoaded(File keyStoreFile, KeyStore keyStore) {
-		/* TODO - create keystore frame. */
+		constructKeyStoreWindow(keyStore);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	public void keyStoreNotLoaded(File keyStoreFile) {
-		JOptionPane.showMessageDialog(mainFrame, "Could not load keystore from “" + keyStoreFile.getName() + "”.", "Could not load keystore", JOptionPane.ERROR_MESSAGE);
+		JOptionPane.showMessageDialog(mainFrame, "Could not load key store from “" + keyStoreFile.getName() + "”.", "Could Not Load Key Store", JOptionPane.ERROR_MESSAGE);
 	}
 
 	//