X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectPage.java;h=f7a46b30fa93e41050d519e01dc2cd49e1e4c643;hb=97855e9e2390f37728f5cb6f064bc58d04ad929c;hp=086493ca19e2a9981e270446c4fdfa5cf104137f;hpb=bfa8ea22740bd472403c67eb383e3fd25b8f93c8;p=jSite.git
diff --git a/src/de/todesbaum/jsite/gui/ProjectPage.java b/src/de/todesbaum/jsite/gui/ProjectPage.java
index 086493c..f7a46b3 100644
--- a/src/de/todesbaum/jsite/gui/ProjectPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectPage.java
@@ -52,20 +52,23 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+import javax.swing.text.AbstractDocument;
+import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
+import javax.swing.text.DocumentFilter;
import de.todesbaum.jsite.application.Freenet7Interface;
import de.todesbaum.jsite.application.Project;
import de.todesbaum.jsite.i18n.I18n;
+import de.todesbaum.jsite.i18n.I18nContainer;
import de.todesbaum.util.swing.SortedListModel;
import de.todesbaum.util.swing.TLabel;
import de.todesbaum.util.swing.TWizard;
import de.todesbaum.util.swing.TWizardPage;
/**
- * @author David Roden <droden@gmail.com>
- * @version $Id$
+ * @author David âBombeâ Roden <bombe@freenetproject.org>
*/
public class ProjectPage extends TWizardPage implements ListSelectionListener, DocumentListener, ClipboardOwner {
@@ -80,6 +83,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
private JFileChooser pathChooser;
private SortedListModel projectListModel;
+ private JScrollPane projectScrollPane;
private JList projectList;
private JTextField projectNameTextField;
private JTextField projectDescriptionTextField;
@@ -88,12 +92,20 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
private JTextField projectPrivateKeyTextField;
private JTextField projectPathTextField;
- public ProjectPage() {
- super();
+ public ProjectPage(final TWizard wizard) {
+ super(wizard);
setLayout(new BorderLayout(12, 12));
dialogInit();
setHeading(I18n.getMessage("jsite.project.heading"));
setDescription(I18n.getMessage("jsite.project.description"));
+
+ I18nContainer.getInstance().registerRunnable(new Runnable() {
+
+ public void run() {
+ setHeading(I18n.getMessage("jsite.project.heading"));
+ setDescription(I18n.getMessage("jsite.project.description"));
+ }
+ });
}
protected void dialogInit() {
@@ -106,7 +118,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectList.addListSelectionListener(this);
projectList.setPreferredSize(new Dimension(150, projectList.getPreferredSize().height));
- add(new JScrollPane(projectList), BorderLayout.LINE_START);
+ add(projectScrollPane = new JScrollPane(projectList), BorderLayout.LINE_START);
add(createInformationPanel(), BorderLayout.CENTER);
}
@@ -117,7 +129,10 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
public void pageAdded(TWizard wizard) {
super.pageAdded(wizard);
projectList.clearSelection();
- wizard.setNextEnabled(false);
+ this.wizard.setPreviousName(I18n.getMessage("jsite.menu.nodes.manage-nodes"));
+ this.wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
+ this.wizard.setQuitName(I18n.getMessage("jsite.wizard.quit"));
+ this.wizard.setNextEnabled(false);
}
/**
@@ -135,6 +150,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
private void createActions() {
projectLocalPathBrowseAction = new AbstractAction(I18n.getMessage("jsite.project.action.browse")) {
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionLocalPathBrowse();
}
@@ -145,6 +161,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectAddAction = new AbstractAction(I18n.getMessage("jsite.project.action.add-project")) {
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionAdd();
}
@@ -154,6 +171,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectDeleteAction = new AbstractAction(I18n.getMessage("jsite.project.action.delete-project")) {
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionDelete();
}
@@ -164,6 +182,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectCloneAction = new AbstractAction(I18n.getMessage("jsite.project.action.clone-project")) {
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionClone();
}
@@ -171,8 +190,10 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectCloneAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project.action.clone-project.tooltip"));
projectCloneAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_L);
projectCloneAction.setEnabled(false);
-
+
projectCopyURIAction = new AbstractAction(I18n.getMessage("jsite.project.action.copy-uri")) {
+
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionCopyURI();
}
@@ -180,8 +201,10 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectCopyURIAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project.action.copy-uri.tooltip"));
projectCopyURIAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_U);
projectCopyURIAction.setEnabled(false);
-
+
projectGenerateKeyAction = new AbstractAction(I18n.getMessage("jsite.project.action.generate-new-key")) {
+
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionGenerateNewKey();
}
@@ -189,6 +212,26 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectGenerateKeyAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project.action.generate-new-key.tooltip"));
projectGenerateKeyAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_G);
projectGenerateKeyAction.setEnabled(false);
+
+ I18nContainer.getInstance().registerRunnable(new Runnable() {
+
+ @SuppressWarnings("synthetic-access")
+ public void run() {
+ projectLocalPathBrowseAction.putValue(Action.NAME, I18n.getMessage("jsite.project.action.browse"));
+ projectLocalPathBrowseAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project.action.browse.tooltip"));
+ projectAddAction.putValue(Action.NAME, I18n.getMessage("jsite.project.action.add-project"));
+ projectAddAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project.action.add-project.tooltip"));
+ projectDeleteAction.putValue(Action.NAME, I18n.getMessage("jsite.project.action.delete-project"));
+ projectDeleteAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project.action.delete-project.tooltip"));
+ projectCloneAction.putValue(Action.NAME, I18n.getMessage("jsite.project.action.clone-project"));
+ projectCloneAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project.action.clone-project.tooltip"));
+ projectCopyURIAction.putValue(Action.NAME, I18n.getMessage("jsite.project.action.copy-uri"));
+ projectCopyURIAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project.action.copy-uri.tooltip"));
+ projectGenerateKeyAction.putValue(Action.NAME, I18n.getMessage("jsite.project.action.generate-new-key"));
+ projectGenerateKeyAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project.action.generate-new-key.tooltip"));
+ pathChooser.setApproveButtonText(I18n.getMessage("jsite.project.action.browse.choose"));
+ }
+ });
}
private JComponent createInformationPanel() {
@@ -206,14 +249,16 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
informationPanel.add(functionButtons, BorderLayout.PAGE_START);
informationPanel.add(informationTable, BorderLayout.CENTER);
- informationTable.add(new JLabel("" + I18n.getMessage("jsite.project.project.information") + ""), new GridBagConstraints(0, 0, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ final JLabel projectInformationLabel = new JLabel("" + I18n.getMessage("jsite.project.project.information") + "");
+ informationTable.add(projectInformationLabel, new GridBagConstraints(0, 0, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
projectNameTextField = new JTextField();
projectNameTextField.getDocument().putProperty("name", "project.name");
projectNameTextField.getDocument().addDocumentListener(this);
projectNameTextField.setEnabled(false);
- informationTable.add(new TLabel(I18n.getMessage("jsite.project.project.name") + ":", KeyEvent.VK_N, projectNameTextField), new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ final TLabel projectNameLabel = new TLabel(I18n.getMessage("jsite.project.project.name") + ":", KeyEvent.VK_N, projectNameTextField);
+ informationTable.add(projectNameLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
informationTable.add(projectNameTextField, new GridBagConstraints(1, 1, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
projectDescriptionTextField = new JTextField();
@@ -221,7 +266,8 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectDescriptionTextField.getDocument().addDocumentListener(this);
projectDescriptionTextField.setEnabled(false);
- informationTable.add(new TLabel(I18n.getMessage("jsite.project.project.description") + ":", KeyEvent.VK_D, projectDescriptionTextField), new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ final TLabel projectDescriptionLabel = new TLabel(I18n.getMessage("jsite.project.project.description") + ":", KeyEvent.VK_D, projectDescriptionTextField);
+ informationTable.add(projectDescriptionLabel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
informationTable.add(projectDescriptionTextField, new GridBagConstraints(1, 2, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
projectLocalPathTextField = new JTextField();
@@ -229,18 +275,21 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectLocalPathTextField.getDocument().addDocumentListener(this);
projectLocalPathTextField.setEnabled(false);
- informationTable.add(new TLabel(I18n.getMessage("jsite.project.project.local-path") + ":", KeyEvent.VK_L, projectLocalPathTextField), new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ final TLabel projectLocalPathLabel = new TLabel(I18n.getMessage("jsite.project.project.local-path") + ":", KeyEvent.VK_L, projectLocalPathTextField);
+ informationTable.add(projectLocalPathLabel, new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
informationTable.add(projectLocalPathTextField, new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
informationTable.add(new JButton(projectLocalPathBrowseAction), new GridBagConstraints(2, 3, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
- informationTable.add(new JLabel("" + I18n.getMessage("jsite.project.project.address") + ""), new GridBagConstraints(0, 4, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(12, 0, 0, 0), 0, 0));
+ final JLabel projectAddressLabel = new JLabel("" + I18n.getMessage("jsite.project.project.address") + "");
+ informationTable.add(projectAddressLabel, new GridBagConstraints(0, 4, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(12, 0, 0, 0), 0, 0));
projectPublicKeyTextField = new JTextField(27);
projectPublicKeyTextField.getDocument().putProperty("name", "project.publickey");
projectPublicKeyTextField.getDocument().addDocumentListener(this);
projectPublicKeyTextField.setEnabled(false);
- informationTable.add(new TLabel(I18n.getMessage("jsite.project.project.public-key") + ":", KeyEvent.VK_U, projectPublicKeyTextField), new GridBagConstraints(0, 5, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ final TLabel projectPublicKeyLabel = new TLabel(I18n.getMessage("jsite.project.project.public-key") + ":", KeyEvent.VK_U, projectPublicKeyTextField);
+ informationTable.add(projectPublicKeyLabel, new GridBagConstraints(0, 5, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
informationTable.add(projectPublicKeyTextField, new GridBagConstraints(1, 5, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
informationTable.add(new JButton(projectGenerateKeyAction), new GridBagConstraints(2, 5, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
@@ -249,15 +298,48 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectPrivateKeyTextField.getDocument().addDocumentListener(this);
projectPrivateKeyTextField.setEnabled(false);
- informationTable.add(new TLabel(I18n.getMessage("jsite.project.project.private-key") + ":", KeyEvent.VK_R, projectPrivateKeyTextField), new GridBagConstraints(0, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ final TLabel projectPrivateKeyLabel = new TLabel(I18n.getMessage("jsite.project.project.private-key") + ":", KeyEvent.VK_R, projectPrivateKeyTextField);
+ informationTable.add(projectPrivateKeyLabel, new GridBagConstraints(0, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
informationTable.add(projectPrivateKeyTextField, new GridBagConstraints(1, 6, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
projectPathTextField = new JTextField();
projectPathTextField.getDocument().putProperty("name", "project.path");
projectPathTextField.getDocument().addDocumentListener(this);
+ ((AbstractDocument) projectPathTextField.getDocument()).setDocumentFilter(new DocumentFilter() {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void insertString(FilterBypass fb, int offset, String string, AttributeSet attr) throws BadLocationException {
+ super.insertString(fb, offset, string.replaceAll("/", ""), attr);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void replace(FilterBypass fb, int offset, int length, String text, AttributeSet attrs) throws BadLocationException {
+ super.replace(fb, offset, length, text.replaceAll("/", ""), attrs);
+ }
+ });
projectPathTextField.setEnabled(false);
- informationTable.add(new TLabel(I18n.getMessage("jsite.project.project.path") + ":", KeyEvent.VK_P, projectPathTextField), new GridBagConstraints(0, 7, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ final TLabel projectPathLabel = new TLabel(I18n.getMessage("jsite.project.project.path") + ":", KeyEvent.VK_P, projectPathTextField);
+ I18nContainer.getInstance().registerRunnable(new Runnable() {
+
+ public void run() {
+ projectInformationLabel.setText("" + I18n.getMessage("jsite.project.project.information") + "");
+ projectNameLabel.setText(I18n.getMessage("jsite.project.project.name") + ":");
+ projectDescriptionLabel.setText(I18n.getMessage("jsite.project.project.description") + ":");
+ projectLocalPathLabel.setText(I18n.getMessage("jsite.project.project.local-path") + ":");
+ projectAddressLabel.setText("" + I18n.getMessage("jsite.project.project.address") + "");
+ projectPublicKeyLabel.setText(I18n.getMessage("jsite.project.project.public-key") + ":");
+ projectPrivateKeyLabel.setText(I18n.getMessage("jsite.project.project.private-key") + ":");
+ projectPathLabel.setText(I18n.getMessage("jsite.project.project.path") + ":");
+ }
+ });
+ informationTable.add(projectPathLabel, new GridBagConstraints(0, 7, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
informationTable.add(projectPathTextField, new GridBagConstraints(1, 7, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
return informationPanel;
@@ -317,7 +399,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
// ACTIONS
//
- protected void actionLocalPathBrowse() {
+ private void actionLocalPathBrowse() {
Project project = (Project) projectList.getSelectedValue();
if (project == null) {
return;
@@ -328,7 +410,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
}
}
- protected void actionAdd() {
+ private void actionAdd() {
String[] keyPair = null;
if (!freenetInterface.hasNode()) {
JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.project-files.no-node-selected"), null, JOptionPane.ERROR_MESSAGE);
@@ -344,12 +426,14 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
newProject.setName(I18n.getMessage("jsite.project.new-project.name"));
newProject.setInsertURI(keyPair[0]);
newProject.setRequestURI(keyPair[1]);
- newProject.setEdition(1);
+ newProject.setEdition(0);
projectListModel.add(newProject);
+ projectScrollPane.revalidate();
+ projectScrollPane.repaint();
projectList.setSelectedIndex(projectListModel.size() - 1);
}
- protected void actionDelete() {
+ private void actionDelete() {
int selectedIndex = projectList.getSelectedIndex();
if (selectedIndex > -1) {
if (JOptionPane.showConfirmDialog(this, MessageFormat.format(I18n.getMessage("jsite.project.action.delete-project.confirm"), ((Project) projectList.getSelectedValue()).getName()), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
@@ -362,7 +446,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
}
}
- protected void actionClone() {
+ private void actionClone() {
int selectedIndex = projectList.getSelectedIndex();
if (selectedIndex > -1) {
Project newProject = new Project((Project) projectList.getSelectedValue());
@@ -371,8 +455,8 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
projectList.setSelectedIndex(projectListModel.indexOf(newProject));
}
}
-
- protected void actionCopyURI() {
+
+ private void actionCopyURI() {
int selectedIndex = projectList.getSelectedIndex();
if (selectedIndex > -1) {
Project selectedProject = (Project) projectList.getSelectedValue();
@@ -380,8 +464,8 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
clipboard.setContents(new StringSelection(selectedProject.getFinalRequestURI(0)), this);
}
}
-
- protected void actionGenerateNewKey() {
+
+ private void actionGenerateNewKey() {
if (JOptionPane.showConfirmDialog(this, I18n.getMessage("jsite.project.warning.generate-new-key"), null, JOptionPane.OK_CANCEL_OPTION) == JOptionPane.CANCEL_OPTION) {
return;
}
@@ -468,7 +552,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
public void changedUpdate(DocumentEvent documentEvent) {
setTextField(documentEvent);
}
-
+
//
// INTERFACE ClipboardOwner
//