Attachment #21652 for bug #44581

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




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */

package org.apache.poi.xssf.usermodel;

import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder;
import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder.BorderSides;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle.Enum;


public class XSSFCellStyle implements CellStyle {
	
	private CTStylesheet stylesheet;
	private CTXf cellXf;
	private CTXf cellStyleXf;
	private XSSFCellBorder cellBorder;
	
	public XSSFCellStyle(CTStylesheet stylesheet, int cellXfsId) {
		this.stylesheet = stylesheet;
		this.cellXf = stylesheet.getCellStyleXfs().getXfArray(cellXfsId);
		if (cellXf.isSetXfId()) {
			this.cellStyleXf = stylesheet.getCellStyleXfs().getXfArray((int) cellXf.getXfId());
		}
	}

	public short getAlignment() {
		// TODO Auto-generated method stub
		return 0;
	}

	public short getBorderBottom() {
		return (short) (getBorderStyle(BorderSides.BOTTOM).intValue() - 1);
	}
	
	public String getBorderBottomAsString() {
		return getBorderStyle(BorderSides.BOTTOM).toString();
	}

	public short getBorderLeft() {
		return (short) (getBorderStyle(BorderSides.LEFT).intValue() - 1);
	}
	
	public String getBorderLeftAsString() {
		return getBorderStyle(BorderSides.LEFT).toString();
	}

	public short getBorderRight() {
		return (short) (getBorderStyle(BorderSides.RIGHT).intValue() - 1);
	}
	
	public String getBorderRightAsString() {
		return getBorderStyle(BorderSides.RIGHT).toString();
	}

	public short getBorderTop() {
		return (short) (getBorderStyle(BorderSides.TOP).intValue() - 1);
	}
	
	public String getBorderTopAsString() {
		return getBorderStyle(BorderSides.TOP).toString();
	}

	public short getBottomBorderColor() {
		return getBorderColorBySide(BorderSides.BOTTOM);
	}

	public short getDataFormat() {
		// TODO Auto-generated method stub
		return 0;
	}

	public short getFillBackgroundColor() {
		// TODO Auto-generated method stub
		return 0;
	}

	public short getFillForegroundColor() {
		// TODO Auto-generated method stub
		return 0;
	}

	public short getFillPattern() {
		// TODO Auto-generated method stub
		return 0;
	}

	public Font getFont(Workbook parentWorkbook) {
		// TODO Auto-generated method stub
		return null;
	}

	public short getFontIndex() {
		// TODO Auto-generated method stub
		return 0;
	}

	public boolean getHidden() {
		// TODO Auto-generated method stub
		return false;
	}

	public short getIndention() {
		// TODO Auto-generated method stub
		return 0;
	}

	public short getIndex() {
		// TODO Auto-generated method stub
		return 0;
	}

	public short getLeftBorderColor() {
		return getBorderColorBySide(BorderSides.LEFT);
	}

	public boolean getLocked() {
		// TODO Auto-generated method stub
		return false;
	}

	public short getRightBorderColor() {
		return getBorderColorBySide(BorderSides.RIGHT);
	}

	public short getRotation() {
		// TODO Auto-generated method stub
		return 0;
	}

	public short getTopBorderColor() {
		return getBorderColorBySide(BorderSides.TOP);
	}

	public short getVerticalAlignment() {
		// TODO Auto-generated method stub
		return 0;
	}

	public boolean getWrapText() {
		// TODO Auto-generated method stub
		return false;
	}

	public void setAlignment(short align) {
		// TODO Auto-generated method stub
		
	}

	public void setBorderBottom(short border) {
		// TODO Auto-generated method stub
		
	}

	public void setBorderLeft(short border) {
		// TODO Auto-generated method stub
		
	}

	public void setBorderRight(short border) {
		// TODO Auto-generated method stub
		
	}

	public void setBorderTop(short border) {
		// TODO Auto-generated method stub
		
	}

	public void setBottomBorderColor(short color) {
		// TODO Auto-generated method stub
		
	}

	public void setDataFormat(short fmt) {
		// TODO Auto-generated method stub
		
	}

	public void setFillBackgroundColor(short bg) {
		// TODO Auto-generated method stub
		
	}

	public void setFillForegroundColor(short bg) {
		// TODO Auto-generated method stub
		
	}

	public void setFillPattern(short fp) {
		// TODO Auto-generated method stub
		
	}

	public void setFont(Font font) {
		// TODO Auto-generated method stub
		
	}

	public void setHidden(boolean hidden) {
		// TODO Auto-generated method stub
		
	}

	public void setIndention(short indent) {
		// TODO Auto-generated method stub
		
	}

	public void setLeftBorderColor(short color) {
		// TODO Auto-generated method stub
		
	}

	public void setLocked(boolean locked) {
		// TODO Auto-generated method stub
		
	}

	public void setRightBorderColor(short color) {
		// TODO Auto-generated method stub
		
	}

	public void setRotation(short rotation) {
		// TODO Auto-generated method stub
		
	}

	public void setTopBorderColor(short color) {
		// TODO Auto-generated method stub
		
	}

	public void setVerticalAlignment(short align) {
		// TODO Auto-generated method stub
		
	}

	public void setWrapText(boolean wrapped) {
		// TODO Auto-generated method stub
		
	}

	private XSSFCellBorder getCellBorder() {
		if (cellBorder == null) {
			CTBorder border = stylesheet.getBorders().getBorderArray(getBorderId());
			cellBorder = new XSSFCellBorder(border);
		}
		return cellBorder;
	}

	private int getBorderId() {
		if (cellXf.isSetBorderId()) {
			return (int) cellXf.getBorderId();
		}
		return (int) cellStyleXf.getBorderId();
	}

	private Enum getBorderStyle(BorderSides side) {
		return getCellBorder().getBorderStyle(side);
	}

	private short getBorderColorBySide(BorderSides side) {
		return (short) getCellBorder().getBorderColor(side).getIndexed();
	}
	
}




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */
package org.apache.poi.xssf.usermodel.extensions;


import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle.Enum;


public class XSSFCellBorder {
	
	private CTBorder border;
	
	public XSSFCellBorder(CTBorder border) {
		this.border = border;
	}
	
	public static enum BorderSides {
		TOP, RIGHT, BOTTOM, LEFT
	}
	
	public Enum getBorderStyle(BorderSides side) {
		return getBorder(side).getStyle();
	}
	
	public XSSFColor getBorderColor(BorderSides side) {
		CTBorderPr borderPr = getBorder(side);
		if (!borderPr.isSetColor()) {
			borderPr.addNewColor();
		}
		return new XSSFColor(getBorder(side).getColor());
	}
	
	private CTBorderPr getBorder(BorderSides side) {
		switch (side) {
		case TOP: return border.getTop();
		case RIGHT: return border.getRight();
		case BOTTOM: return border.getBottom();
		case LEFT: return border.getLeft();
		default: throw new IllegalArgumentException("No suitable side specified for the border");
		}
	}

}




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */
package org.apache.poi.xssf.usermodel.extensions;

import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellAlignment;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.STHorizontalAlignment;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.STHorizontalAlignment.Enum;


public class XSSFCellAlignment {
	
	private CTCellAlignment cellAlignement;
	
	public XSSFCellAlignment(CTCellAlignment cellAlignment) {
		this.cellAlignement = cellAlignment;
	}
	
