Attachment 156666 Details for Bug 299889 – Fix

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

[patch] Fix

clipboard.txt (text/plain), 2.21 KB, created by Rüdiger Herrmann

on 2010-01-20 11:35:46 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2010-01-20 11:35:46 EST

Size: 2.21 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.cheatsheets
>Index: src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java,v
>retrieving revision 1.3
>diff -u -r1.3 CheatSheetRegistryReader.java
>--- src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java	13 May 2009 10:23:31 -0000	1.3
>+++ src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java	20 Jan 2010 16:20:38 -0000
>@@ -143,7 +143,8 @@
> 	protected final static String TAG_TASK_EXPLORER = "taskExplorer"; //$NON-NLS-1$
> 	protected final static String trueString = "TRUE"; //$NON-NLS-1$
> 	private final static String UNCATEGORIZED_CHEATSHEET_CATEGORY = "org.eclipse.ui.Other"; //$NON-NLS-1$
>-	private final static String UNCATEGORIZED_CHEATSHEET_CATEGORY_LABEL = Messages.get().CHEAT_SHEET_OTHER_CATEGORY;
>+// RAP [rh]	Can't use NLS mechanism here: this class my be accessed outside the request scope
>+//	private final static String UNCATEGORIZED_CHEATSHEET_CATEGORY_LABEL = Messages.get().CHEAT_SHEET_OTHER_CATEGORY;
>     public final static String CHEAT_SHEET_CONTENT = "cheatSheetContent"; //$NON-NLS-1$
> 	
>     /**
>@@ -509,8 +510,12 @@
> 	protected void moveElementToUncategorizedCategory(CheatSheetCollectionElement root, CheatSheetElement element) {
> 		CheatSheetCollectionElement otherCategory = getChildWithID(root, UNCATEGORIZED_CHEATSHEET_CATEGORY);
> 
>+// RAP [rh] CheatSheetRegistry is only initialized once, therefore we use the 
>+//     a hard-coded locale for the uncategorized label
>+//		if (otherCategory == null)
>+//			otherCategory = createCollectionElement(root, null, UNCATEGORIZED_CHEATSHEET_CATEGORY, UNCATEGORIZED_CHEATSHEET_CATEGORY_LABEL);
> 		if (otherCategory == null)
>-			otherCategory = createCollectionElement(root, null, UNCATEGORIZED_CHEATSHEET_CATEGORY, UNCATEGORIZED_CHEATSHEET_CATEGORY_LABEL);
>+		  otherCategory = createCollectionElement(root, null, UNCATEGORIZED_CHEATSHEET_CATEGORY, "Other"); //$NON-NLS-1$
> 
> 		otherCategory.add(element);
> 	}

Actions: View | Diff

Attachments on bug 299889: 156666