Attachment 46247 Details for Bug 145123 – updated patch with last changes

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] updated patch with last changes

Clipboard-attachment (text/plain), 11.29 KB, created by Eugene Kuleshov

on 2006-07-13 13:00:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Kuleshov

Created: 2006-07-13 13:00:50 EDT

Size: 11.29 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylar.sandbox
>Index: src/org/eclipse/mylar/internal/sandbox/web/WebRepositoryConnector.java
>===================================================================
>RCS file: /home/technology/org.eclipse.mylar/sandbox/org.eclipse.mylar.sandbox/src/org/eclipse/mylar/internal/sandbox/web/WebRepositoryConnector.java,v
>retrieving revision 1.10
>diff -u -r1.10 WebRepositoryConnector.java
>--- src/org/eclipse/mylar/internal/sandbox/web/WebRepositoryConnector.java	13 Jul 2006 16:08:50 -0000	1.10
>+++ src/org/eclipse/mylar/internal/sandbox/web/WebRepositoryConnector.java	13 Jul 2006 17:02:53 -0000
>@@ -104,6 +104,18 @@
> 			"http://sourceforge.net/tracker/index.php?func=detail&group_id=84122&atid=575154&aid=",
> 			"http://sourceforge.net/tracker/?atid=575154&group_id=84122",
> 		    "<a href=\"/tracker/index.php\\?func=detail&amp;aid=(.+?)&amp;group_id=84122&amp;atid=575154\">(.+?)</a>"),
>+		new WebRepositoryTemplate("phpbb.com (phpBB)", 
>+			"http://www.phpbb.com/phpBB/",
>+			"http://www.phpbb.com/phpBB/posting.php?mode=newtopic&f=1",
>+			"http://www.phpbb.com/phpBB/viewtopic.php?t=",
>+			"http://www.phpbb.com/phpBB/viewforum.php?f=1",
>+		    "<a href=\"viewtopic.php\\?t=(\\d+?)(?:&.+?)?\" class=\"topictitle\">(.+?)</a>"),
>+		new WebRepositoryTemplate("Spring IDE Forum (vBulletin)", 
>+			"http://forum.springframework.org/forumdisplay.php?f=32",
>+			"http://forum.springframework.org/newthread.php?do=newthread&f=32",
>+			"http://forum.springframework.org/showthread.php?t=",
>+			"http://forum.springframework.org/forumdisplay.php?f=32",
>+		    "<a href=\"showthread.php\\?.+?t=(\\d+?)\" id=\"thread_title_\\1\">(.+?)</a>"),
> 	};
> 	
> 	
>Index: src/org/eclipse/mylar/internal/sandbox/web/WebRepositorySettingsPage.java
>===================================================================
>RCS file: /home/technology/org.eclipse.mylar/sandbox/org.eclipse.mylar.sandbox/src/org/eclipse/mylar/internal/sandbox/web/WebRepositorySettingsPage.java,v
>retrieving revision 1.5
>diff -u -r1.5 WebRepositorySettingsPage.java
>--- src/org/eclipse/mylar/internal/sandbox/web/WebRepositorySettingsPage.java	13 Jul 2006 16:08:50 -0000	1.5
>+++ src/org/eclipse/mylar/internal/sandbox/web/WebRepositorySettingsPage.java	13 Jul 2006 17:02:53 -0000
>@@ -22,89 +22,54 @@
> import org.eclipse.swt.widgets.Composite;
> 
> /**
>- * Settings page for generic web-based repository connector
>+ * Settings page for generic web-based repository connector 
>  * 
>  * @author Eugene Kuleshov
>  */
> public class WebRepositorySettingsPage extends AbstractRepositorySettingsPage implements IPropertyChangeListener {
> 	private static final String TITLE = "Web Repository Settings";
>-
> 	private static final String DESCRIPTION = "Generic web-based repository connector";
> 
> 	protected StringFieldEditor taskPrefixUrlEditor;
>-
> 	protected StringFieldEditor newTaskUrlEditor;
>-
>-	private static WebRepositoryInfo[] REPOSITORY_TEMPLATES = {
>-			new WebRepositoryInfo(
>-					"Subclipse (IssueZilla)",
>-					// "http://subclipse.tigris.org/issues/buglist.cgi?issue_status=NEW&issue_status=STARTED&issue_status=REOPENED&order=Issue+Number",
>-					"http://subclipse.tigris.org/issues/",
>-					"http://subclipse.tigris.org/issues/enter_bug.cgi?component=subclipse",
>-					"http://subclipse.tigris.org/issues/show_bug.cgi?id="),
>-			new WebRepositoryInfo(
>-					"GlasFish (IssueZilla)",
>-					// "https://glassfish.dev.java.net/issues/buglist.cgi?component=glassfish&issue_status=NEW&issue_status=STARTED&issue_status=REOPENED&order=Issue+Number",
>-					"https://glassfish.dev.java.net/servlets/ProjectIssues",
>-					"https://glassfish.dev.java.net/issues/enter_bug.cgi?issue_type=DEFECT",
>-					"https://glassfish.dev.java.net/issues/show_bug.cgi?id="),
>-			new WebRepositoryInfo("Spring Framework (Jira)",
>-					"http://opensource.atlassian.com/projects/spring/browse/SPR",
>-					"http://opensource.atlassian.com/projects/spring/secure/CreateIssue!default.jspa",
>-					"http://opensource.atlassian.com/projects/spring/browse/"),
>-			new WebRepositoryInfo("ASM (GForge)", "http://forge.objectweb.org/tracker/?atid=100023&group_id=23",
>-					"http://forge.objectweb.org/tracker/?func=add&group_id=23&atid=100023",
>-					"http://forge.objectweb.org/tracker/index.php?func=detail&group_id=23&atid=100023&aid="),
>-			new WebRepositoryInfo("edgewall.org (Trac)",
>-					// "http://trac.edgewall.org/query?status=new&status=assigned&status=reopened&order=id"
>-					"http://trac.edgewall.org/", "http://trac.edgewall.org/newticket",
>-					"http://trac.edgewall.org/ticket/"), };
>-
>+	
>+	
> 	public WebRepositorySettingsPage(AbstractRepositoryConnector connector) {
> 		super(TITLE, DESCRIPTION, connector);
> 	}
> 
> 	@Override
> 	protected void createAdditionalControls(Composite parent) {
>-		for (WebRepositoryInfo info : REPOSITORY_TEMPLATES) {
>-			if (repositoryLabelCombo.indexOf(info.label) == -1) {
>-				repositoryLabelCombo.add(info.label);
>+		for (WebRepositoryTemplate template : WebRepositoryConnector.REPOSITORY_TEMPLATES) {
>+			if(repositoryLabelCombo.indexOf(template.label)==-1) { 
>+				repositoryLabelCombo.add(template.label);
> 			}
> 		}
>-
>+		
> 		repositoryLabelCombo.addSelectionListener(new SelectionListener() {
> 
>-			public void widgetSelected(SelectionEvent e) {
>-				WebRepositoryInfo info = getInfo(repositoryLabelCombo.getText());
>-				if (info != null) {
>-					serverUrlEditor.setStringValue(info.repositoryUrl);
>-					taskPrefixUrlEditor.setStringValue(info.taskPrefix);
>-					newTaskUrlEditor.setStringValue(info.newTaskUrl);
>-				}
>-			}
>-
>-			public void widgetDefaultSelected(SelectionEvent e) {
>-				// ignore
>-			}
>-
>-			private WebRepositoryInfo getInfo(String text) {
>-				for (WebRepositoryInfo info : REPOSITORY_TEMPLATES) {
>-					if (text.equals(info.label)) {
>-						return info;
>+				public void widgetSelected(SelectionEvent e) {
>+					WebRepositoryTemplate template = WebRepositoryConnector.getTemplate(repositoryLabelCombo.getText());
>+					if(template!=null) {
>+						serverUrlEditor.setStringValue(template.url);
>+						taskPrefixUrlEditor.setStringValue(template.prefix);
>+						newTaskUrlEditor.setStringValue(template.newTask);
> 					}
> 				}
>-				return null;
>-			}
>-		});
> 
>-		taskPrefixUrlEditor = new StringFieldEditor("taskPrefixUrl", "Task prefix URL:", StringFieldEditor.UNLIMITED,
>-				parent);
>+				public void widgetDefaultSelected(SelectionEvent e) {
>+					// ignore
>+				}
>+				
>+			});
>+		
>+		taskPrefixUrlEditor = new StringFieldEditor("taskPrefixUrl", "Task prefix URL:", StringFieldEditor.UNLIMITED, parent);
> 		taskPrefixUrlEditor.setPropertyChangeListener(this);
>-
>+		
> 		newTaskUrlEditor = new StringFieldEditor("newTaskUrl", "New task URL:", StringFieldEditor.UNLIMITED, parent);
> 		newTaskUrlEditor.setPropertyChangeListener(this);
>-
>-		if (repository != null) {
>+		
>+		if(repository!=null) {
> 			taskPrefixUrlEditor.setStringValue(repository.getProperty(WebRepositoryConnector.PROPERTY_TASK_PREFIX_URL));
> 			newTaskUrlEditor.setStringValue(repository.getProperty(WebRepositoryConnector.PROPERTY_NEW_TASK_URL));
> 		}
>@@ -118,11 +83,12 @@
> 		// ignore
> 	}
> 
>+	
> 	// IPropertyChangeListener
>-
>+	
> 	public void propertyChange(PropertyChangeEvent event) {
> 		Object source = event.getSource();
>-		if (source == taskPrefixUrlEditor || source == newTaskUrlEditor) {
>+		if(source==taskPrefixUrlEditor || source == newTaskUrlEditor) {
> 			getWizard().getContainer().updateButtons();
> 		}
> 	}
>@@ -130,27 +96,10 @@
> 	@Override
> 	public TaskRepository createTaskRepository() {
> 		TaskRepository repository = super.createTaskRepository();
>-		repository.setProperty(WebRepositoryConnector.PROPERTY_TASK_PREFIX_URL, taskPrefixUrlEditor.getStringValue());
>-		repository.setProperty(WebRepositoryConnector.PROPERTY_NEW_TASK_URL, newTaskUrlEditor.getStringValue());
>+		repository.setProperty(WebRepositoryConnector.PROPERTY_TASK_PREFIX_URL, taskPrefixUrlEditor.getStringValue()); 
>+		repository.setProperty(WebRepositoryConnector.PROPERTY_NEW_TASK_URL, newTaskUrlEditor.getStringValue()); 
> 		return repository;
> 	}
>-
>-	private static class WebRepositoryInfo {
>-		public final String label;
>-
>-		public final String repositoryUrl;
>-
>-		public final String newTaskUrl;
>-
>-		public final String taskPrefix;
>-
>-		public WebRepositoryInfo(String label, String repositoryUrl, String newTaskUrl, String taskPrefix) {
>-			this.label = label;
>-			this.repositoryUrl = repositoryUrl;
>-			this.newTaskUrl = newTaskUrl;
>-			this.taskPrefix = taskPrefix;
>-		}
>-
>-	}
>-
>+	
> }
>+
>Index: testsrc/org/eclipse/mylar/sandbox/tests/AllSandboxTests.java
>===================================================================
>RCS file: /home/technology/org.eclipse.mylar/sandbox/org.eclipse.mylar.sandbox/testsrc/org/eclipse/mylar/sandbox/tests/AllSandboxTests.java,v
>retrieving revision 1.5
>diff -u -r1.5 AllSandboxTests.java
>--- testsrc/org/eclipse/mylar/sandbox/tests/AllSandboxTests.java	12 Jul 2006 19:21:34 -0000	1.5
>+++ testsrc/org/eclipse/mylar/sandbox/tests/AllSandboxTests.java	13 Jul 2006 17:02:53 -0000
>@@ -17,6 +17,7 @@
> 		TestSuite suite = new TestSuite("Test for org.eclipse.mylar.sandbox.tests");
> 		//$JUnit-BEGIN$
> 		
>+//		suite.addTest(WebRepositoryConnectorTest.suite());
> //		suite.addTestSuite(SharedTaskFolderTest.class);
> //		suite.addTestSuite(BugzillaActiveSearchTest.class);
> 		//$JUnit-END$
>#P org.eclipse.mylar.tasklist
>Index: src/org/eclipse/mylar/internal/tasklist/ui/wizards/AbstractRepositorySettingsPage.java
>===================================================================
>RCS file: /home/technology/org.eclipse.mylar/org.eclipse.mylar.tasklist/src/org/eclipse/mylar/internal/tasklist/ui/wizards/AbstractRepositorySettingsPage.java,v
>retrieving revision 1.26
>diff -u -r1.26 AbstractRepositorySettingsPage.java
>--- src/org/eclipse/mylar/internal/tasklist/ui/wizards/AbstractRepositorySettingsPage.java	13 Jul 2006 16:07:05 -0000	1.26
>+++ src/org/eclipse/mylar/internal/tasklist/ui/wizards/AbstractRepositorySettingsPage.java	13 Jul 2006 17:02:55 -0000
>@@ -18,7 +18,6 @@
> import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.mylar.context.core.MylarStatusHandler;
> import org.eclipse.mylar.provisional.tasklist.AbstractRepositoryConnector;
>-import org.eclipse.mylar.tasks.core.IRepositoryConstants;
> import org.eclipse.mylar.tasks.core.TaskRepository;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionAdapter;
>@@ -140,9 +139,6 @@
> 					// ignore
> 				}
> 			});
>-
>-			// Label anonymousLabel = new Label(container, SWT.NONE);
>-			// anonymousLabel.setText("");
> 		}
> 
> 		userNameEditor = new StringFieldEditor("", LABEL_USER, StringFieldEditor.UNLIMITED, container);
>@@ -151,10 +147,9 @@
> 			oldUsername = repository.getUserName();
> 			oldPassword = repository.getPassword();
> 			try {
>-				String repositoryLabel = repository.getProperty(IRepositoryConstants.PROPERTY_LABEL);
>-				if (repositoryLabel != null && repositoryLabel.length() > 0) {
>-					repositoryLabelCombo.add(repositoryLabel);
>-					repositoryLabelCombo.select(0);
>+				String repositoryLabel = repository.getRepositoryLabel();
>+				if(repositoryLabel!=null && repositoryLabel.length()>0) {
>+					repositoryLabelCombo.setText(repositoryLabel);
> 				}
> 				serverUrlEditor.setStringValue(repository.getUrl());
> 				userNameEditor.setStringValue(repository.getUserName());

Actions: View | Diff

Attachments on bug 145123: 44702 | 45141 | 45184 | 45736 | 45811 | 45814 | 45892 | 46105 | 46185 | 46217 | 46219 | 46247 | 46300