	public Enum getHorizontal() {
		return cellAlignement.getHorizontal();
	}
	
	public void setHorizontal(STHorizontalAlignment.Enum horizontal) {
		cellAlignement.setHorizontal(horizontal);
	}
	
	public long getIndent() {
		return cellAlignement.getIndent();
	}
	
	public void setIndent(long indent) {
		cellAlignement.setIndent(indent);
	}
}




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */
package org.apache.poi.xssf.usermodel.extensions;

import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;

public class XSSFColor {
	
	private CTColor color;
	
	public XSSFColor(CTColor color) {
		this.color = color;
	}
	
	public boolean isAuto() {
		return color.getAuto();
	}
	
	public void setAuto(boolean auto) {
		color.setAuto(auto);
	}
	
	public long getIndexed() {
		return color.getIndexed();
	}
	
	public void setIndexed(long indexed) {
		color.setIndexed(indexed);
	}
	
	public byte[] getRgb() {
		return color.getRgb();
	}
	
	public void setRgb(byte[] rgb) {
		color.setRgb(rgb);
	}
	
	public long getTheme() {
		return color.getTheme();
	}
	
	public void setTheme(long theme) {
		color.setTheme(theme);
	}
	
	public double getTint() {
		return color.getTint();
	}
	
	public void setTint(double tint) {
		color.setTint(tint);
	}
}





package org.apache.poi.xssf.usermodel.helpers;

import java.util.Arrays;

import org.apache.poi.xssf.util.CTColComparator;
import org.apache.poi.xssf.util.NumericRanges;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;

public class ColumnHelper {

public class ColumnHelper {
    
    private CTWorksheet worksheet;
    private CTCols newCols;


        this.newCols = CTCols.Factory.newInstance();
        CTCols[] colsArray = worksheet.getColsArray();
        int i = 0;
        for (i = 0; i < colsArray.length; i++) {
            CTCols cols = colsArray[i];
            CTCol[] colArray = cols.getColArray();
            for (int y = 0; y < colArray.length; y++) {
                CTCol col = colArray[y];
                newCols = addCleanColIntoCols(newCols, col);
                     if (!columnExists(newCols, k)) {
                         CTCol newCol = newCols.addNewCol();
                         newCol.setMin(k);
                         newCol.setMax(k);
                         setColumnAttributes(col, newCol);
                     }
                 }
            }
        }
        for (int y = i - 1; y >= 0; y--) {
            worksheet.removeCols(y);
        }
        worksheet.addNewCols();
        worksheet.setColsArray(0, newCols);
    }

    public void sortColumns(CTCols newCols) {
        CTCol[] colArray = newCols.getColArray();
        Arrays.sort(colArray, new CTColComparator());
        newCols.setColArray(colArray);
    }

    public CTCol cloneCol(CTCols cols, CTCol col) {
        CTCol newCol = cols.addNewCol();
        newCol.setMin(col.getMin());
        newCol.setMax(col.getMax());
        setColumnAttributes(col, newCol);
        return newCol;
    }

    public CTCol getColumn(long index) {
        for (int i = 0; i < worksheet.getColsArray(0).sizeOfColArray(); i++) {
            if (worksheet.getColsArray(0).getColArray(i).getMin() == index) {
                return worksheet.getColsArray(0).getColArray(i);
            }
        }
        return null;
    }

    public CTCols addCleanColIntoCols(CTCols cols, CTCol col) {
        boolean colOverlaps = false;
        for (int i = 0; i < cols.sizeOfColArray(); i++) {
            CTCol ithCol = cols.getColArray(i);
            long[] range1 = { ithCol.getMin(), ithCol.getMax() };
            long[] range2 = { col.getMin(), col.getMax() };
            long[] overlappingRange = NumericRanges.getOverlappingRange(range1,
                    range2);
            int overlappingType = NumericRanges.getOverlappingType(range1,
                    range2);
            // different behavior required for each of the 4 different
            // overlapping types
            if (overlappingType == NumericRanges.OVERLAPS_1_MINOR) {
                ithCol.setMax(overlappingRange[0] - 1);
                CTCol rangeCol = insertCol(cols, overlappingRange[0],
                        overlappingRange[1], new CTCol[] { ithCol, col });
                i++;
                CTCol newCol = insertCol(cols, (overlappingRange[1] + 1), col
                        .getMax(), new CTCol[] { col });
                i++;
            } else if (overlappingType == NumericRanges.OVERLAPS_2_MINOR) {
                ithCol.setMin(overlappingRange[1] + 1);
                CTCol rangeCol = insertCol(cols, overlappingRange[0],
                        overlappingRange[1], new CTCol[] { ithCol, col });
                i++;
                CTCol newCol = insertCol(cols, col.getMin(),
                        (overlappingRange[0] - 1), new CTCol[] { col });
                i++;
            } else if (overlappingType == NumericRanges.OVERLAPS_2_WRAPS) {
                setColumnAttributes(col, ithCol);
                if (col.getMin() != ithCol.getMin()) {
                    CTCol newColBefore = insertCol(cols, col.getMin(), (ithCol
                            .getMin() - 1), new CTCol[] { col });
                    i++;
                }
                if (col.getMax() != ithCol.getMax()) {
                    CTCol newColAfter = insertCol(cols, (ithCol.getMax() + 1),
                            col.getMax(), new CTCol[] { col });
                    i++;
                }
            } else if (overlappingType == NumericRanges.OVERLAPS_1_WRAPS) {
                if (col.getMin() != ithCol.getMin()) {
                    CTCol newColBefore = insertCol(cols, ithCol.getMin(), (col
                            .getMin() - 1), new CTCol[] { ithCol });
                    i++;
                }
                if (col.getMax() != ithCol.getMax()) {
                    CTCol newColAfter = insertCol(cols, (col.getMax() + 1),
                            ithCol.getMax(), new CTCol[] { ithCol });
                    i++;
                }
                ithCol.setMin(overlappingRange[0]);
                ithCol.setMax(overlappingRange[1]);
                setColumnAttributes(col, ithCol);
            }
            if (overlappingType != NumericRanges.NO_OVERLAPS) {
                colOverlaps = true;
            }
        }
        if (!colOverlaps) {
            CTCol newCol = cloneCol(cols, col);
        }
        sortColumns(cols);
        return cols;
    }

    /*
     * Insert a new CTCol at position 0 into cols, setting min=min, max=max and
     * copying all the colsWithAttributes array cols attributes into newCol
     */
    private CTCol insertCol(CTCols cols, long min, long max,
            CTCol[] colsWithAttributes) {
        CTCol newCol = cols.insertNewCol(0);
        newCol.setMin(min);
        newCol.setMax(max);
        for (CTCol col : colsWithAttributes) {
            setColumnAttributes(col, newCol);
        }
        return newCol;
    }

    public boolean columnExists(CTCols cols, long index) {
        for (int i = 0; i < cols.sizeOfColArray(); i++) {
            if (cols.getColArray(i).getMin() == index) {
                return true;
            }
        }
        return false;
    }

    public void setColumnAttributes(CTCol fromCol, CTCol toCol) {
        if (fromCol.getWidth() != 0) {
            toCol.setWidth(fromCol.getWidth());
        }
        if (fromCol.getHidden()) {
            toCol.setHidden(true);
        }
        if (fromCol.getBestFit()) {
            toCol.setBestFit(true);
        }
    }

    public void setColBestFit(long index, boolean bestFit) {
        CTCol col = getOrCreateColumn(index);
        col.setBestFit(bestFit);
    }

    public void setColWidth(long index, double width) {
        CTCol col = getOrCreateColumn(index);
        col.setWidth(width);
    }

    public void setColHidden(long index, boolean hidden) {
        CTCol col = getOrCreateColumn(index);
        col.setHidden(hidden);
    }

    protected CTCol getOrCreateColumn(long index) {
        CTCol col = getColumn(index);
        if (col == null) {
            col = worksheet.getColsArray(0).addNewCol();
            col.setMin(index);
            col.setMax(index);
        }
        return col;
    }

}




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */

