Attachment #30723 for bug #54593

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




public class XSSFCellBorder {
    private ThemesTable _theme;
    private CTBorder border;
    private String borderStr;

    /**
     * Creates a Cell Border from the supplied XML definition

     */
    public XSSFCellBorder(CTBorder border) {
        this.border = border;
        this.borderStr = null;
    }

    /**

     */
    public XSSFCellBorder() {
        border = CTBorder.Factory.newInstance();
        this.borderStr = null;
    }

    /**

     */
    public void setBorderColor(BorderSide side, XSSFColor color) {
        CTBorderPr borderPr = getBorder(side, true);
        if (color == null) 
        	borderPr.unsetColor();
        else
            borderPr.setColor(color.getCTColor());
        this.borderStr = null;
    }

    private CTBorderPr getBorder(BorderSide side) {

    }


    @Override
	public int hashCode() {
    	return toString().hashCode();
    }

    @Override
	public boolean equals(Object o) {
        if (!(o instanceof XSSFCellBorder)) return false;

        XSSFCellBorder cf = (XSSFCellBorder) o;
        return toString().equals(cf.toString());
    }
    
    @Override
	public String toString() {
    	if(borderStr == null) {
    		borderStr = border.toString();
    	}
    	return borderStr;
    }
}
- 

Return to bug 54593

Lines 33-38 import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle; Link Here

(-)a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java (-7 / +21 lines)
33	public class XSSFCellBorder {	33	public class XSSFCellBorder {
34	private ThemesTable _theme;	34	private ThemesTable _theme;
35	private CTBorder border;	35	private CTBorder border;
		36	private String borderStr;
36		37
37	/**	38	/**
38	* Creates a Cell Border from the supplied XML definition	39	* Creates a Cell Border from the supplied XML definition
Lines 47-52 public class XSSFCellBorder { Link Here
47	*/	48	*/
48	public XSSFCellBorder(CTBorder border) {	49	public XSSFCellBorder(CTBorder border) {
49	this.border = border;	50	this.border = border;
		51	this.borderStr = null;
50	}	52	}
51		53
52	/**	54	/**
Lines 55-60 public class XSSFCellBorder { Link Here
55	*/	57	*/
56	public XSSFCellBorder() {	58	public XSSFCellBorder() {
57	border = CTBorder.Factory.newInstance();	59	border = CTBorder.Factory.newInstance();
		60	this.borderStr = null;
58	}	61	}
59		62
60	/**	63	/**
Lines 136-144 public class XSSFCellBorder { Link Here
136	*/	139	*/
137	public void setBorderColor(BorderSide side, XSSFColor color) {	140	public void setBorderColor(BorderSide side, XSSFColor color) {
138	CTBorderPr borderPr = getBorder(side, true);	141	CTBorderPr borderPr = getBorder(side, true);
139	if (color == null) borderPr.unsetColor();	142	if (color == null)
		143	borderPr.unsetColor();
140	else	144	else
141	borderPr.setColor(color.getCTColor());	145	borderPr.setColor(color.getCTColor());
		146	this.borderStr = null;
142	}	147	}
143		148
144	private CTBorderPr getBorder(BorderSide side) {	149	private CTBorderPr getBorder(BorderSide side) {
Lines 172-185 public class XSSFCellBorder { Link Here
172	}	177	}
173		178
174		179
175	public int hashCode() {	180	@Override
176	return border.toString().hashCode();	181	public int hashCode() {
		182	return toString().hashCode();
177	}	183	}
178		184
179	public boolean equals(Object o) {	185	@Override
		186	public boolean equals(Object o) {
180	if (!(o instanceof XSSFCellBorder)) return false;	187	if (!(o instanceof XSSFCellBorder)) return false;
181		188
182	XSSFCellBorder cf = (XSSFCellBorder) o;	189	XSSFCellBorder cf = (XSSFCellBorder) o;
183	return border.toString().equals(cf.getCTBorder().toString());	190	return toString().equals(cf.toString());
184	}	191	}
185	}	192
		193	@Override
		194	public String toString() {
		195	if(borderStr == null) {
		196	borderStr = border.toString();
		197	}
		198	return borderStr;
		199	}
		200	}
186	-