269c269
< 		setAttribute(Figure.POPUP_MENU, createPopupMenu());
---
> 		setAttribute(FigureAttributeConstant.POPUP_MENU, createPopupMenu());
486,487c486,487
< 		displayDelegate.setHorizontalAlignment(((Integer)getAttribute("XAlignment")).intValue());
< 		displayDelegate.setVerticalAlignment(((Integer)getAttribute("YAlignment")).intValue());
---
> 		displayDelegate.setHorizontalAlignment(((Integer)getAttribute(FigureAttributeConstant.XALIGNMENT)).intValue());
> 		displayDelegate.setVerticalAlignment(((Integer)getAttribute(FigureAttributeConstant.YALIGNMENT)).intValue());
510,513c510,513
< 		float leftMargin = ((Float)getAttribute("LeftMargin")).floatValue();
< 		float rightMargin = ((Float)getAttribute("RightMargin")).floatValue();
< 		float topMargin = ((Float)getAttribute("TopMargin")).floatValue();
< 		float bottomMargin = ((Float)getAttribute("BottomMargin")).floatValue();
---
> 		float leftMargin = ((Float)getAttribute(FigureAttributeConstant.LEFT_MARGIN)).floatValue();
> 		float rightMargin = ((Float)getAttribute(FigureAttributeConstant.RIGHT_MARGIN)).floatValue();
> 		float topMargin = ((Float)getAttribute(FigureAttributeConstant.TOP_MARGIN)).floatValue();
> 		float bottomMargin = ((Float)getAttribute(FigureAttributeConstant.BOTTOM_MARGIN)).floatValue();
605c605
< 		if (((Integer)getAttribute("XAlignment")).intValue() == SwingConstants.CENTER) {
---
> 		if (((Integer)getAttribute(FigureAttributeConstant.XALIGNMENT)).intValue() == SwingConstants.CENTER) {
627c627
< 		if (((Integer)getAttribute("XAlignment")).intValue() == SwingConstants.CENTER) {
---
> 		if (((Integer)getAttribute(FigureAttributeConstant.XALIGNMENT)).intValue() == SwingConstants.CENTER) {
859c859
< 		setAttribute(Figure.POPUP_MENU, createPopupMenu());
---
> 		setAttribute(FigureAttributeConstant.POPUP_MENU, createPopupMenu());
940c940
< 	public void setAttribute(String name, Object value) {
---
> 	public void setAttribute(FigureAttributeConstant name, Object value) {
963c963
< 		setAttribute(Figure.POPUP_MENU, createPopupMenu());
---
> 		setAttribute(FigureAttributeConstant.POPUP_MENU, createPopupMenu());