summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Sawicki2011-04-19 17:23:15 (EDT)
committer Chris Aniszczyk2011-04-19 18:43:15 (EDT)
commitcc48e03b2456850cfc1cd60ac2d3b4305a1b35e6 (patch)
tree5fa9d2fb591fde3d91e4de9cd8ca6f094f7e2953
parent16f6242036f687ae7505b2227d6f8dfd970350ac (diff)
downloadegit-github-cc48e03b2456850cfc1cd60ac2d3b4305a1b35e6.zip
egit-github-cc48e03b2456850cfc1cd60ac2d3b4305a1b35e6.tar.gz
egit-github-cc48e03b2456850cfc1cd60ac2d3b4305a1b35e6.tar.bz2
Support default repository label and anonymous accessrefs/changes/71/3171/2
This allows removal of unused credentials class. Change-Id: I4056d3fca93c0fd75e70d1fb7b1305b37abcde8c Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
-rw-r--r--org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubCredentials.java44
-rw-r--r--org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java41
-rw-r--r--org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java8
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositorySettingsPage.java140
4 files changed, 119 insertions, 114 deletions
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubCredentials.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubCredentials.java
deleted file mode 100644
index ff2300b..0000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubCredentials.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Green <david.green@tasktop.com> - initial contribution
- * Christian Trutz <christian.trutz@gmail.com> - initial contribution
- * Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
-import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-
-public class GitHubCredentials {
- private final String username;
- private final String password;
-
-
- public GitHubCredentials(String username, String password) {
- this.username = username;
- this.password = password;
- }
-
- public GitHubCredentials(AuthenticationCredentials credentials) {
- this(credentials.getUserName(),credentials.getPassword());
- }
-
- public static GitHubCredentials create(TaskRepository repository) {
- return new GitHubCredentials(repository.getCredentials(AuthenticationType.REPOSITORY));
- }
-
- public String getUsername() {
- return username;
- }
- public String getPassword() {
- return password;
- }
-
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java
index 3fc2c66..ec5a643 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java
@@ -27,6 +27,8 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
+import org.eclipse.mylyn.commons.net.AuthenticationType;
import org.eclipse.mylyn.commons.net.Policy;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
@@ -47,7 +49,23 @@ public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
/**
* GitHub kind.
*/
- protected static final String KIND = GitHub.CONNECTOR_KIND;
+ public static final String KIND = GitHub.CONNECTOR_KIND;
+
+ /**
+ * Create client for repository
+ *
+ * @param repository
+ * @return client
+ */
+ public static GitHubClient createClient(TaskRepository repository) {
+ GitHubClient client = new GitHubClient();
+ AuthenticationCredentials credentials = repository
+ .getCredentials(AuthenticationType.REPOSITORY);
+ if (credentials != null)
+ client.setCredentials(credentials.getUserName(),
+ credentials.getPassword());
+ return client;
+ }
/**
* GitHub specific {@link AbstractTaskDataHandler}.
@@ -68,20 +86,6 @@ public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
}
/**
- * Create client for repository
- *
- * @param repository
- * @return client
- */
- protected GitHubClient createClient(TaskRepository repository) {
- GitHubClient client = new GitHubClient();
- GitHubCredentials credentials = GitHubCredentials.create(repository);
- client.setCredentials(credentials.getUsername(),
- credentials.getPassword());
- return client;
- }
-
- /**
* Refresh labels for repository
*
* @param repository
@@ -148,7 +152,6 @@ public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
String project = GitHub.computeTaskRepositoryProject(repository
.getRepositoryUrl());
GitHubClient client = createClient(repository);
- GitHubCredentials.create(repository);
MilestoneService service = new MilestoneService(client);
try {
List<Milestone> milestones = new LinkedList<Milestone>();
@@ -240,9 +243,11 @@ public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
IRepositoryQuery query, TaskDataCollector collector,
ISynchronizationSession session, IProgressMonitor monitor) {
IStatus result = Status.OK_STATUS;
- List<String> statuses = QueryUtils.getAttributes(IssueService.FILTER_STATE, query);
+ List<String> statuses = QueryUtils.getAttributes(
+ IssueService.FILTER_STATE, query);
- monitor.beginTask(Messages.GitHubRepositoryConnector_TaskQuerying, statuses.size());
+ monitor.beginTask(Messages.GitHubRepositoryConnector_TaskQuerying,
+ statuses.size());
try {
String user = GitHub.computeTaskRepositoryUser(repository.getUrl());
String project = GitHub.computeTaskRepositoryProject(repository
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java
index d334fde..babfda5 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java
@@ -381,12 +381,8 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
String user = GitHub.computeTaskRepositoryUser(repository.getUrl());
String repo = GitHub.computeTaskRepositoryProject(repository.getUrl());
try {
-
- GitHubClient client = new GitHubClient();
- GitHubCredentials credentials = GitHubCredentials
- .create(repository);
- client.setCredentials(credentials.getUsername(),
- credentials.getPassword());
+ GitHubClient client = GitHubRepositoryConnector
+ .createClient(repository);
IssueService service = new IssueService(client);
if (taskData.isNew()) {
issue.setState(IssueService.STATE_OPEN);
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositorySettingsPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositorySettingsPage.java
index 30af32a..c2cc10f 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/github/ui/internal/GitHubRepositorySettingsPage.java
@@ -13,8 +13,7 @@
package org.eclipse.mylyn.github.ui.internal;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import java.net.URL;
import java.util.regex.Matcher;
import org.eclipse.core.runtime.CoreException;
@@ -25,11 +24,12 @@ import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
import org.eclipse.mylyn.commons.net.AuthenticationType;
import org.eclipse.mylyn.github.internal.GitHub;
import org.eclipse.mylyn.github.internal.GitHubClient;
-import org.eclipse.mylyn.github.internal.GitHubCredentials;
import org.eclipse.mylyn.github.internal.IssueService;
import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
@@ -39,7 +39,18 @@ import org.eclipse.swt.widgets.Composite;
public class GitHubRepositorySettingsPage extends
AbstractRepositorySettingsPage {
- static final String URL = "http://github.com";
+ /**
+ * URL
+ */
+ public static final String URL = "http://github.com"; //$NON-NLS-1$
+
+ /**
+ * DEFAULT_REPOSITORY
+ */
+ public static final String DEFAULT_REPOSITORY = "/user/repository"; //$NON-NLS-1$
+
+ private boolean syncLabel = true;
+ private boolean editingUrl = false;
/**
* Populate taskRepository with repository settings.
@@ -48,7 +59,8 @@ public class GitHubRepositorySettingsPage extends
* - Object to populate
*/
public GitHubRepositorySettingsPage(final TaskRepository taskRepository) {
- super("GitHub Repository Settings", "", taskRepository);
+ super("GitHub Issue Repository Settings",
+ "Enter repository location and credentials", taskRepository);
this.setHttpAuth(false);
this.setNeedsAdvanced(false);
this.setNeedsAnonymousLogin(true);
@@ -61,24 +73,58 @@ public class GitHubRepositorySettingsPage extends
return GitHub.CONNECTOR_KIND;
}
+ /**
+ * Sync server url combo with repository label editor base on default label
+ * format
+ */
+ protected void syncRepositoryLabel() {
+ if (syncLabel) {
+ String url = serverUrlCombo.getText();
+ String user = GitHub.computeTaskRepositoryUser(url);
+ String repo = GitHub.computeTaskRepositoryProject(url);
+ if (user != null && repo != null)
+ repositoryLabelEditor.setStringValue(user + '/' + repo);
+ }
+ }
+
@Override
protected void createAdditionalControls(Composite parent) {
// Set the URL now, because serverURL is definitely instantiated .
- if (serverUrlCombo != null && (serverUrlCombo.getText() == null || serverUrlCombo.getText().trim().length() == 0)) {
- String fullUrlText = URL+"/user/project";
+ if (serverUrlCombo.getText().length() == 0) {
+ String fullUrlText = URL + "/user/project";
serverUrlCombo.setText(fullUrlText);
- // select the user/project part of the URL so that the user can just start
- // typing to replace the text.
- serverUrlCombo.setSelection(new Point(URL.length()+1,fullUrlText.length()));
- }
+ serverUrlCombo.setFocus();
+ // select the user/project part of the URL so that the user can just
+ // start typing to replace the text.
+ serverUrlCombo.setSelection(new Point(URL.length() + 1, fullUrlText
+ .length()));
+
+ syncRepositoryLabel();
+
+ serverUrlCombo.addModifyListener(new ModifyListener() {
- // Specify that you need the GitHub User Name
- if (repositoryUserNameEditor != null) {
- String text = repositoryUserNameEditor.getLabelText();
- repositoryUserNameEditor.setLabelText("GitHub " + text);
+ public void modifyText(ModifyEvent e) {
+ editingUrl = true;
+ try {
+ syncRepositoryLabel();
+ } finally {
+ editingUrl = false;
+ }
+ }
+ });
+
+ repositoryLabelEditor.getTextControl(compositeContainer)
+ .addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ if (!editingUrl)
+ syncLabel = false;
+ }
+ });
}
- this.setAnonymous(false);
+ if (getRepository() == null)
+ setAnonymous(false);
}
@Override
@@ -86,46 +132,44 @@ public class GitHubRepositorySettingsPage extends
Validator validator = new Validator() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
- int totalWork = 1000;
- monitor.beginTask("Validating settings", totalWork);
+ monitor.beginTask("Validating settings", 100);
try {
-
String urlText = repository.getUrl();
- Matcher urlMatcher = GitHub.URL_PATTERN.matcher(urlText==null?"":urlText);
+ Matcher urlMatcher = GitHub.URL_PATTERN
+ .matcher(urlText == null ? "" : urlText);
if (!urlMatcher.matches()) {
- setStatus(GitHubUi.createErrorStatus("Server URL must be in the form http://github.com/user/project or\nhttp://www.github.org/user/project"));
+ setStatus(GitHubUi
+ .createErrorStatus("Server URL must be in the form http://github.com/user/project"));
return;
}
- monitor.worked(100);
- AuthenticationCredentials auth = repository.getCredentials(AuthenticationType.REPOSITORY);
-
+ monitor.worked(20);
+
monitor.subTask("Contacting server...");
try {
- // verify the credentials
- if (auth == null) {
- setStatus(GitHubUi.createErrorStatus("Credentials are required. Please specify username and API Token."));
- return;
- }
- monitor.worked(250);
-
- GitHubCredentials credentials = new GitHubCredentials(auth.getUserName(), auth.getPassword());
+ AuthenticationCredentials auth = repository
+ .getCredentials(AuthenticationType.REPOSITORY);
GitHubClient client = new GitHubClient();
- client.setCredentials(credentials.getUsername(), credentials.getPassword());
+ if (auth != null)
+ client.setCredentials(auth.getUserName(),
+ auth.getPassword());
IssueService service = new IssueService(client);
- String u = GitHub.computeTaskRepositoryUser(repository.getUrl());
- String p = GitHub.computeTaskRepositoryProject(repository
- .getUrl());
- Map<String, String> filterData = new HashMap<String, String>();
- service.getIssues(u, p, filterData);
-
+ String user = GitHub
+ .computeTaskRepositoryUser(repository.getUrl());
+ String project = GitHub
+ .computeTaskRepositoryProject(repository
+ .getUrl());
+ monitor.worked(20);
+ service.getIssues(user, project, null);
} catch (IOException e) {
- setStatus(GitHubUi.createErrorStatus("Invalid credentials. Please check your GitHub User ID and Password."));
+ setStatus(GitHubUi
+ .createErrorStatus("Invalid credentials. Please check your GitHub User ID and Password."));
return;
} finally {
- monitor.worked(650);
+ monitor.done();
}
-
- setStatus(new Status(IStatus.OK,GitHubUi.BUNDLE_ID, "Success!"));
+
+ setStatus(new Status(IStatus.OK, GitHubUi.BUNDLE_ID,
+ "Success!"));
} finally {
monitor.done();
}
@@ -136,9 +180,13 @@ public class GitHubRepositorySettingsPage extends
@Override
protected boolean isValidUrl(final String url) {
- if (url.contains("github")) {
- return true;
- }
+ if (url.startsWith("http://") || url.startsWith("https://")) //$NON-NLS-1$ //$NON-NLS-2$
+ try {
+ new URL(url);
+ return true;
+ } catch (IOException e) {
+ return false;
+ }
return false;
}