For security reasons, personal update sites are associated with a ImageJ Wiki account. " + - "Please provide the account name of your ImageJ Wiki account.
" + - "If your personal update site was not yet initialized, you can initialize it in this dialog.
" + - "You can register a ImageJ Wiki account here if you do not have one yet.
"), "span 2"); userLabel = new JLabel("ImageJ Wiki account"); add(userLabel); userField = new JTextField(); userField.setColumns(30); add(userField); - realNameLabel = new JLabel("Real Name"); - add(realNameLabel); - realNameField = new JTextField(); - realNameField.setColumns(30); - add(realNameField); - emailLabel = new JLabel("Email"); - add(emailLabel); - emailField = new JTextField(); - emailField.setColumns(30); - add(emailField); - passwordLabel = new JLabel("Password"); - add(passwordLabel); - passwordField = new JPasswordField(); - passwordField.setColumns(30); - add(passwordField); final JPanel panel = new JPanel(); cancel = new JButton("Cancel"); cancel.addActionListener(this); @@ -557,9 +513,8 @@ public PersonalSiteDialog() { okay.addActionListener(this); panel.add(okay); add(panel, "span 2, right"); - setWikiAccountFieldsEnabled(false); - setChangePasswordEnabled(false); pack(); + setLocationRelativeTo(null); final KeyAdapter keyListener = new KeyAdapter() { @Override @@ -570,29 +525,12 @@ public void keyPressed(final KeyEvent e) { }; userField.addKeyListener(keyListener); - realNameField.addKeyListener(keyListener); - emailField.addKeyListener(keyListener); - passwordField.addKeyListener(keyListener); cancel.addKeyListener(keyListener); okay.addKeyListener(keyListener); setModal(true); setVisible(true); } - private void setWikiAccountFieldsEnabled(final boolean enabled) { - realNameLabel.setEnabled(enabled); - realNameField.setEnabled(enabled); - emailLabel.setEnabled(enabled); - emailField.setEnabled(enabled); - if (enabled) realNameField.requestFocusInWindow(); - } - - private void setChangePasswordEnabled(final boolean enabled) { - passwordLabel.setEnabled(enabled); - passwordField.setEnabled(enabled); - if (enabled) passwordField.requestFocusInWindow(); - } - @Override public void actionPerformed(ActionEvent e) { if (e.getSource() == cancel) { @@ -618,46 +556,15 @@ public void actionPerformed(ActionEvent e) { final MediaWikiClient wiki = new MediaWikiClient(); try { if (!wiki.userExists(newName)) { - if (realNameLabel.isEnabled()) { - final String realName = realNameField.getText(); - final String email = emailField.getText(); - if ("".equals(realName) || "".equals(email)) { - error("Please provide your name and email address to register an account on the ImageJ Wiki!
"); - } else { - if (wiki.createUser(newName, realName, email, "Wants a personal site")) { - setWikiAccountFieldsEnabled(false); - setChangePasswordEnabled(true); - info("An email with the activation code was sent. " + - "Please provide your ImageJ Wiki password after activating the account.
"); - } else { - error("There was a problem creating the user account!
"); - } - } - } else { - setWikiAccountFieldsEnabled(true); - error("Please provide your name and email address to register an account on the ImageJ Wiki
"); - } - return; - } - else if (!passwordField.isEnabled()) { - setChangePasswordEnabled(true); - error("Please type in your the password for your account on the Fiji/ImageJ Wiki
"); - return; - } - - // initialize the personal update site - final String password = new String(passwordField.getPassword()); - if (!wiki.login(newName, password)) { - error("Could not log in (incorrect password?)"); + error("Wiki user name does not exist yet. Press 'OK' to open a webpage where you can create a new user.
"); + openUrl("https://imagej.net/index.php?title=Special:CreateAccount"); return; } - if (!wiki.changeUploadPassword(password)) { - error("Could not initialize the personal update site"); + else { + error("Update site for user does not exist yet. Press 'OK' to open a webpage where you can set an upload password to initiate your update site.
"); + openUrl("https://imagej.net/Special:ChangeUploadPassword"); return; } - wiki.logout(); - this.name = newName; - dispose(); } catch (IOException e2) { updaterFrame.log.error(e2); error("There was a problem contacting the ImageJ Wiki: " + e2 + "
"); @@ -665,6 +572,14 @@ else if (!passwordField.isEnabled()) { } } } + + private void openUrl(String url) { + try { + java.awt.Desktop.getDesktop().browse(URI.create(url)); + } catch (IOException e) { + e.printStackTrace(); + } + } } }