Attachment #136711 for bug #269803

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

Lines 40-45 Link Here

(-)plugin.xml (+3 lines)
40	<languageAttribute command="processed" response="processed"/>	40	<languageAttribute command="processed" response="processed"/>
41	<languageAttribute command="changes_submitted" response="Changes submitted"/>	41	<languageAttribute command="changes_submitted" response="Changes submitted"/>
42	<languageAttribute command="changes_submitted" response="added to Bug"/>	42	<languageAttribute command="changes_submitted" response="added to Bug"/>
		43	<languageAttribute command="suspicious_action" response="Suspicious action"/>
		44	<languageAttribute command="mainpage_title" response="bugzilla main page"/>
43	</language>	45	</language>
44	-->	46	-->
45	<language	47	<language
Lines 62-67 Link Here
62	<languageAttribute command="submitted" response="Submitted"/>	64	<languageAttribute command="submitted" response="Submitted"/>
63	<languageAttribute command="submitted" response="posted"/>	65	<languageAttribute command="submitted" response="posted"/>
64	<languageAttribute command="suspicious_action" response="Suspicious action"/>	66	<languageAttribute command="suspicious_action" response="Suspicious action"/>
		67	<languageAttribute command="mainpage_title" response="bugzilla main page"/>
65	</language>	68	</language>
66	</extension>	69	</extension>
67		70




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.
 * Strings should be in the language which is the default for an Bugzilla instance.
 * 
 * @author Frank Becker
 */


	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) {




			// TODO: Move this initialization elsewhere
			BugzillaCorePlugin.setConnector(this);
			enSetting = new BugzillaLanguageSettings(IBugzillaConstants.DEFAULT_LANG);
			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);

		}




						}
						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);

Return to bug 269803

Lines 17-25 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaLanguageSettings.java (-3 / +4 lines)
17	import java.util.Map;	17	import java.util.Map;
18		18
19	/**	19	/**
20	* Class describing the html response of Bugzilla requests which are used within Mylyn.	20	* Class describing the html response of Bugzilla requests which are used within Mylyn. Strings should be in the
21	*	21	* language which is the default for an Bugzilla instance.
22	* Strings should be in the language which is the default for an Bugzilla instance.
23	*	22	*
24	* @author Frank Becker	23	* @author Frank Becker
25	*/	24	*/
Lines 47-52 Link Here
47		46
48	public static final String COMMAND_SUBMITTED = "submitted"; //$NON-NLS-1$	47	public static final String COMMAND_SUBMITTED = "submitted"; //$NON-NLS-1$
49		48
		49	public static final String COMMAND_MAINPAGE_TITLE = "mainpage_title"; //$NON-NLS-1$
		50