package org.apache.poi.xssf.util;

public class NumericRanges {

    public static int NO_OVERLAPS = -1;
    public static int OVERLAPS_1_MINOR = 0;
    public static int OVERLAPS_2_MINOR = 1;
    public static int OVERLAPS_1_WRAPS = 2;
    public static int OVERLAPS_2_WRAPS = 3;
    
    public static long[] getOverlappingRange(long[] range1, long[] range2) {
        int overlappingType = getOverlappingType(range1, range2);
        if (overlappingType == OVERLAPS_1_MINOR) {
            return new long[]{range2[0], range1[1]};
        }
        else if (overlappingType == OVERLAPS_2_MINOR) {
            return new long[]{range1[0], range2[1]};
        }
        else if (overlappingType == OVERLAPS_2_WRAPS) {
            return range1;
        }
        else if (overlappingType == OVERLAPS_1_WRAPS) {
            return range2;
        }
        return new long[]{-1, -1};
    }
    
    public static int getOverlappingType(long[] range1, long[] range2) {
        long min1 = range1[0];
        long max1 = range1[1];
        long min2 = range2[0];
        long max2 = range2[1];
        if (min1 >= min2 && max1 <= max2) {
            return OVERLAPS_2_WRAPS;
        }
        else if (min2 >= min1 && max2 <= max1) {
            return OVERLAPS_1_WRAPS;
        }
        else if ((min2 >= min1 && min2 <= max1) && max2 >= max1) {
            return OVERLAPS_1_MINOR;
        }
        else if ((min1 >= min2 && min1 <= max2)  && max1 >= max2) {
            return OVERLAPS_2_MINOR;
        }
        return NO_OVERLAPS;
        
    }
    
}




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */

package org.apache.poi.xssf.util;

import java.util.Comparator;

import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;

public class CTColComparator implements Comparator<CTCol>{

    public int compare(CTCol o1, CTCol o2) {
        if (o1.getMin() < o2.getMin()) {
            return -1;
        }
        else if (o1.getMin() > o2.getMin()) {
            return 1;
        }
        else {
            if (o1.getMax() < o2.getMax()) {
                return -1;
            }
            if (o1.getMax() > o2.getMax()) {
                return 1;
            }
            return 0;
        }
    }
    
    
    
}




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */

package org.apache.poi.xssf.usermodel.extensions;

import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder.BorderSides;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle;

import junit.framework.TestCase;


public class TestXSSFBorder extends TestCase {
	
	public void testGetBorderStyle() {
		CTStylesheet stylesheet = CTStylesheet.Factory.newInstance();
		CTBorder border = stylesheet.addNewBorders().addNewBorder();
		CTBorderPr top = border.addNewTop();
		CTBorderPr right = border.addNewRight();
		CTBorderPr bottom = border.addNewBottom();
		top.setStyle(STBorderStyle.DASH_DOT);
		right.setStyle(STBorderStyle.NONE);
		bottom.setStyle(STBorderStyle.THIN);
		XSSFCellBorder cellBorderStyle = new XSSFCellBorder(border);
		assertEquals("dashDot", cellBorderStyle.getBorderStyle(BorderSides.TOP).toString());
		assertEquals("none", cellBorderStyle.getBorderStyle(BorderSides.RIGHT).toString());
		assertEquals(1, cellBorderStyle.getBorderStyle(BorderSides.RIGHT).intValue());
		assertEquals("thin", cellBorderStyle.getBorderStyle(BorderSides.BOTTOM).toString());
		assertEquals(2, cellBorderStyle.getBorderStyle(BorderSides.BOTTOM).intValue());
	}
	
}




import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;

public class TestColumnHelper extends TestCase {

public class TestColumnHelper extends TestCase {
    
    public void testCleanColumns() {
        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();

        CTCols cols1 = worksheet.addNewCols();
        CTCol col1 = cols1.addNewCol();
        col1.setMin(1);

        col2.setMax(3);
        CTCols cols2 = worksheet.addNewCols();
        CTCol col4 = cols2.addNewCol();
        col4.setMin(13);
        col4.setMax(16384);

        // Test cleaning cols
        assertEquals(2, worksheet.sizeOfColsArray());
        int count = countColumns(worksheet);
        assertEquals(16375, count);
        // Clean columns and test a clean worksheet
        ColumnHelper helper = new ColumnHelper(worksheet);
        assertEquals(1, worksheet.sizeOfColsArray());
        count = countColumns(worksheet);
        assertEquals(16375, count);
        assertEquals((double) 88, helper.getColumn(1).getWidth());
        assertTrue(helper.getColumn(1).getHidden());
        
    }

    public void testSortColumns() {
        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
        ColumnHelper helper = new ColumnHelper(worksheet);

        CTCols cols1 = CTCols.Factory.newInstance();
        CTCol col1 = cols1.addNewCol();
        col1.setMin(1);
        col1.setMax(1);
        col1.setWidth(88);
        col1.setHidden(true);
        CTCol col2 = cols1.addNewCol();
        col2.setMin(2);
        col2.setMax(3);
        CTCol col3 = cols1.addNewCol();
        col3.setMin(13);
        col3.setMax(16750);
        assertEquals(3, cols1.sizeOfColArray());
        CTCol col4 = cols1.addNewCol();
        col4.setMin(8);
        col4.setMax(11);
        assertEquals(4, cols1.sizeOfColArray());
        CTCol col5 = cols1.addNewCol();
        col5.setMin(4);
        col5.setMax(5);
        assertEquals(5, cols1.sizeOfColArray());
        CTCol col6 = cols1.addNewCol();
        col6.setMin(8);
        col6.setMax(9);
        col6.setHidden(true);
        CTCol col7 = cols1.addNewCol();
        col7.setMin(6);
        col7.setMax(8);
        col7.setWidth(17.0);
        CTCol col8 = cols1.addNewCol();
        col8.setMin(25);
        col8.setMax(27);
        CTCol col9 = cols1.addNewCol();
        col9.setMin(20);
        col9.setMax(30);
        assertEquals(9, cols1.sizeOfColArray());
        assertEquals(20, cols1.getColArray(8).getMin());
        assertEquals(30, cols1.getColArray(8).getMax());
        helper.sortColumns(cols1);
        assertEquals(9, cols1.sizeOfColArray());
        assertEquals(25, cols1.getColArray(8).getMin());
        assertEquals(27, cols1.getColArray(8).getMax());
    }

    public void testCloneCol() {
        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
        ColumnHelper helper = new ColumnHelper(worksheet);

        CTCols cols = CTCols.Factory.newInstance();
        CTCol col = CTCol.Factory.newInstance();
        col.setMin(2);
        col.setMax(8);
        col.setHidden(true);
        col.setWidth(13.4);
        CTCol newCol = helper.cloneCol(cols, col);
        assertEquals(2, newCol.getMin());
        assertEquals(8, newCol.getMax());
        assertTrue(newCol.getHidden());
        assertEquals(13.4, newCol.getWidth());
    }

