Reset edition if the keys were changed.

[jSite.git] / src / de / todesbaum / jsite / gui / ProjectPage.java

diff --git a/src/de/todesbaum/jsite/gui/ProjectPage.java b/src/de/todesbaum/jsite/gui/ProjectPage.java
index eedb91a..0b0fc9c 100644 (file)
--- a/src/de/todesbaum/jsite/gui/ProjectPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectPage.java
@@ -1,6 +1,5 @@
 /*
- * jSite - a tool for uploading websites into Freenet
- * Copyright (C) 2006 David Roden
+ * jSite - ProjectPage.java - Copyright © 2006–2011 David Roden
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -103,7 +102,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
        private JFileChooser pathChooser;
 
        /** The project list model. */
-       private SortedListModel projectListModel;
+       private SortedListModel<Project> projectListModel;
 
        /** The project list scroll pane. */
        private JScrollPane projectScrollPane;
@@ -158,13 +157,13 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
                createActions();
 
                pathChooser = new JFileChooser();
-               projectListModel = new SortedListModel();
+               projectListModel = new SortedListModel<Project>();
                projectList = new JList(projectListModel);
                projectList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
                projectList.addListSelectionListener(this);
-               projectList.setPreferredSize(new Dimension(150, projectList.getPreferredSize().height));
 
                add(projectScrollPane = new JScrollPane(projectList), BorderLayout.LINE_START);
+               projectScrollPane.setPreferredSize(new Dimension(150, projectList.getPreferredSize().height));
                add(createInformationPanel(), BorderLayout.CENTER);
        }
 
@@ -441,7 +440,7 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
         * @return The list of projects
         */
        public Project[] getProjects() {
-               return (Project[]) projectListModel.toArray(new Project[projectListModel.size()]);
+               return projectListModel.toArray(new Project[projectListModel.size()]);
        }
 
        /**
@@ -609,8 +608,13 @@ public class ProjectPage extends TWizardPage implements ListSelectionListener, D
                        keyDialog.setPublicKey(selectedProject.getRequestURI());
                        keyDialog.setVisible(true);
                        if (!keyDialog.wasCancelled()) {
+                               String originalPublicKey = selectedProject.getRequestURI();
+                               String originalPrivateKey = selectedProject.getInsertURI();
                                selectedProject.setInsertURI(keyDialog.getPrivateKey());
                                selectedProject.setRequestURI(keyDialog.getPublicKey());
+                               if (!originalPublicKey.equals(selectedProject.getRequestURI()) || !originalPrivateKey.equals(selectedProject.getInsertURI())) {
+                                       selectedProject.setEdition(-1);
+                               }
                                updateCompleteURI();
                        }
                }