Attachment #204084 for bug #359077

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

View | Details | Raw Unified | Return to bug 359077
Collapse All | Expand All




	/**
	 * The string "Page".
	 */
	public static String FitAllAction_Label = GEFMessages.get().FitAllAction_Label;
	/**
	 * The string "Width".
	 */
	public static String FitWidthAction_Label = GEFMessages.get().FitWidthAction_Label;
	/**
	 * The string "Height".
	 */
	public static String FitHeightAction_Label = GEFMessages.get().FitHeightAction_Label;

}




 *******************************************************************************/
package org.eclipse.gef.internal;

import org.eclipse.rwt.RWT;

/**
 * Internal Messages

 * @author hudsonr
 * @since 2.0
 */
public class GEFMessages /* extends NLS */{

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

}

Lines 142-148 Link Here

(-)src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java (-1 / +1 lines)
142	String str = ""; //$NON-NLS-1$	142	String str = ""; //$NON-NLS-1$
143	if (s != null && !s.trim().equals("") //$NON-NLS-1$	143	if (s != null && !s.trim().equals("") //$NON-NLS-1$
144	&& !s.trim().equals(nameText.getText().trim())) {	144	&& !s.trim().equals(nameText.getText().trim())) {
145	str = " " + PaletteMessages.NAME_DESCRIPTION_SEPARATOR //$NON-NLS-1$	145	str = " " + PaletteMessages.get().NAME_DESCRIPTION_SEPARATOR //$NON-NLS-1$
146	+ " " + s; //$NON-NLS-1$	146	+ " " + s; //$NON-NLS-1$
147	}	147	}
148	if (descText.getText().equals(str)) {	148	if (descText.getText().equals(str)) {




		super(new ImageFigure(InternalImages.get(InternalImages.IMG_UNPINNED)));
		setRolloverEnabled(true);
		setRequestFocusEnabled(false);
		Label tooltip = new Label(PaletteMessages.get().TOOLTIP_PIN_FIGURE);
		tooltip.setBorder(TOOLTIP_BORDER);
		setToolTip(tooltip);
		setOpaque(false);

								.setImage(InternalImages
										.get(InternalImages.IMG_PINNED));
						((Label) getToolTip())
								.setText(PaletteMessages.get().TOOLTIP_UNPIN_FIGURE);
					} else {
						((ImageFigure) (getChildren().get(0)))
								.setImage(InternalImages
										.get(InternalImages.IMG_UNPINNED));
						((Label) getToolTip())
								.setText(PaletteMessages.get().TOOLTIP_PIN_FIGURE);
					}
				}
			}




		if (accPart == null)
			accPart = new AccessibleGraphicalEditPart() {
				public void getName(AccessibleEvent e) {
					e.result = isHorizontal() ? GEFMessages.get().Ruler_Horizontal_Label
							: GEFMessages.get().Ruler_Vertical_Label;
				}

				public void getDescription(AccessibleEvent e) {
					e.result = GEFMessages.get().Ruler_Desc;
				}
			};
		return accPart;




	public MarqueeToolEntry(String label, String description) {
		super(label, description, null, null, MarqueeSelectionTool.class);
		if (label == null || label.length() == 0)
			setLabel(GEFMessages.get().MarqueeTool_Label);
		setUserModificationPermission(PERMISSION_NO_MODIFICATION);
	}



		int marqueeBehavior = getMarqueeBehavior();
		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_CONNECTIONS_TOUCHED) {
			return GEFMessages.get().MarqueeTool_Connections_Touched_Desc;
		}
		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_CONNECTIONS_CONTAINED) {
			return GEFMessages.get().MarqueeTool_Connections_Contained_Desc;
		}
		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_TOUCHED) {
			return GEFMessages.get().MarqueeTool_Nodes_Touched_Desc;
		}
		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_CONTAINED) {
			return GEFMessages.get().MarqueeTool_Nodes_Contained_Desc;
		}
		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_TOUCHED_AND_RELATED_CONNECTIONS) {
			return GEFMessages.get().MarqueeTool_Nodes_Touched_And_Related_Connections_Desc;
		}
		if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_CONTAINED_AND_RELATED_CONNECTIONS) {
			return GEFMessages.get().MarqueeTool_Nodes_Contained_And_Related_Connections_Desc;
		}
		throw new IllegalArgumentException("Unknown marquee behavior"); //$NON-NLS-1$
	}

Lines 42-48 Link Here

(-)src/org/eclipse/gef/palette/PaletteSeparator.java (-1 / +1 lines)
42	* This Separator's unique ID	42	* This Separator's unique ID
43	*/	43	*/
44	public PaletteSeparator(String id) {	44	public PaletteSeparator(String id) {
45	super(PaletteMessages.NEW_SEPARATOR_LABEL, "", PALETTE_TYPE_SEPARATOR);//$NON-NLS-1$	45	super(PaletteMessages.get().NEW_SEPARATOR_LABEL, "", PALETTE_TYPE_SEPARATOR);//$NON-NLS-1$
46	setId(id);	46	setId(id);
47	}	47	}
48		48

Lines 51-57 Link Here

(-)src/org/eclipse/gef/palette/SelectionToolEntry.java (-1 / +1 lines)
51	super(label, shortDesc, SharedImages.DESC_SELECTION_TOOL_16,	51	super(label, shortDesc, SharedImages.DESC_SELECTION_TOOL_16,
52	SharedImages.DESC_SELECTION_TOOL_24, SelectionTool.class);	52	SharedImages.DESC_SELECTION_TOOL_24, SelectionTool.class);
53	if (label == null \|\| label.length() == 0)	53	if (label == null \|\| label.length() == 0)
54	setLabel(GEFMessages.SelectionTool_Label);	54	setLabel(GEFMessages.get().SelectionTool_Label);
55	setUserModificationPermission(PERMISSION_NO_MODIFICATION);	55	setUserModificationPermission(PERMISSION_NO_MODIFICATION);
56	}	56	}
57		57

Lines 108-114 Link Here