    public void testAddCleanColIntoCols() {
        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
        ColumnHelper helper = new ColumnHelper(worksheet);

        CTCols cols1 = CTCols.Factory.newInstance();
        CTCol col1 = cols1.addNewCol();
        col1.setMin(1);
        col1.setMax(1);
        col1.setWidth(88);
        col1.setHidden(true);
        CTCol col2 = cols1.addNewCol();
        col2.setMin(2);
        col2.setMax(3);
        CTCol col3 = cols1.addNewCol();
        col3.setMin(13);
        col3.setMax(16750);
        assertEquals(3, cols1.sizeOfColArray());
        CTCol col4 = cols1.addNewCol();
        col4.setMin(8);
        col4.setMax(9);
        assertEquals(4, cols1.sizeOfColArray());

        CTCol col5 = CTCol.Factory.newInstance();
        col5.setMin(4);
        col5.setMax(5);
        helper.addCleanColIntoCols(cols1, col5);
        assertEquals(5, cols1.sizeOfColArray());

        CTCol col6 = CTCol.Factory.newInstance();
        col6.setMin(8);
        col6.setMax(11);
        col6.setHidden(true);
        helper.addCleanColIntoCols(cols1, col6);
        assertEquals(6, cols1.sizeOfColArray());

        CTCol col7 = CTCol.Factory.newInstance();
        col7.setMin(6);
        col7.setMax(8);
        col7.setWidth(17.0);
        helper.addCleanColIntoCols(cols1, col7);
        assertEquals(8, cols1.sizeOfColArray());

        CTCol col8 = CTCol.Factory.newInstance();
        col8.setMin(20);
        col8.setMax(30);
        helper.addCleanColIntoCols(cols1, col8);
        assertEquals(10, cols1.sizeOfColArray());

        CTCol col9 = CTCol.Factory.newInstance();
        col9.setMin(25);
        col9.setMax(27);
        helper.addCleanColIntoCols(cols1, col9);

        System.err.println(cols1);
    }

    public void testGetColumn() {
        CTWorksheet worksheet = CTWorksheet.Factory.newInstance();

        CTCols cols1 = worksheet.addNewCols();
        CTCol col1 = cols1.addNewCol();
        col1.setMin(1);

        CTCol col4 = cols2.addNewCol();
        col4.setMin(3);
        col4.setMax(6);

        ColumnHelper helper = new ColumnHelper(worksheet);
        assertNotNull(helper.getColumn(1));
        assertEquals((double) 88, helper.getColumn(1).getWidth());

        assertFalse(helper.getColumn(2).getHidden());
        assertNull(helper.getColumn(99));
    }

    public void testSetColumnAttributes() {
        CTCol col = CTCol.Factory.newInstance();
        col.setWidth(12);

        CTCol newCol = CTCol.Factory.newInstance();
        assertEquals((double) 0, newCol.getWidth());
        assertFalse(newCol.getHidden());
        ColumnHelper helper = new ColumnHelper(CTWorksheet.Factory
                .newInstance());
        helper.setColumnAttributes(col, newCol);
        assertEquals((double) 12, newCol.getWidth());
        assertTrue(newCol.getHidden());
    }

    public void testGetOrCreateColumn() {
        XSSFWorkbook workbook = new XSSFWorkbook();
        XSSFSheet sheet = (XSSFSheet) workbook.createSheet("Sheet 1");

    private int countColumns(CTWorksheet worksheet) {
        int count;
        count = 0;
        for (int i = 0; i < worksheet.sizeOfColsArray(); i++) {
            for (int y = 0; y < worksheet.getColsArray(i).sizeOfColArray(); y++) {
                for (long k = worksheet.getColsArray(i).getColArray(y).getMin(); k <= worksheet
                        .getColsArray(i).getColArray(y).getMax(); k++) {
                    count++;
                }
            }
        }
        return count;
    }

}




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */

package org.apache.poi.xssf.usermodel;

import junit.framework.TestCase;

import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle;


public class TestXSSFCellStyle extends TestCase {
	
	private CTStylesheet ctStylesheet;
	private CTBorder ctBorder;
	private CTXf cellStyleXf;
	private CTXf cellXf;
	private XSSFCellStyle cellStyle;

	public void setUp() {
		ctStylesheet = CTStylesheet.Factory.newInstance();
		ctBorder = ctStylesheet.addNewBorders().insertNewBorder(0);
		cellStyleXf = ctStylesheet.addNewCellStyleXfs().addNewXf();
		cellStyleXf.setBorderId(0);
		cellXf = ctStylesheet.addNewCellXfs().addNewXf();
		cellXf.setXfId(0);
		cellStyle = new XSSFCellStyle(ctStylesheet, 0);
	}
	
	public void testGetBorderBottom() {		
		ctBorder.addNewBottom().setStyle(STBorderStyle.THIN);
		assertEquals((short)1, cellStyle.getBorderBottom());
	}

	public void testGetBorderBottomAsString() {
		ctBorder.addNewBottom().setStyle(STBorderStyle.THIN);
		assertEquals("thin", cellStyle.getBorderBottomAsString());
	}
	
	public void testGetBorderRight() {
		ctBorder.addNewRight().setStyle(STBorderStyle.MEDIUM);
		assertEquals((short)2, cellStyle.getBorderRight());
	}

	public void testGetBorderRightAsString() {
		ctBorder.addNewRight().setStyle(STBorderStyle.MEDIUM);
		assertEquals("medium", cellStyle.getBorderRightAsString());
	}
	
	public void testGetBorderLeft() {
		ctBorder.addNewLeft().setStyle(STBorderStyle.DASHED);
		assertEquals((short)3, cellStyle.getBorderLeft());
	}

	public void testGetBorderLeftAsString() {
		ctBorder.addNewLeft().setStyle(STBorderStyle.DASHED);
		assertEquals("dashed", cellStyle.getBorderLeftAsString());
	}
	
	public void testGetBorderTop() {
		ctBorder.addNewTop().setStyle(STBorderStyle.HAIR);
		assertEquals((short)7, cellStyle.getBorderTop());
	}

	public void testGetTopBottomAsString() {
		ctBorder.addNewTop().setStyle(STBorderStyle.HAIR);
		assertEquals("hair", cellStyle.getBorderTopAsString());
	}
}




