Attachment 204084 Details for Bug 359077 – a patch proposal

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

[patch] a patch proposal

patch.txt (text/plain), 100.50 KB, created by Arnaud MERGEY

on 2011-09-27 10:27:45 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Arnaud MERGEY

Created: 2011-09-27 10:27:45 EDT

Size: 100.50 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gef
>Index: src/org/eclipse/gef/SharedMessages.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/SharedMessages.java,v
>retrieving revision 1.1
>diff -u -r1.1 SharedMessages.java
>--- src/org/eclipse/gef/SharedMessages.java	9 Dec 2010 19:39:58 -0000	1.1
>+++ src/org/eclipse/gef/SharedMessages.java	27 Sep 2011 14:19:47 -0000
>@@ -23,14 +23,14 @@
> 	/**
> 	 * The string "Page".
> 	 */
>-	public static String FitAllAction_Label = GEFMessages.FitAllAction_Label;
>+	public static String FitAllAction_Label = GEFMessages.get().FitAllAction_Label;
> 	/**
> 	 * The string "Width".
> 	 */
>-	public static String FitWidthAction_Label = GEFMessages.FitWidthAction_Label;
>+	public static String FitWidthAction_Label = GEFMessages.get().FitWidthAction_Label;
> 	/**
> 	 * The string "Height".
> 	 */
>-	public static String FitHeightAction_Label = GEFMessages.FitHeightAction_Label;
>+	public static String FitHeightAction_Label = GEFMessages.get().FitHeightAction_Label;
> 
> }
>Index: src/org/eclipse/gef/internal/GEFMessages.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/internal/GEFMessages.java,v
>retrieving revision 1.2
>diff -u -r1.2 GEFMessages.java
>--- src/org/eclipse/gef/internal/GEFMessages.java	6 Jul 2011 17:45:04 -0000	1.2
>+++ src/org/eclipse/gef/internal/GEFMessages.java	27 Sep 2011 14:19:47 -0000
>@@ -10,7 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.gef.internal;
> 
>-import org.eclipse.osgi.util.NLS;
>+import org.eclipse.rwt.RWT;
> 
> /**
>  * Internal Messages
>@@ -18,100 +18,100 @@
>  * @author hudsonr
>  * @since 2.0
>  */
>-public class GEFMessages extends NLS {
>+public class GEFMessages /* extends NLS */{
> 
>-	public static String AlignBottomAction_Label;
>-	public static String AlignBottomAction_Tooltip;
>-	public static String AlignCenterAction_Label;
>-	public static String AlignCenterAction_Tooltip;
>-	public static String AlignLeftAction_Label;
>-	public static String AlignLeftAction_Tooltip;
>-	public static String AlignMiddleAction_Label;
>-	public static String AlignMiddleAction_Tooltip;
>-	public static String AlignRightAction_Label;
>-	public static String AlignRightAction_Tooltip;
>-	public static String AlignTopAction_Label;
>-	public static String AlignTopAction_Tooltip;
>-
>-	public static String CopyAction_ActionDeleteCommandName;
>-	public static String CopyAction_Label;
>-	public static String CopyAction_Tooltip;
>-
>-	public static String DeleteAction_ActionDeleteCommandName;
>-	public static String DeleteAction_Label;
>-	public static String DeleteAction_Tooltip;
>-
>-	public static String PasteAction_Label;
>-	public static String PasteAction_Tooltip;
>-
>-	public static String PrintAction_ActionDeleteCommandName;
>-	public static String PrintAction_Label;
>-	public static String PrintAction_Tooltip;
>-
>-	public static String RedoAction_Label;
>-	public static String RedoAction_Tooltip;
>-	public static String RenameAction_Label;
>-	public static String RenameAction_Tooltip;
>-	public static String SaveAction_Label;
>-	public static String SaveAction_Tooltip;
>-	public static String SetPropertyValueCommand_Label;
>-
>-	public static String SelectAllAction_Label;
>-	public static String SelectAllAction_Tooltip;
>-
>-	public static String MatchSizeAction_Label;
>-	public static String MatchSizeAction_Tooltip;
>-
>-	public static String MatchWidthAction_Label;
>-	public static String MatchWidthAction_Tooltip;
>-
>-	public static String MatchHeightAction_Label;
>-	public static String MatchHeightAction_Tooltip;
>-
>-	public static String SelectionTool_Label;
>-	public static String MarqueeTool_Label;
>-	public static String MarqueeTool_Connections_Touched_Desc;
>-	public static String MarqueeTool_Connections_Contained_Desc;
>-	public static String MarqueeTool_Nodes_Touched_Desc;
>-	public static String MarqueeTool_Nodes_Contained_Desc;
>-	public static String MarqueeTool_Nodes_Touched_And_Related_Connections_Desc;
>-	public static String MarqueeTool_Nodes_Contained_And_Related_Connections_Desc;
>-	public static String UndoAction_Label;
>-	public static String UndoAction_Tooltip;
>-
>-	// Zoom strings
>-	public static String ZoomIn_Label;
>-	public static String ZoomIn_Tooltip;
>-	public static String ZoomOut_Label;
>-	public static String ZoomOut_Tooltip;
>-	public static String FitAllAction_Label;
>-	public static String FitWidthAction_Label;
>-	public static String FitHeightAction_Label;
>-
>-	// View menu actions
>-	public static String ToggleRulerVisibility_Label;
>-	public static String ToggleRulerVisibility_Tooltip;
>-	public static String ToggleSnapToGeometry_Label;
>-	public static String ToggleSnapToGeometry_Tooltip;
>-	public static String ToggleGrid_Label;
>-	public static String ToggleGrid_Tooltip;
>-
>-	// Palette view Strings
>-	public static String Palette_Label;
>-	public static String Palette_Not_Available;
>-
>-	// Rulers and guides
>-	public static String Ruler_Horizontal_Label;
>-	public static String Ruler_Vertical_Label;
>-	public static String Ruler_Desc;
>-	public static String Guide_Label;
>-	public static String Guide_Desc;
>-	public static String Create_Guide_Label;
>-	public static String Create_Guide_Tooltip;
>-
>-	static {
>-		NLS.initializeMessages(
>-				"org.eclipse.gef.internal.messages", GEFMessages.class); //$NON-NLS-1$
>+	public String AlignBottomAction_Label;
>+	public String AlignBottomAction_Tooltip;
>+	public String AlignCenterAction_Label;
>+	public String AlignCenterAction_Tooltip;
>+	public String AlignLeftAction_Label;
>+	public String AlignLeftAction_Tooltip;
>+	public String AlignMiddleAction_Label;
>+	public String AlignMiddleAction_Tooltip;
>+	public String AlignRightAction_Label;
>+	public String AlignRightAction_Tooltip;
>+	public String AlignTopAction_Label;
>+	public String AlignTopAction_Tooltip;
>+
>+	public String CopyAction_ActionDeleteCommandName;
>+	public String CopyAction_Label;
>+	public String CopyAction_Tooltip;
>+
>+	public String DeleteAction_ActionDeleteCommandName;
>+	public String DeleteAction_Label;
>+	public String DeleteAction_Tooltip;
>+
>+	public String PasteAction_Label;
>+	public String PasteAction_Tooltip;
>+
>+	public String PrintAction_ActionDeleteCommandName;
>+	public String PrintAction_Label;
>+	public String PrintAction_Tooltip;
>+
>+	public String RedoAction_Label;
>+	public String RedoAction_Tooltip;
>+	public String RenameAction_Label;
>+	public String RenameAction_Tooltip;
>+	public String SaveAction_Label;
>+	public String SaveAction_Tooltip;
>+	public String SetPropertyValueCommand_Label;
>+
>+	public String SelectAllAction_Label;
>+	public String SelectAllAction_Tooltip;
>+
>+	public String MatchSizeAction_Label;
>+	public String MatchSizeAction_Tooltip;
>+
>+	public String MatchWidthAction_Label;
>+	public String MatchWidthAction_Tooltip;
>+
>+	public String MatchHeightAction_Label;
>+	public String MatchHeightAction_Tooltip;
>+
>+	public String SelectionTool_Label;
>+	public String MarqueeTool_Label;
>+	public String MarqueeTool_Connections_Touched_Desc;
>+	public String MarqueeTool_Connections_Contained_Desc;
>+	public String MarqueeTool_Nodes_Touched_Desc;
>+	public String MarqueeTool_Nodes_Contained_Desc;
>+	public String MarqueeTool_Nodes_Touched_And_Related_Connections_Desc;
>+	public String MarqueeTool_Nodes_Contained_And_Related_Connections_Desc;
>+	public String UndoAction_Label;
>+	public String UndoAction_Tooltip;
>+
>+	// Zoogs
>+	public String ZoomIn_Label;
>+	public String ZoomIn_Tooltip;
>+	public String ZoomOut_Label;
>+	public String ZoomOut_Tooltip;
>+	public String FitAllAction_Label;
>+	public String FitWidthAction_Label;
>+	public String FitHeightAction_Label;
>+
>+	// Vieactions
>+	public String ToggleRulerVisibility_Label;
>+	public String ToggleRulerVisibility_Tooltip;
>+	public String ToggleSnapToGeometry_Label;
>+	public String ToggleSnapToGeometry_Tooltip;
>+	public String ToggleGrid_Label;
>+	public String ToggleGrid_Tooltip;
>+
>+	// Palew Strings
>+	public String Palette_Label;
>+	public String Palette_Not_Available;
>+
>+	// Rul guides
>+	public String Ruler_Horizontal_Label;
>+	public String Ruler_Vertical_Label;
>+	public String Ruler_Desc;
>+	public String Guide_Label;
>+	public String Guide_Desc;
>+	public String Create_Guide_Label;
>+	public String Create_Guide_Tooltip;
>+
>+	public static GEFMessages get() {
>+		Object result = RWT.NLS.getISO8859_1Encoded(
>+				"org.eclipse.gef.internal.messages", GEFMessages.class);
>+		return (GEFMessages) result;
> 	}
>-
> }
>\ No newline at end of file
>Index: src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java,v
>retrieving revision 1.4
>diff -u -r1.4 DetailedLabelFigure.java
>--- src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java	19 Jul 2011 18:21:26 -0000	1.4
>+++ src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java	27 Sep 2011 14:19:47 -0000
>@@ -142,7 +142,7 @@
> 		String str = ""; //$NON-NLS-1$
> 		if (s != null && !s.trim().equals("") //$NON-NLS-1$
> 				&& !s.trim().equals(nameText.getText().trim())) {
>-			str = " " + PaletteMessages.NAME_DESCRIPTION_SEPARATOR //$NON-NLS-1$
>+			str = " " + PaletteMessages.get().NAME_DESCRIPTION_SEPARATOR //$NON-NLS-1$
> 					+ " " + s; //$NON-NLS-1$
> 		}
> 		if (descText.getText().equals(str)) {
>Index: src/org/eclipse/gef/internal/ui/palette/editparts/PinFigure.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/PinFigure.java,v
>retrieving revision 1.1
>diff -u -r1.1 PinFigure.java
>--- src/org/eclipse/gef/internal/ui/palette/editparts/PinFigure.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/internal/ui/palette/editparts/PinFigure.java	27 Sep 2011 14:19:47 -0000
>@@ -46,7 +46,7 @@
> 		super(new ImageFigure(InternalImages.get(InternalImages.IMG_UNPINNED)));
> 		setRolloverEnabled(true);
> 		setRequestFocusEnabled(false);
>-		Label tooltip = new Label(PaletteMessages.TOOLTIP_PIN_FIGURE);
>+		Label tooltip = new Label(PaletteMessages.get().TOOLTIP_PIN_FIGURE);
> 		tooltip.setBorder(TOOLTIP_BORDER);
> 		setToolTip(tooltip);
> 		setOpaque(false);
>@@ -60,13 +60,13 @@
> 								.setImage(InternalImages
> 										.get(InternalImages.IMG_PINNED));
> 						((Label) getToolTip())
>-								.setText(PaletteMessages.TOOLTIP_UNPIN_FIGURE);
>+								.setText(PaletteMessages.get().TOOLTIP_UNPIN_FIGURE);
> 					} else {
> 						((ImageFigure) (getChildren().get(0)))
> 								.setImage(InternalImages
> 										.get(InternalImages.IMG_UNPINNED));
> 						((Label) getToolTip())
>-								.setText(PaletteMessages.TOOLTIP_PIN_FIGURE);
>+								.setText(PaletteMessages.get().TOOLTIP_PIN_FIGURE);
> 					}
> 				}
> 			}
>Index: src/org/eclipse/gef/internal/ui/rulers/RulerEditPart.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerEditPart.java,v
>retrieving revision 1.1
>diff -u -r1.1 RulerEditPart.java
>--- src/org/eclipse/gef/internal/ui/rulers/RulerEditPart.java	9 Dec 2010 19:40:05 -0000	1.1
>+++ src/org/eclipse/gef/internal/ui/rulers/RulerEditPart.java	27 Sep 2011 14:19:48 -0000
>@@ -113,12 +113,12 @@
> 		if (accPart == null)
> 			accPart = new AccessibleGraphicalEditPart() {
> 				public void getName(AccessibleEvent e) {
>-					e.result = isHorizontal() ? GEFMessages.Ruler_Horizontal_Label
>-							: GEFMessages.Ruler_Vertical_Label;
>+					e.result = isHorizontal() ? GEFMessages.get().Ruler_Horizontal_Label
>+							: GEFMessages.get().Ruler_Vertical_Label;
> 				}
> 
> 				public void getDescription(AccessibleEvent e) {
>-					e.result = GEFMessages.Ruler_Desc;
>+					e.result = GEFMessages.get().Ruler_Desc;
> 				}
> 			};
> 		return accPart;
>Index: src/org/eclipse/gef/palette/MarqueeToolEntry.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/palette/MarqueeToolEntry.java,v
>retrieving revision 1.1
>diff -u -r1.1 MarqueeToolEntry.java
>--- src/org/eclipse/gef/palette/MarqueeToolEntry.java	9 Dec 2010 19:40:01 -0000	1.1
>+++ src/org/eclipse/gef/palette/MarqueeToolEntry.java	27 Sep 2011 14:19:48 -0000
>@@ -55,7 +55,7 @@
> 	public MarqueeToolEntry(String label, String description) {
> 		super(label, description, null, null, MarqueeSelectionTool.class);
> 		if (label == null || label.length() == 0)
>-			setLabel(GEFMessages.MarqueeTool_Label);
>+			setLabel(GEFMessages.get().MarqueeTool_Label);
> 		setUserModificationPermission(PERMISSION_NO_MODIFICATION);
> 	}
> 
>@@ -69,22 +69,22 @@
> 
> 		int marqueeBehavior = getMarqueeBehavior();
> 		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_CONNECTIONS_TOUCHED) {
>-			return GEFMessages.MarqueeTool_Connections_Touched_Desc;
>+			return GEFMessages.get().MarqueeTool_Connections_Touched_Desc;
> 		}
> 		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_CONNECTIONS_CONTAINED) {
>-			return GEFMessages.MarqueeTool_Connections_Contained_Desc;
>+			return GEFMessages.get().MarqueeTool_Connections_Contained_Desc;
> 		}
> 		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_TOUCHED) {
>-			return GEFMessages.MarqueeTool_Nodes_Touched_Desc;
>+			return GEFMessages.get().MarqueeTool_Nodes_Touched_Desc;
> 		}
> 		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_CONTAINED) {
>-			return GEFMessages.MarqueeTool_Nodes_Contained_Desc;
>+			return GEFMessages.get().MarqueeTool_Nodes_Contained_Desc;
> 		}
> 		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_TOUCHED_AND_RELATED_CONNECTIONS) {
>-			return GEFMessages.MarqueeTool_Nodes_Touched_And_Related_Connections_Desc;
>+			return GEFMessages.get().MarqueeTool_Nodes_Touched_And_Related_Connections_Desc;
> 		}
> 		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_CONTAINED_AND_RELATED_CONNECTIONS) {
>-			return GEFMessages.MarqueeTool_Nodes_Contained_And_Related_Connections_Desc;
>+			return GEFMessages.get().MarqueeTool_Nodes_Contained_And_Related_Connections_Desc;
> 		}
> 		throw new IllegalArgumentException("Unknown marquee behavior"); //$NON-NLS-1$
> 	}
>Index: src/org/eclipse/gef/palette/PaletteSeparator.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/palette/PaletteSeparator.java,v
>retrieving revision 1.1
>diff -u -r1.1 PaletteSeparator.java
>--- src/org/eclipse/gef/palette/PaletteSeparator.java	9 Dec 2010 19:40:01 -0000	1.1
>+++ src/org/eclipse/gef/palette/PaletteSeparator.java	27 Sep 2011 14:19:48 -0000
>@@ -42,7 +42,7 @@
> 	 *            This Separator's unique ID
> 	 */
> 	public PaletteSeparator(String id) {
>-		super(PaletteMessages.NEW_SEPARATOR_LABEL, "", PALETTE_TYPE_SEPARATOR);//$NON-NLS-1$
>+		super(PaletteMessages.get().NEW_SEPARATOR_LABEL, "", PALETTE_TYPE_SEPARATOR);//$NON-NLS-1$
> 		setId(id);
> 	}
> 
>Index: src/org/eclipse/gef/palette/SelectionToolEntry.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/palette/SelectionToolEntry.java,v
>retrieving revision 1.1
>diff -u -r1.1 SelectionToolEntry.java
>--- src/org/eclipse/gef/palette/SelectionToolEntry.java	9 Dec 2010 19:40:01 -0000	1.1
>+++ src/org/eclipse/gef/palette/SelectionToolEntry.java	27 Sep 2011 14:19:48 -0000
>@@ -51,7 +51,7 @@
> 		super(label, shortDesc, SharedImages.DESC_SELECTION_TOOL_16,
> 				SharedImages.DESC_SELECTION_TOOL_24, SelectionTool.class);
> 		if (label == null || label.length() == 0)
>-			setLabel(GEFMessages.SelectionTool_Label);
>+			setLabel(GEFMessages.get().SelectionTool_Label);
> 		setUserModificationPermission(PERMISSION_NO_MODIFICATION);
> 	}
> 
>Index: src/org/eclipse/gef/rulers/RulerProvider.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/rulers/RulerProvider.java,v
>retrieving revision 1.1
>diff -u -r1.1 RulerProvider.java
>--- src/org/eclipse/gef/rulers/RulerProvider.java	9 Dec 2010 19:40:06 -0000	1.1
>+++ src/org/eclipse/gef/rulers/RulerProvider.java	27 Sep 2011 14:19:48 -0000
>@@ -108,7 +108,7 @@
> 	 * @see org.eclipse.swt.accessibility.AccessibleAdapter#getDescription(AccessibleEvent)
> 	 */
> 	public void getAccGuideDescription(AccessibleEvent e, Object guide) {
>-		e.result = GEFMessages.Guide_Desc;
>+		e.result = GEFMessages.get().Guide_Desc;
> 	}
> 
> 	/**
>@@ -122,7 +122,7 @@
> 	 * @see org.eclipse.swt.accessibility.AccessibleAdapter#getName(AccessibleEvent)
> 	 */
> 	public void getAccGuideName(AccessibleEvent e, Object guide) {
>-		e.result = GEFMessages.Guide_Label;
>+		e.result = GEFMessages.get().Guide_Label;
> 	}
> 
> 	/**
>Index: src/org/eclipse/gef/ui/actions/AlignmentAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/AlignmentAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 AlignmentAction.java
>--- src/org/eclipse/gef/ui/actions/AlignmentAction.java	9 Dec 2010 19:39:58 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/AlignmentAction.java	27 Sep 2011 14:19:48 -0000
>@@ -197,48 +197,48 @@
> 		switch (alignment) {
> 		case PositionConstants.LEFT:
> 			setId(GEFActionConstants.ALIGN_LEFT);
>-			setText(GEFMessages.AlignLeftAction_Label);
>-			setToolTipText(GEFMessages.AlignLeftAction_Tooltip);
>+			setText(GEFMessages.get().AlignLeftAction_Label);
>+			setToolTipText(GEFMessages.get().AlignLeftAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT);
> 			setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT_DIS);
> 			break;
> 
> 		case PositionConstants.RIGHT:
> 			setId(GEFActionConstants.ALIGN_RIGHT);
>-			setText(GEFMessages.AlignRightAction_Label);
>-			setToolTipText(GEFMessages.AlignRightAction_Tooltip);
>+			setText(GEFMessages.get().AlignRightAction_Label);
>+			setToolTipText(GEFMessages.get().AlignRightAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT);
> 			setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT_DIS);
> 			break;
> 
> 		case PositionConstants.TOP:
> 			setId(GEFActionConstants.ALIGN_TOP);
>-			setText(GEFMessages.AlignTopAction_Label);
>-			setToolTipText(GEFMessages.AlignTopAction_Tooltip);
>+			setText(GEFMessages.get().AlignTopAction_Label);
>+			setToolTipText(GEFMessages.get().AlignTopAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);
> 			setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);
> 			break;
> 
> 		case PositionConstants.BOTTOM:
> 			setId(GEFActionConstants.ALIGN_BOTTOM);
>-			setText(GEFMessages.AlignBottomAction_Label);
>-			setToolTipText(GEFMessages.AlignBottomAction_Tooltip);
>+			setText(GEFMessages.get().AlignBottomAction_Label);
>+			setToolTipText(GEFMessages.get().AlignBottomAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM);
> 			setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM_DIS);
> 			break;
> 
> 		case PositionConstants.CENTER:
> 			setId(GEFActionConstants.ALIGN_CENTER);
>-			setText(GEFMessages.AlignCenterAction_Label);
>-			setToolTipText(GEFMessages.AlignCenterAction_Tooltip);
>+			setText(GEFMessages.get().AlignCenterAction_Label);
>+			setToolTipText(GEFMessages.get().AlignCenterAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER);
> 			setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER_DIS);
> 			break;
> 
> 		case PositionConstants.MIDDLE:
> 			setId(GEFActionConstants.ALIGN_MIDDLE);
>-			setText(GEFMessages.AlignMiddleAction_Label);
>-			setToolTipText(GEFMessages.AlignMiddleAction_Tooltip);
>+			setText(GEFMessages.get().AlignMiddleAction_Label);
>+			setToolTipText(GEFMessages.get().AlignMiddleAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE);
> 			setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE_DIS);
> 			break;
>Index: src/org/eclipse/gef/ui/actions/AlignmentRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/AlignmentRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 AlignmentRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/AlignmentRetargetAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/AlignmentRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -37,43 +37,43 @@
> 		switch (align) {
> 		case PositionConstants.BOTTOM:
> 			setId(GEFActionConstants.ALIGN_BOTTOM);
>-			setText(GEFMessages.AlignBottomAction_Label);
>-			setToolTipText(GEFMessages.AlignBottomAction_Tooltip);
>+			setText(GEFMessages.get().AlignBottomAction_Label);
>+			setToolTipText(GEFMessages.get().AlignBottomAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM);
> 			setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM_DIS);
> 			break;
> 		case PositionConstants.CENTER:
> 			setId(GEFActionConstants.ALIGN_CENTER);
>-			setText(GEFMessages.AlignCenterAction_Label);
>-			setToolTipText(GEFMessages.AlignCenterAction_Tooltip);
>+			setText(GEFMessages.get().AlignCenterAction_Label);
>+			setToolTipText(GEFMessages.get().AlignCenterAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER);
> 			setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER_DIS);
> 			break;
> 		case PositionConstants.LEFT:
> 			setId(GEFActionConstants.ALIGN_LEFT);
>-			setText(GEFMessages.AlignLeftAction_Label);
>-			setToolTipText(GEFMessages.AlignLeftAction_Tooltip);
>+			setText(GEFMessages.get().AlignLeftAction_Label);
>+			setToolTipText(GEFMessages.get().AlignLeftAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT);
> 			setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT_DIS);
> 			break;
> 		case PositionConstants.MIDDLE:
> 			setId(GEFActionConstants.ALIGN_MIDDLE);
>-			setText(GEFMessages.AlignMiddleAction_Label);
>-			setToolTipText(GEFMessages.AlignMiddleAction_Tooltip);
>+			setText(GEFMessages.get().AlignMiddleAction_Label);
>+			setToolTipText(GEFMessages.get().AlignMiddleAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE);
> 			setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE_DIS);
> 			break;
> 		case PositionConstants.RIGHT:
> 			setId(GEFActionConstants.ALIGN_RIGHT);
>-			setText(GEFMessages.AlignRightAction_Label);
>-			setToolTipText(GEFMessages.AlignRightAction_Tooltip);
>+			setText(GEFMessages.get().AlignRightAction_Label);
>+			setToolTipText(GEFMessages.get().AlignRightAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT);
> 			setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT_DIS);
> 			break;
> 		case PositionConstants.TOP:
> 			setId(GEFActionConstants.ALIGN_TOP);
>-			setText(GEFMessages.AlignTopAction_Label);
>-			setToolTipText(GEFMessages.AlignTopAction_Tooltip);
>+			setText(GEFMessages.get().AlignTopAction_Label);
>+			setToolTipText(GEFMessages.get().AlignTopAction_Tooltip);
> 			setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);
> 			setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);
> 			break;
>Index: src/org/eclipse/gef/ui/actions/CopyRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/CopyRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 CopyRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/CopyRetargetAction.java	9 Dec 2010 19:39:58 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/CopyRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -27,7 +27,7 @@
> 	 * Constructs a new CopyRetargetAction with the default ID, label and image.
> 	 */
> 	public CopyRetargetAction() {
>-		super(ActionFactory.COPY.getId(), GEFMessages.CopyAction_Label);
>+		super(ActionFactory.COPY.getId(), GEFMessages.get().CopyAction_Label);
> 		ISharedImages sharedImages = PlatformUI.getWorkbench()
> 				.getSharedImages();
> 		setImageDescriptor(sharedImages
>Index: src/org/eclipse/gef/ui/actions/CopyTemplateAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/CopyTemplateAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 CopyTemplateAction.java
>--- src/org/eclipse/gef/ui/actions/CopyTemplateAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/CopyTemplateAction.java	27 Sep 2011 14:19:48 -0000
>@@ -45,7 +45,7 @@
> 	public CopyTemplateAction(IEditorPart editor) {
> 		super(editor);
> 		setId(ActionFactory.COPY.getId());
>-		setText(GEFMessages.CopyAction_Label);
>+		setText(GEFMessages.get().CopyAction_Label);
> 	}
> 
> 	/**
>Index: src/org/eclipse/gef/ui/actions/CreateGuideAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/CreateGuideAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 CreateGuideAction.java
>--- src/org/eclipse/gef/ui/actions/CreateGuideAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/CreateGuideAction.java	27 Sep 2011 14:19:48 -0000
>@@ -38,9 +38,9 @@
> 	 *            the viewer for the ruler on which the guide is to be created
> 	 */
> 	public CreateGuideAction(EditPartViewer ruler) {
>-		super(GEFMessages.Create_Guide_Label);
>+		super(GEFMessages.get().Create_Guide_Label);
> 		viewer = ruler;
>-		setToolTipText(GEFMessages.Create_Guide_Tooltip);
>+		setToolTipText(GEFMessages.get().Create_Guide_Tooltip);
> 	}
> 
> 	/**
>Index: src/org/eclipse/gef/ui/actions/DeleteAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/DeleteAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 DeleteAction.java
>--- src/org/eclipse/gef/ui/actions/DeleteAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/DeleteAction.java	27 Sep 2011 14:19:48 -0000
>@@ -98,7 +98,7 @@
> 		deleteReq.setEditParts(objects);
> 
> 		CompoundCommand compoundCmd = new CompoundCommand(
>-				GEFMessages.DeleteAction_ActionDeleteCommandName);
>+				GEFMessages.get().DeleteAction_ActionDeleteCommandName);
> 		for (int i = 0; i < objects.size(); i++) {
> 			EditPart object = (EditPart) objects.get(i);
> 			Command cmd = object.getCommand(deleteReq);
>@@ -114,8 +114,8 @@
> 	 */
> 	protected void init() {
> 		super.init();
>-		setText(GEFMessages.DeleteAction_Label);
>-		setToolTipText(GEFMessages.DeleteAction_Tooltip);
>+		setText(GEFMessages.get().DeleteAction_Label);
>+		setToolTipText(GEFMessages.get().DeleteAction_Tooltip);
> 		setId(ActionFactory.DELETE.getId());
> 		ISharedImages sharedImages = PlatformUI.getWorkbench()
> 				.getSharedImages();
>Index: src/org/eclipse/gef/ui/actions/DeleteRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/DeleteRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 DeleteRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/DeleteRetargetAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/DeleteRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -27,8 +27,8 @@
> 	 * image.
> 	 */
> 	public DeleteRetargetAction() {
>-		super(ActionFactory.DELETE.getId(), GEFMessages.DeleteAction_Label);
>-		setToolTipText(GEFMessages.DeleteAction_Tooltip);
>+		super(ActionFactory.DELETE.getId(), GEFMessages.get().DeleteAction_Label);
>+		setToolTipText(GEFMessages.get().DeleteAction_Tooltip);
> 		ISharedImages sharedImages = PlatformUI.getWorkbench()
> 				.getSharedImages();
> 		setImageDescriptor(sharedImages
>Index: src/org/eclipse/gef/ui/actions/DirectEditAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/DirectEditAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 DirectEditAction.java
>--- src/org/eclipse/gef/ui/actions/DirectEditAction.java	9 Dec 2010 19:39:58 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/DirectEditAction.java	27 Sep 2011 14:19:48 -0000
>@@ -120,8 +120,8 @@
> 	 */
> 	protected void init() {
> 		super.init();
>-		setText(GEFMessages.RenameAction_Label);
>-		setToolTipText(GEFMessages.RenameAction_Tooltip);
>+		setText(GEFMessages.get().RenameAction_Label);
>+		setToolTipText(GEFMessages.get().RenameAction_Tooltip);
> 		setId(GEFActionConstants.DIRECT_EDIT);
> 	}
> 
>Index: src/org/eclipse/gef/ui/actions/MatchHeightAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/MatchHeightAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 MatchHeightAction.java
>--- src/org/eclipse/gef/ui/actions/MatchHeightAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/MatchHeightAction.java	27 Sep 2011 14:19:48 -0000
>@@ -32,10 +32,10 @@
> 	 */
> 	public MatchHeightAction(IWorkbenchPart part) {
> 		super(part);
>-		setText(GEFMessages.MatchHeightAction_Label);
>+		setText(GEFMessages.get().MatchHeightAction_Label);
> 		setImageDescriptor(InternalImages.DESC_MATCH_HEIGHT);
> 		setDisabledImageDescriptor(InternalImages.DESC_MATCH_HEIGHT_DIS);
>-		setToolTipText(GEFMessages.MatchHeightAction_Tooltip);
>+		setToolTipText(GEFMessages.get().MatchHeightAction_Tooltip);
> 		setId(GEFActionConstants.MATCH_HEIGHT);
> 	}
> 
>Index: src/org/eclipse/gef/ui/actions/MatchHeightRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/MatchHeightRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 MatchHeightRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/MatchHeightRetargetAction.java	9 Dec 2010 19:39:58 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/MatchHeightRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -25,10 +25,10 @@
> 	 */
> 	public MatchHeightRetargetAction() {
> 		super(GEFActionConstants.MATCH_HEIGHT,
>-				GEFMessages.MatchHeightAction_Label);
>+				GEFMessages.get().MatchHeightAction_Label);
> 		setImageDescriptor(InternalImages.DESC_MATCH_HEIGHT);
> 		setDisabledImageDescriptor(InternalImages.DESC_MATCH_HEIGHT_DIS);
>-		setToolTipText(GEFMessages.MatchHeightAction_Tooltip);
>+		setToolTipText(GEFMessages.get().MatchHeightAction_Tooltip);
> 	}
> 
> }
>Index: src/org/eclipse/gef/ui/actions/MatchSizeAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/MatchSizeAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 MatchSizeAction.java
>--- src/org/eclipse/gef/ui/actions/MatchSizeAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/MatchSizeAction.java	27 Sep 2011 14:19:48 -0000
>@@ -43,10 +43,10 @@
> 	 */
> 	public MatchSizeAction(IWorkbenchPart part) {
> 		super(part);
>-		setText(GEFMessages.MatchSizeAction_Label);
>+		setText(GEFMessages.get().MatchSizeAction_Label);
> 		setImageDescriptor(InternalImages.DESC_MATCH_SIZE);
> 		setDisabledImageDescriptor(InternalImages.DESC_MATCH_SIZE_DIS);
>-		setToolTipText(GEFMessages.MatchSizeAction_Tooltip);
>+		setToolTipText(GEFMessages.get().MatchSizeAction_Tooltip);
> 		setId(GEFActionConstants.MATCH_SIZE);
> 	}
> 
>Index: src/org/eclipse/gef/ui/actions/MatchSizeRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/MatchSizeRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 MatchSizeRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/MatchSizeRetargetAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/MatchSizeRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -26,10 +26,10 @@
> 	 * Constructs a <code>MatchSizeRetargetAction</code>.
> 	 */
> 	public MatchSizeRetargetAction() {
>-		super(GEFActionConstants.MATCH_SIZE, GEFMessages.MatchSizeAction_Label);
>+		super(GEFActionConstants.MATCH_SIZE, GEFMessages.get().MatchSizeAction_Label);
> 		setImageDescriptor(InternalImages.DESC_MATCH_SIZE);
> 		setDisabledImageDescriptor(InternalImages.DESC_MATCH_SIZE_DIS);
>-		setToolTipText(GEFMessages.MatchSizeAction_Tooltip);
>+		setToolTipText(GEFMessages.get().MatchSizeAction_Tooltip);
> 	}
> 
> }
>Index: src/org/eclipse/gef/ui/actions/MatchWidthAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/MatchWidthAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 MatchWidthAction.java
>--- src/org/eclipse/gef/ui/actions/MatchWidthAction.java	9 Dec 2010 19:39:58 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/MatchWidthAction.java	27 Sep 2011 14:19:48 -0000
>@@ -32,10 +32,10 @@
> 	 */
> 	public MatchWidthAction(IWorkbenchPart part) {
> 		super(part);
>-		setText(GEFMessages.MatchWidthAction_Label);
>+		setText(GEFMessages.get().MatchWidthAction_Label);
> 		setImageDescriptor(InternalImages.DESC_MATCH_WIDTH);
> 		setDisabledImageDescriptor(InternalImages.DESC_MATCH_WIDTH_DIS);
>-		setToolTipText(GEFMessages.MatchWidthAction_Tooltip);
>+		setToolTipText(GEFMessages.get().MatchWidthAction_Tooltip);
> 		setId(GEFActionConstants.MATCH_WIDTH);
> 	}
> 
>Index: src/org/eclipse/gef/ui/actions/MatchWidthRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/MatchWidthRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 MatchWidthRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/MatchWidthRetargetAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/MatchWidthRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -25,10 +25,10 @@
> 	 */
> 	public MatchWidthRetargetAction() {
> 		super(GEFActionConstants.MATCH_WIDTH,
>-				GEFMessages.MatchWidthAction_Label);
>+				GEFMessages.get().MatchWidthAction_Label);
> 		setImageDescriptor(InternalImages.DESC_MATCH_WIDTH);
> 		setDisabledImageDescriptor(InternalImages.DESC_MATCH_WIDTH_DIS);
>-		setToolTipText(GEFMessages.MatchWidthAction_Tooltip);
>+		setToolTipText(GEFMessages.get().MatchWidthAction_Tooltip);
> 	}
> 
> }
>Index: src/org/eclipse/gef/ui/actions/PasteRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PasteRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 PasteRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/PasteRetargetAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/PasteRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -28,7 +28,7 @@
> 	 * image.
> 	 */
> 	public PasteRetargetAction() {
>-		super(ActionFactory.PASTE.getId(), GEFMessages.PasteAction_Label);
>+		super(ActionFactory.PASTE.getId(), GEFMessages.get().PasteAction_Label);
> 		ISharedImages sharedImages = PlatformUI.getWorkbench()
> 				.getSharedImages();
> 		setImageDescriptor(sharedImages
>Index: src/org/eclipse/gef/ui/actions/PrintAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java,v
>retrieving revision 1.3
>diff -u -r1.3 PrintAction.java
>--- src/org/eclipse/gef/ui/actions/PrintAction.java	19 Jul 2011 18:21:26 -0000	1.3
>+++ src/org/eclipse/gef/ui/actions/PrintAction.java	27 Sep 2011 14:19:48 -0000
>@@ -52,8 +52,8 @@
> 	 */
> 	protected void init() {
> 		super.init();
>-		setText(GEFMessages.PrintAction_Label);
>-		setToolTipText(GEFMessages.PrintAction_Tooltip);
>+		setText(GEFMessages.get().PrintAction_Label);
>+		setToolTipText(GEFMessages.get().PrintAction_Tooltip);
> 		setId(ActionFactory.PRINT.getId());
> 	}
> 
>Index: src/org/eclipse/gef/ui/actions/RedoAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/RedoAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 RedoAction.java
>--- src/org/eclipse/gef/ui/actions/RedoAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/RedoAction.java	27 Sep 2011 14:19:48 -0000
>@@ -60,9 +60,9 @@
> 	 */
> 	protected void init() {
> 		super.init();
>-		setToolTipText(MessageFormat.format(GEFMessages.RedoAction_Tooltip,
>+		setToolTipText(MessageFormat.format(GEFMessages.get().RedoAction_Tooltip,
> 				new Object[] { "" }).trim()); //$NON-NLS-1$
>-		setText(MessageFormat.format(GEFMessages.RedoAction_Label,
>+		setText(MessageFormat.format(GEFMessages.get().RedoAction_Label,
> 				new Object[] { "" }).trim() //$NON-NLS-1$
> 		);
> 		setId(ActionFactory.REDO.getId());
>@@ -80,9 +80,9 @@
> 	 */
> 	protected void refresh() {
> 		Command redoCmd = getCommandStack().getRedoCommand();
>-		setToolTipText(MessageFormat.format(GEFMessages.RedoAction_Tooltip,
>+		setToolTipText(MessageFormat.format(GEFMessages.get().RedoAction_Tooltip,
> 				new Object[] { getLabelForCommand(redoCmd) }).trim());
>-		setText(MessageFormat.format(GEFMessages.RedoAction_Label,
>+		setText(MessageFormat.format(GEFMessages.get().RedoAction_Label,
> 				new Object[] { getLabelForCommand(redoCmd) }).trim());
> 		super.refresh();
> 	}
>Index: src/org/eclipse/gef/ui/actions/RedoRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/RedoRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 RedoRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/RedoRetargetAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/RedoRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -29,7 +29,7 @@
> 	 */
> 	public RedoRetargetAction() {
> 		super(ActionFactory.REDO.getId(), MessageFormat.format(
>-				GEFMessages.RedoAction_Label, new Object[] { "" }).trim()); //$NON-NLS-1$
>+				GEFMessages.get().RedoAction_Label, new Object[] { "" }).trim()); //$NON-NLS-1$
> 		ISharedImages sharedImages = PlatformUI.getWorkbench()
> 				.getSharedImages();
> 		setImageDescriptor(sharedImages
>Index: src/org/eclipse/gef/ui/actions/SaveAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/SaveAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 SaveAction.java
>--- src/org/eclipse/gef/ui/actions/SaveAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/SaveAction.java	27 Sep 2011 14:19:48 -0000
>@@ -44,8 +44,8 @@
> 	 */
> 	protected void init() {
> 		setId(ActionFactory.SAVE.getId());
>-		setText(GEFMessages.SaveAction_Label);
>-		setToolTipText(GEFMessages.SaveAction_Tooltip);
>+		setText(GEFMessages.get().SaveAction_Label);
>+		setToolTipText(GEFMessages.get().SaveAction_Tooltip);
> 	}
> 
> 	/**
>Index: src/org/eclipse/gef/ui/actions/SelectAllAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/SelectAllAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 SelectAllAction.java
>--- src/org/eclipse/gef/ui/actions/SelectAllAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/SelectAllAction.java	27 Sep 2011 14:19:48 -0000
>@@ -39,8 +39,8 @@
> 	 */
> 	public SelectAllAction(IWorkbenchPart part) {
> 		this.part = part;
>-		setText(GEFMessages.SelectAllAction_Label);
>-		setToolTipText(GEFMessages.SelectAllAction_Tooltip);
>+		setText(GEFMessages.get().SelectAllAction_Label);
>+		setToolTipText(GEFMessages.get().SelectAllAction_Tooltip);
> 		setId(ActionFactory.SELECT_ALL.getId());
> 	}
> 
>Index: src/org/eclipse/gef/ui/actions/ToggleGridAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ToggleGridAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 ToggleGridAction.java
>--- src/org/eclipse/gef/ui/actions/ToggleGridAction.java	9 Dec 2010 19:39:58 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/ToggleGridAction.java	27 Sep 2011 14:19:48 -0000
>@@ -38,9 +38,9 @@
> 	 *            properties are to be toggled
> 	 */
> 	public ToggleGridAction(GraphicalViewer diagramViewer) {
>-		super(GEFMessages.ToggleGrid_Label, AS_CHECK_BOX);
>+		super(GEFMessages.get().ToggleGrid_Label, AS_CHECK_BOX);
> 		this.diagramViewer = diagramViewer;
>-		setToolTipText(GEFMessages.ToggleGrid_Tooltip);
>+		setToolTipText(GEFMessages.get().ToggleGrid_Tooltip);
> 		setId(GEFActionConstants.TOGGLE_GRID_VISIBILITY);
> 		setActionDefinitionId(GEFActionConstants.TOGGLE_GRID_VISIBILITY);
> 		setChecked(isChecked());
>Index: src/org/eclipse/gef/ui/actions/ToggleRulerVisibilityAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ToggleRulerVisibilityAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 ToggleRulerVisibilityAction.java
>--- src/org/eclipse/gef/ui/actions/ToggleRulerVisibilityAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/ToggleRulerVisibilityAction.java	27 Sep 2011 14:19:48 -0000
>@@ -39,9 +39,9 @@
> 	 *            the viewer whose ruler visibility property is to be toggled
> 	 */
> 	public ToggleRulerVisibilityAction(GraphicalViewer diagramViewer) {
>-		super(GEFMessages.ToggleRulerVisibility_Label, AS_CHECK_BOX);
>+		super(GEFMessages.get().ToggleRulerVisibility_Label, AS_CHECK_BOX);
> 		this.diagramViewer = diagramViewer;
>-		setToolTipText(GEFMessages.ToggleRulerVisibility_Tooltip);
>+		setToolTipText(GEFMessages.get().ToggleRulerVisibility_Tooltip);
> 		setId(GEFActionConstants.TOGGLE_RULER_VISIBILITY);
> 		setActionDefinitionId(GEFActionConstants.TOGGLE_RULER_VISIBILITY);
> 		setChecked(isChecked());
>Index: src/org/eclipse/gef/ui/actions/ToggleSnapToGeometryAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ToggleSnapToGeometryAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 ToggleSnapToGeometryAction.java
>--- src/org/eclipse/gef/ui/actions/ToggleSnapToGeometryAction.java	9 Dec 2010 19:39:58 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/ToggleSnapToGeometryAction.java	27 Sep 2011 14:19:48 -0000
>@@ -37,9 +37,9 @@
> 	 *            toggled
> 	 */
> 	public ToggleSnapToGeometryAction(GraphicalViewer diagramViewer) {
>-		super(GEFMessages.ToggleSnapToGeometry_Label, AS_CHECK_BOX);
>+		super(GEFMessages.get().ToggleSnapToGeometry_Label, AS_CHECK_BOX);
> 		this.diagramViewer = diagramViewer;
>-		setToolTipText(GEFMessages.ToggleSnapToGeometry_Tooltip);
>+		setToolTipText(GEFMessages.get().ToggleSnapToGeometry_Tooltip);
> 		setId(GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY);
> 		setActionDefinitionId(GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY);
> 		setChecked(isChecked());
>Index: src/org/eclipse/gef/ui/actions/UndoAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/UndoAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 UndoAction.java
>--- src/org/eclipse/gef/ui/actions/UndoAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/UndoAction.java	27 Sep 2011 14:19:48 -0000
>@@ -60,9 +60,9 @@
> 	 */
> 	protected void init() {
> 		super.init();
>-		setToolTipText(MessageFormat.format(GEFMessages.UndoAction_Tooltip,
>+		setToolTipText(MessageFormat.format(GEFMessages.get().UndoAction_Tooltip,
> 				new Object[] { "" }).trim()); //$NON-NLS-1$
>-		setText(MessageFormat.format(GEFMessages.UndoAction_Label,
>+		setText(MessageFormat.format(GEFMessages.get().UndoAction_Label,
> 				new Object[] { "" }).trim() //$NON-NLS-1$
> 		);
> 		setId(ActionFactory.UNDO.getId());
>@@ -80,9 +80,9 @@
> 	 */
> 	protected void refresh() {
> 		Command undoCmd = getCommandStack().getUndoCommand();
>-		setToolTipText(MessageFormat.format(GEFMessages.UndoAction_Tooltip,
>+		setToolTipText(MessageFormat.format(GEFMessages.get().UndoAction_Tooltip,
> 				new Object[] { getLabelForCommand(undoCmd) }).trim());
>-		setText(MessageFormat.format(GEFMessages.UndoAction_Label,
>+		setText(MessageFormat.format(GEFMessages.get().UndoAction_Label,
> 				new Object[] { getLabelForCommand(undoCmd) }).trim());
> 		super.refresh();
> 	}
>Index: src/org/eclipse/gef/ui/actions/UndoRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/UndoRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 UndoRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/UndoRetargetAction.java	9 Dec 2010 19:39:58 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/UndoRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -29,7 +29,7 @@
> 	 */
> 	public UndoRetargetAction() {
> 		super(ActionFactory.UNDO.getId(), MessageFormat.format(
>-				GEFMessages.UndoAction_Label, new Object[] { "" }).trim()); //$NON-NLS-1$
>+				GEFMessages.get().UndoAction_Label, new Object[] { "" }).trim()); //$NON-NLS-1$
> 		ISharedImages sharedImages = PlatformUI.getWorkbench()
> 				.getSharedImages();
> 		setImageDescriptor(sharedImages
>Index: src/org/eclipse/gef/ui/actions/ZoomInAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomInAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 ZoomInAction.java
>--- src/org/eclipse/gef/ui/actions/ZoomInAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/ZoomInAction.java	27 Sep 2011 14:19:48 -0000
>@@ -26,9 +26,9 @@
> 	 *            the zoom manager
> 	 */
> 	public ZoomInAction(ZoomManager zoomManager) {
>-		super(GEFMessages.ZoomIn_Label, InternalImages.DESC_ZOOM_IN,
>+		super(GEFMessages.get().ZoomIn_Label, InternalImages.DESC_ZOOM_IN,
> 				zoomManager);
>-		setToolTipText(GEFMessages.ZoomIn_Tooltip);
>+		setToolTipText(GEFMessages.get().ZoomIn_Tooltip);
> 		setId(GEFActionConstants.ZOOM_IN);
> 		setActionDefinitionId(GEFActionConstants.ZOOM_IN);
> 	}
>Index: src/org/eclipse/gef/ui/actions/ZoomInRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomInRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 ZoomInRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/ZoomInRetargetAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/ZoomInRetargetAction.java	27 Sep 2011 14:19:48 -0000
>@@ -25,9 +25,9 @@
> 	 */
> 	public ZoomInRetargetAction() {
> 		super(null, null);
>-		setText(GEFMessages.ZoomIn_Label);
>+		setText(GEFMessages.get().ZoomIn_Label);
> 		setId(GEFActionConstants.ZOOM_IN);
>-		setToolTipText(GEFMessages.ZoomIn_Tooltip);
>+		setToolTipText(GEFMessages.get().ZoomIn_Tooltip);
> 		setImageDescriptor(InternalImages.DESC_ZOOM_IN);
> 		setActionDefinitionId(GEFActionConstants.ZOOM_IN);
> 	}
>Index: src/org/eclipse/gef/ui/actions/ZoomOutAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomOutAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 ZoomOutAction.java
>--- src/org/eclipse/gef/ui/actions/ZoomOutAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/ZoomOutAction.java	27 Sep 2011 14:19:49 -0000
>@@ -26,10 +26,10 @@
> 	 *            the zoom manager
> 	 */
> 	public ZoomOutAction(ZoomManager zoomManager) {
>-		super(GEFMessages.ZoomOut_Label, InternalImages.DESC_ZOOM_OUT,
>+		super(GEFMessages.get().ZoomOut_Label, InternalImages.DESC_ZOOM_OUT,
> 				zoomManager);
> 		setId(GEFActionConstants.ZOOM_OUT);
>-		setToolTipText(GEFMessages.ZoomOut_Tooltip);
>+		setToolTipText(GEFMessages.get().ZoomOut_Tooltip);
> 		setActionDefinitionId(GEFActionConstants.ZOOM_OUT);
> 	}
> 
>Index: src/org/eclipse/gef/ui/actions/ZoomOutRetargetAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomOutRetargetAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 ZoomOutRetargetAction.java
>--- src/org/eclipse/gef/ui/actions/ZoomOutRetargetAction.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/actions/ZoomOutRetargetAction.java	27 Sep 2011 14:19:49 -0000
>@@ -25,9 +25,9 @@
> 	 */
> 	public ZoomOutRetargetAction() {
> 		super(null, null);
>-		setText(GEFMessages.ZoomOut_Label);
>+		setText(GEFMessages.get().ZoomOut_Label);
> 		setId(GEFActionConstants.ZOOM_OUT);
>-		setToolTipText(GEFMessages.ZoomOut_Tooltip);
>+		setToolTipText(GEFMessages.get().ZoomOut_Tooltip);
> 		setImageDescriptor(InternalImages.DESC_ZOOM_OUT);
> 		setActionDefinitionId(GEFActionConstants.ZOOM_OUT);
> 	}
>Index: src/org/eclipse/gef/ui/palette/ChangeIconSizeAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/ChangeIconSizeAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 ChangeIconSizeAction.java
>--- src/org/eclipse/gef/ui/palette/ChangeIconSizeAction.java	9 Dec 2010 19:40:06 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/ChangeIconSizeAction.java	27 Sep 2011 14:19:49 -0000
>@@ -30,7 +30,7 @@
> 	 *            action is manipulating
> 	 */
> 	public ChangeIconSizeAction(PaletteViewerPreferences prefs) {
>-		super(PaletteMessages.SETTINGS_USE_LARGE_ICONS_LABEL_CAPS);
>+		super(PaletteMessages.get().SETTINGS_USE_LARGE_ICONS_LABEL_CAPS);
> 		this.prefs = prefs;
> 		setChecked(prefs.useLargeIcons());
> 	}
>Index: src/org/eclipse/gef/ui/palette/CustomizeAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/CustomizeAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 CustomizeAction.java
>--- src/org/eclipse/gef/ui/palette/CustomizeAction.java	9 Dec 2010 19:40:06 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/CustomizeAction.java	27 Sep 2011 14:19:49 -0000
>@@ -36,7 +36,7 @@
> 	 */
> 	public CustomizeAction(PaletteViewer palette) {
> 		super();
>-		setText(PaletteMessages.MENU_OPEN_CUSTOMIZE_DIALOG);
>+		setText(PaletteMessages.get().MENU_OPEN_CUSTOMIZE_DIALOG);
> 		paletteViewer = palette;
> 	}
> 
>Index: src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java,v
>retrieving revision 1.4
>diff -u -r1.4 FlyoutPaletteComposite.java
>--- src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java	19 Jul 2011 18:21:26 -0000	1.4
>+++ src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java	27 Sep 2011 14:19:49 -0000
>@@ -900,7 +900,7 @@
> 
> 	private class ResizeAction extends Action {
> 		public ResizeAction() {
>-			super(PaletteMessages.RESIZE_LABEL);
>+			super(PaletteMessages.get().RESIZE_LABEL);
> 		}
> 
> 		public boolean isEnabled() {
>@@ -1153,7 +1153,7 @@
> 				0, 2);
> 
> 		public TitleLabel(boolean isHorizontal) {
>-			super(GEFMessages.Palette_Label, InternalImages
>+			super(GEFMessages.get().Palette_Label, InternalImages
> 					.get(InternalImages.IMG_PALETTE));
> 			setLabelAlignment(PositionConstants.LEFT);
> 			setBorder(BORDER);
>@@ -1235,8 +1235,8 @@
> 
> 		private String getButtonTooltipText() {
> 			if (isInState(STATE_COLLAPSED))
>-				return PaletteMessages.PALETTE_SHOW;
>-			return PaletteMessages.PALETTE_HIDE;
>+				return PaletteMessages.get().PALETTE_SHOW;
>+			return PaletteMessages.get().PALETTE_HIDE;
> 		}
> 
> 		private void init() {
>@@ -1271,7 +1271,7 @@
> 		private void provideAccSupport() {
> 			getAccessible().addAccessibleListener(new AccessibleAdapter() {
> 				public void getDescription(AccessibleEvent e) {
>-					e.result = PaletteMessages.ACC_DESC_PALETTE_BUTTON;
>+					e.result = PaletteMessages.get().ACC_DESC_PALETTE_BUTTON;
> 				}
> 
> 				public void getHelp(AccessibleEvent e) {
>@@ -1386,10 +1386,10 @@
> 			FONT_MGR.register(this);
> 			new TitleDragManager(this);
> 			final MenuManager manager = new MenuManager();
>-			MenuManager mgr = new MenuManager(PaletteMessages.DOCK_LABEL);
>-			mgr.add(new ChangeDockAction(PaletteMessages.LEFT_LABEL,
>+			MenuManager mgr = new MenuManager(PaletteMessages.get().DOCK_LABEL);
>+			mgr.add(new ChangeDockAction(PaletteMessages.get().LEFT_LABEL,
> 					PositionConstants.WEST));
>-			mgr.add(new ChangeDockAction(PaletteMessages.RIGHT_LABEL,
>+			mgr.add(new ChangeDockAction(PaletteMessages.get().RIGHT_LABEL,
> 					PositionConstants.EAST));
> 			manager.add(new ResizeAction());
> 			manager.add(mgr);
>@@ -1414,7 +1414,7 @@
> 		private void provideAccSupport() {
> 			getAccessible().addAccessibleListener(new AccessibleAdapter() {
> 				public void getDescription(AccessibleEvent e) {
>-					e.result = PaletteMessages.ACC_DESC_PALETTE_TITLE;
>+					e.result = PaletteMessages.get().ACC_DESC_PALETTE_TITLE;
> 				}
> 
> 				public void getHelp(AccessibleEvent e) {
>@@ -1422,7 +1422,7 @@
> 				}
> 
> 				public void getName(AccessibleEvent e) {
>-					e.result = GEFMessages.Palette_Label;
>+					e.result = GEFMessages.get().Palette_Label;
> 				}
> 			});
> 			getAccessible().addAccessibleControlListener(
>Index: src/org/eclipse/gef/ui/palette/LayoutAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/LayoutAction.java,v
>retrieving revision 1.3
>diff -u -r1.3 LayoutAction.java
>--- src/org/eclipse/gef/ui/palette/LayoutAction.java	6 Jul 2011 17:45:04 -0000	1.3
>+++ src/org/eclipse/gef/ui/palette/LayoutAction.java	27 Sep 2011 14:19:49 -0000
>@@ -57,7 +57,7 @@
> 	 *            saved
> 	 */
> 	public LayoutAction(PaletteViewerPreferences prefs, boolean hasIcon) {
>-		super(PaletteMessages.LAYOUT_MENU_LABEL);
>+		super(PaletteMessages.get().LAYOUT_MENU_LABEL);
> 		this.prefs = prefs;
> 		actions = createActions();
> 		setMenuCreator(this);
>@@ -66,7 +66,7 @@
> 			setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
> 					"icons/palette_layout.gif")); //$NON-NLS-1$
> 
>-		setToolTipText(PaletteMessages.LAYOUT_MENU_LABEL);
>+		setToolTipText(PaletteMessages.get().LAYOUT_MENU_LABEL);
> 	}
> 
> 	/**
>@@ -97,25 +97,25 @@
> 			case PaletteViewerPreferences.LAYOUT_COLUMNS:
> 				action = new LayoutChangeAction(
> 						PaletteViewerPreferences.LAYOUT_COLUMNS);
>-				action.setText(PaletteMessages.SETTINGS_COLUMNS_VIEW_LABEL);
>+				action.setText(PaletteMessages.get().SETTINGS_COLUMNS_VIEW_LABEL);
> 				list.add(action);
> 				break;
> 			case PaletteViewerPreferences.LAYOUT_LIST:
> 				action = new LayoutChangeAction(
> 						PaletteViewerPreferences.LAYOUT_LIST);
>-				action.setText(PaletteMessages.SETTINGS_LIST_VIEW_LABEL);
>+				action.setText(PaletteMessages.get().SETTINGS_LIST_VIEW_LABEL);
> 				list.add(action);
> 				break;
> 			case PaletteViewerPreferences.LAYOUT_ICONS:
> 				action = new LayoutChangeAction(
> 						PaletteViewerPreferences.LAYOUT_ICONS);
>-				action.setText(PaletteMessages.SETTINGS_ICONS_VIEW_LABEL_CAPS);
>+				action.setText(PaletteMessages.get().SETTINGS_ICONS_VIEW_LABEL_CAPS);
> 				list.add(action);
> 				break;
> 			case PaletteViewerPreferences.LAYOUT_DETAILS:
> 				action = new LayoutChangeAction(
> 						PaletteViewerPreferences.LAYOUT_DETAILS);
>-				action.setText(PaletteMessages.SETTINGS_DETAILS_VIEW_LABEL);
>+				action.setText(PaletteMessages.get().SETTINGS_DETAILS_VIEW_LABEL);
> 				list.add(action);
> 				break;
> 			}
>Index: src/org/eclipse/gef/ui/palette/PaletteMessages.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PaletteMessages.java,v
>retrieving revision 1.1
>diff -u -r1.1 PaletteMessages.java
>--- src/org/eclipse/gef/ui/palette/PaletteMessages.java	9 Dec 2010 19:40:06 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/PaletteMessages.java	27 Sep 2011 14:19:49 -0000
>@@ -10,291 +10,572 @@
>  *******************************************************************************/
> package org.eclipse.gef.ui.palette;
> 
>-import org.eclipse.osgi.util.NLS;
>+import org.eclipse.rwt.RWT;
> 
> /**
>  * @author Pratik Shah
>  */
>-public class PaletteMessages extends NLS {
>+public class PaletteMessages /* extends NLS */{
>+
>+	// /**
>+	// * The String "Customize Palette"
>+	// */
>+	// public static String CUSTOMIZE_DIALOG_TITLE;
>+	// /**
>+	// * The String "Drawer options:  "
>+	// */
>+	// public static String COLLAPSE_OPTIONS_TITLE;
>+	// /**
>+	// * The String "Layout options"
>+	// */
>+	// public static String SETTINGS_LAYOUT_OPTIONS_TITLE;
>+	// /**
>+	// * The String "&Apply"
>+	// */
>+	// public static String APPLY_LABEL;
>+	// /**
>+	// * The String "Move &Up"
>+	// */
>+	// public static String MOVE_UP_LABEL;
>+	// /**
>+	// * The String "Move Do&wn"
>+	// */
>+	// public static String MOVE_DOWN_LABEL;
>+	// /**
>+	// * The String "&Delete"
>+	// */
>+	// public static String DELETE_LABEL;
>+	// /**
>+	// * The String "&New"
>+	// */
>+	// public static String NEW_LABEL;
>+	// /**
>+	// * The String "&Columns"
>+	// */
>+	// public static String SETTINGS_COLUMNS_VIEW_LABEL;
>+	// /**
>+	// * The String "&List"
>+	// */
>+	// public static String SETTINGS_LIST_VIEW_LABEL;
>+	// /**
>+	// * The String "&Use large icons"
>+	// */
>+	// public static String SETTINGS_USE_LARGE_ICONS_LABEL;
>+	// /**
>+	// * The String "&Use Large Icons"
>+	// */
>+	// public static String SETTINGS_USE_LARGE_ICONS_LABEL_CAPS;
>+	// /**
>+	// * The String "&Icons only"
>+	// */
>+	// public static String SETTINGS_ICONS_VIEW_LABEL;
>+	// /**
>+	// * The String "&Icons Only"
>+	// */
>+	// public static String SETTINGS_ICONS_VIEW_LABEL_CAPS;
>+	// /**
>+	// * The String "&Never close"
>+	// */
>+	// public static String COLLAPSE_NEVER_LABEL;
>+	// /**
>+	// * The String "&Always close when opening another drawer"
>+	// */
>+	// public static String COLLAPSE_ALWAYS_LABEL;
>+	// /**
>+	// * The String "Close automatically &when there is not enough room"
>+	// */
>+	// public static String COLLAPSE_AS_NEEDED_LABEL;
>+	// /**
>+	// * The String "Nothing Selected"
>+	// */
>+	// public static String NO_SELECTION_TITLE;
>+	// /**
>+	// * The String "Na&me:  "
>+	// */
>+	// public static String NAME_LABEL;
>+	// /**
>+	// * The String "Des&cription:  "
>+	// */
>+	// public static String DESCRIPTION_LABEL;
>+	// /**
>+	// * The String "&Hide"
>+	// */
>+	// public static String HIDDEN_LABEL;
>+	// /**
>+	// * The String "No description is available."
>+	// */
>+	// public static String NO_DESCRIPTION_AVAILABLE;
>+	// /**
>+	// * The String "Select a node from the tree on the left."
>+	// */
>+	// public static String NO_SELECTION_MADE;
>+	// /**
>+	// * The String "Cus&tomize..."
>+	// */
>+	// public static String MENU_OPEN_CUSTOMIZE_DIALOG;
>+	// /**
>+	// * The String "Drawer"
>+	// */
>+	// public static String MODEL_TYPE_DRAWER;
>+	// /**
>+	// * The String "Separator"
>+	// */
>+	// public static String MODEL_TYPE_SEPARATOR;
>+	// /**
>+	// * The String "Stack"
>+	// */
>+	// public static String MODEL_TYPE_STACK;
>+	// /**
>+	// * The String "Separates entries in a palette container"
>+	// */
>+	// public static String NEW_SEPARATOR_DESC;
>+	// /**
>+	// * The String "New Drawer"
>+	// */
>+	// public static String NEW_DRAWER_LABEL;
>+	// /**
>+	// * The String "[Separator]"
>+	// */
>+	// public static String NEW_SEPARATOR_LABEL;
>+	// /**
>+	// * The String "New Stack"
>+	// */
>+	// public static String NEW_STACK_LABEL;
>+	// /**
>+	// * The String "Group"
>+	// */
>+	// public static String MODEL_TYPE_GROUP;
>+	// /**
>+	// * The String "New Group"
>+	// */
>+	// public static String NEW_GROUP_LABEL;
>+	// /**
>+	// * The String "&Layout"
>+	// */
>+	// public static String LAYOUT_MENU_LABEL;
>+	// /**
>+	// * The String "Could Not Accept Changes"
>+	// */
>+	// public static String ERROR;
>+	// /**
>+	// * The String "The currently displayed page contains invalid values."
>+	// */
>+	// public static String ABORT_PAGE_FLIPPING_MESSAGE;
>+	// /**
>+	// * The String "&Settings..."
>+	// */
>+	// public static String MENU_OPEN_SETTINGS_DIALOG;
>+	// /**
>+	// * The String "Palette Settings"
>+	// */
>+	// public static String SETTINGS_DIALOG_TITLE;
>+	// /**
>+	// * The String "&Details"
>+	// */
>+	// public static String SETTINGS_DETAILS_VIEW_LABEL;
>+	// /**
>+	// * The String "Font"
>+	// */
>+	// public static String SETTINGS_FONT_TITLE;
>+	// /**
>+	// * The String "C&hange..."
>+	// */
>+	// public static String SETTINGS_FONT_CHANGE;
>+	// /**
>+	// * The String "Font:  "
>+	// */
>+	// public static String SETTINGS_FONT_CURRENT;
>+	// /**
>+	// * The String "Layout:  "
>+	// */
>+	// public static String SETTINGS_LAYOUT_TITLE;
>+	// /**
>+	// * The String "Drawer Options"
>+	// */
>+	// public static String SETTINGS_DRAWER_OPTIONS_TITLE;
>+	// /**
>+	// * The String "&Open drawer at start-up"
>+	// */
>+	// public static String EXPAND_DRAWER_AT_STARTUP_LABEL;
>+	// /**
>+	// * The String "Columns layout options"
>+	// */
>+	// public static String SETTINGS_OPTIONS_COLUMNS;
>+	// /**
>+	// * The String "List layout options"
>+	// */
>+	// public static String SETTINGS_OPTIONS_LIST;
>+	// /**
>+	// * The String " layout options"
>+	// */
>+	// public static String SETTINGS_OPTIONS_ICONS_ONLY;
>+	// /**
>+	// * The String "Details layout options"
>+	// */
>+	// public static String SETTINGS_OPTIONS_DETAILS;
>+	// /**
>+	// * The String "&Override default column width settings"
>+	// */
>+	// public static String SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH;
>+	// /**
>+	// * The String "Colu&mn width (in pixels):  "
>+	// */
>+	// public static String SETTINGS_LAYOUT_COLUMNS_WIDTH;
>+	// /**
>+	// * The String "&Pin drawer open at start-up"
>+	// */
>+	// public static String DRAWER_PIN_AT_STARTUP;
>+	// /**
>+	// * The String "&Restore Default"
>+	// */
>+	// public static String SETTINGS_DEFAULT_FONT;
>+	// /**
>+	// * The String "<Using Workbench Dialog Font>"
>+	// */
>+	// public static String SETTINGS_WORKBENCH_FONT_LABEL;
>+	// /**
>+	// * The String "-"
>+	// */
>+	// public static String NAME_DESCRIPTION_SEPARATOR;
>+	// /**
>+	// * The String "&Pinned"
>+	// */
>+	// public static String PINNED;
>+	// /**
>+	// * The String "Pin Open"
>+	// */
>+	// public static String TOOLTIP_PIN_FIGURE;
>+	//
>+	// /**
>+	// * The String "Unpin"
>+	// */
>+	// public static String TOOLTIP_UNPIN_FIGURE;
>+	//
>+	// /**
>+	// * The String "&Dock On"
>+	// */
>+	// public static String DOCK_LABEL;
>+	//
>+	// /**
>+	// * The String "&Left"
>+	// */
>+	// public static String LEFT_LABEL;
>+	//
>+	// /**
>+	// * The String "&Right"
>+	// */
>+	// public static String RIGHT_LABEL;
>+	//
>+	// /**
>+	// * The String "&Resize"
>+	// */
>+	// public static String RESIZE_LABEL;
>+	//
>+	// /**
>+	// * Show Palette
>+	// */
>+	// public static String PALETTE_SHOW;
>+	//
>+	// /**
>+	// * Hide Palette
>+	// */
>+	// public static String PALETTE_HIDE;
>+	//
>+	// /**
>+	// * This button is used to show or hide the palette.
>+	// */
>+	// public static String ACC_DESC_PALETTE_BUTTON;
>+	//
>+	// /**
>+	// * The palette can be moved or resized through the context menu for this
>+	// * control.
>+	// */
>+	// public static String ACC_DESC_PALETTE_TITLE;
>+	//
> 
> 	/**
> 	 * The String "Customize Palette"
> 	 */
>-	public static String CUSTOMIZE_DIALOG_TITLE;
>+	public String CUSTOMIZE_DIALOG_TITLE;
> 	/**
>-	 * The String "Drawer options:  "
>+	 * The "Drawer options:  "
> 	 */
>-	public static String COLLAPSE_OPTIONS_TITLE;
>+	public String COLLAPSE_OPTIONS_TITLE;
> 	/**
>-	 * The String "Layout options"
>+	 * The "Layout options"
> 	 */
>-	public static String SETTINGS_LAYOUT_OPTIONS_TITLE;
>+	public String SETTINGS_LAYOUT_OPTIONS_TITLE;
> 	/**
>-	 * The String "&Apply"
>+	 * The "&Apply"
> 	 */
>-	public static String APPLY_LABEL;
>+	public String APPLY_LABEL;
> 	/**
>-	 * The String "Move &Up"
>+	 * The "Move &Up"
> 	 */
>-	public static String MOVE_UP_LABEL;
>+	public String MOVE_UP_LABEL;
> 	/**
>-	 * The String "Move Do&wn"
>+	 * The "Move Do&wn"
> 	 */
>-	public static String MOVE_DOWN_LABEL;
>+	public String MOVE_DOWN_LABEL;
> 	/**
>-	 * The String "&Delete"
>+	 * The "&Delete"
> 	 */
>-	public static String DELETE_LABEL;
>+	public String DELETE_LABEL;
> 	/**
>-	 * The String "&New"
>+	 * The "&New"
> 	 */
>-	public static String NEW_LABEL;
>+	public String NEW_LABEL;
> 	/**
>-	 * The String "&Columns"
>+	 * The "&Columns"
> 	 */
>-	public static String SETTINGS_COLUMNS_VIEW_LABEL;
>+	public String SETTINGS_COLUMNS_VIEW_LABEL;
> 	/**
>-	 * The String "&List"
>+	 * The "&List"
> 	 */
>-	public static String SETTINGS_LIST_VIEW_LABEL;
>+	public String SETTINGS_LIST_VIEW_LABEL;
> 	/**
>-	 * The String "&Use large icons"
>+	 * The "&Use large icons"
> 	 */
>-	public static String SETTINGS_USE_LARGE_ICONS_LABEL;
>+	public String SETTINGS_USE_LARGE_ICONS_LABEL;
> 	/**
>-	 * The String "&Use Large Icons"
>+	 * The "&Use Large Icons"
> 	 */
>-	public static String SETTINGS_USE_LARGE_ICONS_LABEL_CAPS;
>+	public String SETTINGS_USE_LARGE_ICONS_LABEL_CAPS;
> 	/**
>-	 * The String "&Icons only"
>+	 * The "&Icons only"
> 	 */
>-	public static String SETTINGS_ICONS_VIEW_LABEL;
>+	public String SETTINGS_ICONS_VIEW_LABEL;
> 	/**
>-	 * The String "&Icons Only"
>+	 * The "&Icons Only"
> 	 */
>-	public static String SETTINGS_ICONS_VIEW_LABEL_CAPS;
>+	public String SETTINGS_ICONS_VIEW_LABEL_CAPS;
> 	/**
>-	 * The String "&Never close"
>+	 * The "&Never close"
> 	 */
>-	public static String COLLAPSE_NEVER_LABEL;
>+	public String COLLAPSE_NEVER_LABEL;
> 	/**
>-	 * The String "&Always close when opening another drawer"
>+	 * The "&Always close when opening another drawer"
> 	 */
>-	public static String COLLAPSE_ALWAYS_LABEL;
>+	public String COLLAPSE_ALWAYS_LABEL;
> 	/**
>-	 * The String "Close automatically &when there is not enough room"
>+	 * The "Close automatically &when there is not enough room"
> 	 */
>-	public static String COLLAPSE_AS_NEEDED_LABEL;
>+	public String COLLAPSE_AS_NEEDED_LABEL;
> 	/**
>-	 * The String "Nothing Selected"
>+	 * The "Nothing Selected"
> 	 */
>-	public static String NO_SELECTION_TITLE;
>+	public String NO_SELECTION_TITLE;
> 	/**
>-	 * The String "Na&me:  "
>+	 * The "Na&me:  "
> 	 */
>-	public static String NAME_LABEL;
>+	public String NAME_LABEL;
> 	/**
>-	 * The String "Des&cription:  "
>+	 * The "Des&cription:  "
> 	 */
>-	public static String DESCRIPTION_LABEL;
>+	public String DESCRIPTION_LABEL;
> 	/**
>-	 * The String "&Hide"
>+	 * The "&Hide"
> 	 */
>-	public static String HIDDEN_LABEL;
>+	public String HIDDEN_LABEL;
> 	/**
>-	 * The String "No description is available."
>+	 * The "No description is available."
> 	 */
>-	public static String NO_DESCRIPTION_AVAILABLE;
>+	public String NO_DESCRIPTION_AVAILABLE;
> 	/**
>-	 * The String "Select a node from the tree on the left."
>+	 * The "Select a node from the tree on the left."
> 	 */
>-	public static String NO_SELECTION_MADE;
>+	public String NO_SELECTION_MADE;
> 	/**
>-	 * The String "Cus&tomize..."
>+	 * The "Cus&tomize..."
> 	 */
>-	public static String MENU_OPEN_CUSTOMIZE_DIALOG;
>+	public String MENU_OPEN_CUSTOMIZE_DIALOG;
> 	/**
>-	 * The String "Drawer"
>+	 * The "Drawer"
> 	 */
>-	public static String MODEL_TYPE_DRAWER;
>+	public String MODEL_TYPE_DRAWER;
> 	/**
>-	 * The String "Separator"
>+	 * The "Separator"
> 	 */
>-	public static String MODEL_TYPE_SEPARATOR;
>+	public String MODEL_TYPE_SEPARATOR;
> 	/**
>-	 * The String "Stack"
>+	 * The "Stack"
> 	 */
>-	public static String MODEL_TYPE_STACK;
>+	public String MODEL_TYPE_STACK;
> 	/**
>-	 * The String "Separates entries in a palette container"
>+	 * The "Separates entries in a palette container"
> 	 */
>-	public static String NEW_SEPARATOR_DESC;
>+	public String NEW_SEPARATOR_DESC;
> 	/**
>-	 * The String "New Drawer"
>+	 * The "New Drawer"
> 	 */
>-	public static String NEW_DRAWER_LABEL;
>+	public String NEW_DRAWER_LABEL;
> 	/**
>-	 * The String "[Separator]"
>+	 * The "[Separator]"
> 	 */
>-	public static String NEW_SEPARATOR_LABEL;
>+	public String NEW_SEPARATOR_LABEL;
> 	/**
>-	 * The String "New Stack"
>+	 * The "New Stack"
> 	 */
>-	public static String NEW_STACK_LABEL;
>+	public String NEW_STACK_LABEL;
> 	/**
>-	 * The String "Group"
>+	 * The "Group"
> 	 */
>-	public static String MODEL_TYPE_GROUP;
>+	public String MODEL_TYPE_GROUP;
> 	/**
>-	 * The String "New Group"
>+	 * The "New Group"
> 	 */
>-	public static String NEW_GROUP_LABEL;
>+	public String NEW_GROUP_LABEL;
> 	/**
>-	 * The String "&Layout"
>+	 * The "&Layout"
> 	 */
>-	public static String LAYOUT_MENU_LABEL;
>+	public String LAYOUT_MENU_LABEL;
> 	/**
>-	 * The String "Could Not Accept Changes"
>+	 * The "Could Not Accept Changes"
> 	 */
>-	public static String ERROR;
>+	public String ERROR;
> 	/**
>-	 * The String "The currently displayed page contains invalid values."
>+	 * The "The currently displayed page contains invalid values."
> 	 */
>-	public static String ABORT_PAGE_FLIPPING_MESSAGE;
>+	public String ABORT_PAGE_FLIPPING_MESSAGE;
> 	/**
>-	 * The String "&Settings..."
>+	 * The "&Settings..."
> 	 */
>-	public static String MENU_OPEN_SETTINGS_DIALOG;
>+	public String MENU_OPEN_SETTINGS_DIALOG;
> 	/**
>-	 * The String "Palette Settings"
>+	 * The "Palette Settings"
> 	 */
>-	public static String SETTINGS_DIALOG_TITLE;
>+	public String SETTINGS_DIALOG_TITLE;
> 	/**
>-	 * The String "&Details"
>+	 * The "&Details"
> 	 */
>-	public static String SETTINGS_DETAILS_VIEW_LABEL;
>+	public String SETTINGS_DETAILS_VIEW_LABEL;
> 	/**
>-	 * The String "Font"
>+	 * The "Font"
> 	 */
>-	public static String SETTINGS_FONT_TITLE;
>+	public String SETTINGS_FONT_TITLE;
> 	/**
>-	 * The String "C&hange..."
>+	 * The "C&hange..."
> 	 */
>-	public static String SETTINGS_FONT_CHANGE;
>+	public String SETTINGS_FONT_CHANGE;
> 	/**
>-	 * The String "Font:  "
>+	 * The "Font:  "
> 	 */
>-	public static String SETTINGS_FONT_CURRENT;
>+	public String SETTINGS_FONT_CURRENT;
> 	/**
>-	 * The String "Layout:  "
>+	 * The "Layout:  "
> 	 */
>-	public static String SETTINGS_LAYOUT_TITLE;
>+	public String SETTINGS_LAYOUT_TITLE;
> 	/**
>-	 * The String "Drawer Options"
>+	 * The "Drawer Options"
> 	 */
>-	public static String SETTINGS_DRAWER_OPTIONS_TITLE;
>+	public String SETTINGS_DRAWER_OPTIONS_TITLE;
> 	/**
>-	 * The String "&Open drawer at start-up"
>+	 * The "&Open drawer at start-up"
> 	 */
>-	public static String EXPAND_DRAWER_AT_STARTUP_LABEL;
>+	public String EXPAND_DRAWER_AT_STARTUP_LABEL;
> 	/**
>-	 * The String "Columns layout options"
>+	 * The "Columns layout options"
> 	 */
>-	public static String SETTINGS_OPTIONS_COLUMNS;
>+	public String SETTINGS_OPTIONS_COLUMNS;
> 	/**
>-	 * The String "List layout options"
>+	 * The "List layout options"
> 	 */
>-	public static String SETTINGS_OPTIONS_LIST;
>+	public String SETTINGS_OPTIONS_LIST;
> 	/**
>-	 * The String " layout options"
>+	 * The " layout options"
> 	 */
>-	public static String SETTINGS_OPTIONS_ICONS_ONLY;
>+	public String SETTINGS_OPTIONS_ICONS_ONLY;
> 	/**
>-	 * The String "Details layout options"
>+	 * The "Details layout options"
> 	 */
>-	public static String SETTINGS_OPTIONS_DETAILS;
>+	public String SETTINGS_OPTIONS_DETAILS;
> 	/**
>-	 * The String "&Override default column width settings"
>+	 * The "&Override default column width settings"
> 	 */
>-	public static String SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH;
>+	public String SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH;
> 	/**
>-	 * The String "Colu&mn width (in pixels):  "
>+	 * The "Colu&mn width (in pixels):  "
> 	 */
>-	public static String SETTINGS_LAYOUT_COLUMNS_WIDTH;
>+	public String SETTINGS_LAYOUT_COLUMNS_WIDTH;
> 	/**
>-	 * The String "&Pin drawer open at start-up"
>+	 * The "&Pin drawer open at start-up"
> 	 */
>-	public static String DRAWER_PIN_AT_STARTUP;
>+	public String DRAWER_PIN_AT_STARTUP;
> 	/**
>-	 * The String "&Restore Default"
>+	 * The "&Restore Default"
> 	 */
>-	public static String SETTINGS_DEFAULT_FONT;
>+	public String SETTINGS_DEFAULT_FONT;
> 	/**
>-	 * The String "<Using Workbench Dialog Font>"
>+	 * The "<Using Workbench Dialog Font>"
> 	 */
>-	public static String SETTINGS_WORKBENCH_FONT_LABEL;
>+	public String SETTINGS_WORKBENCH_FONT_LABEL;
> 	/**
>-	 * The String "-"
>+	 * The "-"
> 	 */
>-	public static String NAME_DESCRIPTION_SEPARATOR;
>+	public String NAME_DESCRIPTION_SEPARATOR;
> 	/**
>-	 * The String "&Pinned"
>+	 * The "&Pinned"
> 	 */
>-	public static String PINNED;
>+	public String PINNED;
> 	/**
>-	 * The String "Pin Open"
>+	 * The "Pin Open"
> 	 */
>-	public static String TOOLTIP_PIN_FIGURE;
>+	public String TOOLTIP_PIN_FIGURE;
> 
> 	/**
>-	 * The String "Unpin"
>+	 * The "Unpin"
> 	 */
>-	public static String TOOLTIP_UNPIN_FIGURE;
>+	public String TOOLTIP_UNPIN_FIGURE;
> 
> 	/**
>-	 * The String "&Dock On"
>+	 * The "&Dock On"
> 	 */
>-	public static String DOCK_LABEL;
>+	public String DOCK_LABEL;
> 
> 	/**
>-	 * The String "&Left"
>+	 * The "&Left"
> 	 */
>-	public static String LEFT_LABEL;
>+	public String LEFT_LABEL;
> 
> 	/**
>-	 * The String "&Right"
>+	 * The "&Right"
> 	 */
>-	public static String RIGHT_LABEL;
>+	public String RIGHT_LABEL;
> 
> 	/**
>-	 * The String "&Resize"
>+	 * The "&Resize"
> 	 */
>-	public static String RESIZE_LABEL;
>+	public String RESIZE_LABEL;
> 
> 	/**
>-	 * Show Palette
>+	 * Showe
> 	 */
>-	public static String PALETTE_SHOW;
>+	public String PALETTE_SHOW;
> 
> 	/**
>-	 * Hide Palette
>+	 * Hidee
> 	 */
>-	public static String PALETTE_HIDE;
>+	public String PALETTE_HIDE;
> 
> 	/**
>-	 * This button is used to show or hide the palette.
>+	 * This is used to show or hide the palette.
> 	 */
>-	public static String ACC_DESC_PALETTE_BUTTON;
>+	public String ACC_DESC_PALETTE_BUTTON;
> 
> 	/**
>-	 * The palette can be moved or resized through the context menu for this
>-	 * control.
>+	 * The can be moved or resized through the context menu for this cont
> 	 */
>-	public static String ACC_DESC_PALETTE_TITLE;
>+	public String ACC_DESC_PALETTE_TITLE;
>+
>+	// static {
>+	// NLS.initializeMessages(
>+	//				"org.eclipse.gef.ui.palette.messages", PaletteMessages.get().class); //$NON-NLS-1$
>+	// }
> 
>-	static {
>-		NLS.initializeMessages(
>-				"org.eclipse.gef.ui.palette.messages", PaletteMessages.class); //$NON-NLS-1$
>+	public static PaletteMessages get() {
>+		Object result = RWT.NLS.getISO8859_1Encoded(
>+				"org.eclipse.gef.ui.palette.messages", PaletteMessages.class);
>+		return (PaletteMessages) result;
> 	}
> 
> }
>\ No newline at end of file
>Index: src/org/eclipse/gef/ui/palette/PinDrawerAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PinDrawerAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 PinDrawerAction.java
>--- src/org/eclipse/gef/ui/palette/PinDrawerAction.java	9 Dec 2010 19:40:06 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/PinDrawerAction.java	27 Sep 2011 14:19:49 -0000
>@@ -35,7 +35,7 @@
> 		this.pinnableEditPart = drawer;
> 		setChecked(drawer.isPinnedOpen());
> 		setEnabled(drawer.isExpanded());
>-		setText(PaletteMessages.PINNED);
>+		setText(PaletteMessages.get().PINNED);
> 	}
> 
> 	/**
>@@ -49,7 +49,7 @@
> 		this.pinnableEditPart = pinnableEditPart;
> 		setChecked(pinnableEditPart.isPinnedOpen());
> 		setEnabled(pinnableEditPart.isExpanded());
>-		setText(PaletteMessages.PINNED);
>+		setText(PaletteMessages.get().PINNED);
> 	}
> 
> 	/**
>Index: src/org/eclipse/gef/ui/palette/SettingsAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/SettingsAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 SettingsAction.java
>--- src/org/eclipse/gef/ui/palette/SettingsAction.java	9 Dec 2010 19:40:06 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/SettingsAction.java	27 Sep 2011 14:19:49 -0000
>@@ -32,7 +32,7 @@
> 	 */
> 	public SettingsAction(PaletteViewer palette) {
> 		super();
>-		setText(PaletteMessages.MENU_OPEN_SETTINGS_DIALOG);
>+		setText(PaletteMessages.get().MENU_OPEN_SETTINGS_DIALOG);
> 		paletteViewer = palette;
> 	}
> 
>Index: src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 DefaultEntryPage.java
>--- src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java	19 Jul 2011 18:21:26 -0000	1.3
>+++ src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java	27 Sep 2011 14:19:49 -0000
>@@ -77,10 +77,10 @@
> 		panel.setLayout(gridLayout);
> 		Control[] tablist = new Control[3];
> 
>-		createLabel(panel, SWT.NONE, PaletteMessages.NAME_LABEL);
>+		createLabel(panel, SWT.NONE, PaletteMessages.get().NAME_LABEL);
> 		tablist[0] = createNameText(panel);
> 
>-		createLabel(panel, SWT.NONE, PaletteMessages.DESCRIPTION_LABEL);
>+		createLabel(panel, SWT.NONE, PaletteMessages.get().DESCRIPTION_LABEL);
> 		tablist[1] = createDescText(panel);
> 
> 		tablist[2] = createHiddenCheckBox(panel);
>@@ -127,7 +127,7 @@
> 	protected Button createHiddenCheckBox(Composite panel) {
> 		Button hidden = new Button(panel, SWT.CHECK);
> 		hidden.setFont(panel.getFont());
>-		hidden.setText(PaletteMessages.HIDDEN_LABEL);
>+		hidden.setText(PaletteMessages.get().HIDDEN_LABEL);
> 		hidden.setSelection(!entry.isVisible());
> 
> 		if (getPermission() == PaletteEntry.PERMISSION_NO_MODIFICATION) {
>Index: src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 DrawerEntryPage.java
>--- src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java	19 Jul 2011 18:21:26 -0000	1.3
>+++ src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java	27 Sep 2011 14:19:49 -0000
>@@ -76,7 +76,7 @@
> 	protected Button createOpenDrawerInitiallyOption(Composite panel) {
> 		Button b = new Button(panel, SWT.CHECK);
> 		b.setFont(panel.getFont());
>-		b.setText(PaletteMessages.EXPAND_DRAWER_AT_STARTUP_LABEL);
>+		b.setText(PaletteMessages.get().EXPAND_DRAWER_AT_STARTUP_LABEL);
> 		b.setSelection(getDrawer().isInitiallyOpen());
> 		if (getPermission() >= PaletteEntry.PERMISSION_LIMITED_MODIFICATION) {
> 			b.addSelectionListener(new SelectionAdapter() {
>@@ -102,7 +102,7 @@
> 	protected Button createPinDrawerInitiallyOption(Composite panel) {
> 		Button pinOption = new Button(panel, SWT.CHECK);
> 		pinOption.setFont(panel.getFont());
>-		pinOption.setText(PaletteMessages.DRAWER_PIN_AT_STARTUP);
>+		pinOption.setText(PaletteMessages.get().DRAWER_PIN_AT_STARTUP);
> 		GridData data = new GridData();
> 		data.horizontalIndent = 15;
> 		pinOption.setLayoutData(data);
>Index: src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java,v
>retrieving revision 1.4
>diff -u -r1.4 PaletteCustomizerDialog.java
>--- src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java	19 Jul 2011 18:21:26 -0000	1.4
>+++ src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java	27 Sep 2011 14:19:50 -0000
>@@ -264,7 +264,7 @@
> 	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
> 	 */
> 	protected void configureShell(Shell newShell) {
>-		newShell.setText(PaletteMessages.CUSTOMIZE_DIALOG_TITLE);
>+		newShell.setText(PaletteMessages.get().CUSTOMIZE_DIALOG_TITLE);
> 		super.configureShell(newShell);
> 	}
> 
>@@ -333,7 +333,7 @@
> 	 */
> 	protected void createButtonsForButtonBar(Composite parent) {
> 		super.createButtonsForButtonBar(parent);
>-		createButton(parent, APPLY_ID, PaletteMessages.APPLY_LABEL, false);
>+		createButton(parent, APPLY_ID, PaletteMessages.get().APPLY_LABEL, false);
> 	}
> 
> 	/**
>@@ -681,7 +681,7 @@
> 		layout.verticalSpacing = 0;
> 		titlePage.setLayout(layout);
> 		title = createSectionTitle(titlePage,
>-				PaletteMessages.NO_SELECTION_TITLE);
>+				PaletteMessages.get().NO_SELECTION_TITLE);
> 
> 		errorPage = new Composite(book, SWT.NONE);
> 		errorPage.setFont(book.getFont());
>@@ -944,9 +944,9 @@
> 
> 		if (errorMessage != null) {
> 			MessageDialog dialog = new MessageDialog(getShell(),
>-					PaletteMessages.ERROR,
>+					PaletteMessages.get().ERROR,
> 					null,
>-					PaletteMessages.ABORT_PAGE_FLIPPING_MESSAGE
>+					PaletteMessages.get().ABORT_PAGE_FLIPPING_MESSAGE
> 							+ "\n" + errorMessage, //$NON-NLS-1$
> 					MessageDialog.ERROR,
> 					new String[] { IDialogConstants.get().OK_LABEL }, 0);
>@@ -1006,7 +1006,7 @@
> 			setActiveEntryPage(panel);
> 		} else {
> 			title.setImage(null);
>-			title.setText(PaletteMessages.NO_SELECTION_TITLE);
>+			title.setText(PaletteMessages.get().NO_SELECTION_TITLE);
> 			// Lazy creation
> 			if (noSelectionPage == null) {
> 				noSelectionPage = new EntryPage() {
>@@ -1019,7 +1019,7 @@
> 							PaletteEntry entry) {
> 						text = new Text(parent, SWT.READ_ONLY);
> 						text.setFont(parent.getFont());
>-						text.setText(PaletteMessages.NO_SELECTION_MADE);
>+						text.setText(PaletteMessages.get().NO_SELECTION_MADE);
> 					}
> 
> 					public Control getControl() {
>@@ -1136,7 +1136,7 @@
> 	private class DeleteAction extends PaletteCustomizationAction {
> 		public DeleteAction() {
> 			setEnabled(false);
>-			setText(PaletteMessages.DELETE_LABEL);
>+			setText(PaletteMessages.get().DELETE_LABEL);
> 			ISharedImages sharedImages = PlatformUI.getWorkbench()
> 					.getSharedImages();
> 			setImageDescriptor(sharedImages
>@@ -1165,7 +1165,7 @@
> 	private class MoveDownAction extends PaletteCustomizationAction {
> 		public MoveDownAction() {
> 			setEnabled(false);
>-			setText(PaletteMessages.MOVE_DOWN_LABEL);
>+			setText(PaletteMessages.get().MOVE_DOWN_LABEL);
> 			setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
> 					"icons/next_nav.gif"));//$NON-NLS-1$
> 			setDisabledImageDescriptor(ImageDescriptor.createFromFile(
>@@ -1192,7 +1192,7 @@
> 	private class MoveUpAction extends PaletteCustomizationAction {
> 		public MoveUpAction() {
> 			setEnabled(false);
>-			setText(PaletteMessages.MOVE_UP_LABEL);
>+			setText(PaletteMessages.get().MOVE_UP_LABEL);
> 			setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
> 					"icons/prev_nav.gif"));//$NON-NLS-1$
> 			setDisabledImageDescriptor(ImageDescriptor.createFromFile(
>@@ -1229,7 +1229,7 @@
> 				setMenuCreator(this);
> 			}
> 
>-			setText(PaletteMessages.NEW_LABEL);
>+			setText(PaletteMessages.get().NEW_LABEL);
> 			setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
> 					"icons/add.gif")); //$NON-NLS-1$
> 			setDisabledImageDescriptor(ImageDescriptor.createFromFile(
>Index: src/org/eclipse/gef/ui/palette/customize/PaletteDrawerFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteDrawerFactory.java,v
>retrieving revision 1.1
>diff -u -r1.1 PaletteDrawerFactory.java
>--- src/org/eclipse/gef/ui/palette/customize/PaletteDrawerFactory.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/customize/PaletteDrawerFactory.java	27 Sep 2011 14:19:50 -0000
>@@ -27,14 +27,14 @@
> 	 * Constructor
> 	 */
> 	public PaletteDrawerFactory() {
>-		setLabel(PaletteMessages.MODEL_TYPE_DRAWER);
>+		setLabel(PaletteMessages.get().MODEL_TYPE_DRAWER);
> 	}
> 
> 	/**
> 	 * @see org.eclipse.gef.ui.palette.customize.PaletteEntryFactory#createNewEntry(Shell)
> 	 */
> 	protected PaletteEntry createNewEntry(Shell shell) {
>-		PaletteEntry entry = new PaletteDrawer(PaletteMessages.NEW_DRAWER_LABEL);
>+		PaletteEntry entry = new PaletteDrawer(PaletteMessages.get().NEW_DRAWER_LABEL);
> 		entry.setUserModificationPermission(PaletteEntry.PERMISSION_FULL_MODIFICATION);
> 		return entry;
> 	}
>Index: src/org/eclipse/gef/ui/palette/customize/PaletteGroupFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteGroupFactory.java,v
>retrieving revision 1.1
>diff -u -r1.1 PaletteGroupFactory.java
>--- src/org/eclipse/gef/ui/palette/customize/PaletteGroupFactory.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/customize/PaletteGroupFactory.java	27 Sep 2011 14:19:50 -0000
>@@ -27,14 +27,14 @@
> 	 * Constructor
> 	 */
> 	public PaletteGroupFactory() {
>-		setLabel(PaletteMessages.MODEL_TYPE_GROUP);
>+		setLabel(PaletteMessages.get().MODEL_TYPE_GROUP);
> 	}
> 
> 	/**
> 	 * @see org.eclipse.gef.ui.palette.customize.PaletteEntryFactory#createNewEntry(Shell)
> 	 */
> 	protected PaletteEntry createNewEntry(Shell shell) {
>-		PaletteGroup group = new PaletteGroup(PaletteMessages.NEW_GROUP_LABEL);
>+		PaletteGroup group = new PaletteGroup(PaletteMessages.get().NEW_GROUP_LABEL);
> 		group.setUserModificationPermission(PaletteEntry.PERMISSION_FULL_MODIFICATION);
> 		return group;
> 	}
>Index: src/org/eclipse/gef/ui/palette/customize/PaletteSeparatorFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSeparatorFactory.java,v
>retrieving revision 1.1
>diff -u -r1.1 PaletteSeparatorFactory.java
>--- src/org/eclipse/gef/ui/palette/customize/PaletteSeparatorFactory.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/customize/PaletteSeparatorFactory.java	27 Sep 2011 14:19:50 -0000
>@@ -28,7 +28,7 @@
> 	 * Constructor
> 	 */
> 	public PaletteSeparatorFactory() {
>-		setLabel(PaletteMessages.MODEL_TYPE_SEPARATOR);
>+		setLabel(PaletteMessages.get().MODEL_TYPE_SEPARATOR);
> 	}
> 
> 	/**
>Index: src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java,v
>retrieving revision 1.3
>diff -u -r1.3 PaletteSettingsDialog.java
>--- src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java	6 Jul 2011 17:45:04 -0000	1.3
>+++ src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java	27 Sep 2011 14:19:51 -0000
>@@ -205,7 +205,7 @@
> 	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
> 	 */
> 	protected void configureShell(Shell newShell) {
>-		newShell.setText(PaletteMessages.SETTINGS_DIALOG_TITLE);
>+		newShell.setText(PaletteMessages.get().SETTINGS_DIALOG_TITLE);
> 		super.configureShell(newShell);
> 	}
> 
>@@ -284,20 +284,20 @@
> 
> 		Label label = new Label(composite, SWT.NONE);
> 		label.setFont(composite.getFont());
>-		label.setText(PaletteMessages.COLLAPSE_OPTIONS_TITLE);
>+		label.setText(PaletteMessages.get().COLLAPSE_OPTIONS_TITLE);
> 		GridData data = new GridData();
> 		label.setLayoutData(data);
> 
> 		Button b = createButton(composite, COLLAPSE_ALWAYS_ID,
>-				PaletteMessages.COLLAPSE_ALWAYS_LABEL, SWT.RADIO, null);
>+				PaletteMessages.get().COLLAPSE_ALWAYS_LABEL, SWT.RADIO, null);
> 		((GridData) b.getLayoutData()).horizontalIndent = 5;
> 
> 		b = createButton(composite, COLLAPSE_NEEDED_ID,
>-				PaletteMessages.COLLAPSE_AS_NEEDED_LABEL, SWT.RADIO, null);
>+				PaletteMessages.get().COLLAPSE_AS_NEEDED_LABEL, SWT.RADIO, null);
> 		((GridData) b.getLayoutData()).horizontalIndent = 5;
> 
> 		b = createButton(composite, COLLAPSE_NEVER_ID,
>-				PaletteMessages.COLLAPSE_NEVER_LABEL, SWT.RADIO, null);
>+				PaletteMessages.get().COLLAPSE_NEVER_LABEL, SWT.RADIO, null);
> 		((GridData) b.getLayoutData()).horizontalIndent = 5;
> 
> 		// Load auto - collapse settings
>@@ -328,7 +328,7 @@
> 	 */
> 	protected Control createDetailsOptions(Composite parent) {
> 		Control contents = createOptionsPage(parent,
>-				PaletteMessages.SETTINGS_OPTIONS_DETAILS,
>+				PaletteMessages.get().SETTINGS_OPTIONS_DETAILS,
> 				LAYOUT_DETAILS_ICON_SIZE_ID);
> 		getButton(LAYOUT_DETAILS_ICON_SIZE_ID).setSelection(
> 				prefs.useLargeIcons(PaletteViewerPreferences.LAYOUT_DETAILS));
>@@ -393,13 +393,13 @@
> 	 */
> 	protected Control createColumnsOptions(Composite parent) {
> 		Composite contents = (Composite) createOptionsPage(parent,
>-				PaletteMessages.SETTINGS_OPTIONS_COLUMNS,
>+				PaletteMessages.get().SETTINGS_OPTIONS_COLUMNS,
> 				LAYOUT_COLUMNS_ICON_SIZE_ID);
> 		getButton(LAYOUT_COLUMNS_ICON_SIZE_ID).setSelection(
> 				prefs.useLargeIcons(PaletteViewerPreferences.LAYOUT_COLUMNS));
> 
> 		// final Button button = createButton(contents, -1,
>-		// PaletteMessages.SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH, SWT.CHECK,
>+		// PaletteMessages.get().SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH, SWT.CHECK,
> 		// null);
> 		// ((GridData)button.getLayoutData()).horizontalSpan = 2;
> 		//
>@@ -414,7 +414,7 @@
> 		//
> 		// final Label label = new Label(container, SWT.NONE);
> 		// label.setFont(container.getFont());
>-		// label.setText(PaletteMessages.SETTINGS_LAYOUT_COLUMNS_WIDTH);
>+		// label.setText(PaletteMessages.get().SETTINGS_LAYOUT_COLUMNS_WIDTH);
> 		// data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING
> 		// | GridData.VERTICAL_ALIGN_BEGINNING);
> 		// label.setLayoutData(data);
>@@ -464,10 +464,10 @@
> 		updateFontName();
> 
> 		createButton(container, FONT_CHANGE_ID,
>-				PaletteMessages.SETTINGS_FONT_CHANGE, SWT.PUSH, null);
>+				PaletteMessages.get().SETTINGS_FONT_CHANGE, SWT.PUSH, null);
> 
> 		createButton(container, DEFAULT_FONT_ID,
>-				PaletteMessages.SETTINGS_DEFAULT_FONT, SWT.PUSH, null);
>+				PaletteMessages.get().SETTINGS_DEFAULT_FONT, SWT.PUSH, null);
> 
> 		return container;
> 	}
>@@ -482,7 +482,7 @@
> 	 */
> 	protected Control createIconsOnlyOptions(Composite parent) {
> 		Control contents = createOptionsPage(parent,
>-				PaletteMessages.SETTINGS_OPTIONS_ICONS_ONLY,
>+				PaletteMessages.get().SETTINGS_OPTIONS_ICONS_ONLY,
> 				LAYOUT_ICONS_ICON_SIZE_ID);
> 		getButton(LAYOUT_ICONS_ICON_SIZE_ID).setSelection(
> 				prefs.useLargeIcons(PaletteViewerPreferences.LAYOUT_ICONS));
>@@ -507,7 +507,7 @@
> 
> 		Label label = new Label(composite, SWT.NONE);
> 		label.setFont(composite.getFont());
>-		label.setText(PaletteMessages.SETTINGS_LAYOUT_TITLE);
>+		label.setText(PaletteMessages.get().SETTINGS_LAYOUT_TITLE);
> 		GridData data = new GridData();
> 		label.setLayoutData(data);
> 
>@@ -517,25 +517,25 @@
> 			switch (modes[i]) {
> 			case PaletteViewerPreferences.LAYOUT_COLUMNS:
> 				b = createButton(composite, LAYOUT_COLUMNS_VIEW_ID,
>-						PaletteMessages.SETTINGS_COLUMNS_VIEW_LABEL, SWT.RADIO,
>+						PaletteMessages.get().SETTINGS_COLUMNS_VIEW_LABEL, SWT.RADIO,
> 						null);
> 				((GridData) b.getLayoutData()).horizontalIndent = 5;
> 				break;
> 			case PaletteViewerPreferences.LAYOUT_LIST:
> 				b = createButton(composite, LAYOUT_LIST_VIEW_ID,
>-						PaletteMessages.SETTINGS_LIST_VIEW_LABEL, SWT.RADIO,
>+						PaletteMessages.get().SETTINGS_LIST_VIEW_LABEL, SWT.RADIO,
> 						null);
> 				((GridData) b.getLayoutData()).horizontalIndent = 5;
> 				break;
> 			case PaletteViewerPreferences.LAYOUT_ICONS:
> 				b = createButton(composite, LAYOUT_ICONS_VIEW_ID,
>-						PaletteMessages.SETTINGS_ICONS_VIEW_LABEL, SWT.RADIO,
>+						PaletteMessages.get().SETTINGS_ICONS_VIEW_LABEL, SWT.RADIO,
> 						null);
> 				((GridData) b.getLayoutData()).horizontalIndent = 5;
> 				break;
> 			case PaletteViewerPreferences.LAYOUT_DETAILS:
> 				b = createButton(composite, LAYOUT_DETAILS_VIEW_ID,
>-						PaletteMessages.SETTINGS_DETAILS_VIEW_LABEL, SWT.RADIO,
>+						PaletteMessages.get().SETTINGS_DETAILS_VIEW_LABEL, SWT.RADIO,
> 						null);
> 				((GridData) b.getLayoutData()).horizontalIndent = 5;
> 				break;
>@@ -608,7 +608,7 @@
> 	 */
> 	protected Control createListOptions(Composite parent) {
> 		Control composite = createOptionsPage(parent,
>-				PaletteMessages.SETTINGS_OPTIONS_LIST, LAYOUT_LIST_ICON_SIZE_ID);
>+				PaletteMessages.get().SETTINGS_OPTIONS_LIST, LAYOUT_LIST_ICON_SIZE_ID);
> 		getButton(LAYOUT_LIST_ICON_SIZE_ID).setSelection(
> 				prefs.useLargeIcons(PaletteViewerPreferences.LAYOUT_LIST));
> 		return composite;
>@@ -642,7 +642,7 @@
> 		contents.setText(title);
> 
> 		createButton(contents, buttonId,
>-				PaletteMessages.SETTINGS_USE_LARGE_ICONS_LABEL, SWT.CHECK, null);
>+				PaletteMessages.get().SETTINGS_USE_LARGE_ICONS_LABEL, SWT.CHECK, null);
> 
> 		return contents;
> 	}
>@@ -822,11 +822,11 @@
> 		String name;
> 		if (prefs.getFontData().equals(
> 				(JFaceResources.getDialogFont().getFontData()[0]))) {
>-			name = PaletteMessages.SETTINGS_WORKBENCH_FONT_LABEL;
>+			name = PaletteMessages.get().SETTINGS_WORKBENCH_FONT_LABEL;
> 		} else {
> 			name = StringConverter.asString(prefs.getFontData());
> 		}
>-		fontName.setText(PaletteMessages.SETTINGS_FONT_CURRENT + name);
>+		fontName.setText(PaletteMessages.get().SETTINGS_FONT_CURRENT + name);
> 	}
> 
> }
>Index: src/org/eclipse/gef/ui/palette/customize/PaletteStackFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteStackFactory.java,v
>retrieving revision 1.1
>diff -u -r1.1 PaletteStackFactory.java
>--- src/org/eclipse/gef/ui/palette/customize/PaletteStackFactory.java	9 Dec 2010 19:39:57 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/customize/PaletteStackFactory.java	27 Sep 2011 14:19:51 -0000
>@@ -28,10 +28,10 @@
> 
> 	/**
> 	 * Creates a new PaletteStackFactory with label
>-	 * PaletteMessages.MODEL_TYPE_STACK
>+	 * PaletteMessages.get().MODEL_TYPE_STACK
> 	 */
> 	public PaletteStackFactory() {
>-		setLabel(PaletteMessages.MODEL_TYPE_STACK);
>+		setLabel(PaletteMessages.get().MODEL_TYPE_STACK);
> 	}
> 
> 	/**
>@@ -48,7 +48,7 @@
> 	 * @see org.eclipse.gef.ui.palette.customize.PaletteEntryFactory#createNewEntry(Shell)
> 	 */
> 	protected PaletteEntry createNewEntry(Shell shell) {
>-		return new PaletteStack(PaletteMessages.NEW_STACK_LABEL, null, null);
>+		return new PaletteStack(PaletteMessages.get().NEW_STACK_LABEL, null, null);
> 	}
> 
> 	/**
>Index: src/org/eclipse/gef/ui/palette/editparts/PaletteEditPart.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/palette/editparts/PaletteEditPart.java,v
>retrieving revision 1.1
>diff -u -r1.1 PaletteEditPart.java
>--- src/org/eclipse/gef/ui/palette/editparts/PaletteEditPart.java	9 Dec 2010 19:40:05 -0000	1.1
>+++ src/org/eclipse/gef/ui/palette/editparts/PaletteEditPart.java	27 Sep 2011 14:19:51 -0000
>@@ -300,7 +300,7 @@
> 			if (needName)
> 				text = entry.getLabel()
> 						+ " " //$NON-NLS-1$
>-						+ PaletteMessages.NAME_DESCRIPTION_SEPARATOR
>+						+ PaletteMessages.get().NAME_DESCRIPTION_SEPARATOR
> 						+ " " + desc; //$NON-NLS-1$
> 			else
> 				text = desc;
>Index: src/org/eclipse/gef/ui/properties/SetPropertyValueCommand.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/properties/SetPropertyValueCommand.java,v
>retrieving revision 1.1
>diff -u -r1.1 SetPropertyValueCommand.java
>--- src/org/eclipse/gef/ui/properties/SetPropertyValueCommand.java	6 Jul 2011 17:45:04 -0000	1.1
>+++ src/org/eclipse/gef/ui/properties/SetPropertyValueCommand.java	27 Sep 2011 14:19:51 -0000
>@@ -63,7 +63,7 @@
> 	 */
> 	public SetPropertyValueCommand(String propertyLabel,
> 			IPropertySource propertySource, Object propertyId, Object newValue) {
>-		super(MessageFormat.format(GEFMessages.SetPropertyValueCommand_Label,
>+		super(MessageFormat.format(GEFMessages.get().SetPropertyValueCommand_Label,
> 				new Object[] { propertyLabel }).trim());
> 		this.propertySource = propertySource;
> 		this.propertyId = propertyId;
>Index: src/org/eclipse/gef/ui/views/palette/PaletteView.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.gef/src/org/eclipse/gef/ui/views/palette/PaletteView.java,v
>retrieving revision 1.1
>diff -u -r1.1 PaletteView.java
>--- src/org/eclipse/gef/ui/views/palette/PaletteView.java	9 Dec 2010 19:40:01 -0000	1.1
>+++ src/org/eclipse/gef/ui/views/palette/PaletteView.java	27 Sep 2011 14:19:51 -0000
>@@ -66,7 +66,7 @@
> 		MessagePage page = new MessagePage();
> 		initPage(page);
> 		page.createControl(book);
>-		page.setMessage(GEFMessages.Palette_Not_Available);
>+		page.setMessage(GEFMessages.get().Palette_Not_Available);
> 		return page;
> 	}
> 
>#P org.eclipse.rap.gef.demo
>Index: src/org/eclipse/gef/examples/logicdesigner/actions/LogicActionBarContributor.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/ports/gef/org.eclipse.rap.gef.demo/src/org/eclipse/gef/examples/logicdesigner/actions/LogicActionBarContributor.java,v
>retrieving revision 1.1
>diff -u -r1.1 LogicActionBarContributor.java
>--- src/org/eclipse/gef/examples/logicdesigner/actions/LogicActionBarContributor.java	4 Jan 2011 16:06:00 -0000	1.1
>+++ src/org/eclipse/gef/examples/logicdesigner/actions/LogicActionBarContributor.java	27 Sep 2011 14:19:55 -0000
>@@ -10,18 +10,9 @@
>  *******************************************************************************/
> package org.eclipse.gef.examples.logicdesigner.actions;
> 
>-import org.eclipse.jface.action.IAction;
>-import org.eclipse.jface.action.IMenuManager;
>-import org.eclipse.jface.action.IToolBarManager;
>-import org.eclipse.jface.action.MenuManager;
>-import org.eclipse.jface.action.Separator;
>-import org.eclipse.ui.IWorkbenchActionConstants;
>-import org.eclipse.ui.actions.ActionFactory;
>-import org.eclipse.ui.actions.RetargetAction;
>-
> import org.eclipse.draw2d.PositionConstants;
>-
> import org.eclipse.gef.editparts.ZoomManager;
>+import org.eclipse.gef.examples.logicdesigner.LogicMessages;
> import org.eclipse.gef.internal.GEFMessages;
> import org.eclipse.gef.ui.actions.ActionBarContributor;
> import org.eclipse.gef.ui.actions.AlignmentRetargetAction;
>@@ -33,8 +24,14 @@
> import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
> import org.eclipse.gef.ui.actions.ZoomInRetargetAction;
> import org.eclipse.gef.ui.actions.ZoomOutRetargetAction;
>-
>-import org.eclipse.gef.examples.logicdesigner.LogicMessages;
>+import org.eclipse.jface.action.IAction;
>+import org.eclipse.jface.action.IMenuManager;
>+import org.eclipse.jface.action.IToolBarManager;
>+import org.eclipse.jface.action.MenuManager;
>+import org.eclipse.jface.action.Separator;
>+import org.eclipse.ui.IWorkbenchActionConstants;
>+import org.eclipse.ui.actions.ActionFactory;
>+import org.eclipse.ui.actions.RetargetAction;
> 
> public class LogicActionBarContributor extends ActionBarContributor {
> 
>@@ -63,15 +60,15 @@
> 
> 		addRetargetAction(new RetargetAction(
> 				GEFActionConstants.TOGGLE_RULER_VISIBILITY,
>-				GEFMessages.ToggleRulerVisibility_Label, IAction.AS_CHECK_BOX));
>+				GEFMessages.get().ToggleRulerVisibility_Label, IAction.AS_CHECK_BOX));
> 
> 		addRetargetAction(new RetargetAction(
> 				GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY,
>-				GEFMessages.ToggleSnapToGeometry_Label, IAction.AS_CHECK_BOX));
>+				GEFMessages.get().ToggleSnapToGeometry_Label, IAction.AS_CHECK_BOX));
> 
> 		addRetargetAction(new RetargetAction(
> 				GEFActionConstants.TOGGLE_GRID_VISIBILITY,
>-				GEFMessages.ToggleGrid_Label, IAction.AS_CHECK_BOX));
>+				GEFMessages.get().ToggleGrid_Label, IAction.AS_CHECK_BOX));
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 359077: 204084