Attachment 35491 Details for Bug 116514 – Improved patch

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

[patch] Improved patch

non-sun-specific.java.patch (text/plain), 10.76 KB, created by Ian Whalley

on 2006-02-28 14:58:26 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Whalley

Created: 2006-02-28 14:58:26 EST

Size: 10.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylar.bugzilla.core
>Index: src/org/eclipse/mylar/internal/bugzilla/core/search/BugzillaSearchEngine.java
>===================================================================
>RCS file: /home/technology/org.eclipse.mylar/org.eclipse.mylar.bugzilla.core/src/org/eclipse/mylar/internal/bugzilla/core/search/BugzillaSearchEngine.java,v
>retrieving revision 1.4
>diff -u -r1.4 BugzillaSearchEngine.java
>--- src/org/eclipse/mylar/internal/bugzilla/core/search/BugzillaSearchEngine.java	21 Feb 2006 01:24:56 -0000	1.4
>+++ src/org/eclipse/mylar/internal/bugzilla/core/search/BugzillaSearchEngine.java	28 Feb 2006 19:49:48 -0000
>@@ -18,6 +18,8 @@
> import java.net.URL;
> import java.net.URLConnection;
> import java.net.URLEncoder;
>+import java.util.regex.Matcher;
>+import java.util.regex.Pattern;
> 
> import javax.security.auth.login.LoginException;
> 
>@@ -33,9 +35,6 @@
> import org.eclipse.mylar.provisional.tasklist.TaskRepository;
> import org.eclipse.search.ui.NewSearchUI;
> 
>-import com.sun.org.apache.xerces.internal.impl.xpath.regex.Match;
>-import com.sun.org.apache.xerces.internal.impl.xpath.regex.RegularExpression;
>-
> /**
> * Queries the Bugzilla server for the list of bugs matching search criteria.
> * 
>@@ -46,19 +45,16 @@
> 	protected static final String QUERYING_SERVER = "Querying Bugzilla Server...";
> 
> 	/** regular expression matching Bugzilla query results format used in Eclipse.org Bugzilla */
>-	protected static final RegularExpression re = new RegularExpression("<a href=\"show_bug.cgi\\?id=(\\d+)\">", "i");
>+	protected static final Pattern re = Pattern.compile("<a href=\"show_bug.cgi\\?id=(\\d+)\">", Pattern.CASE_INSENSITIVE);
> 
> 	/** regular expression matching values of query matches' attributes in Eclipse.org Bugzilla */
>-	public static final RegularExpression reValue = new RegularExpression("<td>([^<]*)");
>-
>-	public static final RegularExpression reValueBugzilla220 = new RegularExpression(
>-			"<td style=\"white-space: nowrap\">([^<]*)");
>+	public static final Pattern reValue = Pattern.compile("<td>([^<]*)");
> 
>+	public static final Pattern reValueBugzilla220 = Pattern.compile("<td style=\"white-space: nowrap\">([^<]*)");
>+	
> 	/** regular expression matching Bugzilla query results format used in v2.12 */
>-	protected static final RegularExpression reOld = new RegularExpression(
>-			"<a href=\"show_bug.cgi\\?id=(\\d+)\">\\d+</a>\\s*<td class=severity>([^>]+)<td class=priority>([^>]+)<td class=platform>([^>]*)<td class=owner>([^>]*)<td class=status>([^>]*)<td class=resolution>([^>]*)<td class=summary>(.*)$",
>-			"i");
>-
>+	protected static final Pattern reOld = Pattern.compile("<a href=\"show_bug.cgi\\?id=(\\d+)\">\\d+</a>\\s*<td class=severity>([^>]+)<td class=priority>([^>]+)<td class=platform>([^>]*)<td class=owner>([^>]*)<td class=status>([^>]*)<td class=resolution>([^>]*)<td class=summary>(.*)$", Pattern.CASE_INSENSITIVE);
>+	
> 	private String urlString;
> 
> 	private TaskRepository repository;
>@@ -192,7 +188,6 @@
> 				throw new OperationCanceledException("Search cancelled");
> 			}
> 
>-			Match match = new Match();
> 			String line;
> 			while ((line = in.readLine()) != null) {
> 				if (maxMatches != -1 && numCollected >= maxMatches) {
>@@ -207,28 +202,29 @@
> 				// create regular expressions that can be mathced to check if we
> 				// have
> 				// bad login information
>-				RegularExpression loginRe = new RegularExpression("<title>.*login.*</title>.*");
>-				RegularExpression invalidRe = new RegularExpression(".*<title>.*invalid.*password.*</title>.*");
>-				RegularExpression passwordRe = new RegularExpression(".*<title>.*password.*invalid.*</title>.*");
>-				RegularExpression emailRe = new RegularExpression(".*<title>.*check e-mail.*</title>.*");
>-				RegularExpression errorRe = new RegularExpression(".*<title>.*error.*</title>.*");
>+				Pattern loginRe = Pattern.compile("<title>.*login.*</title>.*");
>+				Pattern invalidRe = Pattern.compile(".*<title>.*invalid.*password.*</title>.*");
>+				Pattern passwordRe = Pattern.compile(".*<title>.*password.*invalid.*</title>.*");
>+				Pattern emailRe = Pattern.compile(".*<title>.*check e-mail.*</title>.*");
>+				Pattern errorRe = Pattern.compile(".*<title>.*error.*</title>.*");
> 
> 				String lowerLine = line.toLowerCase();
> 
> 				// check if we have anything that suggests bad login info
>-				if (loginRe.matches(lowerLine) || invalidRe.matches(lowerLine) || passwordRe.matches(lowerLine)
>-						|| emailRe.matches(lowerLine) || errorRe.matches(lowerLine))
>+				if (loginRe.matcher(lowerLine).find() || invalidRe.matcher(lowerLine).find() || passwordRe.matcher(lowerLine).find()
>+						|| emailRe.matcher(lowerLine).find() || errorRe.matcher(lowerLine).find())
> 					possibleBadLogin = true;
> 
>-				if (reOld.matches(line, match)) {
>-					int id = Integer.parseInt(match.getCapturedText(1));
>-					String severity = match.getCapturedText(2);
>-					String priority = match.getCapturedText(3);
>-					String platform = match.getCapturedText(4);
>-					String owner = match.getCapturedText(5);
>-					String state = match.getCapturedText(6);
>-					String result = match.getCapturedText(7);
>-					String description = match.getCapturedText(8);
>+				Matcher matcher = reOld.matcher(line);
>+				if (matcher.find()) {
>+					int id = Integer.parseInt(matcher.group(1));
>+					String severity = matcher.group(2);
>+					String priority = matcher.group(3);
>+					String platform = matcher.group(4);
>+					String owner = matcher.group(5);
>+					String state = matcher.group(6);
>+					String result = matcher.group(7);
>+					String description = matcher.group(8);
> 					String query = BugzillaPlugin.getMostRecentQuery();
> 					if (query == null)
> 						query = "";
>@@ -240,19 +236,22 @@
> 					collector.accept(hit);
> 					numCollected++;
> 
>-				} else if (re.matches(line, match)) {
>-					RegularExpression regularExpression;
>-					if (BugzillaPlugin.getDefault().isServerCompatability220()) {
>-						regularExpression = reValueBugzilla220;
>-					} else {
>-						regularExpression = reValue;
>+				} else {
>+					matcher = re.matcher(line);
>+					if (matcher.find()) {
>+						Pattern regularExpression;
>+						if (BugzillaPlugin.getDefault().isServerCompatability220()) {
>+							regularExpression = reValueBugzilla220;
>+						} else {
>+							regularExpression = reValue;
>+						}
>+	
>+						int id = Integer.parseInt(matcher.group(1));
>+						BugzillaSearchHit hit = createHit(regularExpression, monitor, in, repository.getUrl()
>+								.toExternalForm(), id);
>+						collector.accept(hit);
>+						numCollected++;
> 					}
>-
>-					int id = Integer.parseInt(match.getCapturedText(1));
>-					BugzillaSearchHit hit = createHit(regularExpression, monitor, in, match, repository.getUrl()
>-							.toExternalForm(), id);
>-					collector.accept(hit);
>-					numCollected++;
> 				}
> 				if (monitor.isCanceled()) {
> 					throw new OperationCanceledException("Search cancelled");
>@@ -305,8 +304,8 @@
> 			return status;
> 	}
> 
>-	public static BugzillaSearchHit createHit(RegularExpression regularExpression, IProgressMonitor monitor,
>-			BufferedReader in, Match match, String serverUrl, int id) throws IOException {
>+	public static BugzillaSearchHit createHit(Pattern regularExpression, IProgressMonitor monitor,
>+			BufferedReader in, String serverUrl, int id) throws IOException {
> 		String line;
> 		String severity = null;
> 		String priority = null;
>@@ -315,7 +314,9 @@
> 		String state = null;
> 		String result = null;
> 		for (int i = 0; i < 6; i++) {
>+			Matcher matcher;
> 			do {
>+				matcher = null;
> 				if (monitor.isCanceled()) {
> 					throw new OperationCanceledException("Search cancelled");
> 				}
>@@ -323,26 +324,29 @@
> 				if (line == null)
> 					break;
> 				line = line.trim();
>-			} while (!regularExpression.matches(line, match));
>-			switch (i) {
>-			case 0:
>-				severity = match.getCapturedText(1);
>-				break;
>-			case 1:
>-				priority = match.getCapturedText(1);
>-				break;
>-			case 2:
>-				platform = match.getCapturedText(1);
>-				break;
>-			case 3:
>-				owner = match.getCapturedText(1);
>-				break;
>-			case 4:
>-				state = match.getCapturedText(1);
>-				break;
>-			case 5:
>-				result = match.getCapturedText(1);
>-				break;
>+				matcher = regularExpression.matcher(line);
>+			} while (!matcher.find());
>+			if (null != matcher) {
>+				switch (i) {
>+				case 0:
>+					severity = matcher.group(1);
>+					break;
>+				case 1:
>+					priority = matcher.group(1);
>+					break;
>+				case 2:
>+					platform = matcher.group(1);
>+					break;
>+				case 3:
>+					owner = matcher.group(1);
>+					break;
>+				case 4:
>+					state = matcher.group(1);
>+					break;
>+				case 5:
>+					result = matcher.group(1);
>+					break;
>+				}
> 			}
> 		}
> 
>#P org.eclipse.mylar.bugzilla.tests
>Index: src/org/eclipse/mylar/bugzilla/tests/RegularExpressionMatchTest.java
>===================================================================
>RCS file: /home/technology/org.eclipse.mylar/org.eclipse.mylar.bugzilla.tests/src/org/eclipse/mylar/bugzilla/tests/RegularExpressionMatchTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 RegularExpressionMatchTest.java
>--- src/org/eclipse/mylar/bugzilla/tests/RegularExpressionMatchTest.java	24 Jan 2006 19:46:48 -0000	1.4
>+++ src/org/eclipse/mylar/bugzilla/tests/RegularExpressionMatchTest.java	28 Feb 2006 19:49:49 -0000
>@@ -22,24 +22,20 @@
> import org.eclipse.mylar.internal.bugzilla.core.search.BugzillaSearchEngine;
> import org.eclipse.mylar.internal.bugzilla.core.search.BugzillaSearchHit;
> 
>-import com.sun.org.apache.xerces.internal.impl.xpath.regex.Match;
>-
> public class RegularExpressionMatchTest extends TestCase {
> 
> 	public void testMatchV218() throws IOException {
> 		BufferedReader in = new BufferedReader(new StringReader(BUGZILLA_218));
>-		Match match = new Match();
> 		BugzillaSearchHit hit = BugzillaSearchEngine.createHit(BugzillaSearchEngine.reValue, new NullProgressMonitor(),
>-				in, match, IBugzillaConstants.ECLIPSE_BUGZILLA_URL, 123);
>+				in, IBugzillaConstants.ECLIPSE_BUGZILLA_URL, 123);
> 		assertEquals("nor", hit.getSeverity());
> 		assertEquals("P2", hit.getPriority());
> 	}
> 
> 	public void testMatchV220() throws IOException {
> 		BufferedReader in = new BufferedReader(new StringReader(BUGZILLA_220));
>-		Match match = new Match();
> 		BugzillaSearchHit hit = BugzillaSearchEngine.createHit(BugzillaSearchEngine.reValueBugzilla220,
>-				new NullProgressMonitor(), in, match, IBugzillaConstants.ECLIPSE_BUGZILLA_URL, 123);
>+				new NullProgressMonitor(), in, IBugzillaConstants.ECLIPSE_BUGZILLA_URL, 123);
> 		assertEquals("nor", hit.getSeverity());
> 		assertEquals("P2", hit.getPriority());
> 	}

Actions: View | Diff

Attachments on bug 116514: 31895 | 31896 | 35478 | 35491