projects
/
jkeytool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add tabbed panel for key stores.
[jkeytool.git]
/
src
/
net
/
pterodactylus
/
jkeytool
/
gui
/
swing
/
SwingInterface.java
diff --git
a/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
b/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
index
3190c2a
..
6a6597e
100644
(file)
--- a/
src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
+++ b/
src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
@@
-19,12
+19,17
@@
package net.pterodactylus.jkeytool.gui.swing;
package net.pterodactylus.jkeytool.gui.swing;
+import java.awt.BorderLayout;
import java.io.File;
import java.security.KeyStore;
import java.util.HashMap;
import java.util.Map;
import java.io.File;
import java.security.KeyStore;
import java.util.HashMap;
import java.util.Map;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
import net.pterodactylus.jkeytool.core.Core;
import net.pterodactylus.jkeytool.gui.Interface;
import net.pterodactylus.jkeytool.core.Core;
import net.pterodactylus.jkeytool.gui.Interface;
@@
-44,6
+49,9
@@
public class SwingInterface implements Interface {
/** The main frame. */
private JFrame mainFrame = new JFrame("jkeytool " + Main.getVersion());
/** The main frame. */
private JFrame mainFrame = new JFrame("jkeytool " + Main.getVersion());
+ /** The tab pane. */
+ private JTabbedPane tabPane = new JTabbedPane();
+
/** The status bar. */
private StatusBar statusBar = new StatusBar();
/** The status bar. */
private StatusBar statusBar = new StatusBar();
@@
-59,10
+67,20
@@
public class SwingInterface implements Interface {
//
private void createFrame() {
//
private void createFrame() {
+ mainFrame.getContentPane().add(createCenterPanel(), BorderLayout.CENTER);
mainFrame.getContentPane().add(statusBar, BorderLayout.PAGE_END);
mainFrame.pack();
}
mainFrame.getContentPane().add(statusBar, BorderLayout.PAGE_END);
mainFrame.pack();
}
+ private JComponent createCenterPanel() {
+ JPanel centerPanel = new JPanel(new BorderLayout());
+ centerPanel.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6));
+
+ centerPanel.add(tabPane, BorderLayout.CENTER);
+
+ return centerPanel;
+ }
+
//
// INTERFACE Interface
//
//
// INTERFACE Interface
//
@@
-110,6
+128,7
@@
public class SwingInterface implements Interface {
public void keyStoreLoaded(File keyStoreFile, KeyStore keyStore) {
KeyStorePanel keyStorePanel = new KeyStorePanel(keyStore);
keyStores.put(keyStore, keyStorePanel);
public void keyStoreLoaded(File keyStoreFile, KeyStore keyStore) {
KeyStorePanel keyStorePanel = new KeyStorePanel(keyStore);
keyStores.put(keyStore, keyStorePanel);
+ tabPane.addTab(keyStoreFile.getName(), keyStorePanel);
}
/**
}
/**