(-)src/org/eclipse/gef/rulers/RulerProvider.java (-2 / +2 lines)
108	* @see org.eclipse.swt.accessibility.AccessibleAdapter#getDescription(AccessibleEvent)	108	* @see org.eclipse.swt.accessibility.AccessibleAdapter#getDescription(AccessibleEvent)
109	*/	109	*/
110	public void getAccGuideDescription(AccessibleEvent e, Object guide) {	110	public void getAccGuideDescription(AccessibleEvent e, Object guide) {
111	e.result = GEFMessages.Guide_Desc;	111	e.result = GEFMessages.get().Guide_Desc;
112	}	112	}
113		113
114	/**	114	/**
Lines 122-128 Link Here
122	* @see org.eclipse.swt.accessibility.AccessibleAdapter#getName(AccessibleEvent)	122	* @see org.eclipse.swt.accessibility.AccessibleAdapter#getName(AccessibleEvent)
123	*/	123	*/
124	public void getAccGuideName(AccessibleEvent e, Object guide) {	124	public void getAccGuideName(AccessibleEvent e, Object guide) {
125	e.result = GEFMessages.Guide_Label;	125	e.result = GEFMessages.get().Guide_Label;
126	}	126	}
127		127
128	/**	128	/**




		switch (alignment) {
		case PositionConstants.LEFT:
			setId(GEFActionConstants.ALIGN_LEFT);
			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.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.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.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.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.get().AlignMiddleAction_Label);
			setToolTipText(GEFMessages.get().AlignMiddleAction_Tooltip);
			setImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE);
			setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE_DIS);
			break;




		switch (align) {
		case PositionConstants.BOTTOM:
			setId(GEFActionConstants.ALIGN_BOTTOM);
			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.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.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.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.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.get().AlignTopAction_Label);
			setToolTipText(GEFMessages.get().AlignTopAction_Tooltip);
			setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);
			setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);
			break;

Lines 27-33 Link Here

(-)src/org/eclipse/gef/ui/actions/CopyRetargetAction.java (-1 / +1 lines)
27	* Constructs a new CopyRetargetAction with the default ID, label and image.	27	* Constructs a new CopyRetargetAction with the default ID, label and image.
28	*/	28	*/
29	public CopyRetargetAction() {	29	public CopyRetargetAction() {
30	super(ActionFactory.COPY.getId(), GEFMessages.CopyAction_Label);	30	super(ActionFactory.COPY.getId(), GEFMessages.get().CopyAction_Label);
31	ISharedImages sharedImages = PlatformUI.getWorkbench()	31	ISharedImages sharedImages = PlatformUI.getWorkbench()
32	.getSharedImages();	32	.getSharedImages();
33	setImageDescriptor(sharedImages	33	setImageDescriptor(sharedImages

Lines 45-51 Link Here

(-)src/org/eclipse/gef/ui/actions/CopyTemplateAction.java (-1 / +1 lines)
45	public CopyTemplateAction(IEditorPart editor) {	45	public CopyTemplateAction(IEditorPart editor) {
46	super(editor);	46	super(editor);
47	setId(ActionFactory.COPY.getId());	47	setId(ActionFactory.COPY.getId());
48	setText(GEFMessages.CopyAction_Label);	48	setText(GEFMessages.get().CopyAction_Label);
49	}	49	}
50		50
51	/**	51	/**

Lines 38-46 Link Here

(-)src/org/eclipse/gef/ui/actions/CreateGuideAction.java (-2 / +2 lines)
38	* the viewer for the ruler on which the guide is to be created	38	* the viewer for the ruler on which the guide is to be created
39	*/	39	*/
40	public CreateGuideAction(EditPartViewer ruler) {	40	public CreateGuideAction(EditPartViewer ruler) {
41	super(GEFMessages.Create_Guide_Label);	41	super(GEFMessages.get().Create_Guide_Label);
42	viewer = ruler;	42	viewer = ruler;
43	setToolTipText(GEFMessages.Create_Guide_Tooltip);	43	setToolTipText(GEFMessages.get().Create_Guide_Tooltip);
44	}	44	}
45		45
46	/**	46	/**

Lines 98-104 Link Here

(-)src/org/eclipse/gef/ui/actions/DeleteAction.java (-3 / +3 lines)
98	deleteReq.setEditParts(objects);	98	deleteReq.setEditParts(objects);
99		99
100	CompoundCommand compoundCmd = new CompoundCommand(	100	CompoundCommand compoundCmd = new CompoundCommand(
101	GEFMessages.DeleteAction_ActionDeleteCommandName);	101	GEFMessages.get().DeleteAction_ActionDeleteCommandName);
102	for (int i = 0; i < objects.size(); i++) {	102	for (int i = 0; i < objects.size(); i++) {
103	EditPart object = (EditPart) objects.get(i);	103	EditPart object = (EditPart) objects.get(i);
104	Command cmd = object.getCommand(deleteReq);	104	Command cmd = object.getCommand(deleteReq);
Lines 114-121 Link Here
114	*/	114	*/
115	protected void init() {	115	protected void init() {
116	super.init();	116	super.init();
117	setText(GEFMessages.DeleteAction_Label);	117	setText(GEFMessages.get().DeleteAction_Label);
118	setToolTipText(GEFMessages.DeleteAction_Tooltip);	118	setToolTipText(GEFMessages.get().DeleteAction_Tooltip);
119	setId(ActionFactory.DELETE.getId());	119	setId(ActionFactory.DELETE.getId());
120	ISharedImages sharedImages = PlatformUI.getWorkbench()	120	ISharedImages sharedImages = PlatformUI.getWorkbench()
121	.getSharedImages();	121	.getSharedImages();

Lines 27-34 Link Here

(-)src/org/eclipse/gef/ui/actions/DeleteRetargetAction.java (-2 / +2 lines)
27	* image.	27	* image.
28	*/	28	*/
29	public DeleteRetargetAction() {	29	public DeleteRetargetAction() {
30	super(ActionFactory.DELETE.getId(), GEFMessages.DeleteAction_Label);	30	super(ActionFactory.DELETE.getId(), GEFMessages.get().DeleteAction_Label);
31	setToolTipText(GEFMessages.DeleteAction_Tooltip);	31	setToolTipText(GEFMessages.get().DeleteAction_Tooltip);
32	ISharedImages sharedImages = PlatformUI.getWorkbench()	32	ISharedImages sharedImages = PlatformUI.getWorkbench()
33	.getSharedImages();	33	.getSharedImages();
34	setImageDescriptor(sharedImages	34	setImageDescriptor(sharedImages

Lines 120-127 Link Here

(-)src/org/eclipse/gef/ui/actions/DirectEditAction.java (-2 / +2 lines)
120	*/	120	*/
121	protected void init() {	121	protected void init() {
122	super.init();	122	super.init();
123	setText(GEFMessages.RenameAction_Label);	123	setText(GEFMessages.get().RenameAction_Label);
124	setToolTipText(GEFMessages.RenameAction_Tooltip);	124	setToolTipText(GEFMessages.get().RenameAction_Tooltip);
125	setId(GEFActionConstants.DIRECT_EDIT);	125	setId(GEFActionConstants.DIRECT_EDIT);
126	}	126	}
127		127

Lines 32-41 Link Here

(-)src/org/eclipse/gef/ui/actions/MatchHeightAction.java (-2 / +2 lines)
32	*/	32	*/
33	public MatchHeightAction(IWorkbenchPart part) {	33	public MatchHeightAction(IWorkbenchPart part) {
34	super(part);	34	super(part);
35	setText(GEFMessages.MatchHeightAction_Label);	35	setText(GEFMessages.get().MatchHeightAction_Label);
36	setImageDescriptor(InternalImages.DESC_MATCH_HEIGHT);	36	setImageDescriptor(InternalImages.DESC_MATCH_HEIGHT);
37	setDisabledImageDescriptor(InternalImages.DESC_MATCH_HEIGHT_DIS);	37	setDisabledImageDescriptor(InternalImages.DESC_MATCH_HEIGHT_DIS);
38	setToolTipText(GEFMessages.MatchHeightAction_Tooltip);	38	setToolTipText(GEFMessages.get().MatchHeightAction_Tooltip);
39	setId(GEFActionConstants.MATCH_HEIGHT);	39	setId(GEFActionConstants.MATCH_HEIGHT);
40	}	40	}
41		41

Lines 25-34 Link Here

(-)src/org/eclipse/gef/ui/actions/MatchHeightRetargetAction.java (-2 / +2 lines)
25	*/	25	*/
26	public MatchHeightRetargetAction() {	26	public MatchHeightRetargetAction() {
27	super(GEFActionConstants.MATCH_HEIGHT,	27	super(GEFActionConstants.MATCH_HEIGHT,
28	GEFMessages.MatchHeightAction_Label);	28	GEFMessages.get().MatchHeightAction_Label);
29	setImageDescriptor(InternalImages.DESC_MATCH_HEIGHT);	29	setImageDescriptor(InternalImages.DESC_MATCH_HEIGHT);
30	setDisabledImageDescriptor(InternalImages.DESC_MATCH_HEIGHT_DIS);	30	setDisabledImageDescriptor(InternalImages.DESC_MATCH_HEIGHT_DIS);
31	setToolTipText(GEFMessages.MatchHeightAction_Tooltip);	31	setToolTipText(GEFMessages.get().MatchHeightAction_Tooltip);
32	}	32	}
33		33
34	}	34	}

Lines 43-52 Link Here

(-)src/org/eclipse/gef/ui/actions/MatchSizeAction.java (-2 / +2 lines)
43	*/	43	*/
44	public MatchSizeAction(IWorkbenchPart part) {	44	public MatchSizeAction(IWorkbenchPart part) {
45	super(part);	45	super(part);
46	setText(GEFMessages.MatchSizeAction_Label);	46	setText(GEFMessages.get().MatchSizeAction_Label);
47	setImageDescriptor(InternalImages.DESC_MATCH_SIZE);	47	setImageDescriptor(InternalImages.DESC_MATCH_SIZE);
48	setDisabledImageDescriptor(InternalImages.DESC_MATCH_SIZE_DIS);	48	setDisabledImageDescriptor(InternalImages.DESC_MATCH_SIZE_DIS);
49	setToolTipText(GEFMessages.MatchSizeAction_Tooltip);	49	setToolTipText(GEFMessages.get().MatchSizeAction_Tooltip);
50	setId(GEFActionConstants.MATCH_SIZE);	50	setId(GEFActionConstants.MATCH_SIZE);
51	}	51	}
52		52

Lines 26-35 Link Here

(-)src/org/eclipse/gef/ui/actions/MatchSizeRetargetAction.java (-2 / +2 lines)
26	* Constructs a <code>MatchSizeRetargetAction</code>.	26	* Constructs a <code>MatchSizeRetargetAction</code>.
27	*/	27	*/
28	public MatchSizeRetargetAction() {	28	public MatchSizeRetargetAction() {
29	super(GEFActionConstants.MATCH_SIZE, GEFMessages.MatchSizeAction_Label);	29	super(GEFActionConstants.MATCH_SIZE, GEFMessages.get().MatchSizeAction_Label);
30	setImageDescriptor(InternalImages.DESC_MATCH_SIZE);	30	setImageDescriptor(InternalImages.DESC_MATCH_SIZE);
31	setDisabledImageDescriptor(InternalImages.DESC_MATCH_SIZE_DIS);	31	setDisabledImageDescriptor(InternalImages.DESC_MATCH_SIZE_DIS);
32	setToolTipText(GEFMessages.MatchSizeAction_Tooltip);	32	setToolTipText(GEFMessages.get().MatchSizeAction_Tooltip);
33	}	33	}
34		34
35	}	35	}

Lines 32-41 Link Here

(-)src/org/eclipse/gef/ui/actions/MatchWidthAction.java (-2 / +2 lines)
32	*/	32	*/
33	public MatchWidthAction(IWorkbenchPart part) {	33	public MatchWidthAction(IWorkbenchPart part) {
34	super(part);	34	super(part);
35	setText(GEFMessages.MatchWidthAction_Label);	35	setText(GEFMessages.get().MatchWidthAction_Label);
36	setImageDescriptor(InternalImages.DESC_MATCH_WIDTH);	36	setImageDescriptor(InternalImages.DESC_MATCH_WIDTH);
37	setDisabledImageDescriptor(InternalImages.DESC_MATCH_WIDTH_DIS);	37	setDisabledImageDescriptor(InternalImages.DESC_MATCH_WIDTH_DIS);
38	setToolTipText(GEFMessages.MatchWidthAction_Tooltip);	38	setToolTipText(GEFMessages.get().MatchWidthAction_Tooltip);
39	setId(GEFActionConstants.MATCH_WIDTH);	39	setId(GEFActionConstants.MATCH_WIDTH);
40	}	40	}
41		41

Lines 25-34 Link Here

(-)src/org/eclipse/gef/ui/actions/MatchWidthRetargetAction.java (-2 / +2 lines)
25	*/	25	*/
26	public MatchWidthRetargetAction() {	26	public MatchWidthRetargetAction() {
27	super(GEFActionConstants.MATCH_WIDTH,	27	super(GEFActionConstants.MATCH_WIDTH,
28	GEFMessages.MatchWidthAction_Label);	28	GEFMessages.get().MatchWidthAction_Label);
29	setImageDescriptor(InternalImages.DESC_MATCH_WIDTH);	29	setImageDescriptor(InternalImages.DESC_MATCH_WIDTH);
30	setDisabledImageDescriptor(InternalImages.DESC_MATCH_WIDTH_DIS);	30	setDisabledImageDescriptor(InternalImages.DESC_MATCH_WIDTH_DIS);
31	setToolTipText(GEFMessages.MatchWidthAction_Tooltip);	31	setToolTipText(GEFMessages.get().MatchWidthAction_Tooltip);
32	}	32	}
33		33
34	}	34	}

Lines 28-34 Link Here

(-)src/org/eclipse/gef/ui/actions/PasteRetargetAction.java (-1 / +1 lines)
28	* image.	28	* image.
29	*/	29	*/
30	public PasteRetargetAction() {	30	public PasteRetargetAction() {
31	super(ActionFactory.PASTE.getId(), GEFMessages.PasteAction_Label);	31	super(ActionFactory.PASTE.getId(), GEFMessages.get().PasteAction_Label);
32	ISharedImages sharedImages = PlatformUI.getWorkbench()	32	ISharedImages sharedImages = PlatformUI.getWorkbench()
33	.getSharedImages();	33	.getSharedImages();
34	setImageDescriptor(sharedImages	34	setImageDescriptor(sharedImages

Lines 52-59 Link Here

(-)src/org/eclipse/gef/ui/actions/PrintAction.java (-2 / +2 lines)
52	*/	52	*/
53	protected void init() {	53	protected void init() {
54	super.init();	54	super.init();
55	setText(GEFMessages.PrintAction_Label);	55	setText(GEFMessages.get().PrintAction_Label);
56	setToolTipText(GEFMessages.PrintAction_Tooltip);	56	setToolTipText(GEFMessages.get().PrintAction_Tooltip);
57	setId(ActionFactory.PRINT.getId());	57	setId(ActionFactory.PRINT.getId());
58	}	58	}
59		59




	 */
	protected void init() {
		super.init();
		setToolTipText(MessageFormat.format(GEFMessages.get().RedoAction_Tooltip,
				new Object[] { "" }).trim()); //$NON-NLS-1$
		setText(MessageFormat.format(GEFMessages.get().RedoAction_Label,
				new Object[] { "" }).trim() //$NON-NLS-1$
		);
		setId(ActionFactory.REDO.getId());

	 */
	protected void refresh() {
		Command redoCmd = getCommandStack().getRedoCommand();
		setToolTipText(MessageFormat.format(GEFMessages.get().RedoAction_Tooltip,
				new Object[] { getLabelForCommand(redoCmd) }).trim());
		setText(MessageFormat.format(GEFMessages.get().RedoAction_Label,
				new Object[] { getLabelForCommand(redoCmd) }).trim());
		super.refresh();
	}

Lines 29-35 Link Here

(-)src/org/eclipse/gef/ui/actions/RedoRetargetAction.java (-1 / +1 lines)
29	*/	29	*/
30	public RedoRetargetAction() {	30	public RedoRetargetAction() {
31	super(ActionFactory.REDO.getId(), MessageFormat.format(	31	super(ActionFactory.REDO.getId(), MessageFormat.format(
32	GEFMessages.RedoAction_Label, new Object[] { "" }).trim()); //$NON-NLS-1$	32	GEFMessages.get().RedoAction_Label, new Object[] { "" }).trim()); //$NON-NLS-1$
33	ISharedImages sharedImages = PlatformUI.getWorkbench()	33	ISharedImages sharedImages = PlatformUI.getWorkbench()
34	.getSharedImages();	34	.getSharedImages();
35	setImageDescriptor(sharedImages	35	setImageDescriptor(sharedImages

Lines 44-51 Link Here

(-)src/org/eclipse/gef/ui/actions/SaveAction.java (-2 / +2 lines)
44	*/	44	*/
45	protected void init() {	45	protected void init() {
46	setId(ActionFactory.SAVE.getId());	46	setId(ActionFactory.SAVE.getId());
47	setText(GEFMessages.SaveAction_Label);	47	setText(GEFMessages.get().SaveAction_Label);
48	setToolTipText(GEFMessages.SaveAction_Tooltip);	48	setToolTipText(GEFMessages.get().SaveAction_Tooltip);
49	}	49	}
50		50
51	/**	51	/**

Lines 39-46 Link Here

(-)src/org/eclipse/gef/ui/actions/SelectAllAction.java (-2 / +2 lines)
39	*/	39	*/
40	public SelectAllAction(IWorkbenchPart part) {	40	public SelectAllAction(IWorkbenchPart part) {
41	this.part = part;	41	this.part = part;
42	setText(GEFMessages.SelectAllAction_Label);	42	setText(GEFMessages.get().SelectAllAction_Label);
43	setToolTipText(GEFMessages.SelectAllAction_Tooltip);	43	setToolTipText(GEFMessages.get().SelectAllAction_Tooltip);
44	setId(ActionFactory.SELECT_ALL.getId());	44	setId(ActionFactory.SELECT_ALL.getId());
45	}	45	}
46		46

Lines 38-46 Link Here

(-)src/org/eclipse/gef/ui/actions/ToggleGridAction.java (-2 / +2 lines)
38	* properties are to be toggled	38	* properties are to be toggled
39	*/	39	*/
40	public ToggleGridAction(GraphicalViewer diagramViewer) {	40	public ToggleGridAction(GraphicalViewer diagramViewer) {
41	super(GEFMessages.ToggleGrid_Label, AS_CHECK_BOX);	41	super(GEFMessages.get().ToggleGrid_Label, AS_CHECK_BOX);
42	this.diagramViewer = diagramViewer;	42	this.diagramViewer = diagramViewer;
43	setToolTipText(GEFMessages.ToggleGrid_Tooltip);	43	setToolTipText(GEFMessages.get().ToggleGrid_Tooltip);
44	setId(GEFActionConstants.TOGGLE_GRID_VISIBILITY);	44	setId(GEFActionConstants.TOGGLE_GRID_VISIBILITY);
45	setActionDefinitionId(GEFActionConstants.TOGGLE_GRID_VISIBILITY);	45	setActionDefinitionId(GEFActionConstants.TOGGLE_GRID_VISIBILITY);
46	setChecked(isChecked());	46	setChecked(isChecked());

Lines 39-47 Link Here

(-)src/org/eclipse/gef/ui/actions/ToggleRulerVisibilityAction.java (-2 / +2 lines)
39	* the viewer whose ruler visibility property is to be toggled	39	* the viewer whose ruler visibility property is to be toggled
40	*/	40	*/
41	public ToggleRulerVisibilityAction(GraphicalViewer diagramViewer) {	41	public ToggleRulerVisibilityAction(GraphicalViewer diagramViewer) {
42	super(GEFMessages.ToggleRulerVisibility_Label, AS_CHECK_BOX);	42	super(GEFMessages.get().ToggleRulerVisibility_Label, AS_CHECK_BOX);
43	this.diagramViewer = diagramViewer;	43	this.diagramViewer = diagramViewer;
44	setToolTipText(GEFMessages.ToggleRulerVisibility_Tooltip);	44	setToolTipText(GEFMessages.get().ToggleRulerVisibility_Tooltip);
45	setId(GEFActionConstants.TOGGLE_RULER_VISIBILITY);	45	setId(GEFActionConstants.TOGGLE_RULER_VISIBILITY);
46	setActionDefinitionId(GEFActionConstants.TOGGLE_RULER_VISIBILITY);	46	setActionDefinitionId(GEFActionConstants.TOGGLE_RULER_VISIBILITY);
47	setChecked(isChecked());	47	setChecked(isChecked());

Lines 37-45 Link Here

(-)src/org/eclipse/gef/ui/actions/ToggleSnapToGeometryAction.java (-2 / +2 lines)
37	* toggled	37	* toggled
38	*/	38	*/
39	public ToggleSnapToGeometryAction(GraphicalViewer diagramViewer) {	39	public ToggleSnapToGeometryAction(GraphicalViewer diagramViewer) {
40	super(GEFMessages.ToggleSnapToGeometry_Label, AS_CHECK_BOX);	40	super(GEFMessages.get().ToggleSnapToGeometry_Label, AS_CHECK_BOX);
41	this.diagramViewer = diagramViewer;	41	this.diagramViewer = diagramViewer;
42	setToolTipText(GEFMessages.ToggleSnapToGeometry_Tooltip);	42	setToolTipText(GEFMessages.get().ToggleSnapToGeometry_Tooltip);
43	setId(GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY);	43	setId(GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY);
44	setActionDefinitionId(GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY);	44	setActionDefinitionId(GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY);
45	setChecked(isChecked());	45	setChecked(isChecked());




	 */
	protected void init() {
		super.init();
		setToolTipText(MessageFormat.format(GEFMessages.get().UndoAction_Tooltip,
				new Object[] { "" }).trim()); //$NON-NLS-1$
		setText(MessageFormat.format(GEFMessages.get().UndoAction_Label,
				new Object[] { "" }).trim() //$NON-NLS-1$
		);
		setId(ActionFactory.UNDO.getId());

	 */
	protected void refresh() {
		Command undoCmd = getCommandStack().getUndoCommand();
		setToolTipText(MessageFormat.format(GEFMessages.get().UndoAction_Tooltip,
				new Object[] { getLabelForCommand(undoCmd) }).trim());
		setText(MessageFormat.format(GEFMessages.get().UndoAction_Label,
				new Object[] { getLabelForCommand(undoCmd) }).trim());
		super.refresh();
	}

Lines 29-35 Link Here

(-)src/org/eclipse/gef/ui/actions/UndoRetargetAction.java (-1 / +1 lines)
29	*/	29	*/
30	public UndoRetargetAction() {	30	public UndoRetargetAction() {
31	super(ActionFactory.UNDO.getId(), MessageFormat.format(	31	super(ActionFactory.UNDO.getId(), MessageFormat.format(
32	GEFMessages.UndoAction_Label, new Object[] { "" }).trim()); //$NON-NLS-1$	32	GEFMessages.get().UndoAction_Label, new Object[] { "" }).trim()); //$NON-NLS-1$
33	ISharedImages sharedImages = PlatformUI.getWorkbench()	33	ISharedImages sharedImages = PlatformUI.getWorkbench()
34	.getSharedImages();	34	.getSharedImages();
35	setImageDescriptor(sharedImages	35	setImageDescriptor(sharedImages

Lines 26-34 Link Here

(-)src/org/eclipse/gef/ui/actions/ZoomInAction.java (-2 / +2 lines)
26	* the zoom manager	26	* the zoom manager
27	*/	27	*/
28	public ZoomInAction(ZoomManager zoomManager) {	28	public ZoomInAction(ZoomManager zoomManager) {
29	super(GEFMessages.ZoomIn_Label, InternalImages.DESC_ZOOM_IN,	29	super(GEFMessages.get().ZoomIn_Label, InternalImages.DESC_ZOOM_IN,
30	zoomManager);	30	zoomManager);
31	setToolTipText(GEFMessages.ZoomIn_Tooltip);	31	setToolTipText(GEFMessages.get().ZoomIn_Tooltip);
32	setId(GEFActionConstants.ZOOM_IN);	32	setId(GEFActionConstants.ZOOM_IN);
33	setActionDefinitionId(GEFActionConstants.ZOOM_IN);	33	setActionDefinitionId(GEFActionConstants.ZOOM_IN);
34	}	34	}

Lines 25-33 Link Here

(-)src/org/eclipse/gef/ui/actions/ZoomInRetargetAction.java (-2 / +2 lines)
25	*/	25	*/
26	public ZoomInRetargetAction() {	26	public ZoomInRetargetAction() {
27	super(null, null);	27	super(null, null);
28	setText(GEFMessages.ZoomIn_Label);	28	setText(GEFMessages.get().ZoomIn_Label);
29	setId(GEFActionConstants.ZOOM_IN);	29	setId(GEFActionConstants.ZOOM_IN);
30	setToolTipText(GEFMessages.ZoomIn_Tooltip);	30	setToolTipText(GEFMessages.get().ZoomIn_Tooltip);
31	setImageDescriptor(InternalImages.DESC_ZOOM_IN);	31	setImageDescriptor(InternalImages.DESC_ZOOM_IN);
32	setActionDefinitionId(GEFActionConstants.ZOOM_IN);	32	setActionDefinitionId(GEFActionConstants.ZOOM_IN);
33	}	33	}

Lines 26-35 Link Here

(-)src/org/eclipse/gef/ui/actions/ZoomOutAction.java (-2 / +2 lines)
26	* the zoom manager	26	* the zoom manager
27	*/	27	*/
28	public ZoomOutAction(ZoomManager zoomManager) {	28	public ZoomOutAction(ZoomManager zoomManager) {
29	super(GEFMessages.ZoomOut_Label, InternalImages.DESC_ZOOM_OUT,	29	super(GEFMessages.get().ZoomOut_Label, InternalImages.DESC_ZOOM_OUT,
30	zoomManager);	30	zoomManager);
31	setId(GEFActionConstants.ZOOM_OUT);	31	setId(GEFActionConstants.ZOOM_OUT);
32	setToolTipText(GEFMessages.ZoomOut_Tooltip);	32	setToolTipText(GEFMessages.get().ZoomOut_Tooltip);
33	setActionDefinitionId(GEFActionConstants.ZOOM_OUT);	33	setActionDefinitionId(GEFActionConstants.ZOOM_OUT);
34	}	34	}
35		35

Lines 25-33 Link Here

(-)src/org/eclipse/gef/ui/actions/ZoomOutRetargetAction.java (-2 / +2 lines)
25	*/	25	*/
26	public ZoomOutRetargetAction() {	26	public ZoomOutRetargetAction() {
27	super(null, null);	27	super(null, null);
28	setText(GEFMessages.ZoomOut_Label);	28	setText(GEFMessages.get().ZoomOut_Label);
29	setId(GEFActionConstants.ZOOM_OUT);	29	setId(GEFActionConstants.ZOOM_OUT);
30	setToolTipText(GEFMessages.ZoomOut_Tooltip);	30	setToolTipText(GEFMessages.get().ZoomOut_Tooltip);
31	setImageDescriptor(InternalImages.DESC_ZOOM_OUT);	31	setImageDescriptor(InternalImages.DESC_ZOOM_OUT);
32	setActionDefinitionId(GEFActionConstants.ZOOM_OUT);	32	setActionDefinitionId(GEFActionConstants.ZOOM_OUT);
33	}	33	}

Lines 30-36 Link Here

(-)src/org/eclipse/gef/ui/palette/ChangeIconSizeAction.java (-1 / +1 lines)
30	* action is manipulating	30	* action is manipulating
31	*/	31	*/
32	public ChangeIconSizeAction(PaletteViewerPreferences prefs) {	32	public ChangeIconSizeAction(PaletteViewerPreferences prefs) {
33	super(PaletteMessages.SETTINGS_USE_LARGE_ICONS_LABEL_CAPS);	33	super(PaletteMessages.get().SETTINGS_USE_LARGE_ICONS_LABEL_CAPS);
34	this.prefs = prefs;	34	this.prefs = prefs;
35	setChecked(prefs.useLargeIcons());	35	setChecked(prefs.useLargeIcons());
36	}	36	}

Lines 36-42 Link Here

(-)src/org/eclipse/gef/ui/palette/CustomizeAction.java (-1 / +1 lines)
36	*/	36	*/
37	public CustomizeAction(PaletteViewer palette) {	37	public CustomizeAction(PaletteViewer palette) {
38	super();	38	super();
39	setText(PaletteMessages.MENU_OPEN_CUSTOMIZE_DIALOG);	39	setText(PaletteMessages.get().MENU_OPEN_CUSTOMIZE_DIALOG);
40	paletteViewer = palette;	40	paletteViewer = palette;
41	}	41	}
42		42





	private class ResizeAction extends Action {
		public ResizeAction() {
			super(PaletteMessages.get().RESIZE_LABEL);
		}

		public boolean isEnabled() {

				0, 2);

		public TitleLabel(boolean isHorizontal) {
			super(GEFMessages.get().Palette_Label, InternalImages
					.get(InternalImages.IMG_PALETTE));
			setLabelAlignment(PositionConstants.LEFT);
			setBorder(BORDER);


		private String getButtonTooltipText() {
			if (isInState(STATE_COLLAPSED))
				return PaletteMessages.get().PALETTE_SHOW;
			return PaletteMessages.get().PALETTE_HIDE;
		}

		private void init() {

		private void provideAccSupport() {
			getAccessible().addAccessibleListener(new AccessibleAdapter() {
				public void getDescription(AccessibleEvent e) {
					e.result = PaletteMessages.get().ACC_DESC_PALETTE_BUTTON;
				}

				public void getHelp(AccessibleEvent e) {

			FONT_MGR.register(this);
			new TitleDragManager(this);
			final MenuManager manager = new MenuManager();
			MenuManager mgr = new MenuManager(PaletteMessages.get().DOCK_LABEL);
			mgr.add(new ChangeDockAction(PaletteMessages.get().LEFT_LABEL,
					PositionConstants.WEST));
			mgr.add(new ChangeDockAction(PaletteMessages.get().RIGHT_LABEL,
					PositionConstants.EAST));
			manager.add(new ResizeAction());
			manager.add(mgr);

		private void provideAccSupport() {
			getAccessible().addAccessibleListener(new AccessibleAdapter() {
				public void getDescription(AccessibleEvent e) {
					e.result = PaletteMessages.get().ACC_DESC_PALETTE_TITLE;
				}

				public void getHelp(AccessibleEvent e) {

				}

				public void getName(AccessibleEvent e) {
					e.result = GEFMessages.get().Palette_Label;
				}
			});
			getAccessible().addAccessibleControlListener(




	 *            saved
	 */
	public LayoutAction(PaletteViewerPreferences prefs, boolean hasIcon) {
		super(PaletteMessages.get().LAYOUT_MENU_LABEL);
		this.prefs = prefs;
		actions = createActions();
		setMenuCreator(this);

			setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
					"icons/palette_layout.gif")); //$NON-NLS-1$

		setToolTipText(PaletteMessages.get().LAYOUT_MENU_LABEL);
	}

	/**

			case PaletteViewerPreferences.LAYOUT_COLUMNS:
				action = new LayoutChangeAction(
						PaletteViewerPreferences.LAYOUT_COLUMNS);
				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.get().SETTINGS_LIST_VIEW_LABEL);
				list.add(action);
				break;
			case PaletteViewerPreferences.LAYOUT_ICONS:
				action = new LayoutChangeAction(
						PaletteViewerPreferences.LAYOUT_ICONS);
				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.get().SETTINGS_DETAILS_VIEW_LABEL);
				list.add(action);
				break;
			}




 *******************************************************************************/
package org.eclipse.gef.ui.palette;

import org.eclipse.rwt.RWT;

/**
 * @author Pratik Shah
 */
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 String CUSTOMIZE_DIALOG_TITLE;
	/**
	 * The "Drawer options:  "
	 */
	public String COLLAPSE_OPTIONS_TITLE;
	/**
	 * The "Layout options"
	 */
	public String SETTINGS_LAYOUT_OPTIONS_TITLE;
	/**
	 * The "&Apply"
	 */
	public String APPLY_LABEL;
	/**
	 * The "Move &Up"
	 */
	public String MOVE_UP_LABEL;
	/**
	 * The "Move Do&wn"
	 */
	public String MOVE_DOWN_LABEL;
	/**
	 * The "&Delete"
	 */
	public String DELETE_LABEL;
	/**
	 * The "&New"
	 */
	public String NEW_LABEL;
	/**
	 * The "&Columns"
	 */
	public String SETTINGS_COLUMNS_VIEW_LABEL;
	/**
	 * The "&List"
	 */
	public String SETTINGS_LIST_VIEW_LABEL;
	/**
	 * The "&Use large icons"
	 */
	public String SETTINGS_USE_LARGE_ICONS_LABEL;
	/**
	 * The "&Use Large Icons"
	 */
	public String SETTINGS_USE_LARGE_ICONS_LABEL_CAPS;
	/**
	 * The "&Icons only"
	 */
	public String SETTINGS_ICONS_VIEW_LABEL;
	/**
	 * The "&Icons Only"
	 */
	public String SETTINGS_ICONS_VIEW_LABEL_CAPS;
	/**
	 * The "&Never close"
	 */
	public String COLLAPSE_NEVER_LABEL;
	/**
	 * The "&Always close when opening another drawer"
	 */
	public String COLLAPSE_ALWAYS_LABEL;
	/**
	 * The "Close automatically &when there is not enough room"
	 */
	public String COLLAPSE_AS_NEEDED_LABEL;
	/**
	 * The "Nothing Selected"
	 */
	public String NO_SELECTION_TITLE;
	/**
	 * The "Na&me:  "
	 */
	public String NAME_LABEL;
	/**
	 * The "Des&cription:  "
	 */
	public String DESCRIPTION_LABEL;
	/**
	 * The "&Hide"
	 */
	public String HIDDEN_LABEL;
	/**
	 * The "No description is available."
	 */
	public String NO_DESCRIPTION_AVAILABLE;
	/**
	 * The "Select a node from the tree on the left."
	 */
	public String NO_SELECTION_MADE;
	/**
	 * The "Cus&tomize..."
	 */
	public String MENU_OPEN_CUSTOMIZE_DIALOG;
	/**
	 * The "Drawer"
	 */
	public String MODEL_TYPE_DRAWER;
	/**
	 * The "Separator"
	 */
	public String MODEL_TYPE_SEPARATOR;
	/**
	 * The "Stack"
	 */
	public String MODEL_TYPE_STACK;
	/**
	 * The "Separates entries in a palette container"
	 */
	public String NEW_SEPARATOR_DESC;
	/**
	 * The "New Drawer"
	 */
	public String NEW_DRAWER_LABEL;
	/**
	 * The "[Separator]"
	 */
	public String NEW_SEPARATOR_LABEL;
	/**
	 * The "New Stack"
	 */
	public String NEW_STACK_LABEL;
	/**
	 * The "Group"
	 */
	public String MODEL_TYPE_GROUP;
	/**
	 * The "New Group"
	 */
	public String NEW_GROUP_LABEL;
	/**
	 * The "&Layout"
	 */
	public String LAYOUT_MENU_LABEL;
	/**
	 * The "Could Not Accept Changes"
	 */
	public String ERROR;
	/**
	 * The "The currently displayed page contains invalid values."
	 */
	public String ABORT_PAGE_FLIPPING_MESSAGE;
	/**
	 * The "&Settings..."
	 */
	public String MENU_OPEN_SETTINGS_DIALOG;
	/**
	 * The "Palette Settings"
	 */
	public String SETTINGS_DIALOG_TITLE;
	/**
	 * The "&Details"
	 */
	public String SETTINGS_DETAILS_VIEW_LABEL;
	/**
	 * The "Font"
	 */
	public String SETTINGS_FONT_TITLE;
	/**
	 * The "C&hange..."
	 */
	public String SETTINGS_FONT_CHANGE;
	/**
	 * The "Font:  "
	 */
	public String SETTINGS_FONT_CURRENT;
	/**
	 * The "Layout:  "
	 */
	public String SETTINGS_LAYOUT_TITLE;
	/**
	 * The "Drawer Options"
	 */
	public String SETTINGS_DRAWER_OPTIONS_TITLE;
	/**
	 * The "&Open drawer at start-up"
	 */
	public String EXPAND_DRAWER_AT_STARTUP_LABEL;
	/**
	 * The "Columns layout options"
	 */
	public String SETTINGS_OPTIONS_COLUMNS;
	/**
	 * The "List layout options"
	 */
	public String SETTINGS_OPTIONS_LIST;
	/**
	 * The " layout options"
	 */
	public String SETTINGS_OPTIONS_ICONS_ONLY;
	/**
	 * The "Details layout options"
	 */
	public String SETTINGS_OPTIONS_DETAILS;
	/**
	 * The "&Override default column width settings"
	 */
	public String SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH;
	/**
	 * The "Colu&mn width (in pixels):  "
	 */
	public String SETTINGS_LAYOUT_COLUMNS_WIDTH;
	/**
	 * The "&Pin drawer open at start-up"
	 */
	public String DRAWER_PIN_AT_STARTUP;
	/**
	 * The "&Restore Default"
	 */
	public String SETTINGS_DEFAULT_FONT;
	/**
	 * The "<Using Workbench Dialog Font>"
	 */
	public String SETTINGS_WORKBENCH_FONT_LABEL;
	/**
	 * The "-"
	 */
	public String NAME_DESCRIPTION_SEPARATOR;
	/**
	 * The "&Pinned"
	 */
	public String PINNED;
	/**
	 * The "Pin Open"
	 */
	public String TOOLTIP_PIN_FIGURE;

	/**
	 * The "Unpin"
	 */
	public String TOOLTIP_UNPIN_FIGURE;

	/**
	 * The "&Dock On"
	 */
	public String DOCK_LABEL;

	/**
	 * The "&Left"
	 */
	public String LEFT_LABEL;

	/**
	 * The "&Right"
	 */
	public String RIGHT_LABEL;

	/**
	 * The "&Resize"
	 */
	public String RESIZE_LABEL;

	/**
	 * Showe
	 */
	public String PALETTE_SHOW;

	/**
	 * Hidee
	 */
	public String PALETTE_HIDE;

	/**
	 * This is used to show or hide the palette.
	 */
	public String ACC_DESC_PALETTE_BUTTON;

	/**
	 * The can be moved or resized through the context menu for this cont
	 * control.
	 */
	public String ACC_DESC_PALETTE_TITLE;

	// static {
	// NLS.initializeMessages(
	//				"org.eclipse.gef.ui.palette.messages", PaletteMessages.get().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;
	}

}

Lines 35-41 Link Here

(-)src/org/eclipse/gef/ui/palette/PinDrawerAction.java (-2 / +2 lines)
35	this.pinnableEditPart = drawer;	35	this.pinnableEditPart = drawer;
36	setChecked(drawer.isPinnedOpen());	36	setChecked(drawer.isPinnedOpen());
37	setEnabled(drawer.isExpanded());	37	setEnabled(drawer.isExpanded());
38	setText(PaletteMessages.PINNED);	38	setText(PaletteMessages.get().PINNED);
39	}	39	}
40		40
41	/**	41	/**
Lines 49-55 Link Here
49	this.pinnableEditPart = pinnableEditPart;	49	this.pinnableEditPart = pinnableEditPart;
50	setChecked(pinnableEditPart.isPinnedOpen());	50	setChecked(pinnableEditPart.isPinnedOpen());
51	setEnabled(pinnableEditPart.isExpanded());	51	setEnabled(pinnableEditPart.isExpanded());
52	setText(PaletteMessages.PINNED);	52	setText(PaletteMessages.get().PINNED);
53	}	53	}
54		54
55	/**	55	/**

Lines 32-38 Link Here

(-)src/org/eclipse/gef/ui/palette/SettingsAction.java (-1 / +1 lines)
32	*/	32	*/
33	public SettingsAction(PaletteViewer palette) {	33	public SettingsAction(PaletteViewer palette) {
34	super();	34	super();
35	setText(PaletteMessages.MENU_OPEN_SETTINGS_DIALOG);	35	setText(PaletteMessages.get().MENU_OPEN_SETTINGS_DIALOG);
36	paletteViewer = palette;	36	paletteViewer = palette;
37	}	37	}
38		38




		panel.setLayout(gridLayout);
		Control[] tablist = new Control[3];

		createLabel(panel, SWT.NONE, PaletteMessages.get().NAME_LABEL);
		tablist[0] = createNameText(panel);

		createLabel(panel, SWT.NONE, PaletteMessages.get().DESCRIPTION_LABEL);
		tablist[1] = createDescText(panel);

		tablist[2] = createHiddenCheckBox(panel);

	protected Button createHiddenCheckBox(Composite panel) {
		Button hidden = new Button(panel, SWT.CHECK);
		hidden.setFont(panel.getFont());
		hidden.setText(PaletteMessages.get().HIDDEN_LABEL);
		hidden.setSelection(!entry.isVisible());

		if (getPermission() == PaletteEntry.PERMISSION_NO_MODIFICATION) {




	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
	 */
	protected void configureShell(Shell newShell) {
		newShell.setText(PaletteMessages.get().CUSTOMIZE_DIALOG_TITLE);
		super.configureShell(newShell);
	}


	 */
	protected void createButtonsForButtonBar(Composite parent) {
		super.createButtonsForButtonBar(parent);
		createButton(parent, APPLY_ID, PaletteMessages.get().APPLY_LABEL, false);
	}

	/**

		layout.verticalSpacing = 0;
		titlePage.setLayout(layout);
		title = createSectionTitle(titlePage,
				PaletteMessages.get().NO_SELECTION_TITLE);

		errorPage = new Composite(book, SWT.NONE);
		errorPage.setFont(book.getFont());


		if (errorMessage != null) {
			MessageDialog dialog = new MessageDialog(getShell(),
					PaletteMessages.get().ERROR,
					null,
					PaletteMessages.get().ABORT_PAGE_FLIPPING_MESSAGE
							+ "\n" + errorMessage, //$NON-NLS-1$
					MessageDialog.ERROR,
					new String[] { IDialogConstants.get().OK_LABEL }, 0);

			setActiveEntryPage(panel);
		} else {
			title.setImage(null);
			title.setText(PaletteMessages.get().NO_SELECTION_TITLE);
			// Lazy creation
			if (noSelectionPage == null) {
				noSelectionPage = new EntryPage() {

							PaletteEntry entry) {
						text = new Text(parent, SWT.READ_ONLY);
						text.setFont(parent.getFont());
						text.setText(PaletteMessages.get().NO_SELECTION_MADE);
					}

					public Control getControl() {

	private class DeleteAction extends PaletteCustomizationAction {
		public DeleteAction() {
			setEnabled(false);
			setText(PaletteMessages.get().DELETE_LABEL);
			ISharedImages sharedImages = PlatformUI.getWorkbench()
					.getSharedImages();
			setImageDescriptor(sharedImages

	private class MoveDownAction extends PaletteCustomizationAction {
		public MoveDownAction() {
			setEnabled(false);
			setText(PaletteMessages.get().MOVE_DOWN_LABEL);
			setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
					"icons/next_nav.gif"));//$NON-NLS-1$
			setDisabledImageDescriptor(ImageDescriptor.createFromFile(

	private class MoveUpAction extends PaletteCustomizationAction {
		public MoveUpAction() {
			setEnabled(false);
			setText(PaletteMessages.get().MOVE_UP_LABEL);
			setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
					"icons/prev_nav.gif"));//$NON-NLS-1$
			setDisabledImageDescriptor(ImageDescriptor.createFromFile(

				setMenuCreator(this);
			}

			setText(PaletteMessages.get().NEW_LABEL);
			setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
					"icons/add.gif")); //$NON-NLS-1$
			setDisabledImageDescriptor(ImageDescriptor.createFromFile(




	 * Constructor
	 */
	public PaletteDrawerFactory() {
		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.get().NEW_DRAWER_LABEL);
		entry.setUserModificationPermission(PaletteEntry.PERMISSION_FULL_MODIFICATION);
		return entry;
	}




	 * Constructor
	 */
	public PaletteGroupFactory() {
		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.get().NEW_GROUP_LABEL);
		group.setUserModificationPermission(PaletteEntry.PERMISSION_FULL_MODIFICATION);
		return group;
	}

Lines 28-34 Link Here

(-)src/org/eclipse/gef/ui/palette/customize/PaletteSeparatorFactory.java (-1 / +1 lines)
28	* Constructor	28	* Constructor
29	*/	29	*/
30	public PaletteSeparatorFactory() {	30	public PaletteSeparatorFactory() {
31	setLabel(PaletteMessages.MODEL_TYPE_SEPARATOR);	31	setLabel(PaletteMessages.get().MODEL_TYPE_SEPARATOR);
32	}	32	}
33		33
34	/**	34	/**




	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
	 */
	protected void configureShell(Shell newShell) {
		newShell.setText(PaletteMessages.get().SETTINGS_DIALOG_TITLE);
		super.configureShell(newShell);
	}



		Label label = new Label(composite, SWT.NONE);
		label.setFont(composite.getFont());
		label.setText(PaletteMessages.get().COLLAPSE_OPTIONS_TITLE);
		GridData data = new GridData();
		label.setLayoutData(data);

		Button b = createButton(composite, COLLAPSE_ALWAYS_ID,
				PaletteMessages.get().COLLAPSE_ALWAYS_LABEL, SWT.RADIO, null);
		((GridData) b.getLayoutData()).horizontalIndent = 5;

		b = createButton(composite, COLLAPSE_NEEDED_ID,
				PaletteMessages.get().COLLAPSE_AS_NEEDED_LABEL, SWT.RADIO, null);
		((GridData) b.getLayoutData()).horizontalIndent = 5;

		b = createButton(composite, COLLAPSE_NEVER_ID,
				PaletteMessages.get().COLLAPSE_NEVER_LABEL, SWT.RADIO, null);
		((GridData) b.getLayoutData()).horizontalIndent = 5;

		// Load auto - collapse settings

	 */
	protected Control createDetailsOptions(Composite parent) {
		Control contents = createOptionsPage(parent,
				PaletteMessages.get().SETTINGS_OPTIONS_DETAILS,
				LAYOUT_DETAILS_ICON_SIZE_ID);
		getButton(LAYOUT_DETAILS_ICON_SIZE_ID).setSelection(
				prefs.useLargeIcons(PaletteViewerPreferences.LAYOUT_DETAILS));

	 */
	protected Control createColumnsOptions(Composite parent) {
		Composite contents = (Composite) createOptionsPage(parent,
				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.get().SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH, SWT.CHECK,
		// null);
		// ((GridData)button.getLayoutData()).horizontalSpan = 2;
		//

		//
		// final Label label = new Label(container, SWT.NONE);
		// label.setFont(container.getFont());
		// label.setText(PaletteMessages.get().SETTINGS_LAYOUT_COLUMNS_WIDTH);
		// data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING
		// | GridData.VERTICAL_ALIGN_BEGINNING);
		// label.setLayoutData(data);

		updateFontName();

		createButton(container, FONT_CHANGE_ID,
				PaletteMessages.get().SETTINGS_FONT_CHANGE, SWT.PUSH, null);

		createButton(container, DEFAULT_FONT_ID,
				PaletteMessages.get().SETTINGS_DEFAULT_FONT, SWT.PUSH, null);

		return container;
	}

	 */
	protected Control createIconsOnlyOptions(Composite parent) {
		Control contents = createOptionsPage(parent,
				PaletteMessages.get().SETTINGS_OPTIONS_ICONS_ONLY,
				LAYOUT_ICONS_ICON_SIZE_ID);
		getButton(LAYOUT_ICONS_ICON_SIZE_ID).setSelection(
				prefs.useLargeIcons(PaletteViewerPreferences.LAYOUT_ICONS));


		Label label = new Label(composite, SWT.NONE);
		label.setFont(composite.getFont());
		label.setText(PaletteMessages.get().SETTINGS_LAYOUT_TITLE);
		GridData data = new GridData();
		label.setLayoutData(data);


			switch (modes[i]) {
			case PaletteViewerPreferences.LAYOUT_COLUMNS:
				b = createButton(composite, LAYOUT_COLUMNS_VIEW_ID,
						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.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.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.get().SETTINGS_DETAILS_VIEW_LABEL, SWT.RADIO,
						null);
				((GridData) b.getLayoutData()).horizontalIndent = 5;
				break;

	 */
	protected Control createListOptions(Composite parent) {
		Control composite = createOptionsPage(parent,
				PaletteMessages.get().SETTINGS_OPTIONS_LIST, LAYOUT_LIST_ICON_SIZE_ID);
		getButton(LAYOUT_LIST_ICON_SIZE_ID).setSelection(
				prefs.useLargeIcons(PaletteViewerPreferences.LAYOUT_LIST));
		return composite;

		contents.setText(title);

		createButton(contents, buttonId,
				PaletteMessages.get().SETTINGS_USE_LARGE_ICONS_LABEL, SWT.CHECK, null);

		return contents;
	}

		String name;
		if (prefs.getFontData().equals(
				(JFaceResources.getDialogFont().getFontData()[0]))) {
			name = PaletteMessages.get().SETTINGS_WORKBENCH_FONT_LABEL;
		} else {
			name = StringConverter.asString(prefs.getFontData());
		}
		fontName.setText(PaletteMessages.get().SETTINGS_FONT_CURRENT + name);
	}

}





	/**
	 * Creates a new PaletteStackFactory with label
	 * PaletteMessages.get().MODEL_TYPE_STACK
	 */
	public PaletteStackFactory() {
		setLabel(PaletteMessages.get().MODEL_TYPE_STACK);
	}

	/**

	 * @see org.eclipse.gef.ui.palette.customize.PaletteEntryFactory#createNewEntry(Shell)
	 */
	protected PaletteEntry createNewEntry(Shell shell) {
		return new PaletteStack(PaletteMessages.get().NEW_STACK_LABEL, null, null);
	}

	/**

Lines 300-306 Link Here

(-)src/org/eclipse/gef/ui/palette/editparts/PaletteEditPart.java (-1 / +1 lines)
300	if (needName)	300	if (needName)
301	text = entry.getLabel()	301	text = entry.getLabel()
302	+ " " //$NON-NLS-1$	302	+ " " //$NON-NLS-1$
303	+ PaletteMessages.NAME_DESCRIPTION_SEPARATOR	303	+ PaletteMessages.get().NAME_DESCRIPTION_SEPARATOR
304	+ " " + desc; //$NON-NLS-1$	304	+ " " + desc; //$NON-NLS-1$
305	else	305	else
306	text = desc;	306	text = desc;

Lines 63-69 Link Here

(-)src/org/eclipse/gef/ui/properties/SetPropertyValueCommand.java (-1 / +1 lines)
63	*/	63	*/
64	public SetPropertyValueCommand(String propertyLabel,	64	public SetPropertyValueCommand(String propertyLabel,
65	IPropertySource propertySource, Object propertyId, Object newValue) {	65	IPropertySource propertySource, Object propertyId, Object newValue) {
66	super(MessageFormat.format(GEFMessages.SetPropertyValueCommand_Label,	66	super(MessageFormat.format(GEFMessages.get().SetPropertyValueCommand_Label,
67	new Object[] { propertyLabel }).trim());	67	new Object[] { propertyLabel }).trim());
68	this.propertySource = propertySource;	68	this.propertySource = propertySource;
69	this.propertyId = propertyId;	69	this.propertyId = propertyId;

Lines 66-72 Link Here

(-)src/org/eclipse/gef/ui/views/palette/PaletteView.java (-1 / +1 lines)
66	MessagePage page = new MessagePage();	66	MessagePage page = new MessagePage();
67	initPage(page);	67	initPage(page);
68	page.createControl(book);	68	page.createControl(book);
69	page.setMessage(GEFMessages.Palette_Not_Available);	69	page.setMessage(GEFMessages.get().Palette_Not_Available);
70	return page;	70	return page;
71	}	71	}
72		72




 *******************************************************************************/
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;

import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
import org.eclipse.gef.ui.actions.ZoomInRetargetAction;
import org.eclipse.gef.ui.actions.ZoomOutRetargetAction;
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 {



		addRetargetAction(new RetargetAction(
				GEFActionConstants.TOGGLE_RULER_VISIBILITY,
				GEFMessages.get().ToggleRulerVisibility_Label, IAction.AS_CHECK_BOX));

		addRetargetAction(new RetargetAction(
				GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY,
				GEFMessages.get().ToggleSnapToGeometry_Label, IAction.AS_CHECK_BOX));

		addRetargetAction(new RetargetAction(
				GEFActionConstants.TOGGLE_GRID_VISIBILITY,
				GEFMessages.get().ToggleGrid_Label, IAction.AS_CHECK_BOX));
	}

	/**

Return to bug 359077

Lines 197-244 Link Here

(-)src/org/eclipse/gef/ui/actions/AlignmentAction.java (-12 / +12 lines)
197	switch (alignment) {	197	switch (alignment) {
198	case PositionConstants.LEFT:	198	case PositionConstants.LEFT:
199	setId(GEFActionConstants.ALIGN_LEFT);	199	setId(GEFActionConstants.ALIGN_LEFT);
200	setText(GEFMessages.AlignLeftAction_Label);	200	setText(GEFMessages.get().AlignLeftAction_Label);
201	setToolTipText(GEFMessages.AlignLeftAction_Tooltip);	201	setToolTipText(GEFMessages.get().AlignLeftAction_Tooltip);
202	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT);	202	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT);
203	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT_DIS);	203	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT_DIS);
204	break;	204	break;
205		205
206	case PositionConstants.RIGHT:	206	case PositionConstants.RIGHT:
207	setId(GEFActionConstants.ALIGN_RIGHT);	207	setId(GEFActionConstants.ALIGN_RIGHT);
208	setText(GEFMessages.AlignRightAction_Label);	208	setText(GEFMessages.get().AlignRightAction_Label);
209	setToolTipText(GEFMessages.AlignRightAction_Tooltip);	209	setToolTipText(GEFMessages.get().AlignRightAction_Tooltip);
210	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT);	210	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT);
211	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT_DIS);	211	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT_DIS);
212	break;	212	break;
213		213
214	case PositionConstants.TOP:	214	case PositionConstants.TOP:
215	setId(GEFActionConstants.ALIGN_TOP);	215	setId(GEFActionConstants.ALIGN_TOP);
216	setText(GEFMessages.AlignTopAction_Label);	216	setText(GEFMessages.get().AlignTopAction_Label);
217	setToolTipText(GEFMessages.AlignTopAction_Tooltip);	217	setToolTipText(GEFMessages.get().AlignTopAction_Tooltip);
218	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);	218	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);
219	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);	219	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);
220	break;	220	break;
221		221
222	case PositionConstants.BOTTOM:	222	case PositionConstants.BOTTOM:
223	setId(GEFActionConstants.ALIGN_BOTTOM);	223	setId(GEFActionConstants.ALIGN_BOTTOM);
224	setText(GEFMessages.AlignBottomAction_Label);	224	setText(GEFMessages.get().AlignBottomAction_Label);
225	setToolTipText(GEFMessages.AlignBottomAction_Tooltip);	225	setToolTipText(GEFMessages.get().AlignBottomAction_Tooltip);
226	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM);	226	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM);
227	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM_DIS);	227	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM_DIS);
228	break;	228	break;
229		229
230	case PositionConstants.CENTER:	230	case PositionConstants.CENTER:
231	setId(GEFActionConstants.ALIGN_CENTER);	231	setId(GEFActionConstants.ALIGN_CENTER);
232	setText(GEFMessages.AlignCenterAction_Label);	232	setText(GEFMessages.get().AlignCenterAction_Label);
233	setToolTipText(GEFMessages.AlignCenterAction_Tooltip);	233	setToolTipText(GEFMessages.get().AlignCenterAction_Tooltip);
234	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER);	234	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER);
235	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER_DIS);	235	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER_DIS);
236	break;	236	break;
237		237
238	case PositionConstants.MIDDLE:	238	case PositionConstants.MIDDLE:
239	setId(GEFActionConstants.ALIGN_MIDDLE);	239	setId(GEFActionConstants.ALIGN_MIDDLE);
240	setText(GEFMessages.AlignMiddleAction_Label);	240	setText(GEFMessages.get().AlignMiddleAction_Label);
241	setToolTipText(GEFMessages.AlignMiddleAction_Tooltip);	241	setToolTipText(GEFMessages.get().AlignMiddleAction_Tooltip);
242	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE);	242	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE);
243	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE_DIS);	243	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE_DIS);
244	break;	244	break;

Lines 900-906 Link Here

(-)src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java (-10 / +10 lines)
900		900
901	private class ResizeAction extends Action {	901	private class ResizeAction extends Action {
902	public ResizeAction() {	902	public ResizeAction() {
903	super(PaletteMessages.RESIZE_LABEL);	903	super(PaletteMessages.get().RESIZE_LABEL);
904	}	904	}
905		905
906	public boolean isEnabled() {	906	public boolean isEnabled() {
Lines 1153-1159 Link Here
1153	0, 2);	1153	0, 2);
1154		1154
1155	public TitleLabel(boolean isHorizontal) {	1155	public TitleLabel(boolean isHorizontal) {
1156	super(GEFMessages.Palette_Label, InternalImages	1156	super(GEFMessages.get().Palette_Label, InternalImages
1157	.get(InternalImages.IMG_PALETTE));	1157	.get(InternalImages.IMG_PALETTE));
1158	setLabelAlignment(PositionConstants.LEFT);	1158	setLabelAlignment(PositionConstants.LEFT);
1159	setBorder(BORDER);	1159	setBorder(BORDER);
Lines 1235-1242 Link Here
1235		1235
1236	private String getButtonTooltipText() {	1236	private String getButtonTooltipText() {
1237	if (isInState(STATE_COLLAPSED))	1237	if (isInState(STATE_COLLAPSED))
1238	return PaletteMessages.PALETTE_SHOW;	1238	return PaletteMessages.get().PALETTE_SHOW;
1239	return PaletteMessages.PALETTE_HIDE;	1239	return PaletteMessages.get().PALETTE_HIDE;
1240	}	1240	}
1241		1241
1242	private void init() {	1242	private void init() {
Lines 1271-1277 Link Here
1271	private void provideAccSupport() {	1271	private void provideAccSupport() {
1272	getAccessible().addAccessibleListener(new AccessibleAdapter() {	1272	getAccessible().addAccessibleListener(new AccessibleAdapter() {
1273	public void getDescription(AccessibleEvent e) {	1273	public void getDescription(AccessibleEvent e) {
1274	e.result = PaletteMessages.ACC_DESC_PALETTE_BUTTON;	1274	e.result = PaletteMessages.get().ACC_DESC_PALETTE_BUTTON;
1275	}	1275	}
1276		1276
1277	public void getHelp(AccessibleEvent e) {	1277	public void getHelp(AccessibleEvent e) {
Lines 1386-1395 Link Here
1386	FONT_MGR.register(this);	1386	FONT_MGR.register(this);
1387	new TitleDragManager(this);	1387	new TitleDragManager(this);
1388	final MenuManager manager = new MenuManager();	1388	final MenuManager manager = new MenuManager();
1389	MenuManager mgr = new MenuManager(PaletteMessages.DOCK_LABEL);	1389	MenuManager mgr = new MenuManager(PaletteMessages.get().DOCK_LABEL);
1390	mgr.add(new ChangeDockAction(PaletteMessages.LEFT_LABEL,	1390	mgr.add(new ChangeDockAction(PaletteMessages.get().LEFT_LABEL,
1391	PositionConstants.WEST));	1391	PositionConstants.WEST));
1392	mgr.add(new ChangeDockAction(PaletteMessages.RIGHT_LABEL,	1392	mgr.add(new ChangeDockAction(PaletteMessages.get().RIGHT_LABEL,
1393	PositionConstants.EAST));	1393	PositionConstants.EAST));
1394	manager.add(new ResizeAction());	1394	manager.add(new ResizeAction());
1395	manager.add(mgr);	1395	manager.add(mgr);
Lines 1414-1420 Link Here
1414	private void provideAccSupport() {	1414	private void provideAccSupport() {
1415	getAccessible().addAccessibleListener(new AccessibleAdapter() {	1415	getAccessible().addAccessibleListener(new AccessibleAdapter() {
1416	public void getDescription(AccessibleEvent e) {	1416	public void getDescription(AccessibleEvent e) {
1417	e.result = PaletteMessages.ACC_DESC_PALETTE_TITLE;	1417	e.result = PaletteMessages.get().ACC_DESC_PALETTE_TITLE;
1418	}	1418	}
1419		1419
1420	public void getHelp(AccessibleEvent e) {	1420	public void getHelp(AccessibleEvent e) {
Lines 1422-1428 Link Here
1422	}	1422	}
1423		1423
1424	public void getName(AccessibleEvent e) {	1424	public void getName(AccessibleEvent e) {
1425	e.result = GEFMessages.Palette_Label;	1425	e.result = GEFMessages.get().Palette_Label;
1426	}	1426	}
1427	});	1427	});
1428	getAccessible().addAccessibleControlListener(	1428	getAccessible().addAccessibleControlListener(

Lines 264-270 Link Here

(-)src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java (-11 / +11 lines)
264	* @see org.eclipse.jface.window.Window#configureShell(Shell)	264	* @see org.eclipse.jface.window.Window#configureShell(Shell)
265	*/	265	*/
266	protected void configureShell(Shell newShell) {	266	protected void configureShell(Shell newShell) {
267	newShell.setText(PaletteMessages.CUSTOMIZE_DIALOG_TITLE);	267	newShell.setText(PaletteMessages.get().CUSTOMIZE_DIALOG_TITLE);
268	super.configureShell(newShell);	268	super.configureShell(newShell);
269	}	269	}
270		270
Lines 333-339 Link Here
333	*/	333	*/
334	protected void createButtonsForButtonBar(Composite parent) {	334	protected void createButtonsForButtonBar(Composite parent) {
335	super.createButtonsForButtonBar(parent);	335	super.createButtonsForButtonBar(parent);
336	createButton(parent, APPLY_ID, PaletteMessages.APPLY_LABEL, false);	336	createButton(parent, APPLY_ID, PaletteMessages.get().APPLY_LABEL, false);
337	}	337	}
338		338
339	/**	339	/**
Lines 681-687 Link Here
681	layout.verticalSpacing = 0;	681	layout.verticalSpacing = 0;
682	titlePage.setLayout(layout);	682	titlePage.setLayout(layout);
683	title = createSectionTitle(titlePage,	683	title = createSectionTitle(titlePage,
684	PaletteMessages.NO_SELECTION_TITLE);	684	PaletteMessages.get().NO_SELECTION_TITLE);
685		685
686	errorPage = new Composite(book, SWT.NONE);	686	errorPage = new Composite(book, SWT.NONE);
687	errorPage.setFont(book.getFont());	687	errorPage.setFont(book.getFont());
Lines 944-952 Link Here
944		944
945	if (errorMessage != null) {	945	if (errorMessage != null) {
946	MessageDialog dialog = new MessageDialog(getShell(),	946	MessageDialog dialog = new MessageDialog(getShell(),
947	PaletteMessages.ERROR,	947	PaletteMessages.get().ERROR,
948	null,	948	null,
949	PaletteMessages.ABORT_PAGE_FLIPPING_MESSAGE	949	PaletteMessages.get().ABORT_PAGE_FLIPPING_MESSAGE
950	+ "\n" + errorMessage, //$NON-NLS-1$	950	+ "\n" + errorMessage, //$NON-NLS-1$
951	MessageDialog.ERROR,	951	MessageDialog.ERROR,
952	new String[] { IDialogConstants.get().OK_LABEL }, 0);	952	new String[] { IDialogConstants.get().OK_LABEL }, 0);
Lines 1006-1012 Link Here
1006	setActiveEntryPage(panel);	1006	setActiveEntryPage(panel);
1007	} else {	1007	} else {
1008	title.setImage(null);	1008	title.setImage(null);
1009	title.setText(PaletteMessages.NO_SELECTION_TITLE);	1009	title.setText(PaletteMessages.get().NO_SELECTION_TITLE);
1010	// Lazy creation	1010	// Lazy creation
1011	if (noSelectionPage == null) {	1011	if (noSelectionPage == null) {
1012	noSelectionPage = new EntryPage() {	1012	noSelectionPage = new EntryPage() {
Lines 1019-1025 Link Here
1019	PaletteEntry entry) {	1019	PaletteEntry entry) {
1020	text = new Text(parent, SWT.READ_ONLY);	1020	text = new Text(parent, SWT.READ_ONLY);
1021	text.setFont(parent.getFont());	1021	text.setFont(parent.getFont());
1022	text.setText(PaletteMessages.NO_SELECTION_MADE);	1022	text.setText(PaletteMessages.get().NO_SELECTION_MADE);
1023	}	1023	}
1024		1024
1025	public Control getControl() {	1025	public Control getControl() {
Lines 1136-1142 Link Here
1136	private class DeleteAction extends PaletteCustomizationAction {	1136	private class DeleteAction extends PaletteCustomizationAction {
1137	public DeleteAction() {	1137	public DeleteAction() {
1138	setEnabled(false);	1138	setEnabled(false);
1139	setText(PaletteMessages.DELETE_LABEL);	1139	setText(PaletteMessages.get().DELETE_LABEL);
1140	ISharedImages sharedImages = PlatformUI.getWorkbench()	1140	ISharedImages sharedImages = PlatformUI.getWorkbench()
1141	.getSharedImages();	1141	.getSharedImages();
1142	setImageDescriptor(sharedImages	1142	setImageDescriptor(sharedImages
Lines 1165-1171 Link Here
1165	private class MoveDownAction extends PaletteCustomizationAction {	1165	private class MoveDownAction extends PaletteCustomizationAction {
1166	public MoveDownAction() {	1166	public MoveDownAction() {
1167	setEnabled(false);	1167	setEnabled(false);
1168	setText(PaletteMessages.MOVE_DOWN_LABEL);	1168	setText(PaletteMessages.get().MOVE_DOWN_LABEL);
1169	setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,	1169	setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
1170	"icons/next_nav.gif"));//$NON-NLS-1$	1170	"icons/next_nav.gif"));//$NON-NLS-1$
1171	setDisabledImageDescriptor(ImageDescriptor.createFromFile(	1171	setDisabledImageDescriptor(ImageDescriptor.createFromFile(
Lines 1192-1198 Link Here
1192	private class MoveUpAction extends PaletteCustomizationAction {	1192	private class MoveUpAction extends PaletteCustomizationAction {
1193	public MoveUpAction() {	1193	public MoveUpAction() {
1194	setEnabled(false);	1194	setEnabled(false);
1195	setText(PaletteMessages.MOVE_UP_LABEL);	1195	setText(PaletteMessages.get().MOVE_UP_LABEL);
1196	setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,	1196	setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
1197	"icons/prev_nav.gif"));//$NON-NLS-1$	1197	"icons/prev_nav.gif"));//$NON-NLS-1$
1198	setDisabledImageDescriptor(ImageDescriptor.createFromFile(	1198	setDisabledImageDescriptor(ImageDescriptor.createFromFile(
Lines 1229-1235 Link Here
1229	setMenuCreator(this);	1229	setMenuCreator(this);
1230	}	1230	}
1231		1231
1232	setText(PaletteMessages.NEW_LABEL);	1232	setText(PaletteMessages.get().NEW_LABEL);
1233	setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,	1233	setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
1234	"icons/add.gif")); //$NON-NLS-1$	1234	"icons/add.gif")); //$NON-NLS-1$
1235	setDisabledImageDescriptor(ImageDescriptor.createFromFile(	1235	setDisabledImageDescriptor(ImageDescriptor.createFromFile(

Lines 23-36 Link Here

(-)src/org/eclipse/gef/SharedMessages.java (-3 / +3 lines)
23	/**	23	/**
24	* The string "Page".	24	* The string "Page".
25	*/	25	*/
26	public static String FitAllAction_Label = GEFMessages.FitAllAction_Label;	26	public static String FitAllAction_Label = GEFMessages.get().FitAllAction_Label;
27	/**	27	/**
28	* The string "Width".	28	* The string "Width".
29	*/	29	*/
30	public static String FitWidthAction_Label = GEFMessages.FitWidthAction_Label;	30	public static String FitWidthAction_Label = GEFMessages.get().FitWidthAction_Label;
31	/**	31	/**
32	* The string "Height".	32	* The string "Height".
33	*/	33	*/
34	public static String FitHeightAction_Label = GEFMessages.FitHeightAction_Label;	34	public static String FitHeightAction_Label = GEFMessages.get().FitHeightAction_Label;
35		35
36	}	36	}

Lines 10-16 Link Here

(-)src/org/eclipse/gef/internal/GEFMessages.java (-95 / +95 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.gef.internal;	11	package org.eclipse.gef.internal;
12		12
13	import org.eclipse.osgi.util.NLS;	13	import org.eclipse.rwt.RWT;
14		14
15	/**	15	/**
16	* Internal Messages	16	* Internal Messages
Lines 18-117 Link Here
18	* @author hudsonr	18	* @author hudsonr
19	* @since 2.0	19	* @since 2.0
20	*/	20	*/
21	public class GEFMessages extends NLS {	21	public class GEFMessages /* extends NLS */{
22		22
23	public static String AlignBottomAction_Label;	23	public String AlignBottomAction_Label;
24	public static String AlignBottomAction_Tooltip;	24	public String AlignBottomAction_Tooltip;
25	public static String AlignCenterAction_Label;	25	public String AlignCenterAction_Label;
26	public static String AlignCenterAction_Tooltip;	26	public String AlignCenterAction_Tooltip;
27	public static String AlignLeftAction_Label;	27	public String AlignLeftAction_Label;
28	public static String AlignLeftAction_Tooltip;	28	public String AlignLeftAction_Tooltip;
29	public static String AlignMiddleAction_Label;	29	public String AlignMiddleAction_Label;
30	public static String AlignMiddleAction_Tooltip;	30	public String AlignMiddleAction_Tooltip;
31	public static String AlignRightAction_Label;	31	public String AlignRightAction_Label;
32	public static String AlignRightAction_Tooltip;	32	public String AlignRightAction_Tooltip;
33	public static String AlignTopAction_Label;	33	public String AlignTopAction_Label;
34	public static String AlignTopAction_Tooltip;	34	public String AlignTopAction_Tooltip;
35		35
36	public static String CopyAction_ActionDeleteCommandName;	36	public String CopyAction_ActionDeleteCommandName;
37	public static String CopyAction_Label;	37	public String CopyAction_Label;
38	public static String CopyAction_Tooltip;	38	public String CopyAction_Tooltip;
39		39
40	public static String DeleteAction_ActionDeleteCommandName;	40	public String DeleteAction_ActionDeleteCommandName;
41	public static String DeleteAction_Label;	41	public String DeleteAction_Label;
42	public static String DeleteAction_Tooltip;	42	public String DeleteAction_Tooltip;
43		43
44	public static String PasteAction_Label;	44	public String PasteAction_Label;
45	public static String PasteAction_Tooltip;	45	public String PasteAction_Tooltip;
46		46
47	public static String PrintAction_ActionDeleteCommandName;	47	public String PrintAction_ActionDeleteCommandName;
48	public static String PrintAction_Label;	48	public String PrintAction_Label;
49	public static String PrintAction_Tooltip;	49	public String PrintAction_Tooltip;
50		50
51	public static String RedoAction_Label;	51	public String RedoAction_Label;
52	public static String RedoAction_Tooltip;	52	public String RedoAction_Tooltip;
53	public static String RenameAction_Label;	53	public String RenameAction_Label;
54	public static String RenameAction_Tooltip;	54	public String RenameAction_Tooltip;
55	public static String SaveAction_Label;	55	public String SaveAction_Label;
56	public static String SaveAction_Tooltip;	56	public String SaveAction_Tooltip;
57	public static String SetPropertyValueCommand_Label;	57	public String SetPropertyValueCommand_Label;
58		58
59	public static String SelectAllAction_Label;	59	public String SelectAllAction_Label;
60	public static String SelectAllAction_Tooltip;	60	public String SelectAllAction_Tooltip;
61		61
62	public static String MatchSizeAction_Label;	62	public String MatchSizeAction_Label;
63	public static String MatchSizeAction_Tooltip;	63	public String MatchSizeAction_Tooltip;
64		64
65	public static String MatchWidthAction_Label;	65	public String MatchWidthAction_Label;
66	public static String MatchWidthAction_Tooltip;	66	public String MatchWidthAction_Tooltip;
67		67
68	public static String MatchHeightAction_Label;	68	public String MatchHeightAction_Label;
69	public static String MatchHeightAction_Tooltip;	69	public String MatchHeightAction_Tooltip;
70		70
71	public static String SelectionTool_Label;	71	public String SelectionTool_Label;
72	public static String MarqueeTool_Label;	72	public String MarqueeTool_Label;
73	public static String MarqueeTool_Connections_Touched_Desc;	73	public String MarqueeTool_Connections_Touched_Desc;
74	public static String MarqueeTool_Connections_Contained_Desc;	74	public String MarqueeTool_Connections_Contained_Desc;
75	public static String MarqueeTool_Nodes_Touched_Desc;	75	public String MarqueeTool_Nodes_Touched_Desc;
76	public static String MarqueeTool_Nodes_Contained_Desc;	76	public String MarqueeTool_Nodes_Contained_Desc;
77	public static String MarqueeTool_Nodes_Touched_And_Related_Connections_Desc;	77	public String MarqueeTool_Nodes_Touched_And_Related_Connections_Desc;
78	public static String MarqueeTool_Nodes_Contained_And_Related_Connections_Desc;	78	public String MarqueeTool_Nodes_Contained_And_Related_Connections_Desc;
79	public static String UndoAction_Label;	79	public String UndoAction_Label;
80	public static String UndoAction_Tooltip;	80	public String UndoAction_Tooltip;
81		81
82	// Zoom strings	82	// Zoogs
83	public static String ZoomIn_Label;	83	public String ZoomIn_Label;
84	public static String ZoomIn_Tooltip;	84	public String ZoomIn_Tooltip;
85	public static String ZoomOut_Label;	85	public String ZoomOut_Label;
86	public static String ZoomOut_Tooltip;	86	public String ZoomOut_Tooltip;
87	public static String FitAllAction_Label;	87	public String FitAllAction_Label;
88	public static String FitWidthAction_Label;	88	public String FitWidthAction_Label;
89	public static String FitHeightAction_Label;	89	public String FitHeightAction_Label;
90		90
91	// View menu actions	91	// Vieactions
92	public static String ToggleRulerVisibility_Label;	92	public String ToggleRulerVisibility_Label;
93	public static String ToggleRulerVisibility_Tooltip;	93	public String ToggleRulerVisibility_Tooltip;
94	public static String ToggleSnapToGeometry_Label;	94	public String ToggleSnapToGeometry_Label;
95	public static String ToggleSnapToGeometry_Tooltip;	95	public String ToggleSnapToGeometry_Tooltip;
96	public static String ToggleGrid_Label;	96	public String ToggleGrid_Label;
97	public static String ToggleGrid_Tooltip;	97	public String ToggleGrid_Tooltip;
98		98
99	// Palette view Strings	99	// Palew Strings
100	public static String Palette_Label;	100	public String Palette_Label;
101	public static String Palette_Not_Available;	101	public String Palette_Not_Available;
102		102
103	// Rulers and guides	103	// Rul guides
104	public static String Ruler_Horizontal_Label;	104	public String Ruler_Horizontal_Label;
105	public static String Ruler_Vertical_Label;	105	public String Ruler_Vertical_Label;
106	public static String Ruler_Desc;	106	public String Ruler_Desc;
107	public static String Guide_Label;	107	public String Guide_Label;
108	public static String Guide_Desc;	108	public String Guide_Desc;
109	public static String Create_Guide_Label;	109	public String Create_Guide_Label;
110	public static String Create_Guide_Tooltip;	110	public String Create_Guide_Tooltip;
111		111
112	static {	112	public static GEFMessages get() {
113	NLS.initializeMessages(	113	Object result = RWT.NLS.getISO8859_1Encoded(
114	"org.eclipse.gef.internal.messages", GEFMessages.class); //$NON-NLS-1$	114	"org.eclipse.gef.internal.messages", GEFMessages.class);
		115	return (GEFMessages) result;
115	}	116	}
116
117	}	117	}

Lines 46-52 Link Here

(-)src/org/eclipse/gef/internal/ui/palette/editparts/PinFigure.java (-3 / +3 lines)
46	super(new ImageFigure(InternalImages.get(InternalImages.IMG_UNPINNED)));	46	super(new ImageFigure(InternalImages.get(InternalImages.IMG_UNPINNED)));
47	setRolloverEnabled(true);	47	setRolloverEnabled(true);
48	setRequestFocusEnabled(false);	48	setRequestFocusEnabled(false);
49	Label tooltip = new Label(PaletteMessages.TOOLTIP_PIN_FIGURE);	49	Label tooltip = new Label(PaletteMessages.get().TOOLTIP_PIN_FIGURE);
50	tooltip.setBorder(TOOLTIP_BORDER);	50	tooltip.setBorder(TOOLTIP_BORDER);
51	setToolTip(tooltip);	51	setToolTip(tooltip);
52	setOpaque(false);	52	setOpaque(false);
Lines 60-72 Link Here
60	.setImage(InternalImages	60	.setImage(InternalImages
61	.get(InternalImages.IMG_PINNED));	61	.get(InternalImages.IMG_PINNED));
62	((Label) getToolTip())	62	((Label) getToolTip())
63	.setText(PaletteMessages.TOOLTIP_UNPIN_FIGURE);	63	.setText(PaletteMessages.get().TOOLTIP_UNPIN_FIGURE);
64	} else {	64	} else {
65	((ImageFigure) (getChildren().get(0)))	65	((ImageFigure) (getChildren().get(0)))
66	.setImage(InternalImages	66	.setImage(InternalImages
67	.get(InternalImages.IMG_UNPINNED));	67	.get(InternalImages.IMG_UNPINNED));
68	((Label) getToolTip())	68	((Label) getToolTip())
69	.setText(PaletteMessages.TOOLTIP_PIN_FIGURE);	69	.setText(PaletteMessages.get().TOOLTIP_PIN_FIGURE);
70	}	70	}
71	}	71	}
72	}	72	}

Lines 113-124 Link Here

(-)src/org/eclipse/gef/internal/ui/rulers/RulerEditPart.java (-3 / +3 lines)
113	if (accPart == null)	113	if (accPart == null)
114	accPart = new AccessibleGraphicalEditPart() {	114	accPart = new AccessibleGraphicalEditPart() {
115	public void getName(AccessibleEvent e) {	115	public void getName(AccessibleEvent e) {
116	e.result = isHorizontal() ? GEFMessages.Ruler_Horizontal_Label	116	e.result = isHorizontal() ? GEFMessages.get().Ruler_Horizontal_Label
117	: GEFMessages.Ruler_Vertical_Label;	117	: GEFMessages.get().Ruler_Vertical_Label;
118	}	118	}
119		119
120	public void getDescription(AccessibleEvent e) {	120	public void getDescription(AccessibleEvent e) {
121	e.result = GEFMessages.Ruler_Desc;	121	e.result = GEFMessages.get().Ruler_Desc;
122	}	122	}
123	};	123	};
124	return accPart;	124	return accPart;

Lines 55-61 Link Here

(-)src/org/eclipse/gef/palette/MarqueeToolEntry.java (-7 / +7 lines)
55	public MarqueeToolEntry(String label, String description) {	55	public MarqueeToolEntry(String label, String description) {
56	super(label, description, null, null, MarqueeSelectionTool.class);	56	super(label, description, null, null, MarqueeSelectionTool.class);
57	if (label == null \|\| label.length() == 0)	57	if (label == null \|\| label.length() == 0)
58	setLabel(GEFMessages.MarqueeTool_Label);	58	setLabel(GEFMessages.get().MarqueeTool_Label);
59	setUserModificationPermission(PERMISSION_NO_MODIFICATION);	59	setUserModificationPermission(PERMISSION_NO_MODIFICATION);
60	}	60	}
61		61
Lines 69-90 Link Here
69		69
70	int marqueeBehavior = getMarqueeBehavior();	70	int marqueeBehavior = getMarqueeBehavior();
71	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_CONNECTIONS_TOUCHED) {	71	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_CONNECTIONS_TOUCHED) {
72	return GEFMessages.MarqueeTool_Connections_Touched_Desc;	72	return GEFMessages.get().MarqueeTool_Connections_Touched_Desc;
73	}	73	}
74	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_CONNECTIONS_CONTAINED) {	74	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_CONNECTIONS_CONTAINED) {
75	return GEFMessages.MarqueeTool_Connections_Contained_Desc;	75	return GEFMessages.get().MarqueeTool_Connections_Contained_Desc;
76	}	76	}
77	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_TOUCHED) {	77	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_TOUCHED) {
78	return GEFMessages.MarqueeTool_Nodes_Touched_Desc;	78	return GEFMessages.get().MarqueeTool_Nodes_Touched_Desc;
79	}	79	}
80	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_CONTAINED) {	80	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_CONTAINED) {
81	return GEFMessages.MarqueeTool_Nodes_Contained_Desc;	81	return GEFMessages.get().MarqueeTool_Nodes_Contained_Desc;
82	}	82	}
83	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_TOUCHED_AND_RELATED_CONNECTIONS) {	83	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_TOUCHED_AND_RELATED_CONNECTIONS) {
84	return GEFMessages.MarqueeTool_Nodes_Touched_And_Related_Connections_Desc;	84	return GEFMessages.get().MarqueeTool_Nodes_Touched_And_Related_Connections_Desc;
85	}	85	}
86	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_CONTAINED_AND_RELATED_CONNECTIONS) {	86	if (marqueeBehavior == MarqueeSelectionTool.BEHAVIOR_NODES_CONTAINED_AND_RELATED_CONNECTIONS) {
87	return GEFMessages.MarqueeTool_Nodes_Contained_And_Related_Connections_Desc;	87	return GEFMessages.get().MarqueeTool_Nodes_Contained_And_Related_Connections_Desc;
88	}	88	}
89	throw new IllegalArgumentException("Unknown marquee behavior"); //$NON-NLS-1$	89	throw new IllegalArgumentException("Unknown marquee behavior"); //$NON-NLS-1$
90	}	90	}

Lines 37-79 Link Here

(-)src/org/eclipse/gef/ui/actions/AlignmentRetargetAction.java (-12 / +12 lines)
37	switch (align) {	37	switch (align) {
38	case PositionConstants.BOTTOM:	38	case PositionConstants.BOTTOM:
39	setId(GEFActionConstants.ALIGN_BOTTOM);	39	setId(GEFActionConstants.ALIGN_BOTTOM);
40	setText(GEFMessages.AlignBottomAction_Label);	40	setText(GEFMessages.get().AlignBottomAction_Label);
41	setToolTipText(GEFMessages.AlignBottomAction_Tooltip);	41	setToolTipText(GEFMessages.get().AlignBottomAction_Tooltip);
42	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM);	42	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM);
43	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM_DIS);	43	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM_DIS);
44	break;	44	break;
45	case PositionConstants.CENTER:	45	case PositionConstants.CENTER:
46	setId(GEFActionConstants.ALIGN_CENTER);	46	setId(GEFActionConstants.ALIGN_CENTER);
47	setText(GEFMessages.AlignCenterAction_Label);	47	setText(GEFMessages.get().AlignCenterAction_Label);
48	setToolTipText(GEFMessages.AlignCenterAction_Tooltip);	48	setToolTipText(GEFMessages.get().AlignCenterAction_Tooltip);
49	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER);	49	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER);
50	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER_DIS);	50	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER_DIS);
51	break;	51	break;
52	case PositionConstants.LEFT:	52	case PositionConstants.LEFT:
53	setId(GEFActionConstants.ALIGN_LEFT);	53	setId(GEFActionConstants.ALIGN_LEFT);
54	setText(GEFMessages.AlignLeftAction_Label);	54	setText(GEFMessages.get().AlignLeftAction_Label);
55	setToolTipText(GEFMessages.AlignLeftAction_Tooltip);	55	setToolTipText(GEFMessages.get().AlignLeftAction_Tooltip);
56	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT);	56	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT);
57	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT_DIS);	57	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT_DIS);
58	break;	58	break;
59	case PositionConstants.MIDDLE:	59	case PositionConstants.MIDDLE:
60	setId(GEFActionConstants.ALIGN_MIDDLE);	60	setId(GEFActionConstants.ALIGN_MIDDLE);
61	setText(GEFMessages.AlignMiddleAction_Label);	61	setText(GEFMessages.get().AlignMiddleAction_Label);
62	setToolTipText(GEFMessages.AlignMiddleAction_Tooltip);	62	setToolTipText(GEFMessages.get().AlignMiddleAction_Tooltip);
63	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE);	63	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE);
64	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE_DIS);	64	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE_DIS);
65	break;	65	break;
66	case PositionConstants.RIGHT:	66	case PositionConstants.RIGHT:
67	setId(GEFActionConstants.ALIGN_RIGHT);	67	setId(GEFActionConstants.ALIGN_RIGHT);
68	setText(GEFMessages.AlignRightAction_Label);	68	setText(GEFMessages.get().AlignRightAction_Label);
69	setToolTipText(GEFMessages.AlignRightAction_Tooltip);	69	setToolTipText(GEFMessages.get().AlignRightAction_Tooltip);
70	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT);	70	setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT);
71	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT_DIS);	71	setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT_DIS);
72	break;	72	break;
73	case PositionConstants.TOP:	73	case PositionConstants.TOP:
74	setId(GEFActionConstants.ALIGN_TOP);	74	setId(GEFActionConstants.ALIGN_TOP);
75	setText(GEFMessages.AlignTopAction_Label);	75	setText(GEFMessages.get().AlignTopAction_Label);
76	setToolTipText(GEFMessages.AlignTopAction_Tooltip);	76	setToolTipText(GEFMessages.get().AlignTopAction_Tooltip);
77	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);	77	setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);
78	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);	78	setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);
79	break;	79	break;