    protected void setUp() throws Exception {
        super.setUp();
        System.setProperty("org.apache.poi.util.POILogger", org.apache.poi.util.CommonsLogger.class.getName());
        filename = System.getProperty("XSSF.testdata.path");
        if (filename == null) {
            filename = "src/ooxml/testcases/org/apache/poi/xssf/data";
        }

    
    // TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successfull.
    public void testLoadStyles() throws Exception {
        XSSFWorkbook workbook = new XSSFWorkbook(new File(filename, "styles.xlsx").getAbsolutePath());
        Sheet sheet = workbook.getSheetAt(0);
        Row row = sheet.getRow(0);
        Cell cell = row.getCell((short) 0);


    // TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successfull.
    public void testLoadPictures() throws Exception {
        XSSFWorkbook workbook = new XSSFWorkbook(new File(filename, "picture.xlsx").getAbsolutePath());
        List<PictureData> pictures = workbook.getAllPictures();
        assertEquals(1, pictures.size());
    }




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */

package org.apache.poi.xssf.util;

import junit.framework.TestCase;


public class TestNumericRanges extends TestCase {
    
    public void testGetOverlappingType() {
        long[] r1 = {3, 8};
        long[] r2 = {6, 11};
        long[] r3 = {1, 5};
        long[] r4 = {2, 20};
        long[] r5 = {5, 6};
        long[] r6 = {20, 23};
        assertEquals(NumericRanges.OVERLAPS_1_MINOR, NumericRanges.getOverlappingType(r1, r2));
        assertEquals(NumericRanges.OVERLAPS_2_MINOR, NumericRanges.getOverlappingType(r1, r3));
        assertEquals(NumericRanges.OVERLAPS_2_WRAPS, NumericRanges.getOverlappingType(r1, r4));
        assertEquals(NumericRanges.OVERLAPS_1_WRAPS, NumericRanges.getOverlappingType(r1, r5));
        assertEquals(NumericRanges.NO_OVERLAPS, NumericRanges.getOverlappingType(r1, r6));
    }
    
    public void testGetOverlappingRange() {
        long[] r1 = {3, 8};
        long[] r2 = {6, 11};
        long[] r3 = {1, 5};
        long[] r4 = {2, 20};
        long[] r5 = {5, 6};
        long[] r6 = {20, 23};
        assertEquals(6, NumericRanges.getOverlappingRange(r1, r2)[0]);
        assertEquals(8, NumericRanges.getOverlappingRange(r1, r2)[1]);
        assertEquals(3, NumericRanges.getOverlappingRange(r1, r3)[0]);
        assertEquals(5, NumericRanges.getOverlappingRange(r1, r3)[1]);
        assertEquals(3, NumericRanges.getOverlappingRange(r1, r4)[0]);
        assertEquals(8, NumericRanges.getOverlappingRange(r1, r4)[1]);
        assertEquals(5, NumericRanges.getOverlappingRange(r1, r5)[0]);
        assertEquals(6, NumericRanges.getOverlappingRange(r1, r5)[1]);
        assertEquals(-1, NumericRanges.getOverlappingRange(r1, r6)[0]);
        assertEquals(-1, NumericRanges.getOverlappingRange(r1, r6)[1]);
    }
    
}




/* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
==================================================================== */

package org.apache.poi.xssf.util;

import java.util.Arrays;

import junit.framework.TestCase;

import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;


public class TestCTColComparator extends TestCase {
    
    public void testCompare() {
        CTColComparator comparator = new CTColComparator();
        CTCol o1 = CTCol.Factory.newInstance();
        o1.setMin(1);
        o1.setMax(10);
        CTCol o2 = CTCol.Factory.newInstance();
        o2.setMin(11);
        o2.setMax(12);
        assertEquals(-1, comparator.compare(o1, o2));
        CTCol o3 = CTCol.Factory.newInstance();
        o3.setMin(5);
        o3.setMax(8);
        CTCol o4 = CTCol.Factory.newInstance();
        o4.setMin(5);
        o4.setMax(80);
        assertEquals(-1, comparator.compare(o3, o4));
    }
    
    public void testArraysSort() {
        CTColComparator comparator = new CTColComparator();
        CTCol o1 = CTCol.Factory.newInstance();
        o1.setMin(1);
        o1.setMax(10);
        CTCol o2 = CTCol.Factory.newInstance();
        o2.setMin(11);
        o2.setMax(12);
        assertEquals(-1, comparator.compare(o1, o2));
        CTCol o3 = CTCol.Factory.newInstance();
        o3.setMin(5);
        o3.setMax(80);
        CTCol o4 = CTCol.Factory.newInstance();
        o4.setMin(5);
        o4.setMax(8);
        assertEquals(1, comparator.compare(o3, o4));
        CTCol[] cols = new CTCol[4];
        cols[0] = o1;
        cols[1] = o2;
        cols[2] = o3;
        cols[3] = o4;
        assertEquals(80, cols[2].getMax());
        assertEquals(8, cols[3].getMax());
        Arrays.sort(cols, comparator);
        assertEquals(12, cols[3].getMax());
        assertEquals(8, cols[1].getMax());
        assertEquals(80, cols[2].getMax());
    }
    
}

Return to bug 44581

Lines 17-30 Link Here

(-)src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java (-46 / +136 lines)
17		17
18	package org.apache.poi.xssf.usermodel.helpers;	18	package org.apache.poi.xssf.usermodel.helpers;
19		19
		20	import java.util.Arrays;
20		21
		22	import org.apache.poi.xssf.util.CTColComparator;
		23	import org.apache.poi.xssf.util.NumericRanges;
21	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;	24	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
22	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;	25	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
23	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;	26	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
24		27
		28	public class ColumnHelper {
25		29
26	public class ColumnHelper {
27
28	private CTWorksheet worksheet;	30	private CTWorksheet worksheet;
29	private CTCols newCols;	31	private CTCols newCols;
30		32
Lines 38-118 Link Here
38	this.newCols = CTCols.Factory.newInstance();	40	this.newCols = CTCols.Factory.newInstance();
39	CTCols[] colsArray = worksheet.getColsArray();	41	CTCols[] colsArray = worksheet.getColsArray();
40	int i = 0;	42	int i = 0;
41	for (i = 0 ; i < colsArray.length ; i++) {	43	for (i = 0; i < colsArray.length; i++) {
42	CTCols cols = colsArray[i];	44	CTCols cols = colsArray[i];
43	CTCol[] colArray = cols.getColArray();	45	CTCol[] colArray = cols.getColArray();
44	for (int y = 0 ; y < colArray.length ; y++) {	46	for (int y = 0; y < colArray.length; y++) {
45	CTCol col = colArray[y];	47	CTCol col = colArray[y];
46	for (long k = col.getMin() ; k <= col.getMax() ; k++) {	48	newCols = addCleanColIntoCols(newCols, col);
47	if (!columnExists(newCols, k)) {
48	CTCol newCol = newCols.addNewCol();
49	newCol.setMin(k);
50	newCol.setMax(k);
51	setColumnAttributes(col, newCol);
52	}
53	}
54	}	49	}
55	}	50	}
56	for (int y = i-1 ; y >= 0 ; y--) {	51	for (int y = i - 1; y >= 0; y--) {
57	worksheet.removeCols(y);	52	worksheet.removeCols(y);
58	}	53	}
59	worksheet.addNewCols();	54	worksheet.addNewCols();
60	worksheet.setColsArray(0, newCols);	55	worksheet.setColsArray(0, newCols);
61	}	56	}
62		57
		58	public void sortColumns(CTCols newCols) {
		59	CTCol[] colArray = newCols.getColArray();
		60	Arrays.sort(colArray, new CTColComparator());
		61	newCols.setColArray(colArray);
		62	}
		63
		64	public CTCol cloneCol(CTCols cols, CTCol col) {
		65	CTCol newCol = cols.addNewCol();
		66	newCol.setMin(col.getMin());
		67	newCol.setMax(col.getMax());
		68	setColumnAttributes(col, newCol);
		69	return newCol;
		70	}
		71
63	public CTCol getColumn(long index) {	72	public CTCol getColumn(long index) {
64	for (int i = 0 ; i < worksheet.getColsArray(0).sizeOfColArray() ; i++) {	73	for (int i = 0; i < worksheet.getColsArray(0).sizeOfColArray(); i++) {
65	if (worksheet.getColsArray(0).getColArray(i).getMin() == index) {	74	if (worksheet.getColsArray(0).getColArray(i).getMin() == index) {
66	return worksheet.getColsArray(0).getColArray(i);	75	return worksheet.getColsArray(0).getColArray(i);
67	}	76	}
68	}	77	}
69	return null;	78	return null;
70	}	79	}
71		80
		81	public CTCols addCleanColIntoCols(CTCols cols, CTCol col) {
		82	boolean colOverlaps = false;
		83	for (int i = 0; i < cols.sizeOfColArray(); i++) {
		84	CTCol ithCol = cols.getColArray(i);
		85	long[] range1 = { ithCol.getMin(), ithCol.getMax() };
		86	long[] range2 = { col.getMin(), col.getMax() };
		87	long[] overlappingRange = NumericRanges.getOverlappingRange(range1,
		88	range2);
		89	int overlappingType = NumericRanges.getOverlappingType(range1,
		90	range2);
		91	// different behavior required for each of the 4 different
		92	// overlapping types
		93	if (overlappingType == NumericRanges.OVERLAPS_1_MINOR) {
		94	ithCol.setMax(overlappingRange[0] - 1);
		95	CTCol rangeCol = insertCol(cols, overlappingRange[0],
		96	overlappingRange[1], new CTCol[] { ithCol, col });
		97	i++;
		98	CTCol newCol = insertCol(cols, (overlappingRange[1] + 1), col
		99	.getMax(), new CTCol[] { col });
		100	i++;
		101	} else if (overlappingType == NumericRanges.OVERLAPS_2_MINOR) {
		102	ithCol.setMin(overlappingRange[1] + 1);
		103	CTCol rangeCol = insertCol(cols, overlappingRange[0],
		104	overlappingRange[1], new CTCol[] { ithCol, col });
		105	i++;
		106	CTCol newCol = insertCol(cols, col.getMin(),
		107	(overlappingRange[0] - 1), new CTCol[] { col });
		108	i++;
		109	} else if (overlappingType == NumericRanges.OVERLAPS_2_WRAPS) {
		110	setColumnAttributes(col, ithCol);
		111	if (col.getMin() != ithCol.getMin()) {
		112	CTCol newColBefore = insertCol(cols, col.getMin(), (ithCol
		113	.getMin() - 1), new CTCol[] { col });
		114	i++;
		115	}
		116	if (col.getMax() != ithCol.getMax()) {
		117	CTCol newColAfter = insertCol(cols, (ithCol.getMax() + 1),
		118	col.getMax(), new CTCol[] { col });
		119	i++;
		120	}
		121	} else if (overlappingType == NumericRanges.OVERLAPS_1_WRAPS) {
		122	if (col.getMin() != ithCol.getMin()) {
		123	CTCol newColBefore = insertCol(cols, ithCol.getMin(), (col
		124	.getMin() - 1), new CTCol[] { ithCol });
		125	i++;
		126	}
		127	if (col.getMax() != ithCol.getMax()) {
		128	CTCol newColAfter = insertCol(cols, (col.getMax() + 1),
		129	ithCol.getMax(), new CTCol[] { ithCol });
		130	i++;
		131	}
		132	ithCol.setMin(overlappingRange[0]);
		133	ithCol.setMax(overlappingRange[1]);
		134	setColumnAttributes(col, ithCol);
		135	}
		136	if (overlappingType != NumericRanges.NO_OVERLAPS) {
		137	colOverlaps = true;
		138	}
		139	}
		140	if (!colOverlaps) {
		141	CTCol newCol = cloneCol(cols, col);
		142	}
		143	sortColumns(cols);
		144	return cols;
145	}
146
147	/*
148	* Insert a new CTCol at position 0 into cols, setting min=min, max=max and
149	* copying all the colsWithAttributes array cols attributes into newCol
150	*/
151	private CTCol insertCol(CTCols cols, long min, long max,
152	CTCol[] colsWithAttributes) {
153	CTCol newCol = cols.insertNewCol(0);
154	newCol.setMin(min);
155	newCol.setMax(max);
156	for (CTCol col : colsWithAttributes) {
157	setColumnAttributes(col, newCol);
158	}
159	return newCol;
160	}
161
72	public boolean columnExists(CTCols cols, long index) {	162	public boolean columnExists(CTCols cols, long index) {
73	for (int i = 0 ; i < cols.sizeOfColArray() ; i++) {	163	for (int i = 0; i < cols.sizeOfColArray(); i++) {
74	if (cols.getColArray(i).getMin() == index) {	164	if (cols.getColArray(i).getMin() == index) {
75	return true;	165	return true;
76	}	166	}
77	}	167	}
78	return false;	168	return false;
79	}	169	}
80		170
81	public void setColumnAttributes(CTCol col, CTCol newCol) {	171	public void setColumnAttributes(CTCol fromCol, CTCol toCol) {
82	if (col.getWidth() != 0) {	172	if (fromCol.getWidth() != 0) {
83	newCol.setWidth(col.getWidth());	173	toCol.setWidth(fromCol.getWidth());
84	}	174	}
85	if (col.getHidden()) {	175	if (fromCol.getHidden()) {
86	newCol.setHidden(true);	176	toCol.setHidden(true);
87	}	177	}
88	if (col.getBestFit()) {	178	if (fromCol.getBestFit()) {
89	newCol.setBestFit(true);	179	toCol.setBestFit(true);
90	}	180	}
91	}	181	}
92		182
93	public void setColBestFit(long index, boolean bestFit) {	183	public void setColBestFit(long index, boolean bestFit) {
94	CTCol col = getOrCreateColumn(index);	184	CTCol col = getOrCreateColumn(index);
95	col.setBestFit(bestFit);	185	col.setBestFit(bestFit);
96	}	186	}
97		187
98	public void setColWidth(long index, double width) {	188	public void setColWidth(long index, double width) {
99	CTCol col = getOrCreateColumn(index);	189	CTCol col = getOrCreateColumn(index);
100	col.setWidth(width);	190	col.setWidth(width);
101	}	191	}
102		192
103	public void setColHidden(long index, boolean hidden) {	193	public void setColHidden(long index, boolean hidden) {
104	CTCol col = getOrCreateColumn(index);	194	CTCol col = getOrCreateColumn(index);
105	col.setHidden(hidden);	195	col.setHidden(hidden);
106	}	196	}
107		197
108	protected CTCol getOrCreateColumn(long index) {	198	protected CTCol getOrCreateColumn(long index) {
109	CTCol col = getColumn(index);	199	CTCol col = getColumn(index);
110	if (col == null) {	200	if (col == null) {
111	col = worksheet.getColsArray(0).addNewCol();	201	col = worksheet.getColsArray(0).addNewCol();
112	col.setMin(index);	202	col.setMin(index);
113	col.setMax(index);	203	col.setMax(index);
114	}	204	}
115	return col;	205	return col;
116	}	206	}
117		207
118	}	208	}

Line 0 Link Here

(-)src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java (+287 lines)
		1	/* ====================================================================
		2	Licensed to the Apache Software Foundation (ASF) under one or more
		3	contributor license agreements. See the NOTICE file distributed with
		4	this work for additional information regarding copyright ownership.
		5	The ASF licenses this file to You under the Apache License, Version 2.0
		6	(the "License"); you may not use this file except in compliance with
		7	the License. You may obtain a copy of the License at
		8
		9	http://www.apache.org/licenses/LICENSE-2.0
		10
		11	Unless required by applicable law or agreed to in writing, software
		12	distributed under the License is distributed on an "AS IS" BASIS,
		13	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		14	See the License for the specific language governing permissions and
		15	limitations under the License.
		16	==================================================================== */
		17
		18	package org.apache.poi.xssf.usermodel;
		19
		20	import org.apache.poi.ss.usermodel.CellStyle;
		21	import org.apache.poi.ss.usermodel.Font;
		22	import org.apache.poi.ss.usermodel.Workbook;
		23	import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder;
		24	import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder.BorderSides;
		25	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
		26	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
		27	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
		28	import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle.Enum;
		29
		30
		31	public class XSSFCellStyle implements CellStyle {
		32
		33	private CTStylesheet stylesheet;
		34	private CTXf cellXf;
		35	private CTXf cellStyleXf;
		36	private XSSFCellBorder cellBorder;
		37
		38	public XSSFCellStyle(CTStylesheet stylesheet, int cellXfsId) {
		39	this.stylesheet = stylesheet;
		40	this.cellXf = stylesheet.getCellStyleXfs().getXfArray(cellXfsId);
		41	if (cellXf.isSetXfId()) {
		42	this.cellStyleXf = stylesheet.getCellStyleXfs().getXfArray((int) cellXf.getXfId());
		43	}
		44	}
		45
		46	public short getAlignment() {
		47	// TODO Auto-generated method stub
		48	return 0;
		49	}
		50
		51	public short getBorderBottom() {
		52	return (short) (getBorderStyle(BorderSides.BOTTOM).intValue() - 1);
		53	}
		54
		55	public String getBorderBottomAsString() {
		56	return getBorderStyle(BorderSides.BOTTOM).toString();
		57	}
		58
		59	public short getBorderLeft() {
		60	return (short) (getBorderStyle(BorderSides.LEFT).intValue() - 1);
		61	}
		62
		63	public String getBorderLeftAsString() {
		64	return getBorderStyle(BorderSides.LEFT).toString();
65	}
66
67	public short getBorderRight() {
68	return (short) (getBorderStyle(BorderSides.RIGHT).intValue() - 1);
69	}
70
71	public String getBorderRightAsString() {
72	return getBorderStyle(BorderSides.RIGHT).toString();
73	}
74
75	public short getBorderTop() {
76	return (short) (getBorderStyle(BorderSides.TOP).intValue() - 1);
77	}
78
79	public String getBorderTopAsString() {
80	return getBorderStyle(BorderSides.TOP).toString();
81	}
82
83	public short getBottomBorderColor() {
84	return getBorderColorBySide(BorderSides.BOTTOM);
85	}
86
87	public short getDataFormat() {
88	// TODO Auto-generated method stub
89	return 0;
90	}
91
92	public short getFillBackgroundColor() {
93	// TODO Auto-generated method stub
94	return 0;
95	}
96
97	public short getFillForegroundColor() {
98	// TODO Auto-generated method stub
99	return 0;
100	}
101
102	public short getFillPattern() {
103	// TODO Auto-generated method stub
104	return 0;
105	}
106
107	public Font getFont(Workbook parentWorkbook) {
108	// TODO Auto-generated method stub
109	return null;
110	}
111
112	public short getFontIndex() {
113	// TODO Auto-generated method stub
114	return 0;
115	}
116
117	public boolean getHidden() {
118	// TODO Auto-generated method stub
119	return false;
120	}
121
122	public short getIndention() {
123	// TODO Auto-generated method stub
124	return 0;
125	}
126
127	public short getIndex() {
128	// TODO Auto-generated method stub
129	return 0;
130	}
131
132	public short getLeftBorderColor() {
133	return getBorderColorBySide(BorderSides.LEFT);
134	}
135
136	public boolean getLocked() {
137	// TODO Auto-generated method stub
138	return false;
139	}
140
141	public short getRightBorderColor() {
142	return getBorderColorBySide(BorderSides.RIGHT);
143	}
144
145	public short getRotation() {
146	// TODO Auto-generated method stub
147	return 0;
148	}
149
150	public short getTopBorderColor() {
151	return getBorderColorBySide(BorderSides.TOP);
152	}
153
154	public short getVerticalAlignment() {
155	// TODO Auto-generated method stub
156	return 0;
157	}
158
159	public boolean getWrapText() {
160	// TODO Auto-generated method stub
161	return false;
162	}
163
164	public void setAlignment(short align) {
165	// TODO Auto-generated method stub
166
167	}
168
169	public void setBorderBottom(short border) {
170	// TODO Auto-generated method stub
171
172	}
173
174	public void setBorderLeft(short border) {
175	// TODO Auto-generated method stub
176
177	}
178
179	public void setBorderRight(short border) {
180	// TODO Auto-generated method stub
181
182	}
183
184	public void setBorderTop(short border) {
185	// TODO Auto-generated method stub
186
187	}
188
189	public void setBottomBorderColor(short color) {
190	// TODO Auto-generated method stub
191
192	}
193
194	public void setDataFormat(short fmt) {
195	// TODO Auto-generated method stub
196
197	}
198
199	public void setFillBackgroundColor(short bg) {
200	// TODO Auto-generated method stub
201
202	}
203
204	public void setFillForegroundColor(short bg) {
205	// TODO Auto-generated method stub
206
207	}
208
209	public void setFillPattern(short fp) {
210	// TODO Auto-generated method stub
211
212	}
213
214	public void setFont(Font font) {
215	// TODO Auto-generated method stub
216
217	}
218
219	public void setHidden(boolean hidden) {
220	// TODO Auto-generated method stub
221
222	}
223
224	public void setIndention(short indent) {
225	// TODO Auto-generated method stub
226
227	}
228
229	public void setLeftBorderColor(short color) {
230	// TODO Auto-generated method stub
231
232	}
233
234	public void setLocked(boolean locked) {
235	// TODO Auto-generated method stub
236
237	}
238
239	public void setRightBorderColor(short color) {
240	// TODO Auto-generated method stub
241
242	}
243
244	public void setRotation(short rotation) {
245	// TODO Auto-generated method stub
246
247	}
248
249	public void setTopBorderColor(short color) {
250	// TODO Auto-generated method stub
251
252	}
253
254	public void setVerticalAlignment(short align) {
255	// TODO Auto-generated method stub
256
257	}
258
259	public void setWrapText(boolean wrapped) {
260	// TODO Auto-generated method stub
261
262	}
263
264	private XSSFCellBorder getCellBorder() {
265	if (cellBorder == null) {
266	CTBorder border = stylesheet.getBorders().getBorderArray(getBorderId());
267	cellBorder = new XSSFCellBorder(border);
268	}
269	return cellBorder;
270	}
271
272	private int getBorderId() {
273	if (cellXf.isSetBorderId()) {
274	return (int) cellXf.getBorderId();
275	}
276	return (int) cellStyleXf.getBorderId();
277	}
278
279	private Enum getBorderStyle(BorderSides side) {
280	return getCellBorder().getBorderStyle(side);
281	}
282
283	private short getBorderColorBySide(BorderSides side) {
284	return (short) getCellBorder().getBorderColor(side).getIndexed();
285	}
286
287	}

Line 0 Link Here

(-)src/ooxml/java/org/apache/poi/xssf/util/NumericRanges.java (+66 lines)
		1	/* ====================================================================
		2	Licensed to the Apache Software Foundation (ASF) under one or more
		3	contributor license agreements. See the NOTICE file distributed with
		4	this work for additional information regarding copyright ownership.
		5	The ASF licenses this file to You under the Apache License, Version 2.0
		6	(the "License"); you may not use this file except in compliance with
		7	the License. You may obtain a copy of the License at
		8
		9	http://www.apache.org/licenses/LICENSE-2.0
		10
		11	Unless required by applicable law or agreed to in writing, software
		12	distributed under the License is distributed on an "AS IS" BASIS,
		13	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		14	See the License for the specific language governing permissions and
		15	limitations under the License.
		16	==================================================================== */
		17
		18	package org.apache.poi.xssf.util;
		19
		20	public class NumericRanges {
		21
		22	public static int NO_OVERLAPS = -1;
		23	public static int OVERLAPS_1_MINOR = 0;
		24	public static int OVERLAPS_2_MINOR = 1;
		25	public static int OVERLAPS_1_WRAPS = 2;
		26	public static int OVERLAPS_2_WRAPS = 3;
		27
		28	public static long[] getOverlappingRange(long[] range1, long[] range2) {
		29	int overlappingType = getOverlappingType(range1, range2);
		30	if (overlappingType == OVERLAPS_1_MINOR) {
		31	return new long[]{range2[0], range1[1]};
		32	}
		33	else if (overlappingType == OVERLAPS_2_MINOR) {
		34	return new long[]{range1[0], range2[1]};
		35	}
		36	else if (overlappingType == OVERLAPS_2_WRAPS) {
		37	return range1;
		38	}
		39	else if (overlappingType == OVERLAPS_1_WRAPS) {
		40	return range2;
		41	}
		42	return new long[]{-1, -1};
		43	}
		44
		45	public static int getOverlappingType(long[] range1, long[] range2) {
		46	long min1 = range1[0];
		47	long max1 = range1[1];
		48	long min2 = range2[0];
		49	long max2 = range2[1];
		50	if (min1 >= min2 && max1 <= max2) {
		51	return OVERLAPS_2_WRAPS;
		52	}
		53	else if (min2 >= min1 && max2 <= max1) {
		54	return OVERLAPS_1_WRAPS;
		55	}
		56	else if ((min2 >= min1 && min2 <= max1) && max2 >= max1) {
		57	return OVERLAPS_1_MINOR;
		58	}
		59	else if ((min1 >= min2 && min1 <= max2) && max1 >= max2) {
		60	return OVERLAPS_2_MINOR;
		61	}
		62	return NO_OVERLAPS;
		63
		64	}
65
66	}

Line 0 Link Here

(-)src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java (+48 lines)
	1	/* ====================================================================
	2	Licensed to the Apache Software Foundation (ASF) under one or more
	3	contributor license agreements. See the NOTICE file distributed with
	4	this work for additional information regarding copyright ownership.
	5	The ASF licenses this file to You under the Apache License, Version 2.0
	6	(the "License"); you may not use this file except in compliance with
	7	the License. You may obtain a copy of the License at
	8
	9	http://www.apache.org/licenses/LICENSE-2.0
	10
	11	Unless required by applicable law or agreed to in writing, software
	12	distributed under the License is distributed on an "AS IS" BASIS,
	13	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	14	See the License for the specific language governing permissions and
	15	limitations under the License.
	16	==================================================================== */
	17
	18	package org.apache.poi.xssf.usermodel.extensions;
	19
	20	import org.apache.poi.xssf.usermodel.extensions.XSSFCellBorder.BorderSides;
	21	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
	22	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr;
	23	import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
	24	import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle;
	25
	26	import junit.framework.TestCase;
	27
	28
	29	public class TestXSSFBorder extends TestCase {
	30
	31	public void testGetBorderStyle() {
	32	CTStylesheet stylesheet = CTStylesheet.Factory.newInstance();
	33	CTBorder border = stylesheet.addNewBorders().addNewBorder();
	34	CTBorderPr top = border.addNewTop();
	35	CTBorderPr right = border.addNewRight();
	36	CTBorderPr bottom = border.addNewBottom();
	37	top.setStyle(STBorderStyle.DASH_DOT);
	38	right.setStyle(STBorderStyle.NONE);
	39	bottom.setStyle(STBorderStyle.THIN);
	40	XSSFCellBorder cellBorderStyle = new XSSFCellBorder(border);
	41	assertEquals("dashDot", cellBorderStyle.getBorderStyle(BorderSides.TOP).toString());
	42	assertEquals("none", cellBorderStyle.getBorderStyle(BorderSides.RIGHT).toString());
	43	assertEquals(1, cellBorderStyle.getBorderStyle(BorderSides.RIGHT).intValue());
	44	assertEquals("thin", cellBorderStyle.getBorderStyle(BorderSides.BOTTOM).toString());
	45	assertEquals(2, cellBorderStyle.getBorderStyle(BorderSides.BOTTOM).intValue());
	46	}
	47
	48	}

Lines 37-43 Link Here

(-)src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java (-3 / +3 lines)
37	protected void setUp() throws Exception {	37	protected void setUp() throws Exception {
38	super.setUp();	38	super.setUp();
39	System.setProperty("org.apache.poi.util.POILogger", org.apache.poi.util.CommonsLogger.class.getName());	39	System.setProperty("org.apache.poi.util.POILogger", org.apache.poi.util.CommonsLogger.class.getName());
40	filename = System.getProperty("HSSF.testdata.path");	40	filename = System.getProperty("XSSF.testdata.path");
41	if (filename == null) {	41	if (filename == null) {
42	filename = "src/ooxml/testcases/org/apache/poi/xssf/data";	42	filename = "src/ooxml/testcases/org/apache/poi/xssf/data";
43	}	43	}
Lines 58-64 Link Here
58		58
59	// TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successfull.	59	// TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successfull.
60	public void testLoadStyles() throws Exception {	60	public void testLoadStyles() throws Exception {
61	XSSFWorkbook workbook = new XSSFWorkbook(new File("src/ooxml/testcases/org/apache/poi/xssf/data", "styles.xlsx").getAbsolutePath());	61	XSSFWorkbook workbook = new XSSFWorkbook(new File(filename, "styles.xlsx").getAbsolutePath());
62	Sheet sheet = workbook.getSheetAt(0);	62	Sheet sheet = workbook.getSheetAt(0);
63	Row row = sheet.getRow(0);	63	Row row = sheet.getRow(0);
64	Cell cell = row.getCell((short) 0);	64	Cell cell = row.getCell((short) 0);
Lines 68-74 Link Here
68		68
69	// TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successfull.	69	// TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successfull.
70	public void testLoadPictures() throws Exception {	70	public void testLoadPictures() throws Exception {
71	XSSFWorkbook workbook = new XSSFWorkbook(new File("src/ooxml/testcases/org/apache/poi/xssf/data", "picture.xlsx").getAbsolutePath());	71	XSSFWorkbook workbook = new XSSFWorkbook(new File(filename, "picture.xlsx").getAbsolutePath());
72	List<PictureData> pictures = workbook.getAllPictures();	72	List<PictureData> pictures = workbook.getAllPictures();
73	assertEquals(1, pictures.size());	73	assertEquals(1, pictures.size());
74	}	74	}