Skip to content

Commit

Permalink
[INTERNAL][E] Fixed URL
Browse files Browse the repository at this point in the history
More or less by removing them. 

This patch fixes also a small issue in the CreateXMPPAccountWizardPage
that was evaluating the error codes not correctly.
  • Loading branch information
srossbach committed Aug 23, 2019
1 parent b734e60 commit f645b2c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 24 deletions.
1 change: 0 additions & 1 deletion eclipse/src/saros/ui/Messages.java
Expand Up @@ -156,7 +156,6 @@ public class Messages extends NLS {
public static String EnterProjectNamePage_description_socks5proxy;
public static String EnterProjectNamePage_direct_filetransfer_deactivated;
public static String EnterProjectNamePage_direct_filetransfer_nan;
public static String EnterProjectNamePage_error_browser_open;
public static String EnterProjectNamePage_error_projectname_exists;
public static String EnterProjectNamePage_error_projectname_in_use;
public static String EnterProjectNamePage_error_wrong_name;
Expand Down
Expand Up @@ -11,7 +11,8 @@ public class GettingStartedHandler extends AbstractHandler {
public Object execute(ExecutionEvent event) throws ExecutionException {

SWTUtils.openInternalBrowser(
"https://www.saros-project.org/documentation/getting-started.html", "Welcome to Saros");
"https://www.saros-project.org/documentation/getting-started-eclipse.html",
"Welcome to Saros");

return null;
}
Expand Down
3 changes: 1 addition & 2 deletions eclipse/src/saros/ui/messages.properties
Expand Up @@ -253,14 +253,13 @@ EnterProjectNamePage_description_file_transfer=Attention: direct file transfer c
EnterProjectNamePage_description_socks5proxy=A mediated SOCKS5 data transfer connection is used.\nSuggestions: Reuse existing project resources and visit the FAQs using the Help button below.
EnterProjectNamePage_direct_filetransfer_deactivated=Warning: Direct file transfer deactivated. Using slow IBB instead\!\nTo activate, uncheck "Only establish connections over IBB" in Saros network preferences.
EnterProjectNamePage_direct_filetransfer_nan=Warning: Direct file transfer not available\! Using slow IBB instead\!\nSuggestions: Reuse existing project resources and visit the FAQs using the Help button below.
EnterProjectNamePage_error_browser_open=Opening your browser failed.\nPlease visit the FAQ page on http://saros-project.org/faq
EnterProjectNamePage_error_projectname_exists=A project with the name {0} already exists
EnterProjectNamePage_error_projectname_in_use= The name {0} has already been used for another project.
EnterProjectNamePage_error_wrong_name=No project exists with this name to update from
EnterProjectNamePage_warning_project_artifacts_found=The following project(s) will overwrite or delete existing data in the file system: {0}
EnterProjectNamePage_faq=FAQ
EnterProjectNamePage_project_name=Project name
EnterProjectNamePage_saros_url=https://www.saros-project.org/documentation/troubleshooting.html
EnterProjectNamePage_saros_url=https://www.saros-project.org/documentation/troubleshooting.html#network-issues
EnterProjectNamePage_select_project_for_update=Select project for update.
EnterProjectNamePage_set_project_name=Please set a project name
EnterProjectNamePage_title=namePage
Expand Down
8 changes: 5 additions & 3 deletions eclipse/src/saros/ui/wizards/CreateXMPPAccountWizard.java
Expand Up @@ -65,9 +65,8 @@ public CreateXMPPAccountWizard(boolean showUseNowButton) {
setDefaultPageImageDescriptor(
ImageManager.getImageDescriptor(ImageManager.WIZBAN_CREATE_XMPP_ACCOUNT));

this.createXMPPAccountPage = new CreateXMPPAccountWizardPage(showUseNowButton);
createXMPPAccountPage = new CreateXMPPAccountWizardPage(showUseNowButton);
setNeedsProgressMonitor(true);
setHelpAvailable(true);
}

@Override
Expand Down Expand Up @@ -210,7 +209,10 @@ private String getErrorMessage(XMPPException e, String server) {
if (error.getCode() == 409) message = "The XMPP account already exists.";
else
message =
"An unknown error occurred. Please register on "
(error.getCode() != 503
? "An unknown error occurred."
: "No In-Band Registration available.")
+ " Please register on "
+ ("saros-con.imp.fu-berlin.de".equals(server)
? ("our website:" + " https://saros-con.imp.fu-berlin.de:5280/register/")
: "the provider's website.");
Expand Down
Expand Up @@ -7,7 +7,6 @@
import java.util.Set;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
Expand All @@ -18,7 +17,6 @@
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import saros.SarosPluginContext;
import saros.account.XMPPAccountStore;
Expand Down Expand Up @@ -62,7 +60,6 @@ public CreateXMPPAccountWizardPage(boolean showUseNowButton) {
SarosPluginContext.initComponent(this);
setTitle(TITLE);
setDescription(DESCRIPTION);

this.showUseNowButton = showUseNowButton;
}

Expand All @@ -83,20 +80,6 @@ public void createControl(Composite parent) {
setPageComplete(false);
}

@Override
public void performHelp() {
Shell shell = new Shell(getShell());
shell.setText("Saros XMPP Accounts");
shell.setLayout(new GridLayout());
shell.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

Browser browser = new Browser(shell, SWT.NONE);
browser.setUrl("http://www.saros-project.org/setupXMPP");
browser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

shell.open();
}

@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
Expand Down

0 comments on commit f645b2c

Please sign in to comment.