Lines 60-68 Link Here

(-)src/org/eclipse/gef/ui/actions/RedoAction.java (-4 / +4 lines)
60	*/	60	*/
61	protected void init() {	61	protected void init() {
62	super.init();	62	super.init();
63	setToolTipText(MessageFormat.format(GEFMessages.RedoAction_Tooltip,	63	setToolTipText(MessageFormat.format(GEFMessages.get().RedoAction_Tooltip,
64	new Object[] { "" }).trim()); //$NON-NLS-1$	64	new Object[] { "" }).trim()); //$NON-NLS-1$
65	setText(MessageFormat.format(GEFMessages.RedoAction_Label,	65	setText(MessageFormat.format(GEFMessages.get().RedoAction_Label,
66	new Object[] { "" }).trim() //$NON-NLS-1$	66	new Object[] { "" }).trim() //$NON-NLS-1$
67	);	67	);
68	setId(ActionFactory.REDO.getId());	68	setId(ActionFactory.REDO.getId());
Lines 80-88 Link Here
80	*/	80	*/
81	protected void refresh() {	81	protected void refresh() {
82	Command redoCmd = getCommandStack().getRedoCommand();	82	Command redoCmd = getCommandStack().getRedoCommand();
83	setToolTipText(MessageFormat.format(GEFMessages.RedoAction_Tooltip,	83	setToolTipText(MessageFormat.format(GEFMessages.get().RedoAction_Tooltip,
84	new Object[] { getLabelForCommand(redoCmd) }).trim());	84	new Object[] { getLabelForCommand(redoCmd) }).trim());
85	setText(MessageFormat.format(GEFMessages.RedoAction_Label,	85	setText(MessageFormat.format(GEFMessages.get().RedoAction_Label,
86	new Object[] { getLabelForCommand(redoCmd) }).trim());	86	new Object[] { getLabelForCommand(redoCmd) }).trim());
87	super.refresh();	87	super.refresh();
88	}	88	}

Lines 60-68 Link Here

(-)src/org/eclipse/gef/ui/actions/UndoAction.java (-4 / +4 lines)
60	*/	60	*/
61	protected void init() {	61	protected void init() {
62	super.init();	62	super.init();
63	setToolTipText(MessageFormat.format(GEFMessages.UndoAction_Tooltip,	63	setToolTipText(MessageFormat.format(GEFMessages.get().UndoAction_Tooltip,
64	new Object[] { "" }).trim()); //$NON-NLS-1$	64	new Object[] { "" }).trim()); //$NON-NLS-1$
65	setText(MessageFormat.format(GEFMessages.UndoAction_Label,	65	setText(MessageFormat.format(GEFMessages.get().UndoAction_Label,
66	new Object[] { "" }).trim() //$NON-NLS-1$	66	new Object[] { "" }).trim() //$NON-NLS-1$
67	);	67	);
68	setId(ActionFactory.UNDO.getId());	68	setId(ActionFactory.UNDO.getId());
Lines 80-88 Link Here
80	*/	80	*/
81	protected void refresh() {	81	protected void refresh() {
82	Command undoCmd = getCommandStack().getUndoCommand();	82	Command undoCmd = getCommandStack().getUndoCommand();
83	setToolTipText(MessageFormat.format(GEFMessages.UndoAction_Tooltip,	83	setToolTipText(MessageFormat.format(GEFMessages.get().UndoAction_Tooltip,
84	new Object[] { getLabelForCommand(undoCmd) }).trim());	84	new Object[] { getLabelForCommand(undoCmd) }).trim());
85	setText(MessageFormat.format(GEFMessages.UndoAction_Label,	85	setText(MessageFormat.format(GEFMessages.get().UndoAction_Label,
86	new Object[] { getLabelForCommand(undoCmd) }).trim());	86	new Object[] { getLabelForCommand(undoCmd) }).trim());
87	super.refresh();	87	super.refresh();
88	}	88	}

Lines 57-63 Link Here

(-)src/org/eclipse/gef/ui/palette/LayoutAction.java (-6 / +6 lines)
57	* saved	57	* saved
58	*/	58	*/
59	public LayoutAction(PaletteViewerPreferences prefs, boolean hasIcon) {	59	public LayoutAction(PaletteViewerPreferences prefs, boolean hasIcon) {
60	super(PaletteMessages.LAYOUT_MENU_LABEL);	60	super(PaletteMessages.get().LAYOUT_MENU_LABEL);
61	this.prefs = prefs;	61	this.prefs = prefs;
62	actions = createActions();	62	actions = createActions();
63	setMenuCreator(this);	63	setMenuCreator(this);
Lines 66-72 Link Here
66	setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,	66	setImageDescriptor(ImageDescriptor.createFromFile(Internal.class,
67	"icons/palette_layout.gif")); //$NON-NLS-1$	67	"icons/palette_layout.gif")); //$NON-NLS-1$
68		68
69	setToolTipText(PaletteMessages.LAYOUT_MENU_LABEL);	69	setToolTipText(PaletteMessages.get().LAYOUT_MENU_LABEL);
70	}	70	}
71		71
72	/**	72	/**
Lines 97-121 Link Here
97	case PaletteViewerPreferences.LAYOUT_COLUMNS:	97	case PaletteViewerPreferences.LAYOUT_COLUMNS:
98	action = new LayoutChangeAction(	98	action = new LayoutChangeAction(
99	PaletteViewerPreferences.LAYOUT_COLUMNS);	99	PaletteViewerPreferences.LAYOUT_COLUMNS);
100	action.setText(PaletteMessages.SETTINGS_COLUMNS_VIEW_LABEL);	100	action.setText(PaletteMessages.get().SETTINGS_COLUMNS_VIEW_LABEL);
101	list.add(action);	101	list.add(action);
102	break;	102	break;
103	case PaletteViewerPreferences.LAYOUT_LIST:	103	case PaletteViewerPreferences.LAYOUT_LIST:
104	action = new LayoutChangeAction(	104	action = new LayoutChangeAction(
105	PaletteViewerPreferences.LAYOUT_LIST);	105	PaletteViewerPreferences.LAYOUT_LIST);
106	action.setText(PaletteMessages.SETTINGS_LIST_VIEW_LABEL);	106	action.setText(PaletteMessages.get().SETTINGS_LIST_VIEW_LABEL);
107	list.add(action);	107	list.add(action);
108	break;	108	break;
109	case PaletteViewerPreferences.LAYOUT_ICONS:	109	case PaletteViewerPreferences.LAYOUT_ICONS:
110	action = new LayoutChangeAction(	110	action = new LayoutChangeAction(
111	PaletteViewerPreferences.LAYOUT_ICONS);	111	PaletteViewerPreferences.LAYOUT_ICONS);
112	action.setText(PaletteMessages.SETTINGS_ICONS_VIEW_LABEL_CAPS);	112	action.setText(PaletteMessages.get().SETTINGS_ICONS_VIEW_LABEL_CAPS);
113	list.add(action);	113	list.add(action);
114	break;	114	break;
115	case PaletteViewerPreferences.LAYOUT_DETAILS:	115	case PaletteViewerPreferences.LAYOUT_DETAILS:
116	action = new LayoutChangeAction(	116	action = new LayoutChangeAction(
117	PaletteViewerPreferences.LAYOUT_DETAILS);	117	PaletteViewerPreferences.LAYOUT_DETAILS);
118	action.setText(PaletteMessages.SETTINGS_DETAILS_VIEW_LABEL);	118	action.setText(PaletteMessages.get().SETTINGS_DETAILS_VIEW_LABEL);
119	list.add(action);	119	list.add(action);
120	break;	120	break;
121	}	121	}

Lines 10-300 Link Here

(-)src/org/eclipse/gef/ui/palette/PaletteMessages.java (-137 / +418 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.gef.ui.palette;	11	package org.eclipse.gef.ui.palette;
12		12
13	import org.eclipse.osgi.util.NLS;	13	import org.eclipse.rwt.RWT;
14		14
15	/**	15	/**
16	* @author Pratik Shah	16	* @author Pratik Shah
17	*/	17	*/
18	public class PaletteMessages extends NLS {	18	public class PaletteMessages /* extends NLS */{
		19
		20	// /**
		21	// * The String "Customize Palette"
		22	// */
		23	// public static String CUSTOMIZE_DIALOG_TITLE;
		24	// /**
		25	// * The String "Drawer options: "
		26	// */
		27	// public static String COLLAPSE_OPTIONS_TITLE;
		28	// /**
		29	// * The String "Layout options"
		30	// */
		31	// public static String SETTINGS_LAYOUT_OPTIONS_TITLE;
		32	// /**
		33	// * The String "&Apply"
		34	// */
		35	// public static String APPLY_LABEL;
		36	// /**
		37	// * The String "Move &Up"
		38	// */
		39	// public static String MOVE_UP_LABEL;
		40	// /**
		41	// * The String "Move Do&wn"
		42	// */
		43	// public static String MOVE_DOWN_LABEL;
		44	// /**
		45	// * The String "&Delete"
		46	// */
		47	// public static String DELETE_LABEL;
		48	// /**
		49	// * The String "&New"
		50	// */
		51	// public static String NEW_LABEL;
		52	// /**
		53	// * The String "&Columns"
		54	// */
		55	// public static String SETTINGS_COLUMNS_VIEW_LABEL;
		56	// /**
		57	// * The String "&List"
		58	// */
		59	// public static String SETTINGS_LIST_VIEW_LABEL;
		60	// /**
		61	// * The String "&Use large icons"
		62	// */
		63	// public static String SETTINGS_USE_LARGE_ICONS_LABEL;
		64	// /**
		65	// * The String "&Use Large Icons"
		66	// */
		67	// public static String SETTINGS_USE_LARGE_ICONS_LABEL_CAPS;
		68	// /**
		69	// * The String "&Icons only"
		70	// */
		71	// public static String SETTINGS_ICONS_VIEW_LABEL;
		72	// /**
		73	// * The String "&Icons Only"
		74	// */
		75	// public static String SETTINGS_ICONS_VIEW_LABEL_CAPS;
		76	// /**
		77	// * The String "&Never close"
		78	// */
		79	// public static String COLLAPSE_NEVER_LABEL;
		80	// /**
		81	// * The String "&Always close when opening another drawer"
		82	// */
83	// public static String COLLAPSE_ALWAYS_LABEL;
84	// /**
85	// * The String "Close automatically &when there is not enough room"
86	// */
87	// public static String COLLAPSE_AS_NEEDED_LABEL;
88	// /**
89	// * The String "Nothing Selected"
90	// */
91	// public static String NO_SELECTION_TITLE;
92	// /**
93	// * The String "Na&me: "
94	// */
95	// public static String NAME_LABEL;
96	// /**
97	// * The String "Des&cription: "
98	// */
99	// public static String DESCRIPTION_LABEL;
100	// /**
101	// * The String "&Hide"
102	// */
103	// public static String HIDDEN_LABEL;
104	// /**
105	// * The String "No description is available."
106	// */
107	// public static String NO_DESCRIPTION_AVAILABLE;
108	// /**
109	// * The String "Select a node from the tree on the left."
110	// */
111	// public static String NO_SELECTION_MADE;
112	// /**
113	// * The String "Cus&tomize..."
114	// */
115	// public static String MENU_OPEN_CUSTOMIZE_DIALOG;
116	// /**
117	// * The String "Drawer"
118	// */
119	// public static String MODEL_TYPE_DRAWER;
120	// /**
121	// * The String "Separator"
122	// */
123	// public static String MODEL_TYPE_SEPARATOR;
124	// /**
125	// * The String "Stack"
126	// */
127	// public static String MODEL_TYPE_STACK;
128	// /**
129	// * The String "Separates entries in a palette container"
130	// */
131	// public static String NEW_SEPARATOR_DESC;
132	// /**
133	// * The String "New Drawer"
134	// */
135	// public static String NEW_DRAWER_LABEL;
136	// /**
137	// * The String "[Separator]"
138	// */
139	// public static String NEW_SEPARATOR_LABEL;
140	// /**
141	// * The String "New Stack"
142	// */
143	// public static String NEW_STACK_LABEL;
144	// /**
145	// * The String "Group"
146	// */
147	// public static String MODEL_TYPE_GROUP;
148	// /**
149	// * The String "New Group"
150	// */
151	// public static String NEW_GROUP_LABEL;
152	// /**
153	// * The String "&Layout"
154	// */
155	// public static String LAYOUT_MENU_LABEL;
156	// /**
157	// * The String "Could Not Accept Changes"
158	// */
159	// public static String ERROR;
160	// /**
161	// * The String "The currently displayed page contains invalid values."
162	// */
163	// public static String ABORT_PAGE_FLIPPING_MESSAGE;
164	// /**
165	// * The String "&Settings..."
166	// */
167	// public static String MENU_OPEN_SETTINGS_DIALOG;
168	// /**
169	// * The String "Palette Settings"
170	// */
171	// public static String SETTINGS_DIALOG_TITLE;
172	// /**
173	// * The String "&Details"
174	// */
175	// public static String SETTINGS_DETAILS_VIEW_LABEL;
176	// /**
177	// * The String "Font"
178	// */
179	// public static String SETTINGS_FONT_TITLE;
180	// /**
181	// * The String "C&hange..."
182	// */
183	// public static String SETTINGS_FONT_CHANGE;
184	// /**
185	// * The String "Font: "
186	// */
187	// public static String SETTINGS_FONT_CURRENT;
188	// /**
189	// * The String "Layout: "
190	// */
191	// public static String SETTINGS_LAYOUT_TITLE;
192	// /**
193	// * The String "Drawer Options"
194	// */
195	// public static String SETTINGS_DRAWER_OPTIONS_TITLE;
196	// /**
197	// * The String "&Open drawer at start-up"
198	// */
199	// public static String EXPAND_DRAWER_AT_STARTUP_LABEL;
200	// /**
201	// * The String "Columns layout options"
202	// */
203	// public static String SETTINGS_OPTIONS_COLUMNS;
204	// /**
205	// * The String "List layout options"
206	// */
207	// public static String SETTINGS_OPTIONS_LIST;
208	// /**
209	// * The String " layout options"
210	// */
211	// public static String SETTINGS_OPTIONS_ICONS_ONLY;
212	// /**
213	// * The String "Details layout options"
214	// */
215	// public static String SETTINGS_OPTIONS_DETAILS;
216	// /**
217	// * The String "&Override default column width settings"
218	// */
219	// public static String SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH;
220	// /**
221	// * The String "Colu&mn width (in pixels): "
222	// */
223	// public static String SETTINGS_LAYOUT_COLUMNS_WIDTH;
224	// /**
225	// * The String "&Pin drawer open at start-up"
226	// */
227	// public static String DRAWER_PIN_AT_STARTUP;
228	// /**
229	// * The String "&Restore Default"
230	// */
231	// public static String SETTINGS_DEFAULT_FONT;
232	// /**
233	// * The String "<Using Workbench Dialog Font>"
234	// */
235	// public static String SETTINGS_WORKBENCH_FONT_LABEL;
236	// /**
237	// * The String "-"
238	// */
239	// public static String NAME_DESCRIPTION_SEPARATOR;
240	// /**
241	// * The String "&Pinned"
242	// */
243	// public static String PINNED;
244	// /**
245	// * The String "Pin Open"
246	// */
247	// public static String TOOLTIP_PIN_FIGURE;
248	//
249	// /**
250	// * The String "Unpin"
251	// */
252	// public static String TOOLTIP_UNPIN_FIGURE;
253	//
254	// /**
255	// * The String "&Dock On"
256	// */
257	// public static String DOCK_LABEL;
258	//
259	// /**
260	// * The String "&Left"
261	// */
262	// public static String LEFT_LABEL;
263	//
264	// /**
265	// * The String "&Right"
266	// */
267	// public static String RIGHT_LABEL;
268	//
269	// /**
270	// * The String "&Resize"
271	// */
272	// public static String RESIZE_LABEL;
273	//
274	// /**
275	// * Show Palette
276	// */
277	// public static String PALETTE_SHOW;
278	//
279	// /**
280	// * Hide Palette
281	// */
282	// public static String PALETTE_HIDE;
283	//
284	// /**
285	// * This button is used to show or hide the palette.
286	// */
287	// public static String ACC_DESC_PALETTE_BUTTON;
288	//
289	// /**
290	// * The palette can be moved or resized through the context menu for this
291	// * control.
292	// */
293	// public static String ACC_DESC_PALETTE_TITLE;
294	//
19		295
20	/**	296	/**
21	* The String "Customize Palette"	297	* The String "Customize Palette"
22	*/	298	*/
23	public static String CUSTOMIZE_DIALOG_TITLE;	299	public String CUSTOMIZE_DIALOG_TITLE;
24	/**	300	/**
25	* The String "Drawer options: "	301	* The "Drawer options: "
26	*/	302	*/
27	public static String COLLAPSE_OPTIONS_TITLE;	303	public String COLLAPSE_OPTIONS_TITLE;
28	/**	304	/**
29	* The String "Layout options"	305	* The "Layout options"
30	*/	306	*/
31	public static String SETTINGS_LAYOUT_OPTIONS_TITLE;	307	public String SETTINGS_LAYOUT_OPTIONS_TITLE;
32	/**	308	/**
33	* The String "&Apply"	309	* The "&Apply"
34	*/	310	*/
35	public static String APPLY_LABEL;	311	public String APPLY_LABEL;
36	/**	312	/**
37	* The String "Move &Up"	313	* The "Move &Up"
38	*/	314	*/
39	public static String MOVE_UP_LABEL;	315	public String MOVE_UP_LABEL;
40	/**	316	/**
41	* The String "Move Do&wn"	317	* The "Move Do&wn"
42	*/	318	*/
43	public static String MOVE_DOWN_LABEL;	319	public String MOVE_DOWN_LABEL;
44	/**	320	/**
45	* The String "&Delete"	321	* The "&Delete"
46	*/	322	*/
47	public static String DELETE_LABEL;	323	public String DELETE_LABEL;
48	/**	324	/**
49	* The String "&New"	325	* The "&New"
50	*/	326	*/
51	public static String NEW_LABEL;	327	public String NEW_LABEL;
52	/**	328	/**
53	* The String "&Columns"	329	* The "&Columns"
54	*/	330	*/
55	public static String SETTINGS_COLUMNS_VIEW_LABEL;	331	public String SETTINGS_COLUMNS_VIEW_LABEL;
56	/**	332	/**
57	* The String "&List"	333	* The "&List"
58	*/	334	*/
59	public static String SETTINGS_LIST_VIEW_LABEL;	335	public String SETTINGS_LIST_VIEW_LABEL;
60	/**	336	/**
61	* The String "&Use large icons"	337	* The "&Use large icons"
62	*/	338	*/
63	public static String SETTINGS_USE_LARGE_ICONS_LABEL;	339	public String SETTINGS_USE_LARGE_ICONS_LABEL;
64	/**	340	/**
65	* The String "&Use Large Icons"	341	* The "&Use Large Icons"
66	*/	342	*/
67	public static String SETTINGS_USE_LARGE_ICONS_LABEL_CAPS;	343	public String SETTINGS_USE_LARGE_ICONS_LABEL_CAPS;
68	/**	344	/**
69	* The String "&Icons only"	345	* The "&Icons only"
70	*/	346	*/
71	public static String SETTINGS_ICONS_VIEW_LABEL;	347	public String SETTINGS_ICONS_VIEW_LABEL;
72	/**	348	/**
73	* The String "&Icons Only"	349	* The "&Icons Only"
74	*/	350	*/
75	public static String SETTINGS_ICONS_VIEW_LABEL_CAPS;	351	public String SETTINGS_ICONS_VIEW_LABEL_CAPS;
76	/**	352	/**
77	* The String "&Never close"	353	* The "&Never close"
78	*/	354	*/
79	public static String COLLAPSE_NEVER_LABEL;	355	public String COLLAPSE_NEVER_LABEL;
80	/**	356	/**
81	* The String "&Always close when opening another drawer"	357	* The "&Always close when opening another drawer"
82	*/	358	*/
83	public static String COLLAPSE_ALWAYS_LABEL;	359	public String COLLAPSE_ALWAYS_LABEL;
84	/**	360	/**
85	* The String "Close automatically &when there is not enough room"	361	* The "Close automatically &when there is not enough room"
86	*/	362	*/
87	public static String COLLAPSE_AS_NEEDED_LABEL;	363	public String COLLAPSE_AS_NEEDED_LABEL;
88	/**	364	/**
89	* The String "Nothing Selected"	365	* The "Nothing Selected"
90	*/	366	*/
91	public static String NO_SELECTION_TITLE;	367	public String NO_SELECTION_TITLE;
92	/**	368	/**
93	* The String "Na&me: "	369	* The "Na&me: "
94	*/	370	*/
95	public static String NAME_LABEL;	371	public String NAME_LABEL;
96	/**	372	/**
97	* The String "Des&cription: "	373	* The "Des&cription: "
98	*/	374	*/
99	public static String DESCRIPTION_LABEL;	375	public String DESCRIPTION_LABEL;
100	/**	376	/**
101	* The String "&Hide"	377	* The "&Hide"
102	*/	378	*/
103	public static String HIDDEN_LABEL;	379	public String HIDDEN_LABEL;
104	/**	380	/**
105	* The String "No description is available."	381	* The "No description is available."
106	*/	382	*/
107	public static String NO_DESCRIPTION_AVAILABLE;	383	public String NO_DESCRIPTION_AVAILABLE;
108	/**	384	/**
109	* The String "Select a node from the tree on the left."	385	* The "Select a node from the tree on the left."
110	*/	386	*/
111	public static String NO_SELECTION_MADE;	387	public String NO_SELECTION_MADE;
112	/**	388	/**
113	* The String "Cus&tomize..."	389	* The "Cus&tomize..."
114	*/	390	*/
115	public static String MENU_OPEN_CUSTOMIZE_DIALOG;	391	public String MENU_OPEN_CUSTOMIZE_DIALOG;
116	/**	392	/**
117	* The String "Drawer"	393	* The "Drawer"
118	*/	394	*/
119	public static String MODEL_TYPE_DRAWER;	395	public String MODEL_TYPE_DRAWER;
120	/**	396	/**
121	* The String "Separator"	397	* The "Separator"
122	*/	398	*/
123	public static String MODEL_TYPE_SEPARATOR;	399	public String MODEL_TYPE_SEPARATOR;
124	/**	400	/**
125	* The String "Stack"	401	* The "Stack"
126	*/	402	*/
127	public static String MODEL_TYPE_STACK;	403	public String MODEL_TYPE_STACK;
128	/**	404	/**
129	* The String "Separates entries in a palette container"	405	* The "Separates entries in a palette container"
130	*/	406	*/
131	public static String NEW_SEPARATOR_DESC;	407	public String NEW_SEPARATOR_DESC;
132	/**	408	/**
133	* The String "New Drawer"	409	* The "New Drawer"
134	*/	410	*/
135	public static String NEW_DRAWER_LABEL;	411	public String NEW_DRAWER_LABEL;
136	/**	412	/**
137	* The String "[Separator]"	413	* The "[Separator]"
138	*/	414	*/
139	public static String NEW_SEPARATOR_LABEL;	415	public String NEW_SEPARATOR_LABEL;
140	/**	416	/**
141	* The String "New Stack"	417	* The "New Stack"
142	*/	418	*/
143	public static String NEW_STACK_LABEL;	419	public String NEW_STACK_LABEL;
144	/**	420	/**
145	* The String "Group"	421	* The "Group"
146	*/	422	*/
147	public static String MODEL_TYPE_GROUP;	423	public String MODEL_TYPE_GROUP;
148	/**	424	/**
149	* The String "New Group"	425	* The "New Group"
150	*/	426	*/
151	public static String NEW_GROUP_LABEL;	427	public String NEW_GROUP_LABEL;
152	/**	428	/**
153	* The String "&Layout"	429	* The "&Layout"
154	*/	430	*/
155	public static String LAYOUT_MENU_LABEL;	431	public String LAYOUT_MENU_LABEL;
156	/**	432	/**
157	* The String "Could Not Accept Changes"	433	* The "Could Not Accept Changes"
158	*/	434	*/
159	public static String ERROR;	435	public String ERROR;
160	/**	436	/**
161	* The String "The currently displayed page contains invalid values."	437	* The "The currently displayed page contains invalid values."
162	*/	438	*/
163	public static String ABORT_PAGE_FLIPPING_MESSAGE;	439	public String ABORT_PAGE_FLIPPING_MESSAGE;
164	/**	440	/**
165	* The String "&Settings..."	441	* The "&Settings..."
166	*/	442	*/
167	public static String MENU_OPEN_SETTINGS_DIALOG;	443	public String MENU_OPEN_SETTINGS_DIALOG;
168	/**	444	/**
169	* The String "Palette Settings"	445	* The "Palette Settings"
170	*/	446	*/
171	public static String SETTINGS_DIALOG_TITLE;	447	public String SETTINGS_DIALOG_TITLE;
172	/**	448	/**
173	* The String "&Details"	449	* The "&Details"
174	*/	450	*/
175	public static String SETTINGS_DETAILS_VIEW_LABEL;	451	public String SETTINGS_DETAILS_VIEW_LABEL;
176	/**	452	/**
177	* The String "Font"	453	* The "Font"
178	*/	454	*/
179	public static String SETTINGS_FONT_TITLE;	455	public String SETTINGS_FONT_TITLE;
180	/**	456	/**
181	* The String "C&hange..."	457	* The "C&hange..."
182	*/	458	*/
183	public static String SETTINGS_FONT_CHANGE;	459	public String SETTINGS_FONT_CHANGE;
184	/**	460	/**
185	* The String "Font: "	461	* The "Font: "
186	*/	462	*/
187	public static String SETTINGS_FONT_CURRENT;	463	public String SETTINGS_FONT_CURRENT;
188	/**	464	/**
189	* The String "Layout: "	465	* The "Layout: "
190	*/	466	*/
191	public static String SETTINGS_LAYOUT_TITLE;	467	public String SETTINGS_LAYOUT_TITLE;
192	/**	468	/**
193	* The String "Drawer Options"	469	* The "Drawer Options"
194	*/	470	*/
195	public static String SETTINGS_DRAWER_OPTIONS_TITLE;	471	public String SETTINGS_DRAWER_OPTIONS_TITLE;
196	/**	472	/**
197	* The String "&Open drawer at start-up"	473	* The "&Open drawer at start-up"
198	*/	474	*/
199	public static String EXPAND_DRAWER_AT_STARTUP_LABEL;	475	public String EXPAND_DRAWER_AT_STARTUP_LABEL;
200	/**	476	/**
201	* The String "Columns layout options"	477	* The "Columns layout options"
202	*/	478	*/
203	public static String SETTINGS_OPTIONS_COLUMNS;	479	public String SETTINGS_OPTIONS_COLUMNS;
204	/**	480	/**
205	* The String "List layout options"	481	* The "List layout options"
206	*/	482	*/
207	public static String SETTINGS_OPTIONS_LIST;	483	public String SETTINGS_OPTIONS_LIST;
208	/**	484	/**
209	* The String " layout options"	485	* The " layout options"
210	*/	486	*/
211	public static String SETTINGS_OPTIONS_ICONS_ONLY;	487	public String SETTINGS_OPTIONS_ICONS_ONLY;
212	/**	488	/**
213	* The String "Details layout options"	489	* The "Details layout options"
214	*/	490	*/
215	public static String SETTINGS_OPTIONS_DETAILS;	491	public String SETTINGS_OPTIONS_DETAILS;
216	/**	492	/**
217	* The String "&Override default column width settings"	493	* The "&Override default column width settings"
218	*/	494	*/
219	public static String SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH;	495	public String SETTINGS_LAYOUT_COLUMNS_OVERRIDE_WIDTH;
220	/**	496	/**
221	* The String "Colu&mn width (in pixels): "	497	* The "Colu&mn width (in pixels): "
222	*/	498	*/
223	public static String SETTINGS_LAYOUT_COLUMNS_WIDTH;	499	public String SETTINGS_LAYOUT_COLUMNS_WIDTH;
224	/**	500	/**
225	* The String "&Pin drawer open at start-up"	501	* The "&Pin drawer open at start-up"
226	*/	502	*/
227	public static String DRAWER_PIN_AT_STARTUP;	503	public String DRAWER_PIN_AT_STARTUP;
228	/**	504	/**
229	* The String "&Restore Default"	505	* The "&Restore Default"
230	*/	506	*/
231	public static String SETTINGS_DEFAULT_FONT;	507	public String SETTINGS_DEFAULT_FONT;
232	/**	508	/**
233	* The String "<Using Workbench Dialog Font>"	509	* The "<Using Workbench Dialog Font>"
234	*/	510	*/
235	public static String SETTINGS_WORKBENCH_FONT_LABEL;	511	public String SETTINGS_WORKBENCH_FONT_LABEL;
236	/**	512	/**
237	* The String "-"	513	* The "-"
238	*/	514	*/
239	public static String NAME_DESCRIPTION_SEPARATOR;	515	public String NAME_DESCRIPTION_SEPARATOR;
240	/**	516	/**
241	* The String "&Pinned"	517	* The "&Pinned"
242	*/	518	*/
243	public static String PINNED;	519	public String PINNED;
244	/**	520	/**
245	* The String "Pin Open"	521	* The "Pin Open"
246	*/	522	*/
247	public static String TOOLTIP_PIN_FIGURE;	523	public String TOOLTIP_PIN_FIGURE;
248		524
249	/**	525	/**
250	* The String "Unpin"	526	* The "Unpin"
251	*/	527	*/
252	public static String TOOLTIP_UNPIN_FIGURE;	528	public String TOOLTIP_UNPIN_FIGURE;
253		529
254	/**	530	/**
255	* The String "&Dock On"	531	* The "&Dock On"
256	*/	532	*/
257	public static String DOCK_LABEL;	533	public String DOCK_LABEL;
258		534
259	/**	535	/**
260	* The String "&Left"	536	* The "&Left"
261	*/	537	*/
262	public static String LEFT_LABEL;	538	public String LEFT_LABEL;
263		539
264	/**	540	/**
265	* The String "&Right"	541	* The "&Right"
266	*/	542	*/
267	public static String RIGHT_LABEL;	543	public String RIGHT_LABEL;
268		544
269	/**	545	/**
270	* The String "&Resize"	546	* The "&Resize"
271	*/	547	*/
272	public static String RESIZE_LABEL;	548	public String RESIZE_LABEL;
273		549
274	/**	550	/**
275	* Show Palette	551	* Showe
276	*/	552	*/
277	public static String PALETTE_SHOW;	553	public String PALETTE_SHOW;
278		554
279	/**	555	/**
280	* Hide Palette	556	* Hidee
281	*/	557	*/
282	public static String PALETTE_HIDE;	558	public String PALETTE_HIDE;
283		559
284	/**	560	/**
285	* This button is used to show or hide the palette.	561	* This is used to show or hide the palette.
286	*/	562	*/
287	public static String ACC_DESC_PALETTE_BUTTON;	563	public String ACC_DESC_PALETTE_BUTTON;
288		564
289	/**	565	/**
290	* The palette can be moved or resized through the context menu for this	566	* The can be moved or resized through the context menu for this cont
291	* control.
292	*/	567	*/
293	public static String ACC_DESC_PALETTE_TITLE;	568	public String ACC_DESC_PALETTE_TITLE;
		569
		570	// static {
		571	// NLS.initializeMessages(
		572	// "org.eclipse.gef.ui.palette.messages", PaletteMessages.get().class); //$NON-NLS-1$
		573	// }
294		574
295	static {	575	public static PaletteMessages get() {
296	NLS.initializeMessages(	576	Object result = RWT.NLS.getISO8859_1Encoded(
297	"org.eclipse.gef.ui.palette.messages", PaletteMessages.class); //$NON-NLS-1$	577	"org.eclipse.gef.ui.palette.messages", PaletteMessages.class);
		578	return (PaletteMessages) result;
298	}	579	}
299		580
300	}	581	}

Lines 77-86 Link Here

(-)src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java (-3 / +3 lines)
77	panel.setLayout(gridLayout);	77	panel.setLayout(gridLayout);
78	Control[] tablist = new Control[3];	78	Control[] tablist = new Control[3];
79		79
80	createLabel(panel, SWT.NONE, PaletteMessages.NAME_LABEL);	80	createLabel(panel, SWT.NONE, PaletteMessages.get().NAME_LABEL);
81	tablist[0] = createNameText(panel);	81	tablist[0] = createNameText(panel);
82		82
83	createLabel(panel, SWT.NONE, PaletteMessages.DESCRIPTION_LABEL);	83	createLabel(panel, SWT.NONE, PaletteMessages.get().DESCRIPTION_LABEL);
84	tablist[1] = createDescText(panel);	84	tablist[1] = createDescText(panel);
85		85
86	tablist[2] = createHiddenCheckBox(panel);	86	tablist[2] = createHiddenCheckBox(panel);
Lines 127-133 Link Here
127	protected Button createHiddenCheckBox(Composite panel) {	127	protected Button createHiddenCheckBox(Composite panel) {
128	Button hidden = new Button(panel, SWT.CHECK);	128	Button hidden = new Button(panel, SWT.CHECK);
129	hidden.setFont(panel.getFont());	129	hidden.setFont(panel.getFont());
130	hidden.setText(PaletteMessages.HIDDEN_LABEL);	130	hidden.setText(PaletteMessages.get().HIDDEN_LABEL);
131	hidden.setSelection(!entry.isVisible());	131	hidden.setSelection(!entry.isVisible());
132		132
133	if (getPermission() == PaletteEntry.PERMISSION_NO_MODIFICATION) {	133	if (getPermission() == PaletteEntry.PERMISSION_NO_MODIFICATION) {

Lines 76-82 Link Here

(-)src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java (-2 / +2 lines)
76	protected Button createOpenDrawerInitiallyOption(Composite panel) {	76	protected Button createOpenDrawerInitiallyOption(Composite panel) {
77	Button b = new Button(panel, SWT.CHECK);	77	Button b = new Button(panel, SWT.CHECK);
78	b.setFont(panel.getFont());	78	b.setFont(panel.getFont());
79	b.setText(PaletteMessages.EXPAND_DRAWER_AT_STARTUP_LABEL);	79	b.setText(PaletteMessages.get().EXPAND_DRAWER_AT_STARTUP_LABEL);
80	b.setSelection(getDrawer().isInitiallyOpen());	80	b.setSelection(getDrawer().isInitiallyOpen());
81	if (getPermission() >= PaletteEntry.PERMISSION_LIMITED_MODIFICATION) {	81	if (getPermission() >= PaletteEntry.PERMISSION_LIMITED_MODIFICATION) {
82	b.addSelectionListener(new SelectionAdapter() {	82	b.addSelectionListener(new SelectionAdapter() {
Lines 102-108 Link Here
102	protected Button createPinDrawerInitiallyOption(Composite panel) {	102	protected Button createPinDrawerInitiallyOption(Composite panel) {
103	Button pinOption = new Button(panel, SWT.CHECK);	103	Button pinOption = new Button(panel, SWT.CHECK);
104	pinOption.setFont(panel.getFont());	104	pinOption.setFont(panel.getFont());
105	pinOption.setText(PaletteMessages.DRAWER_PIN_AT_STARTUP);	105	pinOption.setText(PaletteMessages.get().DRAWER_PIN_AT_STARTUP);
106	GridData data = new GridData();	106	GridData data = new GridData();
107	data.horizontalIndent = 15;	107	data.horizontalIndent = 15;
108	pinOption.setLayoutData(data);	108	pinOption.setLayoutData(data);

Lines 28-37 Link Here

(-)src/org/eclipse/gef/ui/palette/customize/PaletteStackFactory.java (-3 / +3 lines)
28		28
29	/**	29	/**
30	* Creates a new PaletteStackFactory with label	30	* Creates a new PaletteStackFactory with label
31	* PaletteMessages.MODEL_TYPE_STACK	31	* PaletteMessages.get().MODEL_TYPE_STACK
32	*/	32	*/
33	public PaletteStackFactory() {	33	public PaletteStackFactory() {
34	setLabel(PaletteMessages.MODEL_TYPE_STACK);	34	setLabel(PaletteMessages.get().MODEL_TYPE_STACK);
35	}	35	}
36		36
37	/**	37	/**
Lines 48-54 Link Here
48	* @see org.eclipse.gef.ui.palette.customize.PaletteEntryFactory#createNewEntry(Shell)	48	* @see org.eclipse.gef.ui.palette.customize.PaletteEntryFactory#createNewEntry(Shell)
49	*/	49	*/
50	protected PaletteEntry createNewEntry(Shell shell) {	50	protected PaletteEntry createNewEntry(Shell shell) {
51	return new PaletteStack(PaletteMessages.NEW_STACK_LABEL, null, null);	51	return new PaletteStack(PaletteMessages.get().NEW_STACK_LABEL, null, null);
52	}	52	}
53		53
54	/**	54	/**

Lines 10-27 Link Here

(-)src/org/eclipse/gef/examples/logicdesigner/actions/LogicActionBarContributor.java (-15 / +12 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.gef.examples.logicdesigner.actions;	11	package org.eclipse.gef.examples.logicdesigner.actions;
12		12
13	import org.eclipse.jface.action.IAction;
14	import org.eclipse.jface.action.IMenuManager;
15	import org.eclipse.jface.action.IToolBarManager;
16	import org.eclipse.jface.action.MenuManager;
17	import org.eclipse.jface.action.Separator;
18	import org.eclipse.ui.IWorkbenchActionConstants;
19	import org.eclipse.ui.actions.ActionFactory;
20	import org.eclipse.ui.actions.RetargetAction;
21
22	import org.eclipse.draw2d.PositionConstants;	13	import org.eclipse.draw2d.PositionConstants;
23
24	import org.eclipse.gef.editparts.ZoomManager;	14	import org.eclipse.gef.editparts.ZoomManager;
		15	import org.eclipse.gef.examples.logicdesigner.LogicMessages;
25	import org.eclipse.gef.internal.GEFMessages;	16	import org.eclipse.gef.internal.GEFMessages;
26	import org.eclipse.gef.ui.actions.ActionBarContributor;	17	import org.eclipse.gef.ui.actions.ActionBarContributor;
27	import org.eclipse.gef.ui.actions.AlignmentRetargetAction;	18	import org.eclipse.gef.ui.actions.AlignmentRetargetAction;
Lines 33-40 Link Here
33	import org.eclipse.gef.ui.actions.ZoomComboContributionItem;	24	import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
34	import org.eclipse.gef.ui.actions.ZoomInRetargetAction;	25	import org.eclipse.gef.ui.actions.ZoomInRetargetAction;
35	import org.eclipse.gef.ui.actions.ZoomOutRetargetAction;	26	import org.eclipse.gef.ui.actions.ZoomOutRetargetAction;
36		27	import org.eclipse.jface.action.IAction;
37	import org.eclipse.gef.examples.logicdesigner.LogicMessages;	28	import org.eclipse.jface.action.IMenuManager;
		29	import org.eclipse.jface.action.IToolBarManager;
		30	import org.eclipse.jface.action.MenuManager;
		31	import org.eclipse.jface.action.Separator;
		32	import org.eclipse.ui.IWorkbenchActionConstants;
		33	import org.eclipse.ui.actions.ActionFactory;
		34	import org.eclipse.ui.actions.RetargetAction;
38		35
39	public class LogicActionBarContributor extends ActionBarContributor {	36	public class LogicActionBarContributor extends ActionBarContributor {
40		37
Lines 63-77 Link Here
63		60
64	addRetargetAction(new RetargetAction(	61	addRetargetAction(new RetargetAction(
65	GEFActionConstants.TOGGLE_RULER_VISIBILITY,	62	GEFActionConstants.TOGGLE_RULER_VISIBILITY,
66	GEFMessages.ToggleRulerVisibility_Label, IAction.AS_CHECK_BOX));	63	GEFMessages.get().ToggleRulerVisibility_Label, IAction.AS_CHECK_BOX));
67		64
68	addRetargetAction(new RetargetAction(	65	addRetargetAction(new RetargetAction(
69	GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY,	66	GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY,
70	GEFMessages.ToggleSnapToGeometry_Label, IAction.AS_CHECK_BOX));	67	GEFMessages.get().ToggleSnapToGeometry_Label, IAction.AS_CHECK_BOX));
71		68
72	addRetargetAction(new RetargetAction(	69	addRetargetAction(new RetargetAction(
73	GEFActionConstants.TOGGLE_GRID_VISIBILITY,	70	GEFActionConstants.TOGGLE_GRID_VISIBILITY,
74	GEFMessages.ToggleGrid_Label, IAction.AS_CHECK_BOX));	71	GEFMessages.get().ToggleGrid_Label, IAction.AS_CHECK_BOX));
75	}	72	}
76		73
77	/**	74	/**