50	private final Map<String, List<String>> languageAttributes = new LinkedHashMap<String, List<String>>();	51	private final Map<String, List<String>> languageAttributes = new LinkedHashMap<String, List<String>>();
51		52
52	public BugzillaLanguageSettings(String languageName) {	53	public BugzillaLanguageSettings(String languageName) {

Lines 391-416 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java (-20 / +21 lines)
391	// TODO: Move this initialization elsewhere	391	// TODO: Move this initialization elsewhere
392	BugzillaCorePlugin.setConnector(this);	392	BugzillaCorePlugin.setConnector(this);
393	enSetting = new BugzillaLanguageSettings(IBugzillaConstants.DEFAULT_LANG);	393	enSetting = new BugzillaLanguageSettings(IBugzillaConstants.DEFAULT_LANG);
394	enSetting.addLanguageAttribute("error_login", "Login"); //$NON-NLS-1$ //$NON-NLS-2$	394	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGIN, "Login"); //$NON-NLS-1$
395	enSetting.addLanguageAttribute("error_login", "log in"); //$NON-NLS-1$ //$NON-NLS-2$	395	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGIN, "log in"); //$NON-NLS-1$
396	enSetting.addLanguageAttribute("error_login", "check e-mail"); //$NON-NLS-1$ //$NON-NLS-2$	396	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGIN, "check e-mail"); //$NON-NLS-1$
397	enSetting.addLanguageAttribute("error_login", "Invalid Username Or Password"); //$NON-NLS-1$ //$NON-NLS-2$	397	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGIN, "Invalid Username Or Password"); //$NON-NLS-1$
398	enSetting.addLanguageAttribute("error_collision", "Mid-air collision!"); //$NON-NLS-1$ //$NON-NLS-2$	398	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_COLLISION, "Mid-air collision!"); //$NON-NLS-1$
399	enSetting.addLanguageAttribute("error_comment_required", "Comment Required"); //$NON-NLS-1$ //$NON-NLS-2$	399	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_COMMENT_REQUIRED, "Comment Required"); //$NON-NLS-1$
400	enSetting.addLanguageAttribute("error_logged_out", "logged out"); //$NON-NLS-1$ //$NON-NLS-2$	400	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_ERROR_LOGGED_OUT, "logged out"); //$NON-NLS-1$
401	enSetting.addLanguageAttribute("bad_login", "Login"); //$NON-NLS-1$ //$NON-NLS-2$	401	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "Login"); //$NON-NLS-1$
402	enSetting.addLanguageAttribute("bad_login", "log in"); //$NON-NLS-1$ //$NON-NLS-2$	402	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "log in"); //$NON-NLS-1$
403	enSetting.addLanguageAttribute("bad_login", "check e-mail"); //$NON-NLS-1$ //$NON-NLS-2$	403	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "check e-mail"); //$NON-NLS-1$
404	enSetting.addLanguageAttribute("bad_login", "Invalid Username Or Password"); //$NON-NLS-1$ //$NON-NLS-2$	404	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "Invalid Username Or Password"); //$NON-NLS-1$
405	enSetting.addLanguageAttribute("bad_login", "error"); //$NON-NLS-1$ //$NON-NLS-2$	405	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BAD_LOGIN, "error"); //$NON-NLS-1$
406	enSetting.addLanguageAttribute("processed", "processed"); //$NON-NLS-1$ //$NON-NLS-2$	406	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_PROCESSED, "processed"); //$NON-NLS-1$
407	enSetting.addLanguageAttribute("changes_submitted", "Changes submitted"); //$NON-NLS-1$ //$NON-NLS-2$	407	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_CHANGES_SUBMITTED, "Changes submitted"); //$NON-NLS-1$
408	enSetting.addLanguageAttribute("changes_submitted", "added to Bug"); //$NON-NLS-1$ //$NON-NLS-2$	408	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_CHANGES_SUBMITTED, "added to Bug"); //$NON-NLS-1$
409	enSetting.addLanguageAttribute("bug", "Bug"); //$NON-NLS-1$ //$NON-NLS-2$	409	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BUG, "Bug"); //$NON-NLS-1$
410	enSetting.addLanguageAttribute("bug", "Issue"); //$NON-NLS-1$ //$NON-NLS-2$	410	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_BUG, "Issue"); //$NON-NLS-1$
411	enSetting.addLanguageAttribute("submitted", "Submitted"); //$NON-NLS-1$ //$NON-NLS-2$	411	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_SUBMITTED, "Submitted"); //$NON-NLS-1$
412	enSetting.addLanguageAttribute("submitted", "posted"); //$NON-NLS-1$ //$NON-NLS-2$	412	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_SUBMITTED, "posted"); //$NON-NLS-1$
413	enSetting.addLanguageAttribute("suspicious_action", "Suspicious action"); //$NON-NLS-1$ //$NON-NLS-2$	413	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_SUSPICIOUS_ACTION, "Suspicious action"); //$NON-NLS-1$
		414	enSetting.addLanguageAttribute(BugzillaLanguageSettings.COMMAND_MAINPAGE_TITLE, "bugzilla main page"); //$NON-NLS-1$
414	languages.add(enSetting);	415	languages.add(enSetting);
415		416
416	}	417	}

Lines 1577-1582 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java (+15 lines)
1577	}	1577	}
1578	found = false;	1578	found = false;
1579	for (Iterator<String> iterator = bugzillaLanguageSettings.getResponseForCommand(	1579	for (Iterator<String> iterator = bugzillaLanguageSettings.getResponseForCommand(
		1580	BugzillaLanguageSettings.COMMAND_MAINPAGE_TITLE).iterator(); iterator.hasNext()
		1581	&& !found;) {
		1582	String value = iterator.next().toLowerCase(Locale.ENGLISH);
		1583	found = found \|\| title.indexOf(value) != -1;
		1584	}
		1585	if (found && loggedIn == false) {
		1586
		1587	// throw new
		1588	// BugzillaException(IBugzillaConstants.LOGGED_OUT);
		1589	throw new CoreException(new BugzillaStatus(IStatus.INFO, BugzillaCorePlugin.ID_PLUGIN,
		1590	RepositoryStatus.REPOSITORY_LOGGED_OUT,
		1591	"You have been logged in but the cookie was not found. Please retry operation.")); //$NON-NLS-1$
		1592	}
		1593	found = false;
		1594	for (Iterator<String> iterator = bugzillaLanguageSettings.getResponseForCommand(
1580	BugzillaLanguageSettings.COMMAND_CHANGES_SUBMITTED).iterator(); iterator.hasNext()	1595	BugzillaLanguageSettings.COMMAND_CHANGES_SUBMITTED).iterator(); iterator.hasNext()
1581	&& !found;) {	1596	&& !found;) {
1582	String value = iterator.next().toLowerCase(Locale.ENGLISH);	1597	String value = iterator.next().toLowerCase(Locale.ENGLISH);