Attachment 136711 Details for Bug 269803 – next version

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

[patch] next version

patch269803.txt (text/plain), 9.17 KB, created by Frank Becker

on 2009-05-21 15:40:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2009-05-21 15:40:43 EDT

Size: 9.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/plugin.xml,v
>retrieving revision 1.106
>diff -u -r1.106 plugin.xml
>--- plugin.xml	16 Feb 2009 16:38:12 -0000	1.106
>+++ plugin.xml	21 May 2009 19:37:09 -0000
>@@ -40,6 +40,8 @@
>             <languageAttribute command="processed" 					response="processed"/> 
>             <languageAttribute command="changes_submitted" 			response="Changes submitted"/> 
>             <languageAttribute command="changes_submitted" 			response="added to Bug"/>
>+	     	<languageAttribute command="suspicious_action"			response="Suspicious action"/> 
>+	     	<languageAttribute command="mainpage_title"				response="bugzilla main page"/> 
>       </language> 
>       -->
>       <language 
>@@ -62,6 +64,7 @@
> 			<languageAttribute command="submitted" 					response="Submitted"/>
> 			<languageAttribute command="submitted" 					response="posted"/>
> 	     	<languageAttribute command="suspicious_action"			response="Suspicious action"/> 
>+	     	<languageAttribute command="mainpage_title"				response="bugzilla main page"/> 
>        </language> 
>    </extension>    
>   
>#P org.eclipse.mylyn.bugzilla.core
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaLanguageSettings.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaLanguageSettings.java,v
>retrieving revision 1.10
>diff -u -r1.10 BugzillaLanguageSettings.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaLanguageSettings.java	16 Feb 2009 16:38:14 -0000	1.10
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaLanguageSettings.java	21 May 2009 19:37:11 -0000
>@@ -17,9 +17,8 @@
> import java.util.Map;
> 
> /**
>- * Class describing the html response of Bugzilla requests which are used within Mylyn.
>- * 
>- * Strings should be in the language which is the default for an Bugzilla instance.
>+ * Class describing the html response of Bugzilla requests which are used within Mylyn. Strings should be in the
>+ * language which is the default for an Bugzilla instance.
>  * 
>  * @author Frank Becker
>  */
>@@ -47,6 +46,8 @@
> 
> 	public static final String COMMAND_SUBMITTED = "submitted"; //$NON-NLS-1$
> 
>+	public static final String COMMAND_MAINPAGE_TITLE = "mainpage_title"; //$NON-NLS-1$
>+
> 	private final Map<String, List<String>> languageAttributes = new LinkedHashMap<String, List<String>>();
> 
> 	public BugzillaLanguageSettings(String languageName) {
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java,v
>retrieving revision 1.163
>diff -u -r1.163 BugzillaRepositoryConnector.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java	30 Mar 2009 23:11:59 -0000	1.163
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java	21 May 2009 19:37:11 -0000
>@@ -391,26 +391,27 @@
> 			// TODO: Move this initialization elsewhere
> 			BugzillaCorePlugin.setConnector(this);
> 			enSetting = new BugzillaLanguageSettings(IBugzillaConstants.DEFAULT_LANG);
>-			enSetting.addLanguageAttribute("error_login", "Login"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("error_login", "log in"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("error_login", "check e-mail"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("error_login", "Invalid Username Or Password"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("error_collision", "Mid-air collision!"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("error_comment_required", "Comment Required"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("error_logged_out", "logged out"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("bad_login", "Login"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("bad_login", "log in"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("bad_login", "check e-mail"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("bad_login", "Invalid Username Or Password"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("bad_login", "error"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("processed", "processed"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("changes_submitted", "Changes submitted"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("changes_submitted", "added to Bug"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("bug", "Bug"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("bug", "Issue"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("submitted", "Submitted"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("submitted", "posted"); //$NON-NLS-1$ //$NON-NLS-2$
>-			enSetting.addLanguageAttribute("suspicious_action", "Suspicious action"); //$NON-NLS-1$ //$NON-NLS-2$
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGIN, "Login"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGIN, "log in"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGIN, "check e-mail"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGIN, "Invalid Username Or Password"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_COLLISION, "Mid-air collision!"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_COMMENT_REQUIRED, "Comment Required"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGGED_OUT, "logged out"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "Login"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "log in"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "check e-mail"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "Invalid Username Or Password"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "error"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_PROCESSED, "processed"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_CHANGES_SUBMITTED, "Changes submitted"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_CHANGES_SUBMITTED, "added to Bug"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BUG, "Bug"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BUG, "Issue"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_SUBMITTED, "Submitted"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_SUBMITTED, "posted"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_SUSPICIOUS_ACTION, "Suspicious action"); //$NON-NLS-1$ 
>+			enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_MAINPAGE_TITLE, "bugzilla main page"); //$NON-NLS-1$ 
> 			languages.add(enSetting);
> 
> 		}
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java,v
>retrieving revision 1.182
>diff -u -r1.182 BugzillaClient.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	11 May 2009 19:50:49 -0000	1.182
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	21 May 2009 19:37:11 -0000
>@@ -1577,6 +1577,21 @@
> 						}
> 						found = false;
> 						for (Iterator<String> iterator = bugzillaLanguageSettings.getResponseForCommand(
>+								BugzillaLanguageSettings.COMMAND_MAINPAGE_TITLE).iterator(); iterator.hasNext()
>+								&& !found;) {
>+							String value = iterator.next().toLowerCase(Locale.ENGLISH);
>+							found = found || title.indexOf(value) != -1;
>+						}
>+						if (found && loggedIn == false) {
>+
>+							// throw new
>+							// BugzillaException(IBugzillaConstants.LOGGED_OUT);
>+							throw new CoreException(new BugzillaStatus(IStatus.INFO, BugzillaCorePlugin.ID_PLUGIN,
>+									RepositoryStatus.REPOSITORY_LOGGED_OUT,
>+									"You have been logged in but the cookie was not found. Please retry operation.")); //$NON-NLS-1$
>+						}
>+						found = false;
>+						for (Iterator<String> iterator = bugzillaLanguageSettings.getResponseForCommand(
> 								BugzillaLanguageSettings.COMMAND_CHANGES_SUBMITTED).iterator(); iterator.hasNext()
> 								&& !found;) {
> 							String value = iterator.next().toLowerCase(Locale.ENGLISH);

Actions: View | Diff

Attachments on bug 269803: 129769 | 129770 | 136711 | 136712 | 211997 | 212033 | 212832 | 230752 | 231267