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