diff --git a/build.gradle b/build.gradle index eaa832a..6edf5e0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,13 @@ plugins { - id "checkstyle" - id "pmd" id 'maven-publish' id 'signing' id "io.github.gradle-nexus.publish-plugin" version "2.0.0-rc-1" - id "com.github.spotbugs" version "6.0.0-beta.3" - id "org.cyclonedx.bom" version "1.7.4" - id "org.xbib.gradle.plugin.asciidoctor" version "3.0.0" } wrapper { gradleVersion = libs.versions.gradle.get() - distributionType = Wrapper.DistributionType.ALL + distributionType = Wrapper.DistributionType.BIN } ext { @@ -31,16 +26,10 @@ ext { } subprojects { - //apply from: rootProject.file('gradle/ide/idea.gradle') apply from: rootProject.file('gradle/repositories/maven.gradle') apply from: rootProject.file('gradle/compile/java.gradle') apply from: rootProject.file('gradle/test/junit5.gradle') - apply from: rootProject.file('gradle/documentation/asciidoc.gradle') - apply from: rootProject.file('gradle/quality/checkstyle.gradle') - apply from: rootProject.file('gradle/quality/pmd.gradle') - //apply from: rootProject.file('gradle/quality/spotbugs.gradle') apply from: rootProject.file('gradle/publish/maven.gradle') } apply from: rootProject.file('gradle/publish/sonatype.gradle') apply from: rootProject.file('gradle/publish/forgejo.gradle') -apply from: rootProject.file('gradle/quality/cyclonedx.gradle') diff --git a/datastructures-xslx/src/main/java/jxl/CellFormat.java b/datastructures-xslx/src/main/java/jxl/CellFormat.java deleted file mode 100755 index 0932039..0000000 --- a/datastructures-xslx/src/main/java/jxl/CellFormat.java +++ /dev/null @@ -1,28 +0,0 @@ -/********************************************************************* - * - * Copyright (C) 2002 Andrew Khan - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - ***************************************************************************/ - -package jxl; - -/** - * Interface for cell formats - used for typing information - * - * @deprecated Repackaged as jxl.format.CellFormat - */ -public interface CellFormat extends jxl.format.CellFormat { -} diff --git a/datastructures-xslx/src/main/java/module-info.java b/datastructures-xslx/src/main/java/module-info.java new file mode 100644 index 0000000..e25b131 --- /dev/null +++ b/datastructures-xslx/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module org.xbib.datastructures.xslx { + requires java.xml; + exports org.xbib.datastructures.xslx; +} \ No newline at end of file diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Cell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Cell.java similarity index 96% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Cell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Cell.java index 057b5f0..bcf1df8 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Cell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Cell.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; public class Cell { Cell(String r, String s, String t, String v, String text) { diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/CellFormat.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/CellFormat.java similarity index 95% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/CellFormat.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/CellFormat.java index 4479a2b..fb84ac7 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/CellFormat.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/CellFormat.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.support; +package org.xbib.datastructures.xslx; public class CellFormat { public CellFormat() { diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/CellStyle.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/CellStyle.java similarity index 97% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/CellStyle.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/CellStyle.java index 27ead44..6325498 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/CellStyle.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/CellStyle.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; import javax.xml.stream.XMLStreamException; diff --git a/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ExcelRowIterator.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ExcelRowIterator.java index 6e70440..f19128b 100644 --- a/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ExcelRowIterator.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ExcelRowIterator.java @@ -1,18 +1,21 @@ package org.xbib.datastructures.xslx; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + public interface ExcelRowIterator { - public void init(); + void init() throws IOException, XMLStreamException; - public boolean nextRow(); + boolean nextRow(); - public String getCellValue(int col); + String getCellValue(int col); - public int getCellCount(); + int getCellCount(); - public byte getSheetIndex(); + byte getSheetIndex(); - public int getRowPos(); + int getRowPos(); - public void prevRow(); + void prevRow(); } diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Fill.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Fill.java similarity index 97% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Fill.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Fill.java index 35680c2..25b38b9 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Fill.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Fill.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; import javax.xml.stream.XMLStreamException; diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Font.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Font.java similarity index 97% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Font.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Font.java index cd2b3f9..b64d617 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Font.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Font.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/FontRegion.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/FontRegion.java similarity index 93% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/FontRegion.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/FontRegion.java index e3b985d..c92272e 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/FontRegion.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/FontRegion.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; public class FontRegion { diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/IndexedObject.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/IndexedObject.java similarity index 78% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/IndexedObject.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/IndexedObject.java index 355f86b..ba2cd7d 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/IndexedObject.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/IndexedObject.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; public abstract class IndexedObject { int index; diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/ParsableEntry.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ParsableEntry.java similarity index 74% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/ParsableEntry.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ParsableEntry.java index 02026c9..d828845 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/ParsableEntry.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ParsableEntry.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; import javax.xml.stream.XMLStreamReader; diff --git a/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ReaderSupport.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ReaderSupport.java index 29a492d..47135f2 100644 --- a/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ReaderSupport.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/ReaderSupport.java @@ -1,9 +1,8 @@ package org.xbib.datastructures.xslx; +import javax.xml.stream.XMLStreamException; import java.io.File; - -import com.incesoft.tools.excel.support.XLSReaderSupport; -import com.incesoft.tools.excel.support.XLSXReaderSupport; +import java.io.IOException; abstract public class ReaderSupport { @@ -14,7 +13,7 @@ abstract public class ReaderSupport { abstract public void open(); - abstract public ExcelRowIterator rowIterator(); + abstract public ExcelRowIterator rowIterator() throws XMLStreamException, IOException; abstract public void close(); diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/RichText.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/RichText.java similarity index 98% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/RichText.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/RichText.java index 69710b9..094884b 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/RichText.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/RichText.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; import java.util.ArrayList; diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SerializableEntry.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SerializableEntry.java similarity index 83% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SerializableEntry.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SerializableEntry.java index a87f16f..cca4ed6 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SerializableEntry.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SerializableEntry.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; import javax.xml.stream.XMLStreamException; diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SharedStringText.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SharedStringText.java similarity index 95% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SharedStringText.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SharedStringText.java index f540db8..1d6e497 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SharedStringText.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SharedStringText.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Sheet.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Sheet.java similarity index 90% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Sheet.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Sheet.java index 1b6276d..1a9f632 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/Sheet.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/Sheet.java @@ -1,6 +1,7 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -9,8 +10,8 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import com.incesoft.tools.excel.xlsx.SimpleXLSXWorkbook.ModifyEntry; -import com.incesoft.tools.excel.xlsx.SimpleXLSXWorkbook.XMLStreamCreator; +import org.xbib.datastructures.xslx.SimpleXLSXWorkbook.ModifyEntry; +import org.xbib.datastructures.xslx.SimpleXLSXWorkbook.XMLStreamCreator; /** * One Sheet in a workbook.It provides read and write functions of the @@ -42,7 +43,7 @@ public class Sheet { */ boolean alreadyParsed = false; - void parseAllRows() { + void parseAllRows() throws IOException { if (!alreadyParsed) { alreadyParsed = true; new SheetRowReader(this, workbook.getSheetReader(sheetIndex + 1), @@ -216,7 +217,7 @@ public class Sheet { } - public SheetRowReader newReader() { + public SheetRowReader newReader() throws IOException { return new SheetRowReader(this, workbook.getSheetReader(sheetIndex + 1), false); } @@ -240,7 +241,7 @@ public class Sheet { private int rowCount = -2; // count of the lazy or non-lazy rows - public int getRowCount() { + public int getRowCount() throws IOException, XMLStreamException { if (alreadyParsed && addToMemory) { return parsedRows.size(); } @@ -250,41 +251,35 @@ public class Sheet { try { // // ... - loopR: while (reader.hasNext()) { + loopR: + while (reader.hasNext()) { int type = reader.next(); - switch (type) { - case XMLStreamReader.START_ELEMENT: - if ("dimension".equals(reader.getLocalName())) { - String v = reader.getAttributeValue(null, "ref"); - if (v != null) { - String[] spanPair = v.replaceAll("[A-Z]", "") - .split(":"); - if (spanPair.length == 2) { - try { - rowCount = Integer.valueOf(spanPair[1]) - - Integer.valueOf(spanPair[0]) - + 1; - } catch (NumberFormatException e) { - } - break loopR; - } - } - } else if ("row".equals(reader.getLocalName())) { - int r = Integer.valueOf(reader.getAttributeValue( - null, "r")); - if (r > rowCount) - rowCount = r; - } - break; - } + if (type == XMLStreamReader.START_ELEMENT) { + if ("dimension".equals(reader.getLocalName())) { + String v = reader.getAttributeValue(null, "ref"); + if (v != null) { + String[] spanPair = v.replaceAll("[A-Z]", "") + .split(":"); + if (spanPair.length == 2) { + try { + rowCount = Integer.valueOf(spanPair[1]) + - Integer.valueOf(spanPair[0]) + + 1; + } catch (NumberFormatException e) { + } + break loopR; + } + } + } else if ("row".equals(reader.getLocalName())) { + int r = Integer.valueOf(reader.getAttributeValue( + null, "r")); + if (r > rowCount) + rowCount = r; + } + } } - } catch (XMLStreamException e) { - throw new RuntimeException(e); } finally { - try { - reader.close(); - } catch (XMLStreamException e) { - } + reader.close(); } } return rowCount; @@ -637,16 +632,7 @@ public class Sheet { private boolean merged = false; - /** - * - * - * @param writer - * @throws XMLStreamException - */ - void mergeSheet() throws XMLStreamException { + void mergeSheet() throws XMLStreamException, IOException { if (merged) { writeSheet(); return; diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SheetCommentWriter.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SheetCommentWriter.java similarity index 98% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SheetCommentWriter.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SheetCommentWriter.java index 5046301..64d0def 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SheetCommentWriter.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SheetCommentWriter.java @@ -1,11 +1,11 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; import java.util.StringTokenizer; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import com.incesoft.tools.excel.xlsx.SimpleXLSXWorkbook.XMLStreamCreator; +import org.xbib.datastructures.xslx.SimpleXLSXWorkbook.XMLStreamCreator; public class SheetCommentWriter { diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SimpleXLSXWorkbook.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SimpleXLSXWorkbook.java similarity index 89% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SimpleXLSXWorkbook.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SimpleXLSXWorkbook.java index 5ba54be..71d0755 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/xlsx/SimpleXLSXWorkbook.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/SimpleXLSXWorkbook.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.xlsx; +package org.xbib.datastructures.xslx; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -32,31 +32,12 @@ import javax.xml.stream.XMLStreamWriter; /** * A simple implementation of OOXML(Excel part) to read and modify Excel 2007+ * documents - * */ public class SimpleXLSXWorkbook { - static { - // this the fastest stax implementation by test,especially when doing - // output - if ("false".equals(System.getProperty("ince.tools.excel.disableXMLOptimize"))) { - System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); - System.setProperty("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory"); - } - } - ZipFile zipfile; + private static final XMLInputFactory inputFactory = XMLInputFactory.newInstance(); - private InputStream findData(String name) { - try { - ZipEntry entry = zipfile.getEntry(name); - if (entry != null) { - return zipfile.getInputStream(entry); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - return null; - } + private ZipFile zipfile; private static final String PATH_XL_RELATION = "xl/_rels/workbook.xml.rels"; @@ -66,9 +47,9 @@ public class SimpleXLSXWorkbook { private static final String PATH_CONTENT_TYPES = "[Content_Types].xml"; - static private List blackListPatterns = new ArrayList(); + private static final List blackListPatterns = new ArrayList(); - static private List blackList = Arrays.asList(".*comments\\d+\\.xml", ".*calcChain\\.xml", + private static final List blackList = Arrays.asList(".*comments\\d+\\.xml", ".*calcChain\\.xml", ".*drawings/vmlDrawing\\d+\\.vml"); static { for (String pstr : blackList) { @@ -76,16 +57,22 @@ public class SimpleXLSXWorkbook { } } - public SimpleXLSXWorkbook(File file) { - try { - this.zipfile = new ZipFile(file); - InputStream stream = findData(PATH_SHAREDSTRINGS); - if (stream != null) { - parseSharedStrings(stream); + public SimpleXLSXWorkbook() { + sheets.add(new Sheet(0, this)); + } + + public SimpleXLSXWorkbook(File file) throws IOException, XMLStreamException { + this.zipfile = new ZipFile(file); + InputStream stream = findData(PATH_SHAREDSTRINGS); + if (stream != null) { + parseSharedStrings(stream); + } + for (int i = 0; true; i++) { + ZipEntry entry = zipfile.getEntry(getSheetPath(i + 1)); + if (entry == null) { + break; } - initSheets(); - } catch (Exception e) { - throw new RuntimeException(e); + sheets.add(new Sheet(i, this)); } } @@ -170,17 +157,6 @@ public class SimpleXLSXWorkbook { return null; } - // int getSharedStringIndex(String string) { - // Integer i = (Integer) sharedStrings.inverseBidiMap().get(string); - // if (i != null) { - // return i; - // } else { - // return -1; - // } - // } - - XMLInputFactory inputFactory = XMLInputFactory.newInstance(); - private String getSheetPath(int i) { return String.format(PATH_SHEET, i); } @@ -193,7 +169,8 @@ public class SimpleXLSXWorkbook { return String.format(PATH_SHEET_COMMENT_VMLDRAWING, i); } - private void parseSharedStrings(InputStream inputStream) throws Exception { + private void parseSharedStrings(InputStream inputStream) + throws XMLStreamException { XMLStreamReader reader = inputFactory.createXMLStreamReader(inputStream); int type; boolean si = false; @@ -241,10 +218,23 @@ public class SimpleXLSXWorkbook { private static final String PATH_STYLES = "xl/styles.xml"; private static final String STR_XML_HEAD = ""; + private static final byte[] DATA_XL_WORKSHEETS__RELS_SHEET = (STR_XML_HEAD + "") .getBytes(); - XMLStreamReader getReader(String resourceId) { + + XMLStreamReader getSheetReader(Integer sheetId) throws IOException { + if (sheetId == null) { + sheetId = 1; + } + return getReader(getSheetPath(sheetId)); + } + + XMLStreamReader getStylesReader() throws IOException { + return getReader(PATH_STYLES); + } + + private XMLStreamReader getReader(String resourceId) throws IOException { InputStream stream = findData(resourceId); if (stream == null) { if (resourceId.startsWith("xl/worksheets/_rels/sheet")) { @@ -262,30 +252,9 @@ public class SimpleXLSXWorkbook { } } - XMLStreamReader getSheetReader(Integer sheetId) { - if (sheetId == null) { - sheetId = 1; - } - return getReader(getSheetPath(sheetId)); - } - - XMLStreamReader getStylesReader() { - return getReader(PATH_STYLES); - } - // SHEET>>> List sheets = new ArrayList(); - private void initSheets() { - for (int i = 0; true; i++) { - ZipEntry entry = zipfile.getEntry(getSheetPath(i + 1)); - if (entry == null) { - break; - } - sheets.add(new Sheet(i, this)); - } - } - /** * create new sheet added to exists sheet list */ @@ -299,11 +268,11 @@ public class SimpleXLSXWorkbook { return sheets.size(); } - public Sheet getSheet(int i) { + public Sheet getSheet(int i) throws IOException { return getSheet(i, true); } - public Sheet getSheet(int i, boolean parseAllRow) { + public Sheet getSheet(int i, boolean parseAllRow) throws IOException { if (i >= sheets.size()) throw new IllegalArgumentException("sheet " + i + " not exists!SheetCount=" + sheets.size()); Sheet sheet = sheets.get(i); @@ -419,7 +388,7 @@ public class SimpleXLSXWorkbook { writer.writeEndElement();// end sst } - private void mergeStyles(XMLStreamWriter writer) throws XMLStreamException { + private void mergeStyles(XMLStreamWriter writer) throws XMLStreamException, IOException { prepareStylesCount(); XMLStreamReader reader = getStylesReader(); @@ -606,36 +575,32 @@ public class SimpleXLSXWorkbook { boolean stylesCountLoaded = false; - private void prepareStylesCount() { + private void prepareStylesCount() throws XMLStreamException, IOException { if (stylesCountLoaded) return; stylesCountLoaded = true; - try { - XMLStreamReader reader = getStylesReader(); - loop1: while (reader.hasNext()) { - int event = reader.next(); - switch (event) { - case XMLStreamReader.START_ELEMENT: - if ("fonts".equals(reader.getLocalName())) { - fontsCountOffset = Integer.valueOf(reader.getAttributeValue(null, "count")); - } - if ("fills".equals(reader.getLocalName())) { - fillsCountOffset = Integer.valueOf(reader.getAttributeValue(null, "count")); - } - if ("cellXfs".equals(reader.getLocalName())) { - stylesCountOffset = Integer.valueOf(reader.getAttributeValue(null, "count")); - break loop1; - } - break; - case XMLStreamReader.END_ELEMENT: - break; - default: - break; + XMLStreamReader reader = getStylesReader(); + loop1: while (reader.hasNext()) { + int event = reader.next(); + switch (event) { + case XMLStreamReader.START_ELEMENT: + if ("fonts".equals(reader.getLocalName())) { + fontsCountOffset = Integer.valueOf(reader.getAttributeValue(null, "count")); } + if ("fills".equals(reader.getLocalName())) { + fillsCountOffset = Integer.valueOf(reader.getAttributeValue(null, "count")); + } + if ("cellXfs".equals(reader.getLocalName())) { + stylesCountOffset = Integer.valueOf(reader.getAttributeValue(null, "count")); + break loop1; + } + break; + case XMLStreamReader.END_ELEMENT: + break; + default: + break; } - } catch (XMLStreamException e) { - throw new RuntimeException(e); } } @@ -652,7 +617,7 @@ public class SimpleXLSXWorkbook { return new Fill(); } - public CellStyle createStyle(Font font, Fill fill) { + public CellStyle createStyle(Font font, Fill fill) throws XMLStreamException, IOException { if (font == null && fill == null) { throw new IllegalArgumentException("either font or fill is required"); } @@ -831,14 +796,10 @@ public class SimpleXLSXWorkbook { /** * merge the sheet's modifications */ - public void commitSheetModifications() { - try { - if (lastCommitSheet == null) - throw new IllegalStateException("plz call beginCommitSheet(Sheet) first"); - lastCommitSheet.mergeSheet(); - } catch (XMLStreamException e) { - throw new RuntimeException(e); - } + public void commitSheetModifications() throws XMLStreamException, IOException { + if (lastCommitSheet == null) + throw new IllegalStateException("plz call beginCommitSheet(Sheet) first"); + lastCommitSheet.mergeSheet(); } /** @@ -1065,21 +1026,6 @@ public class SimpleXLSXWorkbook { commiter.endCommit(); } - // MODIFY <<< - - // TEST - public static void testMergeStyles(SimpleXLSXWorkbook excel, XMLStreamWriter writer) throws Exception { - // CellStyle style = excel.createStyle(); - // style.setFont(new Font()); - // style.getFont().setColor("FFFF0000"); - // style = excel.createStyle(); - // style.setFont(new Font()); - // style.setFill(new Fill()); - // style.getFont().setColor("FF0000FF"); - // style.getFill().setFgColor("FF00FF00"); - - } - @SuppressWarnings("unchecked") static private class BidirectionMap implements Map { private Map values = new LinkedHashMap(); @@ -1141,4 +1087,12 @@ public class SimpleXLSXWorkbook { } } + private InputStream findData(String name) throws IOException { + ZipEntry entry = zipfile.getEntry(name); + if (entry != null) { + return zipfile.getInputStream(entry); + } + return null; + } + } diff --git a/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/WriterSupport.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/WriterSupport.java index 10c2ebf..5ff5d41 100644 --- a/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/WriterSupport.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/WriterSupport.java @@ -1,12 +1,10 @@ package org.xbib.datastructures.xslx; +import javax.xml.stream.XMLStreamException; import java.io.File; +import java.io.IOException; import java.io.OutputStream; -import com.incesoft.tools.excel.support.CellFormat; -import com.incesoft.tools.excel.support.XLSWriterSupport; -import com.incesoft.tools.excel.support.XLSXWriterSupport; - abstract public class WriterSupport { public final static int TYPE_XLS = 1; @@ -28,11 +26,11 @@ abstract public class WriterSupport { abstract public void open(); - abstract public void createNewSheet(); + abstract public void createNewSheet() throws IOException; - abstract public void writeRow(String[] rowData); + abstract public void writeRow(String[] rowData) throws XMLStreamException, IOException; - abstract public void writeRow(String[] rowData, CellFormat[] formats); + abstract public void writeRow(String[] rowData, CellFormat[] formats) throws XMLStreamException, IOException; abstract public void close(); @@ -69,10 +67,10 @@ abstract public class WriterSupport { protected int sheetIndex = -1; - public void increaseRow() { + public void increaseRow() throws IOException { rowpos++; - if (rowpos > getMaxRowNumOfSheet()) {// 判断是否需要新建一个sheet + if (rowpos > getMaxRowNumOfSheet()) { sheetIndex++; createNewSheet(); rowpos = -1; diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSReaderSupport.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSReaderSupport.java similarity index 90% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSReaderSupport.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSReaderSupport.java index c41009d..f7c46f1 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSReaderSupport.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSReaderSupport.java @@ -1,16 +1,13 @@ -package com.incesoft.tools.excel.support; +package org.xbib.datastructures.xslx; import java.io.File; import java.text.SimpleDateFormat; -import org.xbib.datastructures.xslx.ExcelRowIterator; -import org.xbib.datastructures.xslx.ReaderSupport; - -import jxl.Cell; -import jxl.CellType; -import jxl.DateCell; -import jxl.Sheet; -import jxl.Workbook; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.DateCell; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.Workbook; public class XLSReaderSupport extends ReaderSupport { diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSWriterSupport.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSWriterSupport.java similarity index 83% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSWriterSupport.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSWriterSupport.java index 839cb8b..977fa64 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSWriterSupport.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSWriterSupport.java @@ -1,4 +1,4 @@ -package com.incesoft.tools.excel.support; +package org.xbib.datastructures.xslx; import java.io.IOException; import java.util.ArrayList; @@ -7,18 +7,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jxl.Workbook; -import jxl.format.Colour; -import jxl.format.RGB; -import jxl.write.Label; -import jxl.write.WritableCell; -import jxl.write.WritableCellFormat; -import jxl.write.WritableFont; -import jxl.write.WritableSheet; -import jxl.write.WritableWorkbook; -import jxl.write.WriteException; - -import org.xbib.datastructures.xslx.WriterSupport; +import org.xbib.datastructures.xslx.jxl.Workbook; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.RGB; +import org.xbib.datastructures.xslx.jxl.write.Label; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFormat; +import org.xbib.datastructures.xslx.jxl.write.WritableFont; +import org.xbib.datastructures.xslx.jxl.write.WritableSheet; +import org.xbib.datastructures.xslx.jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.write.WriteException; public class XLSWriterSupport extends WriterSupport { WritableSheet sheet; diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSXReaderSupport.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSXReaderSupport.java similarity index 79% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSXReaderSupport.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSXReaderSupport.java index 4a4fb7e..6f36fce 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSXReaderSupport.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSXReaderSupport.java @@ -1,13 +1,11 @@ -package com.incesoft.tools.excel.support; +package org.xbib.datastructures.xslx; import java.io.File; +import java.io.IOException; -import org.xbib.datastructures.xslx.ExcelRowIterator; -import org.xbib.datastructures.xslx.ReaderSupport; -import com.incesoft.tools.excel.xlsx.Cell; -import com.incesoft.tools.excel.xlsx.Sheet; -import com.incesoft.tools.excel.xlsx.SimpleXLSXWorkbook; -import com.incesoft.tools.excel.xlsx.Sheet.SheetRowReader; +import org.xbib.datastructures.xslx.Sheet.SheetRowReader; + +import javax.xml.stream.XMLStreamException; public class XLSXReaderSupport extends ReaderSupport { @@ -33,7 +31,7 @@ public class XLSXReaderSupport extends ReaderSupport { || curRow[col] == null) return null; String v = curRow[col].getValue(); - return v == null || v.trim().length() == 0 ? null : v.trim(); + return v == null || v.trim().isEmpty() ? null : v.trim(); } public int getRowPos() { @@ -46,7 +44,7 @@ public class XLSXReaderSupport extends ReaderSupport { SheetRowReader reader; - public void init() { + public void init() throws IOException { reader = sheet.newReader(); } @@ -85,14 +83,14 @@ public class XLSXReaderSupport extends ReaderSupport { int rowPos = -1; - public void init() { + public void init() throws XMLStreamException, IOException { currentSheetRowCount = sheet.getRowCount(); } public boolean nextRow() { rowPos++; - if (rowPos == currentSheetRowCount) {// 当读取最后一行,如果当前读取的是当前sheet的最后一行 - return false;// 所有记录里面的最后一行 + if (rowPos == currentSheetRowCount) { + return false; } return true; } @@ -101,7 +99,7 @@ public class XLSXReaderSupport extends ReaderSupport { if (col < 0) return null; String v = sheet.getCellValue(rowPos, col); - return v == null || v.trim().length() == 0 ? null : v.trim(); + return v == null || v.trim().isEmpty() ? null : v.trim(); } public byte getSheetIndex() { @@ -138,7 +136,7 @@ public class XLSXReaderSupport extends ReaderSupport { } } - public ExcelRowIterator rowIterator() { + public ExcelRowIterator rowIterator() throws XMLStreamException, IOException { ExcelRowIterator iterator = lazy ? new LazyXLSXObjectIterator() : new XLSXObjectIterator(); iterator.init(); diff --git a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSXWriterSupport.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSXWriterSupport.java similarity index 70% rename from datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSXWriterSupport.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSXWriterSupport.java index ec66213..2ba99df 100644 --- a/datastructures-xslx/src/main/java/com/incesoft/tools/excel/support/XLSXWriterSupport.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/XLSXWriterSupport.java @@ -1,25 +1,15 @@ -package com.incesoft.tools.excel.support; +package org.xbib.datastructures.xslx; -import java.io.File; +import javax.xml.stream.XMLStreamException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.xbib.datastructures.xslx.WriterSupport; -import com.incesoft.tools.excel.xlsx.CellStyle; -import com.incesoft.tools.excel.xlsx.Fill; -import com.incesoft.tools.excel.xlsx.Font; -import com.incesoft.tools.excel.xlsx.Sheet; -import com.incesoft.tools.excel.xlsx.SimpleXLSXWorkbook; - public class XLSXWriterSupport extends WriterSupport { SimpleXLSXWorkbook workbook; public void open() { - if (getClass().getResource("/empty.xlsx") == null) { - throw new IllegalStateException("no empty.xlsx found in classpath"); - } - workbook = new SimpleXLSXWorkbook(new File(getClass().getResource("/empty.xlsx").getFile())); + workbook = new SimpleXLSXWorkbook(); } Sheet sheet; @@ -28,17 +18,17 @@ public class XLSXWriterSupport extends WriterSupport { return Integer.MAX_VALUE / 2; } - public void writeRow(String[] rowData) { + public void writeRow(String[] rowData) throws XMLStreamException, IOException { writeRow(rowData, null); } - public void writeRow(String[] rowData, CellFormat[] formats) { + public void writeRow(String[] rowData, CellFormat[] formats) throws XMLStreamException, IOException { for (int col = 0; col < rowData.length; col++) { String string = rowData[col]; if (string == null) continue; CellFormat format = null; - if (formats != null && formats.length > 0) { + if (formats != null) { for (CellFormat cellFormat : formats) { if (cellFormat != null && cellFormat.getCellIndex() == col) { format = cellFormat; @@ -92,7 +82,7 @@ public class XLSXWriterSupport extends WriterSupport { } } - public void createNewSheet() { + public void createNewSheet() throws IOException { if (sheetIndex > 0) { throw new IllegalStateException("only one sheet allowed"); } diff --git a/datastructures-xslx/src/main/java/jxl/BooleanCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/BooleanCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/BooleanCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/BooleanCell.java index 8504e00..e2922d4 100755 --- a/datastructures-xslx/src/main/java/jxl/BooleanCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/BooleanCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * This type represents the Microsoft concept of a Boolean. Accordingly, this diff --git a/datastructures-xslx/src/main/java/jxl/BooleanFormulaCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/BooleanFormulaCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/BooleanFormulaCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/BooleanFormulaCell.java index 2a69c81..e89c77c 100755 --- a/datastructures-xslx/src/main/java/jxl/BooleanFormulaCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/BooleanFormulaCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * A mixin interface for numerical formulas, which combines the interfaces diff --git a/datastructures-xslx/src/main/java/jxl/Cell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Cell.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/Cell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Cell.java index 7644dce..f452f66 100755 --- a/datastructures-xslx/src/main/java/jxl/Cell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Cell.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * Represents an individual Cell within a Sheet. May be queried for its diff --git a/datastructures-xslx/src/main/java/jxl/CellFeatures.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellFeatures.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/CellFeatures.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellFeatures.java index 5ac5ea7..a4e2e37 100755 --- a/datastructures-xslx/src/main/java/jxl/CellFeatures.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellFeatures.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; -import jxl.biff.BaseCellFeatures; +import org.xbib.datastructures.xslx.jxl.biff.BaseCellFeatures; /** * Container for any additional cell features diff --git a/datastructures-xslx/src/main/java/jxl/CellReferenceHelper.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellReferenceHelper.java similarity index 78% rename from datastructures-xslx/src/main/java/jxl/CellReferenceHelper.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellReferenceHelper.java index 8926b7d..7d03555 100755 --- a/datastructures-xslx/src/main/java/jxl/CellReferenceHelper.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellReferenceHelper.java @@ -17,9 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; -import jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; /** * Exposes some cell reference helper methods to the public interface. @@ -41,7 +42,7 @@ public final class CellReferenceHelper { * @param buf the string buffer to append */ public static void getCellReference(int column, int row, StringBuffer buf) { - jxl.biff.CellReferenceHelper.getCellReference(column, row, buf); + org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getCellReference(column, row, buf); } /** @@ -58,7 +59,7 @@ public final class CellReferenceHelper { int row, boolean rowabs, StringBuffer buf) { - jxl.biff.CellReferenceHelper.getCellReference(column, colabs, + org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getCellReference(column, colabs, row, rowabs, buf); } @@ -72,7 +73,7 @@ public final class CellReferenceHelper { * @return the cell reference */ public static String getCellReference(int column, int row) { - return jxl.biff.CellReferenceHelper.getCellReference(column, row); + return org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getCellReference(column, row); } /** @@ -82,7 +83,7 @@ public final class CellReferenceHelper { * @return the column portion of the cell reference */ public static int getColumn(String s) { - return jxl.biff.CellReferenceHelper.getColumn(s); + return org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getColumn(s); } /** @@ -92,7 +93,7 @@ public final class CellReferenceHelper { * @return the letter for that column number */ public static String getColumnReference(int c) { - return jxl.biff.CellReferenceHelper.getColumnReference(c); + return org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getColumnReference(c); } /** @@ -102,7 +103,7 @@ public final class CellReferenceHelper { * @return the row number */ public static int getRow(String s) { - return jxl.biff.CellReferenceHelper.getRow(s); + return org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getRow(s); } /** @@ -112,7 +113,7 @@ public final class CellReferenceHelper { * @return TRUE if the column is relative, FALSE otherwise */ public static boolean isColumnRelative(String s) { - return jxl.biff.CellReferenceHelper.isColumnRelative(s); + return org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.isColumnRelative(s); } /** @@ -122,7 +123,7 @@ public final class CellReferenceHelper { * @return TRUE if the row is relative, FALSE otherwise */ public static boolean isRowRelative(String s) { - return jxl.biff.CellReferenceHelper.isRowRelative(s); + return org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.isRowRelative(s); } /** @@ -138,8 +139,8 @@ public final class CellReferenceHelper { public static void getCellReference (int sheet, int column, int row, Workbook workbook, StringBuffer buf) { - jxl.biff.CellReferenceHelper.getCellReference - (sheet, column, row, (jxl.biff.formula.ExternalSheet) workbook, buf); + org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getCellReference + (sheet, column, row, (ExternalSheet) workbook, buf); } /** @@ -157,8 +158,8 @@ public final class CellReferenceHelper { int row, WritableWorkbook workbook, StringBuffer buf) { - jxl.biff.CellReferenceHelper.getCellReference - (sheet, column, row, (jxl.biff.formula.ExternalSheet) workbook, buf); + org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getCellReference + (sheet, column, row, (ExternalSheet) workbook, buf); } /** @@ -180,9 +181,9 @@ public final class CellReferenceHelper { boolean rowabs, Workbook workbook, StringBuffer buf) { - jxl.biff.CellReferenceHelper.getCellReference + org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getCellReference (sheet, column, colabs, row, rowabs, - (jxl.biff.formula.ExternalSheet) workbook, buf); + (ExternalSheet) workbook, buf); } /** @@ -199,8 +200,8 @@ public final class CellReferenceHelper { int column, int row, Workbook workbook) { - return jxl.biff.CellReferenceHelper.getCellReference - (sheet, column, row, (jxl.biff.formula.ExternalSheet) workbook); + return org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getCellReference + (sheet, column, row, (ExternalSheet) workbook); } /** @@ -217,8 +218,8 @@ public final class CellReferenceHelper { int column, int row, WritableWorkbook workbook) { - return jxl.biff.CellReferenceHelper.getCellReference - (sheet, column, row, (jxl.biff.formula.ExternalSheet) workbook); + return org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getCellReference + (sheet, column, row, (ExternalSheet) workbook); } @@ -229,7 +230,7 @@ public final class CellReferenceHelper { * @return the sheet name */ public static String getSheet(String ref) { - return jxl.biff.CellReferenceHelper.getSheet(ref); + return org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper.getSheet(ref); } /** diff --git a/datastructures-xslx/src/main/java/jxl/CellType.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellType.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/CellType.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellType.java index a8c1a97..33981b2 100755 --- a/datastructures-xslx/src/main/java/jxl/CellType.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * An enumeration type listing the available content types for a cell diff --git a/datastructures-xslx/src/main/java/jxl/CellView.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellView.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/CellView.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellView.java index 117a8ba..70cb94c 100755 --- a/datastructures-xslx/src/main/java/jxl/CellView.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/CellView.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * This is a bean which client applications may use to get/set various diff --git a/datastructures-xslx/src/main/java/jxl/DateCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/DateCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/DateCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/DateCell.java index 9b73ba1..e493ae1 100755 --- a/datastructures-xslx/src/main/java/jxl/DateCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/DateCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; import java.text.DateFormat; import java.util.Date; diff --git a/datastructures-xslx/src/main/java/jxl/DateFormulaCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/DateFormulaCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/DateFormulaCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/DateFormulaCell.java index b798d7f..d34ff16 100755 --- a/datastructures-xslx/src/main/java/jxl/DateFormulaCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/DateFormulaCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * A mixin interface for date formulas, which combines the interfaces diff --git a/datastructures-xslx/src/main/java/jxl/ErrorCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/ErrorCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/ErrorCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/ErrorCell.java index ab7f1ee..7461f0a 100755 --- a/datastructures-xslx/src/main/java/jxl/ErrorCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/ErrorCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * This type represents a cell which contains an error. This error will diff --git a/datastructures-xslx/src/main/java/jxl/ErrorFormulaCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/ErrorFormulaCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/ErrorFormulaCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/ErrorFormulaCell.java index 0819934..3ee9574 100755 --- a/datastructures-xslx/src/main/java/jxl/ErrorFormulaCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/ErrorFormulaCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * A mixin interface for numerical formulas, which combines the interfaces diff --git a/datastructures-xslx/src/main/java/jxl/FormulaCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/FormulaCell.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/FormulaCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/FormulaCell.java index 84cc24f..536c070 100755 --- a/datastructures-xslx/src/main/java/jxl/FormulaCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/FormulaCell.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; -import jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; /** * Interface for formulas which allow clients to read the Excel formula diff --git a/datastructures-xslx/src/main/java/jxl/HeaderFooter.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/HeaderFooter.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/HeaderFooter.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/HeaderFooter.java index a0520d3..a1b7b31 100755 --- a/datastructures-xslx/src/main/java/jxl/HeaderFooter.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/HeaderFooter.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * Class which represents an Excel header or footer. */ -public final class HeaderFooter extends jxl.biff.HeaderFooter { +public final class HeaderFooter extends org.xbib.datastructures.xslx.jxl.biff.HeaderFooter { /** * Default constructor. */ @@ -98,7 +98,7 @@ public final class HeaderFooter extends jxl.biff.HeaderFooter { * * @return the created contents */ - protected jxl.biff.HeaderFooter.Contents createContents() { + protected org.xbib.datastructures.xslx.jxl.biff.HeaderFooter.Contents createContents() { return new Contents(); } @@ -108,7 +108,7 @@ public final class HeaderFooter extends jxl.biff.HeaderFooter { * @param s the string to create the contents * @return the created contents */ - protected jxl.biff.HeaderFooter.Contents createContents(String s) { + protected org.xbib.datastructures.xslx.jxl.biff.HeaderFooter.Contents createContents(String s) { return new Contents(s); } @@ -118,15 +118,15 @@ public final class HeaderFooter extends jxl.biff.HeaderFooter { * @param c the contents to copy * @return the new contents */ - protected jxl.biff.HeaderFooter.Contents - createContents(jxl.biff.HeaderFooter.Contents c) { + protected org.xbib.datastructures.xslx.jxl.biff.HeaderFooter.Contents + createContents(org.xbib.datastructures.xslx.jxl.biff.HeaderFooter.Contents c) { return new Contents((Contents) c); } /** * The contents - a simple wrapper around a string buffer */ - public static class Contents extends jxl.biff.HeaderFooter.Contents { + public static class Contents extends org.xbib.datastructures.xslx.jxl.biff.HeaderFooter.Contents { /** * The constructor */ diff --git a/datastructures-xslx/src/main/java/jxl/Hyperlink.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Hyperlink.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/Hyperlink.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Hyperlink.java index c8be8e5..13c34e3 100755 --- a/datastructures-xslx/src/main/java/jxl/Hyperlink.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Hyperlink.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; import java.io.File; import java.net.URL; diff --git a/datastructures-xslx/src/main/java/jxl/Image.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Image.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/Image.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Image.java index e3600a8..aa8ae07 100755 --- a/datastructures-xslx/src/main/java/jxl/Image.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Image.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; import java.io.File; -import jxl.common.LengthUnit; +import org.xbib.datastructures.xslx.jxl.common.LengthUnit; /** * Accessor functions for an image diff --git a/datastructures-xslx/src/main/java/jxl/JXLException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/JXLException.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/JXLException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/JXLException.java index fa32309..3c2de42 100755 --- a/datastructures-xslx/src/main/java/jxl/JXLException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/JXLException.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * Base exception class for JExcelAPI exceptions diff --git a/datastructures-xslx/src/main/java/jxl/LabelCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/LabelCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/LabelCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/LabelCell.java index 938efa4..36156fd 100755 --- a/datastructures-xslx/src/main/java/jxl/LabelCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/LabelCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * A label cell diff --git a/datastructures-xslx/src/main/java/jxl/NumberCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/NumberCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/NumberCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/NumberCell.java index bc88e11..190916a 100755 --- a/datastructures-xslx/src/main/java/jxl/NumberCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/NumberCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; import java.text.NumberFormat; diff --git a/datastructures-xslx/src/main/java/jxl/NumberFormulaCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/NumberFormulaCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/NumberFormulaCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/NumberFormulaCell.java index 148fa5a..9ad509a 100755 --- a/datastructures-xslx/src/main/java/jxl/NumberFormulaCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/NumberFormulaCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * A mixin interface for numerical formulas, which combines the interfaces diff --git a/datastructures-xslx/src/main/java/jxl/Range.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Range.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/Range.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Range.java index dd4be76..44fdde6 100755 --- a/datastructures-xslx/src/main/java/jxl/Range.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Range.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * Represents a 3-D range of cells in a workbook. This object is diff --git a/datastructures-xslx/src/main/java/jxl/Sheet.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Sheet.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/Sheet.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Sheet.java index 1aa5ceb..c4d8b9e 100755 --- a/datastructures-xslx/src/main/java/jxl/Sheet.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Sheet.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; import java.util.regex.Pattern; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * Represents a sheet within a workbook. Provides a handle to the individual diff --git a/datastructures-xslx/src/main/java/jxl/SheetSettings.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/SheetSettings.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/SheetSettings.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/SheetSettings.java index 0361b85..509df29 100755 --- a/datastructures-xslx/src/main/java/jxl/SheetSettings.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/SheetSettings.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; -import jxl.biff.SheetRangeImpl; -import jxl.common.Assert; -import jxl.format.PageOrder; -import jxl.format.PageOrientation; -import jxl.format.PaperSize; +import org.xbib.datastructures.xslx.jxl.biff.SheetRangeImpl; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.format.PageOrder; +import org.xbib.datastructures.xslx.jxl.format.PageOrientation; +import org.xbib.datastructures.xslx.jxl.format.PaperSize; /** * This is a bean which client applications may use to get/set various diff --git a/datastructures-xslx/src/main/java/jxl/StringFormulaCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/StringFormulaCell.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/StringFormulaCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/StringFormulaCell.java index 4a1793a..7044ba5 100755 --- a/datastructures-xslx/src/main/java/jxl/StringFormulaCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/StringFormulaCell.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; /** * A mixin interface for numerical formulas, which combines the interfaces diff --git a/datastructures-xslx/src/main/java/jxl/Workbook.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Workbook.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/Workbook.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Workbook.java index 35e74eb..1ee9b8c 100755 --- a/datastructures-xslx/src/main/java/jxl/Workbook.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/Workbook.java @@ -17,19 +17,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import jxl.read.biff.BiffException; -import jxl.read.biff.File; -import jxl.read.biff.PasswordException; -import jxl.read.biff.WorkbookParser; -import jxl.write.WritableWorkbook; -import jxl.write.biff.WritableWorkbookImpl; +import org.xbib.datastructures.xslx.jxl.read.biff.BiffException; +import org.xbib.datastructures.xslx.jxl.read.biff.File; +import org.xbib.datastructures.xslx.jxl.read.biff.PasswordException; +import org.xbib.datastructures.xslx.jxl.read.biff.WorkbookParser; +import org.xbib.datastructures.xslx.jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.write.biff.WritableWorkbookImpl; /** * Represents a Workbook. Contains the various factory methods and provides diff --git a/datastructures-xslx/src/main/java/jxl/WorkbookSettings.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/WorkbookSettings.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/WorkbookSettings.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/WorkbookSettings.java index 17f9a0e..f426527 100755 --- a/datastructures-xslx/src/main/java/jxl/WorkbookSettings.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/WorkbookSettings.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl; +package org.xbib.datastructures.xslx.jxl; import java.io.File; import java.util.HashMap; import java.util.Locale; -import jxl.biff.CountryCode; -import jxl.biff.formula.FunctionNames; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.CountryCode; +import org.xbib.datastructures.xslx.jxl.biff.formula.FunctionNames; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * This is a bean which client applications may use to set various advanced diff --git a/datastructures-xslx/src/main/java/jxl/biff/AutoFilter.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/AutoFilter.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/AutoFilter.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/AutoFilter.java index da7bf70..5327e2a 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/AutoFilter.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/AutoFilter.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.io.IOException; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * Information for autofiltering diff --git a/datastructures-xslx/src/main/java/jxl/biff/AutoFilterInfoRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/AutoFilterInfoRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/biff/AutoFilterInfoRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/AutoFilterInfoRecord.java index 8ce86ed..11e1caa 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/AutoFilterInfoRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/AutoFilterInfoRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * Range information for conditional formatting diff --git a/datastructures-xslx/src/main/java/jxl/biff/AutoFilterRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/AutoFilterRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/biff/AutoFilterRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/AutoFilterRecord.java index 5f4994e..b166d2b 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/AutoFilterRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/AutoFilterRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * Range information for conditional formatting diff --git a/datastructures-xslx/src/main/java/jxl/biff/BaseCellFeatures.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BaseCellFeatures.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/BaseCellFeatures.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BaseCellFeatures.java index 3adbb0b..00d78c4 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/BaseCellFeatures.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BaseCellFeatures.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.util.Collection; -import jxl.CellReferenceHelper; -import jxl.Range; -import jxl.biff.drawing.ComboBox; -import jxl.biff.drawing.Comment; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.biff.CellValue; +import org.xbib.datastructures.xslx.jxl.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.biff.drawing.ComboBox; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Comment; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.biff.CellValue; /** * Container for any additional cell features diff --git a/datastructures-xslx/src/main/java/jxl/biff/BaseCompoundFile.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BaseCompoundFile.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/BaseCompoundFile.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BaseCompoundFile.java index 3c93ced..347a37b 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/BaseCompoundFile.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BaseCompoundFile.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains the common data for a compound file diff --git a/datastructures-xslx/src/main/java/jxl/biff/BuiltInFormat.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BuiltInFormat.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/BuiltInFormat.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BuiltInFormat.java index f424e79..ea34b3a 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/BuiltInFormat.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BuiltInFormat.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.format.Format; +import org.xbib.datastructures.xslx.jxl.format.Format; /** * The excel string for the various built in formats. Used to present diff --git a/datastructures-xslx/src/main/java/jxl/biff/BuiltInName.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BuiltInName.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/BuiltInName.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BuiltInName.java index 5aeafb8..f4cf654 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/BuiltInName.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BuiltInName.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; /** * Enumeration of built in names diff --git a/datastructures-xslx/src/main/java/jxl/biff/BuiltInStyle.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BuiltInStyle.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/BuiltInStyle.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BuiltInStyle.java index 780f8d8..0c010f4 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/BuiltInStyle.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/BuiltInStyle.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; /** * Represents a built in, rather than a user defined, style. diff --git a/datastructures-xslx/src/main/java/jxl/biff/ByteArray.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ByteArray.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/ByteArray.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ByteArray.java index 322e841..62216ab 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/ByteArray.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ByteArray.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; /** * A growable array of bytes diff --git a/datastructures-xslx/src/main/java/jxl/biff/ByteData.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ByteData.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/ByteData.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ByteData.java index ba6cf5a..e1d597d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/ByteData.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ByteData.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; /** * Interface which provides a method for transferring chunks of binary diff --git a/datastructures-xslx/src/main/java/jxl/biff/CellFinder.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/CellFinder.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/CellFinder.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/CellFinder.java index 0ee9b6d..c7eea9e 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/CellFinder.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/CellFinder.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jxl.Cell; -import jxl.CellType; -import jxl.LabelCell; -import jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.Sheet; /** * Refactorisation to provide more sophisticated find cell by contents diff --git a/datastructures-xslx/src/main/java/jxl/biff/CellReferenceHelper.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/CellReferenceHelper.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/CellReferenceHelper.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/CellReferenceHelper.java index 001dad2..5deae22 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/CellReferenceHelper.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/CellReferenceHelper.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.biff.formula.ExternalSheet; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A helper to transform between excel cell references and diff --git a/datastructures-xslx/src/main/java/jxl/biff/ConditionalFormat.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ConditionalFormat.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/ConditionalFormat.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ConditionalFormat.java index 8489d51..f70c27c 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/ConditionalFormat.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ConditionalFormat.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * Class containing the CONDFMT and CF records for conditionally formatting diff --git a/datastructures-xslx/src/main/java/jxl/biff/ConditionalFormatRangeRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ConditionalFormatRangeRecord.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/ConditionalFormatRangeRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ConditionalFormatRangeRecord.java index 0ebcd89..7da7f68 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/ConditionalFormatRangeRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ConditionalFormatRangeRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * Range information for conditional formatting diff --git a/datastructures-xslx/src/main/java/jxl/biff/ConditionalFormatRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ConditionalFormatRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/biff/ConditionalFormatRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ConditionalFormatRecord.java index d9b6dff..02dbf1c 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/ConditionalFormatRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ConditionalFormatRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * The conditional format conditions diff --git a/datastructures-xslx/src/main/java/jxl/biff/ContinueRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ContinueRecord.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/ContinueRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ContinueRecord.java index d1a074f..76d8dad 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/ContinueRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/ContinueRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A continue record - only used explicitly in special circumstances, as diff --git a/datastructures-xslx/src/main/java/jxl/biff/CountryCode.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/CountryCode.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/CountryCode.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/CountryCode.java index 71d3cba..9c6db79 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/CountryCode.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/CountryCode.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Enumeration type for the excel country codes diff --git a/datastructures-xslx/src/main/java/jxl/biff/DVParser.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DVParser.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/DVParser.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DVParser.java index 1a777fa..9b1e1c1 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/DVParser.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DVParser.java @@ -17,19 +17,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.text.DecimalFormat; import java.text.MessageFormat; import java.util.Collection; import java.util.Iterator; -import jxl.WorkbookSettings; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.biff.formula.ParseContext; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.biff.formula.ParseContext; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Class which parses the binary data associated with Data Validity (DV) diff --git a/datastructures-xslx/src/main/java/jxl/biff/DValParser.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DValParser.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/DValParser.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DValParser.java index 8d8dd24..23126a3 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/DValParser.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DValParser.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Class which parses the binary data associated with Data Validity (DVal) diff --git a/datastructures-xslx/src/main/java/jxl/biff/DataValidation.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DataValidation.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/DataValidation.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DataValidation.java index f03a329..a465ca3 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/DataValidation.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DataValidation.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import jxl.WorkbookSettings; -import jxl.biff.formula.ExternalSheet; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** diff --git a/datastructures-xslx/src/main/java/jxl/biff/DataValidityListRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DataValidityListRecord.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/DataValidityListRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DataValidityListRecord.java index 2c41f7b..ae414ab 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/DataValidityListRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DataValidityListRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * Record containing the list of data validation settings for a given sheet diff --git a/datastructures-xslx/src/main/java/jxl/biff/DataValiditySettingsRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DataValiditySettingsRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/biff/DataValiditySettingsRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DataValiditySettingsRecord.java index b64ac68..c2da036 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/DataValiditySettingsRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DataValiditySettingsRecord.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.WorkbookSettings; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * Data validity settings. Contains an individual Data validation (DV). diff --git a/datastructures-xslx/src/main/java/jxl/biff/DisplayFormat.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DisplayFormat.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/DisplayFormat.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DisplayFormat.java index e2782ad..520a3fa 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/DisplayFormat.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DisplayFormat.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; /** * The interface implemented by the various number and date format styles. diff --git a/datastructures-xslx/src/main/java/jxl/biff/DoubleHelper.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DoubleHelper.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/DoubleHelper.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DoubleHelper.java index 249d94d..7cd95e2 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/DoubleHelper.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/DoubleHelper.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; /** * Class to help handle doubles diff --git a/datastructures-xslx/src/main/java/jxl/biff/EmptyCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/EmptyCell.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/biff/EmptyCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/EmptyCell.java index dac8e3d..bb88003 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/EmptyCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/EmptyCell.java @@ -17,17 +17,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.CellFeatures; -import jxl.CellType; -import jxl.format.Alignment; -import jxl.format.Border; -import jxl.format.BorderLineStyle; -import jxl.format.CellFormat; -import jxl.format.VerticalAlignment; -import jxl.write.WritableCell; -import jxl.write.WritableCellFeatures; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.format.Alignment; +import org.xbib.datastructures.xslx.jxl.format.Border; +import org.xbib.datastructures.xslx.jxl.format.BorderLineStyle; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.format.VerticalAlignment; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFeatures; /** * An empty cell. Represents an empty, as opposed to a blank cell @@ -107,15 +107,6 @@ public class EmptyCell implements WritableCell { public void setCellFormat(CellFormat cf) { } - /** - * Dummy override - * - * @param cf dummy - * @deprecated - */ - public void setCellFormat(jxl.CellFormat cf) { - } - /** * Dummy override * diff --git a/datastructures-xslx/src/main/java/jxl/biff/EncodedURLHelper.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/EncodedURLHelper.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/EncodedURLHelper.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/EncodedURLHelper.java index 7ea12f4..896be6f 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/EncodedURLHelper.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/EncodedURLHelper.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.WorkbookSettings; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Helper to get the Microsoft encoded URL from the given string diff --git a/datastructures-xslx/src/main/java/jxl/biff/FilterModeRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FilterModeRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/biff/FilterModeRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FilterModeRecord.java index 89ddcb3..d7b394d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/FilterModeRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FilterModeRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * Range information for conditional formatting diff --git a/datastructures-xslx/src/main/java/jxl/biff/FontRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FontRecord.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/FontRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FontRecord.java index 4d22bd2..3bb17c6 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/FontRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FontRecord.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.WorkbookSettings; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.Colour; -import jxl.format.Font; -import jxl.format.ScriptStyle; -import jxl.format.UnderlineStyle; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.Font; +import org.xbib.datastructures.xslx.jxl.format.ScriptStyle; +import org.xbib.datastructures.xslx.jxl.format.UnderlineStyle; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A record containing the necessary data for the font information diff --git a/datastructures-xslx/src/main/java/jxl/biff/Fonts.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/Fonts.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/Fonts.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/Fonts.java index a7548c8..6fa3d34 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/Fonts.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/Fonts.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import jxl.common.Assert; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * A container for the list of fonts used in this workbook diff --git a/datastructures-xslx/src/main/java/jxl/biff/FormatRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FormatRecord.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/FormatRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FormatRecord.java index 22af783..dc81180 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/FormatRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FormatRecord.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.text.DateFormat; import java.text.DecimalFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; -import jxl.WorkbookSettings; -import jxl.common.Logger; -import jxl.format.Format; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.Format; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A non-built in format record diff --git a/datastructures-xslx/src/main/java/jxl/biff/FormattingRecords.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FormattingRecords.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/FormattingRecords.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FormattingRecords.java index 473e182..9844597 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/FormattingRecords.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FormattingRecords.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.io.IOException; import java.text.DateFormat; @@ -25,11 +25,11 @@ import java.text.NumberFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.Colour; -import jxl.format.RGB; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.RGB; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * The list of XF records and formatting records for the workbook diff --git a/datastructures-xslx/src/main/java/jxl/biff/FormulaData.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FormulaData.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/biff/FormulaData.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FormulaData.java index c373c71..b3a90ae 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/FormulaData.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/FormulaData.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.Cell; -import jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; /** * Interface which is used for copying formulas from a read only diff --git a/datastructures-xslx/src/main/java/jxl/biff/HeaderFooter.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/HeaderFooter.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/biff/HeaderFooter.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/HeaderFooter.java index 39b527d..b46b393 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/HeaderFooter.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/HeaderFooter.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Class which represents an Excel header or footer. Information for this diff --git a/datastructures-xslx/src/main/java/jxl/biff/IndexMapping.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/IndexMapping.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/IndexMapping.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/IndexMapping.java index a31017f..503588f 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/IndexMapping.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/IndexMapping.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * This class is a wrapper for a list of mappings between indices. diff --git a/datastructures-xslx/src/main/java/jxl/biff/IntegerHelper.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/IntegerHelper.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/IntegerHelper.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/IntegerHelper.java index b7b23af..99592f8 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/IntegerHelper.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/IntegerHelper.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; /** * Converts excel byte representations into integers diff --git a/datastructures-xslx/src/main/java/jxl/biff/NameRangeException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/NameRangeException.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/biff/NameRangeException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/NameRangeException.java index b528a1f..60e41a8 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/NameRangeException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/NameRangeException.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.JXLException; +import org.xbib.datastructures.xslx.jxl.JXLException; /** * A properly typed exception in case consumers of the API specifically diff --git a/datastructures-xslx/src/main/java/jxl/biff/NumFormatRecordsException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/NumFormatRecordsException.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/NumFormatRecordsException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/NumFormatRecordsException.java index 42ca5c3..6e44abc 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/NumFormatRecordsException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/NumFormatRecordsException.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; /** * Excel places a constraint on the number of format records that diff --git a/datastructures-xslx/src/main/java/jxl/biff/PaletteRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/PaletteRecord.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/PaletteRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/PaletteRecord.java index 5154e5f..8fad097 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/PaletteRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/PaletteRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.format.Colour; -import jxl.format.RGB; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.RGB; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A record representing the RGB colour palette diff --git a/datastructures-xslx/src/main/java/jxl/biff/RangeImpl.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/RangeImpl.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/RangeImpl.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/RangeImpl.java index 8321cf8..8d86920 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/RangeImpl.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/RangeImpl.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.Cell; -import jxl.Range; -import jxl.Sheet; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Implementation class for the Range interface. This merely diff --git a/datastructures-xslx/src/main/java/jxl/biff/RecordData.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/RecordData.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/RecordData.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/RecordData.java index 163e4a1..a2c4ead 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/RecordData.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/RecordData.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * The record data within a record diff --git a/datastructures-xslx/src/main/java/jxl/biff/SheetRangeImpl.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/SheetRangeImpl.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/SheetRangeImpl.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/SheetRangeImpl.java index e193ee0..a1bb9d5 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/SheetRangeImpl.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/SheetRangeImpl.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.Cell; -import jxl.Range; -import jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; /** * Implementation class for the Range interface. This merely diff --git a/datastructures-xslx/src/main/java/jxl/biff/StringHelper.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/StringHelper.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/StringHelper.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/StringHelper.java index b3eed46..d026b4c 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/StringHelper.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/StringHelper.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.io.UnsupportedEncodingException; -import jxl.WorkbookSettings; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Helper function to convert Java string objects to and from the byte diff --git a/datastructures-xslx/src/main/java/jxl/biff/Type.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/Type.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/biff/Type.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/Type.java index 761cb66..e19635f 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/Type.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/Type.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; /** * An enumeration class which contains the biff types diff --git a/datastructures-xslx/src/main/java/jxl/biff/WorkbookMethods.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/WorkbookMethods.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/WorkbookMethods.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/WorkbookMethods.java index b1700b1..761f194 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/WorkbookMethods.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/WorkbookMethods.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.Sheet; /** * An interface containing some common workbook methods. This so that diff --git a/datastructures-xslx/src/main/java/jxl/biff/WorkspaceInformationRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/WorkspaceInformationRecord.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/WorkspaceInformationRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/WorkspaceInformationRecord.java index 78607a2..f5b83e7 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/WorkspaceInformationRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/WorkspaceInformationRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A record detailing whether the sheet is protected diff --git a/datastructures-xslx/src/main/java/jxl/biff/WritableRecordData.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/WritableRecordData.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/WritableRecordData.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/WritableRecordData.java index 41c604b..dd5fff7 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/WritableRecordData.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/WritableRecordData.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * Extension of the standard RecordData which is used to support those diff --git a/datastructures-xslx/src/main/java/jxl/biff/XCTRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/XCTRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/biff/XCTRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/XCTRecord.java index 8298ee7..94ba78c 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/XCTRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/XCTRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A record representing the XCT record diff --git a/datastructures-xslx/src/main/java/jxl/biff/XFRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/XFRecord.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/XFRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/XFRecord.java index 32c0270..48e10fd 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/XFRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/XFRecord.java @@ -18,27 +18,27 @@ ***************************************************************************/ -package jxl.biff; +package org.xbib.datastructures.xslx.jxl.biff; import java.text.DateFormat; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.text.SimpleDateFormat; -import jxl.WorkbookSettings; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.Alignment; -import jxl.format.Border; -import jxl.format.BorderLineStyle; -import jxl.format.CellFormat; -import jxl.format.Colour; -import jxl.format.Font; -import jxl.format.Format; -import jxl.format.Orientation; -import jxl.format.Pattern; -import jxl.format.VerticalAlignment; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.Alignment; +import org.xbib.datastructures.xslx.jxl.format.Border; +import org.xbib.datastructures.xslx.jxl.format.BorderLineStyle; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.Font; +import org.xbib.datastructures.xslx.jxl.format.Format; +import org.xbib.datastructures.xslx.jxl.format.Orientation; +import org.xbib.datastructures.xslx.jxl.format.Pattern; +import org.xbib.datastructures.xslx.jxl.format.VerticalAlignment; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * Holds an extended formatting record diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/BStoreContainer.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/BStoreContainer.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/BStoreContainer.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/BStoreContainer.java index da8b797..c216cc4 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/BStoreContainer.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/BStoreContainer.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A BStoreContainer escher record diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/BlipStoreEntry.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/BlipStoreEntry.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/BlipStoreEntry.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/BlipStoreEntry.java index 3f8d898..1f2f6f5 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/BlipStoreEntry.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/BlipStoreEntry.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.IOException; -import jxl.biff.IntegerHelper; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * The data for this blip store entry. Typically this is the raw image data diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/BlipType.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/BlipType.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/BlipType.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/BlipType.java index 24deaf4..eeddd12 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/BlipType.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/BlipType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * Enumeration for the BLIP type diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Button.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Button.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Button.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Button.java index dd93dd4..4838524 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Button.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Button.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.IOException; -import jxl.WorkbookSettings; -import jxl.biff.ContinueRecord; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.ContinueRecord; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * Contains the various biff records used to copy a Button (from the diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Chart.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Chart.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Chart.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Chart.java index e257050..a232b5a 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Chart.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Chart.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.WorkbookSettings; -import jxl.biff.ByteData; -import jxl.biff.IndexMapping; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.read.biff.File; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.ByteData; +import org.xbib.datastructures.xslx.jxl.biff.IndexMapping; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.File; /** * Contains the various biff records used to insert a chart into a diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/CheckBox.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/CheckBox.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/CheckBox.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/CheckBox.java index bb37622..4c84000 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/CheckBox.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/CheckBox.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.IOException; -import jxl.WorkbookSettings; -import jxl.biff.ContinueRecord; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.ContinueRecord; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * Contains the various biff records used to copy a CheckBox (from the diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Chunk.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Chunk.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Chunk.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Chunk.java index 04e5e6e..09f1d82 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Chunk.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Chunk.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; class Chunk { private final int pos; diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/ChunkType.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ChunkType.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/ChunkType.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ChunkType.java index b0b0e03..bde9fbd 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/ChunkType.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ChunkType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.util.Arrays; diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/ClientAnchor.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ClientAnchor.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/ClientAnchor.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ClientAnchor.java index 91ab320..0548f06 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/ClientAnchor.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ClientAnchor.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * The client anchor record diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/ClientData.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ClientData.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/ClientData.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ClientData.java index 13c7839..378f046 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/ClientData.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ClientData.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * The client data diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/ClientTextBox.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ClientTextBox.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/ClientTextBox.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ClientTextBox.java index e614461..4a44a27 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/ClientTextBox.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ClientTextBox.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * ??? diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/ComboBox.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ComboBox.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/ComboBox.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ComboBox.java index a8ba810..66402ef 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/ComboBox.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ComboBox.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.IOException; -import jxl.WorkbookSettings; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * Contains the various biff records used to copy a ComboBox (from the diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Comment.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Comment.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Comment.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Comment.java index 7bd5b29..67ad3f8 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Comment.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Comment.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.IOException; -import jxl.WorkbookSettings; -import jxl.biff.ContinueRecord; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.ContinueRecord; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * Contains the various biff records used to insert a cell note into a diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Dg.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Dg.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Dg.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Dg.java index 070d1a6..136abb6 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Dg.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Dg.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; /** * The Drawing Group diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/DgContainer.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DgContainer.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/DgContainer.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DgContainer.java index 1278cce..acc803e 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/DgContainer.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DgContainer.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * A Dg Container diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Dgg.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Dgg.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Dgg.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Dgg.java index cae1897..9a06ba9 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Dgg.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Dgg.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.util.ArrayList; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Dgg record diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/DggContainer.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DggContainer.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/DggContainer.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DggContainer.java index 82d3236..440866d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/DggContainer.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DggContainer.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * Container for Dgg objects diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Drawing.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Drawing.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Drawing.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Drawing.java index 625730c..a3d24e6 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Drawing.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Drawing.java @@ -17,18 +17,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.FileInputStream; import java.io.IOException; -import jxl.CellView; -import jxl.Image; -import jxl.Sheet; -import jxl.common.Assert; -import jxl.common.LengthConverter; -import jxl.common.LengthUnit; -import jxl.common.Logger; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.CellView; +import org.xbib.datastructures.xslx.jxl.Image; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.LengthConverter; +import org.xbib.datastructures.xslx.jxl.common.LengthUnit; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Drawing2.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Drawing2.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Drawing2.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Drawing2.java index 73a767f..5800676 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Drawing2.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Drawing2.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.FileInputStream; import java.io.IOException; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingData.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingData.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingData.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingData.java index fa3b05c..d0f35ef 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingData.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingData.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.util.ArrayList; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Class used to concatenate all the data for the various drawing objects diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingDataException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingDataException.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingDataException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingDataException.java index 8ee2358..bbd3339 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingDataException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingDataException.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * Checked exception thrown when the drawing data is corrupt eg. when diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingGroup.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingGroup.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingGroup.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingGroup.java index 8a91a33..14db50a 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingGroup.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingGroup.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.read.biff.Record; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * This class contains the Excel picture data in Escher format for the diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingGroupObject.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingGroupObject.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingGroupObject.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingGroupObject.java index 10ede04..8865f04 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/DrawingGroupObject.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/DrawingGroupObject.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.IOException; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * Interface for the various object types that can be added to a drawing diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherAtom.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherAtom.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/EscherAtom.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherAtom.java index 611a444..6b0b50f 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherAtom.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherAtom.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Class for atoms. This may be instantiated as is for unknown/uncared about diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherContainer.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherContainer.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/EscherContainer.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherContainer.java index 2f9a9cc..d1cefa3 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherContainer.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherContainer.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.util.ArrayList; import java.util.Iterator; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * An escher container. This record may contain other escher containers or diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherDisplay.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherDisplay.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/EscherDisplay.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherDisplay.java index dfcb7dd..034b6e1 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherDisplay.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherDisplay.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.BufferedWriter; import java.io.IOException; diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherRecord.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/EscherRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherRecord.java index 8961dec..4debca5 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * The base class for all escher records. This class contains diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherRecordData.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherRecordData.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/EscherRecordData.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherRecordData.java index cf9adcb..6304e68 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherRecordData.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherRecordData.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherRecordType.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherRecordType.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/EscherRecordType.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherRecordType.java index d230edd..ab23e4c 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherRecordType.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherRecordType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * Enumeration class for Escher record types diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherStream.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherStream.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/EscherStream.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherStream.java index 6e7a13e..80aac6f 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/EscherStream.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/EscherStream.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * Interface implemented by records which contain escher byte streams diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/MsoDrawingGroupRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/MsoDrawingGroupRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/MsoDrawingGroupRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/MsoDrawingGroupRecord.java index 06835a1..6d97caa 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/MsoDrawingGroupRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/MsoDrawingGroupRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A record which merely holds the MSODRAWINGGROUP data. Used when copying diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/MsoDrawingRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/MsoDrawingRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/MsoDrawingRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/MsoDrawingRecord.java index 8fc1390..255720b 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/MsoDrawingRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/MsoDrawingRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A record which merely holds the MSODRAWING data. Used when copying files diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/NoteRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/NoteRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/NoteRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/NoteRecord.java index 6faff5d..85267a0 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/NoteRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/NoteRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A Note (TXO) record which contains the information for comments diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/ObjRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ObjRecord.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/ObjRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ObjRecord.java index 9b4168d..bb9cc93 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/ObjRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ObjRecord.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A record which merely holds the OBJ data. Used when copying files which diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Opt.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Opt.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Opt.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Opt.java index da22f30..e34744f 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Opt.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Opt.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.util.ArrayList; import java.util.Iterator; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * An options record in the escher stream diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Origin.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Origin.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Origin.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Origin.java index 2777aa3..93bd24f 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Origin.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Origin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * Enumeration type for the origin of a drawing object diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/PNGReader.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/PNGReader.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/PNGReader.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/PNGReader.java index d83ec68..ca39580 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/PNGReader.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/PNGReader.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.File; import java.io.FileInputStream; diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/ShapeType.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ShapeType.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/ShapeType.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ShapeType.java index 42a2494..ab1cd22 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/ShapeType.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/ShapeType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * Enumerations for the shape type diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/SheetDrawingWriter.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SheetDrawingWriter.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/SheetDrawingWriter.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SheetDrawingWriter.java index 7779a49..8ff0b03 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/SheetDrawingWriter.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SheetDrawingWriter.java @@ -17,15 +17,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; -import jxl.write.biff.File; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.biff.File; /** * Handles the writing out of the different charts and images on a sheet. diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Sp.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Sp.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Sp.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Sp.java index de311e8..120f656 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Sp.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Sp.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * The Sp escher atom diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/SpContainer.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SpContainer.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/SpContainer.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SpContainer.java index 7a01f0d..97c8fb1 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/SpContainer.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SpContainer.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * Shape contianer - Contains the data for this particular shape diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/Spgr.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Spgr.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/Spgr.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Spgr.java index 6a74121..ad132c1 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/Spgr.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/Spgr.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * The SpGr escher atom diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/SpgrContainer.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SpgrContainer.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/SpgrContainer.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SpgrContainer.java index bc680b3..60c1454 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/SpgrContainer.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SpgrContainer.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * An Spgr container record in an escher stream diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/SplitMenuColors.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SplitMenuColors.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/SplitMenuColors.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SplitMenuColors.java index d780ca3..453bcc7 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/SplitMenuColors.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/SplitMenuColors.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; /** * Split menu colours escher record diff --git a/datastructures-xslx/src/main/java/jxl/biff/drawing/TextObjectRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/TextObjectRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/biff/drawing/TextObjectRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/TextObjectRecord.java index 61bf58b..70146cb 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/drawing/TextObjectRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/drawing/TextObjectRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.drawing; +package org.xbib.datastructures.xslx.jxl.biff.drawing; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Logger; -import jxl.read.biff.Record; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.Record; /** * A TextObject (TXO) record which contains the information for comments diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Add.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Add.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Add.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Add.java index df142a8..43afedc 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Add.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Add.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Area.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Area.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Area.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Area.java index e98ee9b..4fbf090 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Area.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Area.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.biff.CellReferenceHelper; -import jxl.biff.IntegerHelper; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A nested class to hold range information diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Area3d.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Area3d.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Area3d.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Area3d.java index 219a4c1..a1c6bbc 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Area3d.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Area3d.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.biff.CellReferenceHelper; -import jxl.biff.IntegerHelper; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A nested class to hold range information diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/ArgumentSeparator.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ArgumentSeparator.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/ArgumentSeparator.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ArgumentSeparator.java index 636e741..10c7790 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/ArgumentSeparator.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ArgumentSeparator.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A dummy token used when parsing strings in order to indicate the diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Attribute.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Attribute.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Attribute.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Attribute.java index bde9c23..ead5d1b 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Attribute.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Attribute.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A special attribute control token - typically either a SUM function diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/BinaryOperator.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/BinaryOperator.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/formula/BinaryOperator.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/BinaryOperator.java index 0f1edb2..bab0903 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/BinaryOperator.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/BinaryOperator.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/BooleanValue.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/BooleanValue.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/BooleanValue.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/BooleanValue.java index b6abddc..697c550 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/BooleanValue.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/BooleanValue.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A boolean operand in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/BuiltInFunction.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/BuiltInFunction.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/BuiltInFunction.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/BuiltInFunction.java index 5d20c76..1d05825 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/BuiltInFunction.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/BuiltInFunction.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A built in function in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/CellReference.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CellReference.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/CellReference.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CellReference.java index 5baf15a..96dd396 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/CellReference.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CellReference.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.Cell; -import jxl.biff.CellReferenceHelper; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/CellReference3d.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CellReference3d.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/CellReference3d.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CellReference3d.java index 0815fad..e30f2b2 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/CellReference3d.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CellReference3d.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.Cell; -import jxl.biff.CellReferenceHelper; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A 3d cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/CellReferenceError.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CellReferenceError.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/CellReferenceError.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CellReferenceError.java index 5bed91f..f878e26 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/CellReferenceError.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CellReferenceError.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * An cell reference error which occurs in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/CloseParentheses.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CloseParentheses.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/CloseParentheses.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CloseParentheses.java index b4b3b37..a09cda8 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/CloseParentheses.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/CloseParentheses.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * The close of parentheses token diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/ColumnRange.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ColumnRange.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/biff/formula/ColumnRange.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ColumnRange.java index 317201e..a64db2b 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/ColumnRange.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ColumnRange.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.biff.CellReferenceHelper; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A class to hold range information across two entire columns diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/ColumnRange3d.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ColumnRange3d.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/formula/ColumnRange3d.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ColumnRange3d.java index 85fa32e..09bcd41 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/ColumnRange3d.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ColumnRange3d.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.biff.CellReferenceHelper; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A nested class to hold range information diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Concatenate.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Concatenate.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Concatenate.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Concatenate.java index fdcd748..5375e83 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Concatenate.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Concatenate.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Divide.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Divide.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Divide.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Divide.java index ecfc299..9116018 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Divide.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Divide.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/DoubleValue.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/DoubleValue.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/formula/DoubleValue.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/DoubleValue.java index c3e0cb3..04de9a2 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/DoubleValue.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/DoubleValue.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.biff.DoubleHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Equal.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Equal.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Equal.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Equal.java index 407a516..2d7b806 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Equal.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Equal.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/ErrorConstant.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ErrorConstant.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/ErrorConstant.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ErrorConstant.java index f90f55b..781ab8d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/ErrorConstant.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ErrorConstant.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * An error constant diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/ExternalSheet.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ExternalSheet.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/ExternalSheet.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ExternalSheet.java index f0838a0..f6e1fcd 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/ExternalSheet.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ExternalSheet.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.read.biff.BOFRecord; +import org.xbib.datastructures.xslx.jxl.read.biff.BOFRecord; /** * Interface which exposes the methods needed by formulas diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/FormulaErrorCode.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FormulaErrorCode.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/formula/FormulaErrorCode.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FormulaErrorCode.java index 4500bef..c7cd07a 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/FormulaErrorCode.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FormulaErrorCode.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * Enumeration for formula error codes diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/FormulaException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FormulaException.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/FormulaException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FormulaException.java index 3597d80..b532bf8 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/FormulaException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FormulaException.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.JXLException; +import org.xbib.datastructures.xslx.jxl.JXLException; /** * Exception thrown when parsing a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/FormulaParser.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FormulaParser.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/FormulaParser.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FormulaParser.java index 9b92d5b..26b5864 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/FormulaParser.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FormulaParser.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.Cell; -import jxl.WorkbookSettings; -import jxl.biff.WorkbookMethods; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Parses the formula passed in (either as parsed strings or as a string) diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Function.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Function.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Function.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Function.java index 8d220d7..d9f95ff 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Function.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Function.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.WorkbookSettings; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * An enumeration detailing the Excel function codes diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/FunctionNames.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FunctionNames.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/FunctionNames.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FunctionNames.java index d648b4d..9076069 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/FunctionNames.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/FunctionNames.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.HashMap; import java.util.Locale; import java.util.ResourceBundle; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A class which contains the function names for the current workbook. The diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/GreaterEqual.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/GreaterEqual.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/GreaterEqual.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/GreaterEqual.java index 798f3d2..ddc8ba8 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/GreaterEqual.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/GreaterEqual.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/GreaterThan.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/GreaterThan.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/GreaterThan.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/GreaterThan.java index 0cadd98..8b19ba3 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/GreaterThan.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/GreaterThan.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/IntegerValue.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/IntegerValue.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/formula/IntegerValue.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/IntegerValue.java index e8e5e20..a994b17 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/IntegerValue.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/IntegerValue.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/LessEqual.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/LessEqual.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/LessEqual.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/LessEqual.java index 10dea8c..f023158 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/LessEqual.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/LessEqual.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/LessThan.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/LessThan.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/LessThan.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/LessThan.java index 5e11973..7c47b8d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/LessThan.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/LessThan.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/MemArea.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/MemArea.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/formula/MemArea.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/MemArea.java index 67b9ed0..04adcde 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/MemArea.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/MemArea.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; /** * Indicates that the function doesn't evaluate to a constant reference diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/MemFunc.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/MemFunc.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/MemFunc.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/MemFunc.java index 12c1842..8cdf46a 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/MemFunc.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/MemFunc.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * Indicates that the function doesn't evaluate to a constant reference diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Minus.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Minus.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Minus.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Minus.java index a741512..4def01c 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Minus.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Minus.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Ambiguously defined minus operator, used as a place holder when parsing diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/MissingArg.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/MissingArg.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/MissingArg.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/MissingArg.java index 8f61caf..3fbec50 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/MissingArg.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/MissingArg.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * Represents a missing argument in an argument list diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Multiply.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Multiply.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Multiply.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Multiply.java index 12a4362..2a72582 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Multiply.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Multiply.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Name.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Name.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Name.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Name.java index 082c3d9..a879853 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Name.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Name.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A name operand diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/NameRange.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/NameRange.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/biff/formula/NameRange.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/NameRange.java index 1d8de91..1ed66cb 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/NameRange.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/NameRange.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.biff.IntegerHelper; -import jxl.biff.NameRangeException; -import jxl.biff.WorkbookMethods; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.NameRangeException; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A name operand diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/NotEqual.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/NotEqual.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/NotEqual.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/NotEqual.java index 8750c36..70ba662 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/NotEqual.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/NotEqual.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/NumberValue.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/NumberValue.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/NumberValue.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/NumberValue.java index 4ebfa5d..3916c1a 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/NumberValue.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/NumberValue.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A constant numerical value in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/OpenParentheses.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/OpenParentheses.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/OpenParentheses.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/OpenParentheses.java index 6e709b1..94738d2 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/OpenParentheses.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/OpenParentheses.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A dummy token used when parsing strings in order to indicate the diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Operand.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Operand.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Operand.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Operand.java index a3198c5..9671b3e 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Operand.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Operand.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * An operand in the parse tree. Operands represent leaf nodes in the diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Operator.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Operator.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Operator.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Operator.java index 77faf2b..350abfc 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Operator.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Operator.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Parenthesis.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Parenthesis.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Parenthesis.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Parenthesis.java index 8083dfb..673cc74 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Parenthesis.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Parenthesis.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/ParseContext.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ParseContext.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/ParseContext.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ParseContext.java index 7f75326..a59829d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/ParseContext.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ParseContext.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * Enumeration type for the context in which this formula is being parsed diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/ParseItem.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ParseItem.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/formula/ParseItem.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ParseItem.java index a560ecf..1846ce2 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/ParseItem.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ParseItem.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Abstract base class for an item in a formula parse tree diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/ParsedThing.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ParsedThing.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/ParsedThing.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ParsedThing.java index 30cba98..2716c9e 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/ParsedThing.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/ParsedThing.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * An interface for an excel ptg diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Parser.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Parser.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Parser.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Parser.java index da9ce6e..07011d4 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Parser.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Parser.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * Interface used by the two different types of formula parser diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Percent.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Percent.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Percent.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Percent.java index da9aecb..d110707 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Percent.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Percent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Plus.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Plus.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Plus.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Plus.java index f32c781..be5fb9a 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Plus.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Plus.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * Ambiguously defined plus operator, used as a place holder when parsing diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Power.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Power.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Power.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Power.java index ef7c01a..ffbc494 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Power.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Power.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/RangeSeparator.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/RangeSeparator.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/RangeSeparator.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/RangeSeparator.java index 5514862..3f618ee 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/RangeSeparator.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/RangeSeparator.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; /** * A "holding" token for a range separator. This token gets instantiated diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/SharedFormulaArea.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/SharedFormulaArea.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/biff/formula/SharedFormulaArea.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/SharedFormulaArea.java index cfe9bf6..3a45b9b 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/SharedFormulaArea.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/SharedFormulaArea.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.Cell; -import jxl.biff.CellReferenceHelper; -import jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/SharedFormulaCellReference.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/SharedFormulaCellReference.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/biff/formula/SharedFormulaCellReference.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/SharedFormulaCellReference.java index b6f2755..982227d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/SharedFormulaCellReference.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/SharedFormulaCellReference.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.Cell; -import jxl.biff.CellReferenceHelper; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/StringFormulaParser.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringFormulaParser.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/formula/StringFormulaParser.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringFormulaParser.java index 10e3116..62de1e5 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/StringFormulaParser.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringFormulaParser.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; import java.util.Iterator; import java.util.Stack; -import jxl.WorkbookSettings; -import jxl.biff.WorkbookMethods; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Parses a string formula into a parse tree diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/StringFunction.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringFunction.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/biff/formula/StringFunction.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringFunction.java index 1eb2feb..e21e67d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/StringFunction.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringFunction.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.WorkbookSettings; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Class used to hold a function when reading it in from a string. At this diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/StringOperator.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringOperator.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/StringOperator.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringOperator.java index f2da274..8285968 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/StringOperator.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringOperator.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; -import jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Assert; /** * Ambiguously defined operator, used as a place holder when parsing diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/StringParseItem.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringParseItem.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/formula/StringParseItem.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringParseItem.java index a64cb8d..8028ce3 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/StringParseItem.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringParseItem.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A dummy implementation used for typing information when tokens diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/StringValue.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringValue.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/biff/formula/StringValue.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringValue.java index 61edacc..0ff698e 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/StringValue.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/StringValue.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; -import jxl.WorkbookSettings; -import jxl.biff.StringHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/SubExpression.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/SubExpression.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/SubExpression.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/SubExpression.java index 4260dac..01c347c 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/SubExpression.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/SubExpression.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; -import jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; /** * Base class for those tokens which encapsulate a subexpression diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Subtract.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Subtract.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Subtract.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Subtract.java index 0d60f9c..7253734 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Subtract.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Subtract.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Token.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Token.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Token.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Token.java index a87dfb2..5ee87af 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Token.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Token.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.HashMap; diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/TokenFormulaParser.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/TokenFormulaParser.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/biff/formula/TokenFormulaParser.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/TokenFormulaParser.java index 03e09a0..21a28de 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/TokenFormulaParser.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/TokenFormulaParser.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; -import jxl.Cell; -import jxl.WorkbookSettings; -import jxl.biff.WorkbookMethods; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Parses the excel ptgs into a parse tree diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/UnaryMinus.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/UnaryMinus.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/UnaryMinus.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/UnaryMinus.java index c57f628..3ec261d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/UnaryMinus.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/UnaryMinus.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/UnaryOperator.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/UnaryOperator.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/biff/formula/UnaryOperator.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/UnaryOperator.java index 9e2d144..9d1ac56 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/UnaryOperator.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/UnaryOperator.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/UnaryPlus.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/UnaryPlus.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/UnaryPlus.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/UnaryPlus.java index 0c3ff91..7ee4b47 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/UnaryPlus.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/UnaryPlus.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A cell reference in a formula diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Union.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Union.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Union.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Union.java index 63665af..7a7d09d 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Union.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Union.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * A union of two cell ranges - the "," operator diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/VariableArgFunction.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/VariableArgFunction.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/biff/formula/VariableArgFunction.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/VariableArgFunction.java index 21134b8..6f17a76 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/VariableArgFunction.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/VariableArgFunction.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; import java.util.Stack; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A built in function in a formula. These functions take a variable diff --git a/datastructures-xslx/src/main/java/jxl/biff/formula/Yylex.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Yylex.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/biff/formula/Yylex.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Yylex.java index 13b2113..456677f 100755 --- a/datastructures-xslx/src/main/java/jxl/biff/formula/Yylex.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/biff/formula/Yylex.java @@ -19,14 +19,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.biff.formula; +package org.xbib.datastructures.xslx.jxl.biff.formula; /** * This file is generated by JLex. Do not alter the contents of this file * because changes will be overridden */ -import jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; /** diff --git a/datastructures-xslx/src/main/java/jxl/common/Assert.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/Assert.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/common/Assert.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/Assert.java index 82a47b7..22f474b 100755 --- a/datastructures-xslx/src/main/java/jxl/common/Assert.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/Assert.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.common; +package org.xbib.datastructures.xslx.jxl.common; /** * Simple assertion mechanism for use during development diff --git a/datastructures-xslx/src/main/java/jxl/common/AssertionFailed.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/AssertionFailed.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/common/AssertionFailed.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/AssertionFailed.java index cb0b88e..0bc706b 100755 --- a/datastructures-xslx/src/main/java/jxl/common/AssertionFailed.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/AssertionFailed.java @@ -18,7 +18,7 @@ ***************************************************************************/ -package jxl.common; +package org.xbib.datastructures.xslx.jxl.common; /** * An exception thrown when an assert (from the Assert class) fails diff --git a/datastructures-xslx/src/main/java/jxl/common/BaseUnit.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/BaseUnit.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/common/BaseUnit.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/BaseUnit.java index b9032ea..166b09c 100755 --- a/datastructures-xslx/src/main/java/jxl/common/BaseUnit.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/BaseUnit.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.common; +package org.xbib.datastructures.xslx.jxl.common; public class BaseUnit { private final int index; diff --git a/datastructures-xslx/src/main/java/jxl/common/LengthConverter.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/LengthConverter.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/common/LengthConverter.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/LengthConverter.java index 72773b1..636d463 100755 --- a/datastructures-xslx/src/main/java/jxl/common/LengthConverter.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/LengthConverter.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.common; +package org.xbib.datastructures.xslx.jxl.common; public class LengthConverter { private static final double[][] factors = diff --git a/datastructures-xslx/src/main/java/jxl/common/LengthUnit.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/LengthUnit.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/common/LengthUnit.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/LengthUnit.java index 8fd29e8..f56ea47 100755 --- a/datastructures-xslx/src/main/java/jxl/common/LengthUnit.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/LengthUnit.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.common; +package org.xbib.datastructures.xslx.jxl.common; /** diff --git a/datastructures-xslx/src/main/java/jxl/common/Logger.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/Logger.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/common/Logger.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/Logger.java index 562dde1..99f4ddb 100755 --- a/datastructures-xslx/src/main/java/jxl/common/Logger.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/Logger.java @@ -17,7 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.common; +package org.xbib.datastructures.xslx.jxl.common; + +import org.xbib.datastructures.xslx.jxl.common.log.LoggerName; +import org.xbib.datastructures.xslx.jxl.common.log.SimpleLogger; import java.security.AccessControlException; @@ -56,7 +59,7 @@ public abstract class Logger { return; } - String loggerName = jxl.common.log.LoggerName.NAME; + String loggerName = LoggerName.NAME; try { // First see if there was anything defined at run time @@ -64,24 +67,24 @@ public abstract class Logger { if (loggerName == null) { // Get the logger name from the compiled in logger - loggerName = jxl.common.log.LoggerName.NAME; + loggerName = LoggerName.NAME; } logger = (Logger) Class.forName(loggerName).newInstance(); } catch (IllegalAccessException e) { - logger = new jxl.common.log.SimpleLogger(); + logger = new SimpleLogger(); logger.warn("Could not instantiate logger " + loggerName + " using default"); } catch (InstantiationException e) { - logger = new jxl.common.log.SimpleLogger(); + logger = new SimpleLogger(); logger.warn("Could not instantiate logger " + loggerName + " using default"); } catch (AccessControlException e) { - logger = new jxl.common.log.SimpleLogger(); + logger = new SimpleLogger(); logger.warn("Could not instantiate logger " + loggerName + " using default"); } catch (ClassNotFoundException e) { - logger = new jxl.common.log.SimpleLogger(); + logger = new SimpleLogger(); logger.warn("Could not instantiate logger " + loggerName + " using default"); } diff --git a/datastructures-xslx/src/main/java/jxl/common/log/LoggerName.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/log/LoggerName.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/common/log/LoggerName.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/log/LoggerName.java index b594936..ca3789e 100755 --- a/datastructures-xslx/src/main/java/jxl/common/log/LoggerName.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/log/LoggerName.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.common.log; +package org.xbib.datastructures.xslx.jxl.common.log; /** * Static structure containing the class name of the logger. This may diff --git a/datastructures-xslx/src/main/java/jxl/common/log/SimpleLogger.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/log/SimpleLogger.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/common/log/SimpleLogger.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/log/SimpleLogger.java index 0599470..132781e 100755 --- a/datastructures-xslx/src/main/java/jxl/common/log/SimpleLogger.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/log/SimpleLogger.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.common.log; +package org.xbib.datastructures.xslx.jxl.common.log; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * The default logger. Simple writes everything out to stdout or stderr diff --git a/datastructures-xslx/src/main/java/jxl/common/log/SimpleLoggerName.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/log/SimpleLoggerName.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/common/log/SimpleLoggerName.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/log/SimpleLoggerName.java index 0f3ce0b..3c698f6 100755 --- a/datastructures-xslx/src/main/java/jxl/common/log/SimpleLoggerName.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/common/log/SimpleLoggerName.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.common.log; +package org.xbib.datastructures.xslx.jxl.common.log; /** * Static structure containing the class name of the logger. This may diff --git a/datastructures-xslx/src/main/java/jxl/format/Alignment.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Alignment.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/format/Alignment.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Alignment.java index 1bcd809..c03b18d 100755 --- a/datastructures-xslx/src/main/java/jxl/format/Alignment.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Alignment.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration class which contains the various alignments for data within a diff --git a/datastructures-xslx/src/main/java/jxl/format/BoldStyle.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/BoldStyle.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/format/BoldStyle.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/BoldStyle.java index f4bbe6d..952dcf5 100755 --- a/datastructures-xslx/src/main/java/jxl/format/BoldStyle.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/BoldStyle.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration class containing the various bold styles for data diff --git a/datastructures-xslx/src/main/java/jxl/format/Border.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Border.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/format/Border.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Border.java index ad63acf..41302f9 100755 --- a/datastructures-xslx/src/main/java/jxl/format/Border.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Border.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * The location of a border diff --git a/datastructures-xslx/src/main/java/jxl/format/BorderLineStyle.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/BorderLineStyle.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/format/BorderLineStyle.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/BorderLineStyle.java index 23b81d5..941fd57 100755 --- a/datastructures-xslx/src/main/java/jxl/format/BorderLineStyle.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/BorderLineStyle.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * The border line style diff --git a/datastructures-xslx/src/main/java/jxl/format/CellFormat.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/CellFormat.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/format/CellFormat.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/CellFormat.java index da96fa9..7e0a53a 100755 --- a/datastructures-xslx/src/main/java/jxl/format/CellFormat.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/CellFormat.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Interface for cell formats diff --git a/datastructures-xslx/src/main/java/jxl/format/Colour.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Colour.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/format/Colour.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Colour.java index b38934d..452a270 100755 --- a/datastructures-xslx/src/main/java/jxl/format/Colour.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Colour.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration class which contains the various colours available within diff --git a/datastructures-xslx/src/main/java/jxl/format/Font.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Font.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/format/Font.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Font.java index 26d5524..4726f11 100755 --- a/datastructures-xslx/src/main/java/jxl/format/Font.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Font.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Interface which exposes the user font display information to the user diff --git a/datastructures-xslx/src/main/java/jxl/format/Format.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Format.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/format/Format.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Format.java index 842bd39..c86bdbc 100755 --- a/datastructures-xslx/src/main/java/jxl/format/Format.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Format.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Exposes the cell formatting information diff --git a/datastructures-xslx/src/main/java/jxl/format/Orientation.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Orientation.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/format/Orientation.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Orientation.java index b131415..0e8d164 100755 --- a/datastructures-xslx/src/main/java/jxl/format/Orientation.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Orientation.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration type which describes the orientation of data within a cell diff --git a/datastructures-xslx/src/main/java/jxl/format/PageOrder.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/PageOrder.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/format/PageOrder.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/PageOrder.java index 3a1c816..3570c13 100755 --- a/datastructures-xslx/src/main/java/jxl/format/PageOrder.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/PageOrder.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration type which describes the page orientation diff --git a/datastructures-xslx/src/main/java/jxl/format/PageOrientation.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/PageOrientation.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/format/PageOrientation.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/PageOrientation.java index c65cb38..2269a38 100755 --- a/datastructures-xslx/src/main/java/jxl/format/PageOrientation.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/PageOrientation.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration type which describes the page orientation diff --git a/datastructures-xslx/src/main/java/jxl/format/PaperSize.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/PaperSize.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/format/PaperSize.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/PaperSize.java index 78fb4a8..9059751 100755 --- a/datastructures-xslx/src/main/java/jxl/format/PaperSize.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/PaperSize.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration type which contains the available excel paper sizes and their diff --git a/datastructures-xslx/src/main/java/jxl/format/Pattern.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Pattern.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/format/Pattern.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Pattern.java index 30fdd90..e57e633 100755 --- a/datastructures-xslx/src/main/java/jxl/format/Pattern.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/Pattern.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** diff --git a/datastructures-xslx/src/main/java/jxl/format/RGB.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/RGB.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/format/RGB.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/RGB.java index 9dbd994..dbaf1c4 100755 --- a/datastructures-xslx/src/main/java/jxl/format/RGB.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/RGB.java @@ -18,7 +18,7 @@ ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * A structure which contains the RGB values for a particular colour diff --git a/datastructures-xslx/src/main/java/jxl/format/ScriptStyle.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/ScriptStyle.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/format/ScriptStyle.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/ScriptStyle.java index b09b789..2545dfd 100755 --- a/datastructures-xslx/src/main/java/jxl/format/ScriptStyle.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/ScriptStyle.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration class which contains the various script styles available diff --git a/datastructures-xslx/src/main/java/jxl/format/UnderlineStyle.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/UnderlineStyle.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/format/UnderlineStyle.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/UnderlineStyle.java index 0e34a39..efa964c 100755 --- a/datastructures-xslx/src/main/java/jxl/format/UnderlineStyle.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/UnderlineStyle.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration class which contains the various underline styles available diff --git a/datastructures-xslx/src/main/java/jxl/format/VerticalAlignment.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/VerticalAlignment.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/format/VerticalAlignment.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/VerticalAlignment.java index 028beb7..a3c31f5 100755 --- a/datastructures-xslx/src/main/java/jxl/format/VerticalAlignment.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/format/VerticalAlignment.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.format; +package org.xbib.datastructures.xslx.jxl.format; /** * Enumeration type which describes the vertical alignment of data within a cell diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/BOFRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BOFRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/read/biff/BOFRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BOFRecord.java index 3086e37..ed3f7a2 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/BOFRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BOFRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A Beginning Of File record, found at the commencement of all substreams diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/BaseSharedFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BaseSharedFormulaRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/BaseSharedFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BaseSharedFormulaRecord.java index 9cb622b..70c5028 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/BaseSharedFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BaseSharedFormulaRecord.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; /** * A base class for shared formula records diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/BiffException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BiffException.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/read/biff/BiffException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BiffException.java index 92b1cd9..1f0d6dc 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/BiffException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BiffException.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.JXLException; +import org.xbib.datastructures.xslx.jxl.JXLException; /** * Exception thrown when reading a biff file diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/BiffRecordReader.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BiffRecordReader.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/read/biff/BiffRecordReader.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BiffRecordReader.java index da2bca4..2e0d114 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/BiffRecordReader.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BiffRecordReader.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; /** * Serves up Record objects from a biff file. This object is used by the diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/BlankCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BlankCell.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/read/biff/BlankCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BlankCell.java index 736a678..7087783 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/BlankCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BlankCell.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; /** * A blank cell. Despite the fact that this cell has no contents, it diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/BooleanFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BooleanFormulaRecord.java similarity index 86% rename from datastructures-xslx/src/main/java/jxl/read/biff/BooleanFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BooleanFormulaRecord.java index 977264f..415625a 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/BooleanFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BooleanFormulaRecord.java @@ -17,18 +17,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.BooleanCell; -import jxl.BooleanFormulaCell; -import jxl.CellType; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.BooleanCell; +import org.xbib.datastructures.xslx.jxl.BooleanFormulaCell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Assert; /** * A boolean formula's last calculated value diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/BooleanRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BooleanRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/read/biff/BooleanRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BooleanRecord.java index 715be90..8ace8c5 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/BooleanRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BooleanRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.BooleanCell; -import jxl.CellType; -import jxl.biff.FormattingRecords; -import jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.BooleanCell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.common.Assert; /** * A boolean cell last calculated value diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/BottomMarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BottomMarginRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/read/biff/BottomMarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BottomMarginRecord.java index 1991023..4f05d28 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/BottomMarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BottomMarginRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * Record for the left margin settings diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/BoundsheetRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BoundsheetRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/read/biff/BoundsheetRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BoundsheetRecord.java index 3d49c64..d08326b 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/BoundsheetRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/BoundsheetRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; /** * A boundsheet record, which contains the worksheet name diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/ButtonPropertySetRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ButtonPropertySetRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/ButtonPropertySetRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ButtonPropertySetRecord.java index e1606d3..4f76d50 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/ButtonPropertySetRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ButtonPropertySetRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Data associated with a button property set diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/CalcModeRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CalcModeRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/read/biff/CalcModeRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CalcModeRecord.java index ef1405b..b6ebd1e 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/CalcModeRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CalcModeRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A calculation mode record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/CellFeaturesAccessor.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CellFeaturesAccessor.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/read/biff/CellFeaturesAccessor.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CellFeaturesAccessor.java index d9a47d0..0e013c0 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/CellFeaturesAccessor.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CellFeaturesAccessor.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.CellFeatures; /** * Allows the setting of the cell features in this package only diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/CellValue.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CellValue.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/CellValue.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CellValue.java index 8391dd6..a409655 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/CellValue.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CellValue.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.Cell; -import jxl.CellFeatures; -import jxl.biff.FormattingRecords; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.XFRecord; -import jxl.common.Logger; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * Abstract class for all records which actually contain cell values diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/CentreRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CentreRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/CentreRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CentreRecord.java index b0fec80..ac33426 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/CentreRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CentreRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * Record which indicates the whether the horizontal center option has been set diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/CodepageRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CodepageRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/read/biff/CodepageRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CodepageRecord.java index 529435f..d3a9914 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/CodepageRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CodepageRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A codepage record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/ColumnInfoRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ColumnInfoRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/read/biff/ColumnInfoRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ColumnInfoRecord.java index a1d9d66..8968085 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/ColumnInfoRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ColumnInfoRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * Contains the display info data which affects the entire columns diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/CompoundFile.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CompoundFile.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/read/biff/CompoundFile.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CompoundFile.java index 0a8beeb..dd1b281 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/CompoundFile.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CompoundFile.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.util.ArrayList; import java.util.Iterator; -import jxl.WorkbookSettings; -import jxl.biff.BaseCompoundFile; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.BaseCompoundFile; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Reads in and defrags an OLE compound compound file diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/CountryRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CountryRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/read/biff/CountryRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CountryRecord.java index 0dd448a..59429b0 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/CountryRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/CountryRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains the cell dimensions of this worksheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/DateFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DateFormulaRecord.java similarity index 86% rename from datastructures-xslx/src/main/java/jxl/read/biff/DateFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DateFormulaRecord.java index d886966..f17e622 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/DateFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DateFormulaRecord.java @@ -17,18 +17,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.text.NumberFormat; -import jxl.CellType; -import jxl.DateCell; -import jxl.DateFormulaCell; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.DateCell; +import org.xbib.datastructures.xslx.jxl.DateFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; /** * A date formula's last calculated value diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/DateRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DateRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/read/biff/DateRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DateRecord.java index b954a49..22b6bd5 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/DateRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DateRecord.java @@ -17,20 +17,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import jxl.CellFeatures; -import jxl.CellType; -import jxl.DateCell; -import jxl.NumberCell; -import jxl.biff.FormattingRecords; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.DateCell; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * A date which is stored in the cell diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/DefaultColumnWidthRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DefaultColumnWidthRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/DefaultColumnWidthRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DefaultColumnWidthRecord.java index 9d56eb4..6181c9a 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/DefaultColumnWidthRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DefaultColumnWidthRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * Contains the default column width for cells in this sheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/DefaultRowHeightRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DefaultRowHeightRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/DefaultRowHeightRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DefaultRowHeightRecord.java index f9d8951..b7ce567 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/DefaultRowHeightRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DefaultRowHeightRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * Contains the default column width for cells in this sheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/DimensionRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DimensionRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/read/biff/DimensionRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DimensionRecord.java index 108ce78..940a9e9 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/DimensionRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/DimensionRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains the cell dimensions of this worksheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/ErrorFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ErrorFormulaRecord.java similarity index 85% rename from datastructures-xslx/src/main/java/jxl/read/biff/ErrorFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ErrorFormulaRecord.java index 8b3f51e..5e4aca7 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/ErrorFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ErrorFormulaRecord.java @@ -17,19 +17,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.ErrorCell; -import jxl.ErrorFormulaCell; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaErrorCode; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.ErrorCell; +import org.xbib.datastructures.xslx.jxl.ErrorFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaErrorCode; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Assert; /** * An error resulting from the calculation of a formula diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/ErrorRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ErrorRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/read/biff/ErrorRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ErrorRecord.java index 2b6f09a..e08edac 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/ErrorRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ErrorRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.ErrorCell; -import jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.ErrorCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; /** * A cell containing an error code. This will usually be the result diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/Excel9FileRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Excel9FileRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/Excel9FileRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Excel9FileRecord.java index 409538b..8bfdc64 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/Excel9FileRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Excel9FileRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A excel9file record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/ExternalNameRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ExternalNameRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/read/biff/ExternalNameRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ExternalNameRecord.java index caa28b8..5653f92 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/ExternalNameRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ExternalNameRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.StringHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/ExternalSheetRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ExternalSheetRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/read/biff/ExternalSheetRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ExternalSheetRecord.java index 03ebe48..6a93286 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/ExternalSheetRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ExternalSheetRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * An Externsheet record, containing the details of externally references diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/File.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/File.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/read/biff/File.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/File.java index d1a9d8d..652b87f 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/File.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/File.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; -import jxl.WorkbookSettings; -import jxl.biff.BaseCompoundFile; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.BaseCompoundFile; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * File containing the data from the binary stream diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/FooterRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/FooterRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/read/biff/FooterRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/FooterRecord.java index 57f8303..0a1f2bc 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/FooterRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/FooterRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; /** * A workbook page footer record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/Formula.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Formula.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/read/biff/Formula.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Formula.java index bdaba9a..0509dfe 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/Formula.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Formula.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.Cell; +import org.xbib.datastructures.xslx.jxl.Cell; /** * Interface which is used for copying formulas from a read only diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/FormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/FormulaRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/read/biff/FormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/FormulaRecord.java index aeaf5ab..5e2114e 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/FormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/FormulaRecord.java @@ -17,17 +17,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.WorkbookSettings; -import jxl.biff.DoubleHelper; -import jxl.biff.FormattingRecords; -import jxl.biff.IntegerHelper; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A formula's last calculated value diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/GuttersRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/GuttersRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/read/biff/GuttersRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/GuttersRecord.java index c27c750..5b456e0 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/GuttersRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/GuttersRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * The gutters record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/HeaderRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HeaderRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/read/biff/HeaderRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HeaderRecord.java index 4629806..6b2db9d 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/HeaderRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HeaderRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.StringHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A workbook page header record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/HideobjRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HideobjRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/read/biff/HideobjRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HideobjRecord.java index dae08fe..042a473 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/HideobjRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HideobjRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A hideobj record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/HorizontalPageBreaksRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HorizontalPageBreaksRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/read/biff/HorizontalPageBreaksRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HorizontalPageBreaksRecord.java index 792d9fc..e125ce3 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/HorizontalPageBreaksRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HorizontalPageBreaksRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains the cell dimensions of this worksheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/HyperlinkRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HyperlinkRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/read/biff/HyperlinkRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HyperlinkRecord.java index 81dad89..a97acb3 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/HyperlinkRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/HyperlinkRecord.java @@ -17,21 +17,21 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import jxl.CellReferenceHelper; -import jxl.Hyperlink; -import jxl.Range; -import jxl.Sheet; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.SheetRangeImpl; -import jxl.biff.StringHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.Hyperlink; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.SheetRangeImpl; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A number record. This is stored as 8 bytes, as opposed to the diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/LabelRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/LabelRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/read/biff/LabelRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/LabelRecord.java index e497826..c8e263f 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/LabelRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/LabelRecord.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.LabelCell; -import jxl.WorkbookSettings; -import jxl.biff.FormattingRecords; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; /** * A label which is stored in the cell diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/LabelSSTRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/LabelSSTRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/read/biff/LabelSSTRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/LabelSSTRecord.java index 2e8058c..0db0086 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/LabelSSTRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/LabelSSTRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.LabelCell; -import jxl.biff.FormattingRecords; -import jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; /** * A label which is stored in the shared string table diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/LeftMarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/LeftMarginRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/read/biff/LeftMarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/LeftMarginRecord.java index 022b2a2..e95ea9c 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/LeftMarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/LeftMarginRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * Record for the left margin settings diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/MarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MarginRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/read/biff/MarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MarginRecord.java index 32fe710..ec71680 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/MarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MarginRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.DoubleHelper; -import jxl.biff.RecordData; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * Abstract class containing the margin value for top,left,right and bottom diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/MergedCellsRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MergedCellsRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/read/biff/MergedCellsRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MergedCellsRecord.java index e6d4bcc..f7557a1 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/MergedCellsRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MergedCellsRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.Range; -import jxl.Sheet; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.SheetRangeImpl; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.SheetRangeImpl; /** * A merged cells record for a given sheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/MulBlankCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MulBlankCell.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/read/biff/MulBlankCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MulBlankCell.java index 4245860..e9bd6f6 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/MulBlankCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MulBlankCell.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.Cell; -import jxl.CellFeatures; -import jxl.CellType; -import jxl.biff.FormattingRecords; -import jxl.common.Logger; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * A blank cell value, initialized indirectly from a multiple biff record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/MulBlankRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MulBlankRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/read/biff/MulBlankRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MulBlankRecord.java index b28c7b2..09ab4e6 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/MulBlankRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MulBlankRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains an array of Blank, formatted cells diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/MulRKRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MulRKRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/read/biff/MulRKRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MulRKRecord.java index c429f62..8816b62 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/MulRKRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/MulRKRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains an array of RK numbers diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/NameRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NameRecord.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/read/biff/NameRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NameRecord.java index 7de4be1..75fa442 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/NameRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NameRecord.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.util.ArrayList; -import jxl.WorkbookSettings; -import jxl.biff.BuiltInName; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.StringHelper; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.BuiltInName; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Holds an excel name record, and the details of the cells/ranges it refers diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/NineteenFourRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NineteenFourRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/read/biff/NineteenFourRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NineteenFourRecord.java index 4dc7e3d..eb1bd98 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/NineteenFourRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NineteenFourRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * Identifies the date system as the 1904 system or not diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/NumberFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NumberFormulaRecord.java similarity index 86% rename from datastructures-xslx/src/main/java/jxl/read/biff/NumberFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NumberFormulaRecord.java index 6919c86..1e82a3a 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/NumberFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NumberFormulaRecord.java @@ -17,21 +17,21 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.text.DecimalFormat; import java.text.NumberFormat; -import jxl.CellType; -import jxl.NumberCell; -import jxl.NumberFormulaCell; -import jxl.biff.DoubleHelper; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.NumberFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A formula's last calculated value diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/NumberRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NumberRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/read/biff/NumberRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NumberRecord.java index 2828df6..e35e72d 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/NumberRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NumberRecord.java @@ -17,15 +17,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.text.DecimalFormat; import java.text.NumberFormat; -import jxl.CellType; -import jxl.NumberCell; -import jxl.biff.DoubleHelper; -import jxl.biff.FormattingRecords; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A number record. This is stored as 8 bytes, as opposed to the diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/NumberValue.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NumberValue.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/read/biff/NumberValue.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NumberValue.java index 92006fe..5587c86 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/NumberValue.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/NumberValue.java @@ -17,15 +17,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.text.DecimalFormat; import java.text.NumberFormat; -import jxl.CellFeatures; -import jxl.CellType; -import jxl.NumberCell; -import jxl.biff.FormattingRecords; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * A numerical cell value, initialized indirectly from a multiple biff record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/PLSRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PLSRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/read/biff/PLSRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PLSRecord.java index f296cac..31b2c5a 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/PLSRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PLSRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * The environment specific print record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/PaletteRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PaletteRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/read/biff/PaletteRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PaletteRecord.java index fe92bca..85a1e56 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/PaletteRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PaletteRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * A password record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/PaneRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PaneRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/PaneRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PaneRecord.java index 75a60b5..dbcf4bb 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/PaneRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PaneRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains the cell dimensions of this worksheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/PasswordException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PasswordException.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/read/biff/PasswordException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PasswordException.java index ecf1c6a..b0fa6c9 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/PasswordException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PasswordException.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; /** * A properly typed exception in case consumers of the API specifically diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/PasswordRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PasswordRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/read/biff/PasswordRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PasswordRecord.java index e13f337..51015c7 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/PasswordRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PasswordRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * A password record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/PrintGridLinesRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PrintGridLinesRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/read/biff/PrintGridLinesRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PrintGridLinesRecord.java index 22c6342..3983a24 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/PrintGridLinesRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PrintGridLinesRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * Contains the print grid lines option of this worksheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/PrintHeadersRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PrintHeadersRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/read/biff/PrintHeadersRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PrintHeadersRecord.java index ca04b91..7bd0124 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/PrintHeadersRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/PrintHeadersRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * Contains the print grid lines option of this worksheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/ProtectRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ProtectRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/ProtectRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ProtectRecord.java index 8ef1c55..61ea4fc 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/ProtectRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/ProtectRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; /** * A record detailing whether the sheet is protected diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/RKHelper.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RKHelper.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/read/biff/RKHelper.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RKHelper.java index d15d063..f5a75b2 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/RKHelper.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RKHelper.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; /** * Helper to convert an RK number into a double or an integer diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/RKRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RKRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/read/biff/RKRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RKRecord.java index a5a10b1..649b24e 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/RKRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RKRecord.java @@ -17,15 +17,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.text.DecimalFormat; import java.text.NumberFormat; -import jxl.CellType; -import jxl.NumberCell; -import jxl.biff.FormattingRecords; -import jxl.biff.IntegerHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * An individual RK record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/RStringRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RStringRecord.java similarity index 85% rename from datastructures-xslx/src/main/java/jxl/read/biff/RStringRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RStringRecord.java index 1b03658..efc5dbf 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/RStringRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RStringRecord.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.LabelCell; -import jxl.WorkbookSettings; -import jxl.biff.FormattingRecords; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; /** * A label which is stored in the cell diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/Record.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Record.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/read/biff/Record.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Record.java index 43afc94..454a2be 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/Record.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Record.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.util.ArrayList; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/RefreshAllRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RefreshAllRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/read/biff/RefreshAllRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RefreshAllRecord.java index 88a0de1..edbd628 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/RefreshAllRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RefreshAllRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A Refresh all mode record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/RightMarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RightMarginRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/read/biff/RightMarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RightMarginRecord.java index 3bbff05..cc1e137 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/RightMarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RightMarginRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * Record for the left margin settings diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/RowRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RowRecord.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/read/biff/RowRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RowRecord.java index 76ec4d7..06addac 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/RowRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/RowRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A row record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SCLRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SCLRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/read/biff/SCLRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SCLRecord.java index ff5d77d..a405411 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SCLRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SCLRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * Class containing the zoom factor for display diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SSTRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SSTRecord.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/read/biff/SSTRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SSTRecord.java index c1b66bf..b5a26c8 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SSTRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SSTRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.StringHelper; -import jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; /** * Holds all the strings in the shared string table diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SaveRecalcRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SaveRecalcRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/read/biff/SaveRecalcRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SaveRecalcRecord.java index 6346d10..e2e9c3b 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SaveRecalcRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SaveRecalcRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A calculation mode record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SetupRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SetupRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/read/biff/SetupRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SetupRecord.java index e9ae744..70165ce 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SetupRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SetupRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.DoubleHelper; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.Type; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains the page set up for a sheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SharedBooleanFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedBooleanFormulaRecord.java similarity index 86% rename from datastructures-xslx/src/main/java/jxl/read/biff/SharedBooleanFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedBooleanFormulaRecord.java index dd4c84d..9354363 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SharedBooleanFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedBooleanFormulaRecord.java @@ -17,19 +17,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.BooleanCell; -import jxl.BooleanFormulaCell; -import jxl.CellType; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.BooleanCell; +import org.xbib.datastructures.xslx.jxl.BooleanFormulaCell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A shared boolean formula record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SharedDateFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedDateFormulaRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/read/biff/SharedDateFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedDateFormulaRecord.java index 7bcc522..2ec4986 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SharedDateFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedDateFormulaRecord.java @@ -17,19 +17,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.text.DateFormat; import java.util.Date; -import jxl.CellType; -import jxl.DateCell; -import jxl.DateFormulaCell; -import jxl.biff.DoubleHelper; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.DateCell; +import org.xbib.datastructures.xslx.jxl.DateFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; /** * A number formula record, manufactured out of the Shared Formula diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SharedErrorFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedErrorFormulaRecord.java similarity index 86% rename from datastructures-xslx/src/main/java/jxl/read/biff/SharedErrorFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedErrorFormulaRecord.java index 87bbbb5..fe0e695 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SharedErrorFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedErrorFormulaRecord.java @@ -17,20 +17,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.ErrorCell; -import jxl.ErrorFormulaCell; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaErrorCode; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.ErrorCell; +import org.xbib.datastructures.xslx.jxl.ErrorFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaErrorCode; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A number formula record, manufactured out of the Shared Formula diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SharedFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedFormulaRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/read/biff/SharedFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedFormulaRecord.java index 03cdfe9..2240327 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SharedFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedFormulaRecord.java @@ -17,17 +17,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.text.NumberFormat; import java.util.ArrayList; -import jxl.Cell; -import jxl.CellType; -import jxl.biff.FormattingRecords; -import jxl.biff.IntegerHelper; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A shared formula diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SharedNumberFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedNumberFormulaRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/read/biff/SharedNumberFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedNumberFormulaRecord.java index 14a8499..297bfc0 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SharedNumberFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedNumberFormulaRecord.java @@ -17,22 +17,22 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.text.DecimalFormat; import java.text.NumberFormat; -import jxl.CellType; -import jxl.NumberCell; -import jxl.NumberFormulaCell; -import jxl.biff.DoubleHelper; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.NumberFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A number formula record, manufactured out of the Shared Formula diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SharedStringFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedStringFormulaRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/read/biff/SharedStringFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedStringFormulaRecord.java index 2b13945..1277d41 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SharedStringFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SharedStringFormulaRecord.java @@ -17,23 +17,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.LabelCell; -import jxl.StringFormulaCell; -import jxl.WorkbookSettings; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.StringFormulaCell; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A string formula record, manufactured out of the Shared Formula diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SheetImpl.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SheetImpl.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/read/biff/SheetImpl.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SheetImpl.java index 9ba897d..13bb123 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SheetImpl.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SheetImpl.java @@ -17,36 +17,36 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.util.ArrayList; import java.util.Iterator; import java.util.regex.Pattern; -import jxl.Cell; -import jxl.CellView; -import jxl.Hyperlink; -import jxl.Image; -import jxl.LabelCell; -import jxl.Range; -import jxl.Sheet; -import jxl.SheetSettings; -import jxl.WorkbookSettings; -import jxl.biff.AutoFilter; -import jxl.biff.BuiltInName; -import jxl.biff.CellFinder; -import jxl.biff.CellReferenceHelper; -import jxl.biff.ConditionalFormat; -import jxl.biff.DataValidation; -import jxl.biff.EmptyCell; -import jxl.biff.FormattingRecords; -import jxl.biff.Type; -import jxl.biff.WorkspaceInformationRecord; -import jxl.biff.drawing.Chart; -import jxl.biff.drawing.Drawing; -import jxl.biff.drawing.DrawingData; -import jxl.biff.drawing.DrawingGroupObject; -import jxl.common.Logger; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellView; +import org.xbib.datastructures.xslx.jxl.Hyperlink; +import org.xbib.datastructures.xslx.jxl.Image; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.SheetSettings; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.AutoFilter; +import org.xbib.datastructures.xslx.jxl.biff.BuiltInName; +import org.xbib.datastructures.xslx.jxl.biff.CellFinder; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.ConditionalFormat; +import org.xbib.datastructures.xslx.jxl.biff.DataValidation; +import org.xbib.datastructures.xslx.jxl.biff.EmptyCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WorkspaceInformationRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Chart; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Drawing; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingData; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingGroupObject; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * Represents a sheet within a workbook. Provides a handle to the individual diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SheetReader.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SheetReader.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/read/biff/SheetReader.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SheetReader.java index fc1e353..7e7776b 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SheetReader.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SheetReader.java @@ -17,53 +17,53 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import jxl.Cell; -import jxl.CellFeatures; -import jxl.CellReferenceHelper; -import jxl.CellType; -import jxl.DateCell; -import jxl.HeaderFooter; -import jxl.Range; -import jxl.SheetSettings; -import jxl.WorkbookSettings; -import jxl.biff.AutoFilter; -import jxl.biff.AutoFilterInfoRecord; -import jxl.biff.AutoFilterRecord; -import jxl.biff.ConditionalFormat; -import jxl.biff.ConditionalFormatRangeRecord; -import jxl.biff.ConditionalFormatRecord; -import jxl.biff.ContinueRecord; -import jxl.biff.DataValidation; -import jxl.biff.DataValidityListRecord; -import jxl.biff.DataValiditySettingsRecord; -import jxl.biff.FilterModeRecord; -import jxl.biff.FormattingRecords; -import jxl.biff.Type; -import jxl.biff.WorkspaceInformationRecord; -import jxl.biff.drawing.Button; -import jxl.biff.drawing.Chart; -import jxl.biff.drawing.CheckBox; -import jxl.biff.drawing.ComboBox; -import jxl.biff.drawing.Comment; -import jxl.biff.drawing.Drawing; -import jxl.biff.drawing.Drawing2; -import jxl.biff.drawing.DrawingData; -import jxl.biff.drawing.DrawingDataException; -import jxl.biff.drawing.MsoDrawingRecord; -import jxl.biff.drawing.NoteRecord; -import jxl.biff.drawing.ObjRecord; -import jxl.biff.drawing.TextObjectRecord; -import jxl.biff.formula.FormulaException; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.PageOrder; -import jxl.format.PageOrientation; -import jxl.format.PaperSize; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.DateCell; +import org.xbib.datastructures.xslx.jxl.HeaderFooter; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.SheetSettings; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.AutoFilter; +import org.xbib.datastructures.xslx.jxl.biff.AutoFilterInfoRecord; +import org.xbib.datastructures.xslx.jxl.biff.AutoFilterRecord; +import org.xbib.datastructures.xslx.jxl.biff.ConditionalFormat; +import org.xbib.datastructures.xslx.jxl.biff.ConditionalFormatRangeRecord; +import org.xbib.datastructures.xslx.jxl.biff.ConditionalFormatRecord; +import org.xbib.datastructures.xslx.jxl.biff.ContinueRecord; +import org.xbib.datastructures.xslx.jxl.biff.DataValidation; +import org.xbib.datastructures.xslx.jxl.biff.DataValidityListRecord; +import org.xbib.datastructures.xslx.jxl.biff.DataValiditySettingsRecord; +import org.xbib.datastructures.xslx.jxl.biff.FilterModeRecord; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WorkspaceInformationRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Button; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Chart; +import org.xbib.datastructures.xslx.jxl.biff.drawing.CheckBox; +import org.xbib.datastructures.xslx.jxl.biff.drawing.ComboBox; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Comment; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Drawing; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Drawing2; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingData; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingDataException; +import org.xbib.datastructures.xslx.jxl.biff.drawing.MsoDrawingRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.NoteRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.ObjRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.TextObjectRecord; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.PageOrder; +import org.xbib.datastructures.xslx.jxl.format.PageOrientation; +import org.xbib.datastructures.xslx.jxl.format.PaperSize; /** * Reads the sheet. This functionality was originally part of the diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SortRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SortRecord.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/read/biff/SortRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SortRecord.java index 5bded55..71ad368 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SortRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SortRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.RecordData; -import jxl.biff.StringHelper; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * A storage area for the last Sort dialog box area diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/StringFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/StringFormulaRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/read/biff/StringFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/StringFormulaRecord.java index 6158a3e..f8bcb62 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/StringFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/StringFormulaRecord.java @@ -17,23 +17,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.CellType; -import jxl.LabelCell; -import jxl.StringFormulaCell; -import jxl.WorkbookSettings; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.StringFormulaCell; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A string formula's last calculated value diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/SupbookRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SupbookRecord.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/read/biff/SupbookRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SupbookRecord.java index 7136902..8193408 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/SupbookRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/SupbookRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.WorkbookSettings; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.biff.StringHelper; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A record containing the references to the various sheets (internal and diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/TemplateRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/TemplateRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/read/biff/TemplateRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/TemplateRecord.java index ec5d4cd..dce170b 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/TemplateRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/TemplateRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A template record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/TopMarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/TopMarginRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/read/biff/TopMarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/TopMarginRecord.java index efaae34..6a3c90b 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/TopMarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/TopMarginRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * Record for the left margin settings diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/VerticalPageBreaksRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/VerticalPageBreaksRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/read/biff/VerticalPageBreaksRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/VerticalPageBreaksRecord.java index 895dbfd..0143a5b 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/VerticalPageBreaksRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/VerticalPageBreaksRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains the cell dimensions of this worksheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/Window2Record.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Window2Record.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/read/biff/Window2Record.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Window2Record.java index a21ab22..a8f7ee4 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/Window2Record.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/Window2Record.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Contains the cell dimensions of this worksheet diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/WindowProtectedRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/WindowProtectedRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/read/biff/WindowProtectedRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/WindowProtectedRecord.java index a2ed5d9..c2b0fdd 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/WindowProtectedRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/WindowProtectedRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.RecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A windowProtected mode record diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/WorkbookParser.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/WorkbookParser.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/read/biff/WorkbookParser.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/WorkbookParser.java index 924dc94..c63877a 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/WorkbookParser.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/WorkbookParser.java @@ -17,38 +17,38 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import jxl.Cell; -import jxl.Range; -import jxl.Sheet; -import jxl.Workbook; -import jxl.WorkbookSettings; -import jxl.biff.BuiltInName; -import jxl.biff.CellReferenceHelper; -import jxl.biff.EmptyCell; -import jxl.biff.FontRecord; -import jxl.biff.Fonts; -import jxl.biff.FormatRecord; -import jxl.biff.FormattingRecords; -import jxl.biff.NameRangeException; -import jxl.biff.NumFormatRecordsException; -import jxl.biff.PaletteRecord; -import jxl.biff.RangeImpl; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WorkbookMethods; -import jxl.biff.XCTRecord; -import jxl.biff.XFRecord; -import jxl.biff.drawing.DrawingGroup; -import jxl.biff.drawing.MsoDrawingGroupRecord; -import jxl.biff.drawing.Origin; -import jxl.biff.formula.ExternalSheet; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.Workbook; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.BuiltInName; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.EmptyCell; +import org.xbib.datastructures.xslx.jxl.biff.FontRecord; +import org.xbib.datastructures.xslx.jxl.biff.Fonts; +import org.xbib.datastructures.xslx.jxl.biff.FormatRecord; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.NameRangeException; +import org.xbib.datastructures.xslx.jxl.biff.NumFormatRecordsException; +import org.xbib.datastructures.xslx.jxl.biff.PaletteRecord; +import org.xbib.datastructures.xslx.jxl.biff.RangeImpl; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.XCTRecord; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingGroup; +import org.xbib.datastructures.xslx.jxl.biff.drawing.MsoDrawingGroupRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Origin; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Parses the biff file passed in, and builds up an internal representation of @@ -563,7 +563,7 @@ public class WorkbookParser extends Workbook } fonts.addFont(fr); } else if (r.getType() == Type.PALETTE) { - PaletteRecord palette = new PaletteRecord(r); + org.xbib.datastructures.xslx.jxl.biff.PaletteRecord palette = new PaletteRecord(r); formattingRecords.setPalette(palette); } else if (r.getType() == Type.NINETEENFOUR) { NineteenFourRecord nr = new NineteenFourRecord(r); diff --git a/datastructures-xslx/src/main/java/jxl/read/biff/WriteAccessRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/WriteAccessRecord.java similarity index 86% rename from datastructures-xslx/src/main/java/jxl/read/biff/WriteAccessRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/WriteAccessRecord.java index 16e3a55..52bb837 100755 --- a/datastructures-xslx/src/main/java/jxl/read/biff/WriteAccessRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/read/biff/WriteAccessRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.read.biff; +package org.xbib.datastructures.xslx.jxl.read.biff; -import jxl.WorkbookSettings; -import jxl.biff.RecordData; -import jxl.biff.StringHelper; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.RecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * A write access record diff --git a/datastructures-xslx/src/main/java/jxl/write/Alignment.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Alignment.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/Alignment.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Alignment.java index 84339fc..e6ff09c 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Alignment.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Alignment.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; /** * Enumeration class which contains the various alignments for data within a @@ -26,7 +26,7 @@ package jxl.write; * @deprecated Repackaged as jxl.Alignment. This version is retained * for backwards compatibility */ -public final class Alignment extends jxl.format.Alignment { +public final class Alignment extends org.xbib.datastructures.xslx.jxl.format.Alignment { /** * Private constructor */ diff --git a/datastructures-xslx/src/main/java/jxl/write/Blank.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Blank.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/Blank.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Blank.java index 928a1ca..a3eb692 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Blank.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Blank.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.Cell; -import jxl.format.CellFormat; -import jxl.write.biff.BlankRecord; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.biff.BlankRecord; /** * A blank cell. Despite not having any contents, it may contain diff --git a/datastructures-xslx/src/main/java/jxl/write/BoldStyle.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/BoldStyle.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/BoldStyle.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/BoldStyle.java index a4f8a2d..03c25b2 100755 --- a/datastructures-xslx/src/main/java/jxl/write/BoldStyle.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/BoldStyle.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; /** * Enumeration class containing the various bold styles for data */ -public final class BoldStyle extends jxl.format.BoldStyle { +public final class BoldStyle extends org.xbib.datastructures.xslx.jxl.format.BoldStyle { /** * Constructor * diff --git a/datastructures-xslx/src/main/java/jxl/write/Boolean.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Boolean.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/Boolean.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Boolean.java index c390f43..df0223e 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Boolean.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Boolean.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.BooleanCell; -import jxl.format.CellFormat; -import jxl.write.biff.BooleanRecord; +import org.xbib.datastructures.xslx.jxl.BooleanCell; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.biff.BooleanRecord; /** * A cell, created by user applications, which contains a boolean (or diff --git a/datastructures-xslx/src/main/java/jxl/write/Border.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Border.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/Border.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Border.java index b2f8481..3cb7ea4 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Border.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Border.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; /** * @deprecated repackaged as jxl.format.Border */ -public final class Border extends jxl.format.Border { +public final class Border extends org.xbib.datastructures.xslx.jxl.format.Border { /** * Constructor */ diff --git a/datastructures-xslx/src/main/java/jxl/write/BorderLineStyle.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/BorderLineStyle.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/BorderLineStyle.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/BorderLineStyle.java index c282d7e..4c36f9e 100755 --- a/datastructures-xslx/src/main/java/jxl/write/BorderLineStyle.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/BorderLineStyle.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; /** * @deprecated Repackaged as jxl.format.BorderLineStyle */ -public final class BorderLineStyle extends jxl.format.BorderLineStyle { +public final class BorderLineStyle extends org.xbib.datastructures.xslx.jxl.format.BorderLineStyle { /** * Constructor */ diff --git a/datastructures-xslx/src/main/java/jxl/write/Colour.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Colour.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/Colour.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Colour.java index 95dd57f..954e4e4 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Colour.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Colour.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; /** * Enumeration class which contains the various colours available within @@ -25,7 +25,7 @@ package jxl.write; * * @deprecated This has been repackaged as jxl.format.Colour */ -public final class Colour extends jxl.format.Colour { +public final class Colour extends org.xbib.datastructures.xslx.jxl.format.Colour { /** * Constructor * This is currently just a placeholder for backwards compatibility diff --git a/datastructures-xslx/src/main/java/jxl/write/DateFormat.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/DateFormat.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/DateFormat.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/DateFormat.java index 7cb7c43..4aaff1b 100755 --- a/datastructures-xslx/src/main/java/jxl/write/DateFormat.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/DateFormat.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; import java.text.SimpleDateFormat; -import jxl.biff.DisplayFormat; -import jxl.write.biff.DateFormatRecord; +import org.xbib.datastructures.xslx.jxl.biff.DisplayFormat; +import org.xbib.datastructures.xslx.jxl.write.biff.DateFormatRecord; /** * A custom user defined number format which may be instantiated within user diff --git a/datastructures-xslx/src/main/java/jxl/write/DateFormats.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/DateFormats.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/write/DateFormats.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/DateFormats.java index 4a029b6..482c8dd 100755 --- a/datastructures-xslx/src/main/java/jxl/write/DateFormats.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/DateFormats.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.biff.DisplayFormat; +import org.xbib.datastructures.xslx.jxl.biff.DisplayFormat; /** * Static class which contains Excels predefined Date formats diff --git a/datastructures-xslx/src/main/java/jxl/write/DateTime.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/DateTime.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/write/DateTime.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/DateTime.java index 89c6220..0690948 100755 --- a/datastructures-xslx/src/main/java/jxl/write/DateTime.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/DateTime.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; import java.util.Date; -import jxl.DateCell; -import jxl.format.CellFormat; -import jxl.write.biff.DateRecord; +import org.xbib.datastructures.xslx.jxl.DateCell; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.biff.DateRecord; /** * A Date which may be created on the fly by a user application and added to a diff --git a/datastructures-xslx/src/main/java/jxl/write/Font.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Font.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/write/Font.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Font.java index 5fdccba..77bf1d1 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Font.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Font.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.format.Colour; -import jxl.format.ScriptStyle; -import jxl.format.UnderlineStyle; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.ScriptStyle; +import org.xbib.datastructures.xslx.jxl.format.UnderlineStyle; /** * A class which is instantiated when the user application wishes to specify diff --git a/datastructures-xslx/src/main/java/jxl/write/Formula.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Formula.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/Formula.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Formula.java index 3456356..ab687b1 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Formula.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Formula.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.format.CellFormat; -import jxl.write.biff.FormulaRecord; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.biff.FormulaRecord; /** * A cell, created by user applications, which contains a numerical value diff --git a/datastructures-xslx/src/main/java/jxl/write/Label.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Label.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/Label.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Label.java index b1eaffa..300aaf4 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Label.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Label.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.LabelCell; -import jxl.format.CellFormat; -import jxl.write.biff.LabelRecord; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.biff.LabelRecord; /** * A cell containing text which may be created by user applications diff --git a/datastructures-xslx/src/main/java/jxl/write/Number.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Number.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/write/Number.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Number.java index 5ee2300..49001f9 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Number.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Number.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.NumberCell; -import jxl.format.CellFormat; -import jxl.write.biff.NumberRecord; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.biff.NumberRecord; /** * A cell, created by user applications, which contains a numerical value diff --git a/datastructures-xslx/src/main/java/jxl/write/NumberFormat.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/NumberFormat.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/write/NumberFormat.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/NumberFormat.java index c8eaf67..07befbe 100755 --- a/datastructures-xslx/src/main/java/jxl/write/NumberFormat.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/NumberFormat.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; import java.text.DecimalFormat; -import jxl.biff.DisplayFormat; -import jxl.write.biff.NumberFormatRecord; +import org.xbib.datastructures.xslx.jxl.biff.DisplayFormat; +import org.xbib.datastructures.xslx.jxl.write.biff.NumberFormatRecord; /** * A custom user defined number format, which may be instantiated within user diff --git a/datastructures-xslx/src/main/java/jxl/write/NumberFormats.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/NumberFormats.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/write/NumberFormats.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/NumberFormats.java index 43469ae..4bdb294 100755 --- a/datastructures-xslx/src/main/java/jxl/write/NumberFormats.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/NumberFormats.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.biff.DisplayFormat; -import jxl.format.Format; +import org.xbib.datastructures.xslx.jxl.biff.DisplayFormat; +import org.xbib.datastructures.xslx.jxl.format.Format; /** * Static class which contains the available list of built in Number formats diff --git a/datastructures-xslx/src/main/java/jxl/write/Pattern.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Pattern.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/Pattern.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Pattern.java index ea60896..ee6e3d9 100755 --- a/datastructures-xslx/src/main/java/jxl/write/Pattern.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/Pattern.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; /** * Enumeration class which contains the various patterns available within @@ -25,7 +25,7 @@ package jxl.write; * * @deprecated Repackaged as jxl.format.Pattern */ -public final class Pattern extends jxl.format.Pattern { +public final class Pattern extends org.xbib.datastructures.xslx.jxl.format.Pattern { /** * Private constructor * diff --git a/datastructures-xslx/src/main/java/jxl/write/VerticalAlignment.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/VerticalAlignment.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/VerticalAlignment.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/VerticalAlignment.java index 21a0cec..445ff98 100755 --- a/datastructures-xslx/src/main/java/jxl/write/VerticalAlignment.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/VerticalAlignment.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; /** * Enumeration type which describes the vertical alignment of data within a cell * * @deprecated Repackaged as jxl.format.VerticalAlignment */ -public final class VerticalAlignment extends jxl.format.VerticalAlignment { +public final class VerticalAlignment extends org.xbib.datastructures.xslx.jxl.format.VerticalAlignment { /** * Constructor */ diff --git a/datastructures-xslx/src/main/java/jxl/write/WritableCell.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableCell.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/WritableCell.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableCell.java index e37eff9..b8cd0f7 100755 --- a/datastructures-xslx/src/main/java/jxl/write/WritableCell.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableCell.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.Cell; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * The interface for all writable cells diff --git a/datastructures-xslx/src/main/java/jxl/write/WritableCellFeatures.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableCellFeatures.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/write/WritableCellFeatures.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableCellFeatures.java index 238cd88..1b65463 100755 --- a/datastructures-xslx/src/main/java/jxl/write/WritableCellFeatures.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableCellFeatures.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; import java.util.Collection; -import jxl.CellFeatures; -import jxl.biff.BaseCellFeatures; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.biff.BaseCellFeatures; /** * Container for any additional cell features diff --git a/datastructures-xslx/src/main/java/jxl/write/WritableCellFormat.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableCellFormat.java similarity index 82% rename from datastructures-xslx/src/main/java/jxl/write/WritableCellFormat.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableCellFormat.java index 7195e1a..e881849 100755 --- a/datastructures-xslx/src/main/java/jxl/write/WritableCellFormat.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableCellFormat.java @@ -17,18 +17,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.biff.DisplayFormat; -import jxl.format.Alignment; -import jxl.format.Border; -import jxl.format.BorderLineStyle; -import jxl.format.CellFormat; -import jxl.format.Colour; -import jxl.format.Orientation; -import jxl.format.Pattern; -import jxl.format.VerticalAlignment; -import jxl.write.biff.CellXFRecord; +import org.xbib.datastructures.xslx.jxl.biff.DisplayFormat; +import org.xbib.datastructures.xslx.jxl.format.Alignment; +import org.xbib.datastructures.xslx.jxl.format.Border; +import org.xbib.datastructures.xslx.jxl.format.BorderLineStyle; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.Orientation; +import org.xbib.datastructures.xslx.jxl.format.Pattern; +import org.xbib.datastructures.xslx.jxl.format.VerticalAlignment; +import org.xbib.datastructures.xslx.jxl.write.biff.CellXFRecord; /** * A user specified cell format, which may be reused across many cells. @@ -140,8 +140,8 @@ public class WritableCellFormat extends CellXFRecord { * @param ls the border line style * @throws WriteException */ - public void setBorder(Border b, BorderLineStyle ls) throws WriteException { - super.setBorder(b, ls, Colour.BLACK); + public void setBorder(org.xbib.datastructures.xslx.jxl.format.Border b, org.xbib.datastructures.xslx.jxl.format.BorderLineStyle ls) throws WriteException { + super.setBorder(b, ls, org.xbib.datastructures.xslx.jxl.format.Colour.BLACK); } /** @@ -152,7 +152,7 @@ public class WritableCellFormat extends CellXFRecord { * @param c the colour of the specified border * @throws WriteException */ - public void setBorder(Border b, BorderLineStyle ls, Colour c) + public void setBorder(Border b, BorderLineStyle ls, org.xbib.datastructures.xslx.jxl.format.Colour c) throws WriteException { super.setBorder(b, ls, c); } @@ -163,8 +163,8 @@ public class WritableCellFormat extends CellXFRecord { * @param c the bacground colour * @throws WriteException */ - public void setBackground(Colour c) throws WriteException { - this.setBackground(c, Pattern.SOLID); + public void setBackground(org.xbib.datastructures.xslx.jxl.format.Colour c) throws WriteException { + this.setBackground(c, org.xbib.datastructures.xslx.jxl.format.Pattern.SOLID); } /** diff --git a/datastructures-xslx/src/main/java/jxl/write/WritableFont.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableFont.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/WritableFont.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableFont.java index ff1c38d..8c96fff 100755 --- a/datastructures-xslx/src/main/java/jxl/write/WritableFont.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableFont.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.format.Colour; -import jxl.format.Font; -import jxl.format.ScriptStyle; -import jxl.format.UnderlineStyle; -import jxl.write.biff.WritableFontRecord; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.Font; +import org.xbib.datastructures.xslx.jxl.format.ScriptStyle; +import org.xbib.datastructures.xslx.jxl.format.UnderlineStyle; +import org.xbib.datastructures.xslx.jxl.write.biff.WritableFontRecord; /** * A class which is instantiated when the user application wishes to specify @@ -76,7 +76,7 @@ public class WritableFont extends WritableFontRecord { NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, - Colour.BLACK, + org.xbib.datastructures.xslx.jxl.format.Colour.BLACK, ScriptStyle.NORMAL_SCRIPT); } @@ -99,7 +99,7 @@ public class WritableFont extends WritableFontRecord { public WritableFont(FontName fn, int ps) { this(fn, ps, NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, - Colour.BLACK, + org.xbib.datastructures.xslx.jxl.format.Colour.BLACK, ScriptStyle.NORMAL_SCRIPT); } @@ -113,7 +113,7 @@ public class WritableFont extends WritableFontRecord { public WritableFont(FontName fn, int ps, BoldStyle bs) { this(fn, ps, bs, false, UnderlineStyle.NO_UNDERLINE, - Colour.BLACK, + org.xbib.datastructures.xslx.jxl.format.Colour.BLACK, ScriptStyle.NORMAL_SCRIPT); } @@ -129,7 +129,7 @@ public class WritableFont extends WritableFontRecord { public WritableFont(FontName fn, int ps, BoldStyle bs, boolean italic) { this(fn, ps, bs, italic, UnderlineStyle.NO_UNDERLINE, - Colour.BLACK, + org.xbib.datastructures.xslx.jxl.format.Colour.BLACK, ScriptStyle.NORMAL_SCRIPT); } @@ -148,7 +148,7 @@ public class WritableFont extends WritableFontRecord { BoldStyle bs, boolean it, UnderlineStyle us) { - this(fn, ps, bs, it, us, Colour.BLACK, ScriptStyle.NORMAL_SCRIPT); + this(fn, ps, bs, it, us, org.xbib.datastructures.xslx.jxl.format.Colour.BLACK, ScriptStyle.NORMAL_SCRIPT); } /** @@ -167,7 +167,7 @@ public class WritableFont extends WritableFontRecord { BoldStyle bs, boolean it, UnderlineStyle us, - Colour c) { + org.xbib.datastructures.xslx.jxl.format.Colour c) { this(fn, ps, bs, it, us, c, ScriptStyle.NORMAL_SCRIPT); } @@ -189,7 +189,7 @@ public class WritableFont extends WritableFontRecord { BoldStyle bs, boolean it, UnderlineStyle us, - Colour c, + org.xbib.datastructures.xslx.jxl.format.Colour c, ScriptStyle ss) { super(fn.name, ps, bs.value, it, us.getValue(), diff --git a/datastructures-xslx/src/main/java/jxl/write/WritableHyperlink.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableHyperlink.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/write/WritableHyperlink.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableHyperlink.java index 28ac95c..150dbfe 100755 --- a/datastructures-xslx/src/main/java/jxl/write/WritableHyperlink.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableHyperlink.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; import java.io.File; import java.net.URL; -import jxl.Hyperlink; -import jxl.write.biff.HyperlinkRecord; +import org.xbib.datastructures.xslx.jxl.Hyperlink; +import org.xbib.datastructures.xslx.jxl.write.biff.HyperlinkRecord; /** * A writable hyperlink. Provides API to modify the contents of the hyperlink diff --git a/datastructures-xslx/src/main/java/jxl/write/WritableImage.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableImage.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/WritableImage.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableImage.java index 151eb07..6445005 100755 --- a/datastructures-xslx/src/main/java/jxl/write/WritableImage.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableImage.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; import java.io.File; -import jxl.biff.drawing.Drawing; -import jxl.biff.drawing.DrawingGroup; -import jxl.biff.drawing.DrawingGroupObject; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Drawing; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingGroup; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingGroupObject; /** * Allows an image to be created, or an existing image to be manipulated diff --git a/datastructures-xslx/src/main/java/jxl/write/WritableSheet.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableSheet.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/write/WritableSheet.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableSheet.java index 0dfae07..f161652 100755 --- a/datastructures-xslx/src/main/java/jxl/write/WritableSheet.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableSheet.java @@ -17,15 +17,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.CellView; -import jxl.Range; -import jxl.Sheet; -import jxl.format.CellFormat; -import jxl.format.PageOrientation; -import jxl.format.PaperSize; -import jxl.write.biff.RowsExceededException; +import org.xbib.datastructures.xslx.jxl.CellView; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.format.PageOrientation; +import org.xbib.datastructures.xslx.jxl.format.PaperSize; +import org.xbib.datastructures.xslx.jxl.write.biff.RowsExceededException; /** * Interface for a worksheet that may be modified. The most diff --git a/datastructures-xslx/src/main/java/jxl/write/WritableWorkbook.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableWorkbook.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/write/WritableWorkbook.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableWorkbook.java index a8354f3..8c104be 100755 --- a/datastructures-xslx/src/main/java/jxl/write/WritableWorkbook.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WritableWorkbook.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; import java.io.IOException; -import jxl.Range; -import jxl.Sheet; -import jxl.Workbook; -import jxl.format.Colour; -import jxl.format.UnderlineStyle; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.Workbook; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.UnderlineStyle; /** * A writable workbook diff --git a/datastructures-xslx/src/main/java/jxl/write/WriteException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WriteException.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/WriteException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WriteException.java index a8a7035..8b135ae 100755 --- a/datastructures-xslx/src/main/java/jxl/write/WriteException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/WriteException.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write; +package org.xbib.datastructures.xslx.jxl.write; -import jxl.JXLException; +import org.xbib.datastructures.xslx.jxl.JXLException; /** * Exception thrown when using the API to generate an Excel file diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ArbitraryRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ArbitraryRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/ArbitraryRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ArbitraryRecord.java index 7038876..b840b1d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ArbitraryRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ArbitraryRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Writes out some arbitrary record data. Used during the debug process diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/BOFRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BOFRecord.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/write/biff/BOFRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BOFRecord.java index ec24f80..2ef7b75 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/BOFRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BOFRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record to indicate the beginning of a new stream in the Compound diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/BackupRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BackupRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/BackupRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BackupRecord.java index 45da57d..e2322ec 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/BackupRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BackupRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which indicates whether Excel should save backup versions of the diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/BlankRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BlankRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/BlankRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BlankRecord.java index 8b4f5d1..5d3d88a 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/BlankRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BlankRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.Cell; -import jxl.CellType; -import jxl.biff.Type; -import jxl.common.Logger; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * A blank record, which is used to contain formatting information diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/BookboolRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BookboolRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/BookboolRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BookboolRecord.java index 8d21708..f5a6273 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/BookboolRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BookboolRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Writes out the workbook option flag (should it save the external diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/BooleanRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BooleanRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/write/biff/BooleanRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BooleanRecord.java index cdbcfc1..6205de2 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/BooleanRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BooleanRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.BooleanCell; -import jxl.CellType; -import jxl.biff.Type; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.BooleanCell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/BottomMarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BottomMarginRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/BottomMarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BottomMarginRecord.java index d7b2bdd..9de7f7c 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/BottomMarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BottomMarginRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * The settings for the left margin diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/BoundsheetRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BoundsheetRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/BoundsheetRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BoundsheetRecord.java index a626301..4d0519d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/BoundsheetRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/BoundsheetRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which stores the sheet name, the sheet type and the stream diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ButtonPropertySetRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ButtonPropertySetRecord.java similarity index 85% rename from datastructures-xslx/src/main/java/jxl/write/biff/ButtonPropertySetRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ButtonPropertySetRecord.java index 8d1a8e6..214a133 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ButtonPropertySetRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ButtonPropertySetRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Any arbitrary excel record. Used during development only @@ -34,7 +34,7 @@ class ButtonPropertySetRecord extends WritableRecordData { /** * Constructor */ - public ButtonPropertySetRecord(jxl.read.biff.ButtonPropertySetRecord bps) { + public ButtonPropertySetRecord(org.xbib.datastructures.xslx.jxl.read.biff.ButtonPropertySetRecord bps) { super(Type.BUTTONPROPERTYSET); data = bps.getData(); diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CalcCountRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CalcCountRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/CalcCountRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CalcCountRecord.java index dda09ae..901602b 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/CalcCountRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CalcCountRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which stores the maximum iterations option from the Options diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CalcModeRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CalcModeRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/CalcModeRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CalcModeRecord.java index 81ee47a..c3072ae 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/CalcModeRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CalcModeRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The calculation mode for the workbook, as set from the Options diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CellValue.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CellValue.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/CellValue.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CellValue.java index 87dbb52..62cdf2c 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/CellValue.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CellValue.java @@ -17,27 +17,28 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.Cell; -import jxl.CellFeatures; -import jxl.CellReferenceHelper; -import jxl.Sheet; -import jxl.biff.DVParser; -import jxl.biff.FormattingRecords; -import jxl.biff.IntegerHelper; -import jxl.biff.NumFormatRecordsException; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.biff.XFRecord; -import jxl.biff.drawing.ComboBox; -import jxl.biff.drawing.Comment; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.CellFormat; -import jxl.write.WritableCell; -import jxl.write.WritableCellFeatures; -import jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.biff.DVParser; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.NumFormatRecordsException; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.ComboBox; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Comment; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFeatures; +import org.xbib.datastructures.xslx.jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; /** * Abstract class which stores the jxl.common.data used for cells, such @@ -524,7 +525,7 @@ public abstract class CellValue extends WritableRecordData sheet.getWorkbook(), sheet.getWorkbook(), sheet.getWorkbookSettings()); - } catch (jxl.biff.formula.FormulaException e) { + } catch (FormulaException e) { Assert.verify(false); } diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CellXFRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CellXFRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/CellXFRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CellXFRecord.java index d49aa3d..9c5b090 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/CellXFRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CellXFRecord.java @@ -17,20 +17,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.DisplayFormat; -import jxl.biff.FontRecord; -import jxl.biff.XFRecord; -import jxl.format.Alignment; -import jxl.format.Border; -import jxl.format.BorderLineStyle; -import jxl.format.CellFormat; -import jxl.format.Colour; -import jxl.format.Orientation; -import jxl.format.Pattern; -import jxl.format.VerticalAlignment; -import jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.biff.DisplayFormat; +import org.xbib.datastructures.xslx.jxl.biff.FontRecord; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.format.Alignment; +import org.xbib.datastructures.xslx.jxl.format.Border; +import org.xbib.datastructures.xslx.jxl.format.BorderLineStyle; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.Orientation; +import org.xbib.datastructures.xslx.jxl.format.Pattern; +import org.xbib.datastructures.xslx.jxl.format.VerticalAlignment; +import org.xbib.datastructures.xslx.jxl.write.WriteException; /** * A cell XF Record diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CodepageRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CodepageRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/CodepageRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CodepageRecord.java index 73ff9fe..70444a0 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/CodepageRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CodepageRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the default character set in operation when the workbook was diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ColumnInfoRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ColumnInfoRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/write/biff/ColumnInfoRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ColumnInfoRecord.java index bc14e47..b38b6e0 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ColumnInfoRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ColumnInfoRecord.java @@ -17,15 +17,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.FormattingRecords; -import jxl.biff.IndexMapping; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IndexMapping; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; /** * Describes the column formatting for a particular column @@ -114,7 +114,7 @@ class ColumnInfoRecord extends WritableRecordData { * @param cir the column info record read in * @param fr the format records */ - public ColumnInfoRecord(jxl.read.biff.ColumnInfoRecord cir, + public ColumnInfoRecord(org.xbib.datastructures.xslx.jxl.read.biff.ColumnInfoRecord cir, int col, FormattingRecords fr) { super(Type.COLINFO); @@ -134,7 +134,7 @@ class ColumnInfoRecord extends WritableRecordData { * @param col the column number * @param cir the column info record read in */ - public ColumnInfoRecord(jxl.read.biff.ColumnInfoRecord cir, + public ColumnInfoRecord(org.xbib.datastructures.xslx.jxl.read.biff.ColumnInfoRecord cir, int col) { super(Type.COLINFO); diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ColumnsExceededException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ColumnsExceededException.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/write/biff/ColumnsExceededException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ColumnsExceededException.java index e4b5cd0..bdd7345 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ColumnsExceededException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ColumnsExceededException.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; /** * Exception thrown when attempting to add a column to a spreadsheet which diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CompoundFile.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CompoundFile.java similarity index 98% rename from datastructures-xslx/src/main/java/jxl/write/biff/CompoundFile.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CompoundFile.java index 2cee9d6..3c132db 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/CompoundFile.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CompoundFile.java @@ -17,18 +17,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import jxl.biff.BaseCompoundFile; -import jxl.biff.IntegerHelper; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.read.biff.BiffException; +import org.xbib.datastructures.xslx.jxl.biff.BaseCompoundFile; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.read.biff.BiffException; /** * Writes out a compound file @@ -177,7 +177,7 @@ final class CompoundFile extends BaseCompoundFile { * @param rcf the read compound */ public CompoundFile(ExcelDataOutput data, int l, OutputStream os, - jxl.read.biff.CompoundFile rcf) + org.xbib.datastructures.xslx.jxl.read.biff.CompoundFile rcf) throws CopyAdditionalPropertySetsException, IOException { super(); size = l; @@ -325,7 +325,7 @@ final class CompoundFile extends BaseCompoundFile { * @throws IOException */ private void readAdditionalPropertySets - (jxl.read.biff.CompoundFile readCompoundFile) + (org.xbib.datastructures.xslx.jxl.read.biff.CompoundFile readCompoundFile) throws CopyAdditionalPropertySetsException, IOException { if (readCompoundFile == null) { return; diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CompoundFile.java3 b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CompoundFile.java3 similarity index 100% rename from datastructures-xslx/src/main/java/jxl/write/biff/CompoundFile.java3 rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CompoundFile.java3 diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CompoundFile.java4 b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CompoundFile.java4 similarity index 100% rename from datastructures-xslx/src/main/java/jxl/write/biff/CompoundFile.java4 rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CompoundFile.java4 diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CopyAdditionalPropertySetsException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CopyAdditionalPropertySetsException.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/write/biff/CopyAdditionalPropertySetsException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CopyAdditionalPropertySetsException.java index 30799d1..90ab4e6 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/CopyAdditionalPropertySetsException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CopyAdditionalPropertySetsException.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; /** * Exception thrown when attempting to copy a workbook which contains diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/CountryRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CountryRecord.java similarity index 83% rename from datastructures-xslx/src/main/java/jxl/write/biff/CountryRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CountryRecord.java index d5b7fc3..e2f3e4c 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/CountryRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/CountryRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.CountryCode; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.CountryCode; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** @@ -49,7 +49,7 @@ class CountryRecord extends WritableRecordData { regionalSettings = r.getValue(); } - public CountryRecord(jxl.read.biff.CountryRecord cr) { + public CountryRecord(org.xbib.datastructures.xslx.jxl.read.biff.CountryRecord cr) { super(Type.COUNTRY); language = cr.getLanguageCode(); diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/DBCellRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DBCellRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/write/biff/DBCellRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DBCellRecord.java index dd514ad..5fb23d8 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/DBCellRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DBCellRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.util.ArrayList; import java.util.Iterator; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Indexes the first row record of the block and each individual cell. diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/DSFRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DSFRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/DSFRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DSFRecord.java index 8a3ff90..7e12f07 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/DSFRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DSFRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores a flag which indicates whether the file is a double stream diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/DateFormatRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DateFormatRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/DateFormatRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DateFormatRecord.java index 2f370a2..008135f 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/DateFormatRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DateFormatRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.FormatRecord; +import org.xbib.datastructures.xslx.jxl.biff.FormatRecord; /** * A class which contains a date format diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/DateRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DateRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/write/biff/DateRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DateRecord.java index 35ffbbb..ec485fe 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/DateRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DateRecord.java @@ -17,19 +17,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.text.DateFormat; import java.util.Calendar; import java.util.Date; -import jxl.CellType; -import jxl.DateCell; -import jxl.biff.DoubleHelper; -import jxl.biff.Type; -import jxl.common.Logger; -import jxl.format.CellFormat; -import jxl.write.DateFormats; -import jxl.write.WritableCellFormat; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.DateCell; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.DateFormats; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFormat; /** * A date stored in the database diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/DefaultColumnWidth.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DefaultColumnWidth.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/DefaultColumnWidth.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DefaultColumnWidth.java index 09bf5d0..431e7cf 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/DefaultColumnWidth.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DefaultColumnWidth.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The default column width for a workbook diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/DefaultRowHeightRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DefaultRowHeightRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/DefaultRowHeightRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DefaultRowHeightRecord.java index 5dccd54..a71782b 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/DefaultRowHeightRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DefaultRowHeightRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The default row height for cells in the workbook diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/DeltaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DeltaRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/DeltaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DeltaRecord.java index c84ab53..c79a674 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/DeltaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DeltaRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.DoubleHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which stores the maximum change value from the Options diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/DimensionRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DimensionRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/DimensionRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DimensionRecord.java index 2b81984..e2b3595 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/DimensionRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/DimensionRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which contains the bounds of the sheet diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/EOFRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/EOFRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/EOFRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/EOFRecord.java index 04747d0..07aa79e 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/EOFRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/EOFRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which marks the end of the current stream diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/Excel9FileRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Excel9FileRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/Excel9FileRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Excel9FileRecord.java index b098949..92a5031 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/Excel9FileRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Excel9FileRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which indicates whether this file has been generated by excel 2000 diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ExcelDataOutput.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExcelDataOutput.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/write/biff/ExcelDataOutput.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExcelDataOutput.java index 9225028..d547f7d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ExcelDataOutput.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExcelDataOutput.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.IOException; import java.io.OutputStream; diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ExtendedSSTRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExtendedSSTRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/write/biff/ExtendedSSTRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExtendedSSTRecord.java index f4cf1bb..5551d1a 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ExtendedSSTRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExtendedSSTRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Indicates an extension to the Shared String Table. Currently this diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ExternalNameRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExternalNameRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/ExternalNameRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExternalNameRecord.java index 38f4e1a..9980717 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ExternalNameRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExternalNameRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * An external sheet record, used to maintain integrity when formulas diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ExternalSheetRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExternalSheetRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/write/biff/ExternalSheetRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExternalSheetRecord.java index b21aa83..eb1c962 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ExternalSheetRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ExternalSheetRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.util.ArrayList; import java.util.Iterator; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * An external sheet record, used to maintain integrity when formulas @@ -45,7 +45,7 @@ class ExternalSheetRecord extends WritableRecordData { * * @param esf the external sheet record to copy */ - public ExternalSheetRecord(jxl.read.biff.ExternalSheetRecord esf) { + public ExternalSheetRecord(org.xbib.datastructures.xslx.jxl.read.biff.ExternalSheetRecord esf) { super(Type.EXTERNSHEET); xtis = new ArrayList(esf.getNumRecords()); diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/File.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/File.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/File.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/File.java index 8ef73be..1df5f87 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/File.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/File.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.IOException; import java.io.OutputStream; -import jxl.WorkbookSettings; -import jxl.biff.ByteData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.ByteData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A file of excel data to be written out. All the excel data is held @@ -40,7 +40,7 @@ public final class File { * The read compound file. This will only be non-null if there are macros * or other property sets of that ilk which that we should be copying */ - jxl.read.biff.CompoundFile readCompoundFile; + org.xbib.datastructures.xslx.jxl.read.biff.CompoundFile readCompoundFile; /** * The data from the excel 97 file */ @@ -73,7 +73,7 @@ public final class File { * @param ws the configuration settings for this workbook * @param rcf the rea compound file */ - File(OutputStream os, WorkbookSettings ws, jxl.read.biff.CompoundFile rcf) + File(OutputStream os, WorkbookSettings ws, org.xbib.datastructures.xslx.jxl.read.biff.CompoundFile rcf) throws IOException { outputStream = os; workbookSettings = ws; diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/FileDataOutput.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FileDataOutput.java similarity index 97% rename from datastructures-xslx/src/main/java/jxl/write/biff/FileDataOutput.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FileDataOutput.java index c3026be..90236d4 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/FileDataOutput.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FileDataOutput.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.io.RandomAccessFile; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Used to generate the excel biff data using a temporary file. This diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/FooterRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FooterRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/FooterRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FooterRecord.java index 665c827..426b0b4 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/FooterRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FooterRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Places a string at the bottom of each page when the file is printed. diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/FormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FormulaRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/FormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FormulaRecord.java index 16fb8bd..1081020 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/FormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FormulaRecord.java @@ -17,24 +17,24 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.CellReferenceHelper; -import jxl.CellType; -import jxl.Sheet; -import jxl.WorkbookSettings; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.CellFormat; -import jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; /** * A formula record. Parses the string passed in to deduce the set of diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/FunctionGroupCountRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FunctionGroupCountRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/FunctionGroupCountRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FunctionGroupCountRecord.java index aeb2c47..249ed7d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/FunctionGroupCountRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/FunctionGroupCountRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the number of build in function groups diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/GridSetRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/GridSetRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/GridSetRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/GridSetRecord.java index 0041104..7a1d9f9 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/GridSetRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/GridSetRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which indicates that the user changed the stae of the diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/GuttersRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/GuttersRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/GuttersRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/GuttersRecord.java index 6ceb6ef..da2658d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/GuttersRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/GuttersRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which contains the size of the row and column gutters. These are diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/HeaderRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HeaderRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/HeaderRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HeaderRecord.java index 7b8431d..55e74f2 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/HeaderRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HeaderRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which specifies a print header for a work sheet diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/HideobjRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HideobjRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/HideobjRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HideobjRecord.java index b1fd757..496db2b 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/HideobjRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HideobjRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores options selected in the Options dialog box diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/HorizontalCentreRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HorizontalCentreRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/HorizontalCentreRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HorizontalCentreRecord.java index 2e88e0f..bffe53d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/HorizontalCentreRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HorizontalCentreRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which indicates the whether the horizontal center option has diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/HorizontalPageBreaksRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HorizontalPageBreaksRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/HorizontalPageBreaksRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HorizontalPageBreaksRecord.java index 752ad1d..b47d111 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/HorizontalPageBreaksRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HorizontalPageBreaksRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Contains the list of explicit horizontal page breaks on the current sheet diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/HyperlinkRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HyperlinkRecord.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/write/biff/HyperlinkRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HyperlinkRecord.java index 2efc2cf..fed61c5 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/HyperlinkRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/HyperlinkRecord.java @@ -17,26 +17,26 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import jxl.CellType; -import jxl.Hyperlink; -import jxl.Range; -import jxl.biff.CellReferenceHelper; -import jxl.biff.IntegerHelper; -import jxl.biff.SheetRangeImpl; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.Label; -import jxl.write.WritableCell; -import jxl.write.WritableSheet; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.Hyperlink; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.SheetRangeImpl; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.Label; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.write.WritableSheet; /** @@ -114,7 +114,7 @@ public class HyperlinkRecord extends WritableRecordData { protected HyperlinkRecord(Hyperlink h, WritableSheet s) { super(Type.HLINK); - if (h instanceof jxl.read.biff.HyperlinkRecord) { + if (h instanceof org.xbib.datastructures.xslx.jxl.read.biff.HyperlinkRecord) { copyReadHyperlink(h, s); } else { copyWritableHyperlink(h, s); @@ -223,7 +223,7 @@ public class HyperlinkRecord extends WritableRecordData { * Copies a hyperlink read in from a read only sheet */ private void copyReadHyperlink(Hyperlink h, WritableSheet s) { - jxl.read.biff.HyperlinkRecord hl = (jxl.read.biff.HyperlinkRecord) h; + org.xbib.datastructures.xslx.jxl.read.biff.HyperlinkRecord hl = (org.xbib.datastructures.xslx.jxl.read.biff.HyperlinkRecord) h; data = hl.getRecord().getData(); sheet = s; diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/IndexRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/IndexRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/IndexRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/IndexRecord.java index 4337f96..c6ab646 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/IndexRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/IndexRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Index into the cell rows in an worksheet diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/InterfaceEndRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/InterfaceEndRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/InterfaceEndRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/InterfaceEndRecord.java index 8fb52af..1058aea 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/InterfaceEndRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/InterfaceEndRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Marks the end of the user interface section of the Book stream. diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/InterfaceHeaderRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/InterfaceHeaderRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/InterfaceHeaderRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/InterfaceHeaderRecord.java index 54acfd8..62cb382 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/InterfaceHeaderRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/InterfaceHeaderRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Marks the beginning of the user interface record diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/IterationRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/IterationRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/IterationRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/IterationRecord.java index bad702f..2b14268 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/IterationRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/IterationRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the iteration option from the dialog box diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/JxlWriteException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/JxlWriteException.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/write/biff/JxlWriteException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/JxlWriteException.java index 07c4575..1d17f1c 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/JxlWriteException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/JxlWriteException.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.write.WriteException; /** * Exception thrown when reading a biff file diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/LabelRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/LabelRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/LabelRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/LabelRecord.java index d9a22d1..cbf00fa 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/LabelRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/LabelRecord.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.CellType; -import jxl.LabelCell; -import jxl.biff.FormattingRecords; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * A label record, used for writing out string diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/LeftMarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/LeftMarginRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/LeftMarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/LeftMarginRecord.java index 329e9b8..748f4a9 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/LeftMarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/LeftMarginRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * The settings for the left margin diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/MMSRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MMSRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/MMSRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MMSRecord.java index ce38048..ccf6c04 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/MMSRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MMSRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the number of addmen and delmenu groups in the book stream diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/MarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MarginRecord.java similarity index 86% rename from datastructures-xslx/src/main/java/jxl/write/biff/MarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MarginRecord.java index 7ead8e9..3b262f2 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/MarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MarginRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.DoubleHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which specifies a margin value diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/MemoryDataOutput.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MemoryDataOutput.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/write/biff/MemoryDataOutput.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MemoryDataOutput.java index 1b6ccf3..a0e8d8d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/MemoryDataOutput.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MemoryDataOutput.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.IOException; import java.io.OutputStream; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Used to generate the excel biff data in memory. This class wraps a byte diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/MergedCells.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MergedCells.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/write/biff/MergedCells.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MergedCells.java index 76573ac..fac94bd 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/MergedCells.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MergedCells.java @@ -17,21 +17,21 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import jxl.Cell; -import jxl.CellType; -import jxl.Range; -import jxl.WorkbookSettings; -import jxl.biff.SheetRangeImpl; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.Blank; -import jxl.write.WritableSheet; -import jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.SheetRangeImpl; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.Blank; +import org.xbib.datastructures.xslx.jxl.write.WritableSheet; +import org.xbib.datastructures.xslx.jxl.write.WriteException; /** * Contains all the merged cells, and the necessary logic for checking diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/MergedCellsRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MergedCellsRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/MergedCellsRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MergedCellsRecord.java index 7fd9ba1..95cfd85 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/MergedCellsRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MergedCellsRecord.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.util.ArrayList; -import jxl.Cell; -import jxl.Range; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * A number record. This is stored as 8 bytes, as opposed to the diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/MulRKRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MulRKRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/MulRKRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MulRKRecord.java index 9e4a9b5..22c7df0 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/MulRKRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/MulRKRecord.java @@ -17,13 +17,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.util.List; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.write.Number; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.write.Number; /** * Contains an array of RK numbers diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/NameRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NameRecord.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/write/biff/NameRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NameRecord.java index bec192c..ef29607 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/NameRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NameRecord.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.BuiltInName; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.BuiltInName; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A name record. Simply takes the binary data from the name @@ -75,7 +75,7 @@ class NameRecord extends WritableRecordData { * * @param index the index into the name table */ - public NameRecord(jxl.read.biff.NameRecord sr, int ind) { + public NameRecord(org.xbib.datastructures.xslx.jxl.read.biff.NameRecord sr, int ind) { super(Type.NAME); data = sr.getData(); @@ -85,7 +85,7 @@ class NameRecord extends WritableRecordData { modified = false; // Copy the ranges - jxl.read.biff.NameRecord.NameRange[] r = sr.getRanges(); + org.xbib.datastructures.xslx.jxl.read.biff.NameRecord.NameRange[] r = sr.getRanges(); ranges = new NameRange[r.length]; for (int i = 0; i < ranges.length; i++) { ranges[i] = new NameRange(r[i]); @@ -517,7 +517,7 @@ class NameRecord extends WritableRecordData { private int rowLast; private final int externalSheet; - NameRange(jxl.read.biff.NameRecord.NameRange nr) { + NameRange(org.xbib.datastructures.xslx.jxl.read.biff.NameRecord.NameRange nr) { columnFirst = nr.getFirstColumn(); rowFirst = nr.getFirstRow(); columnLast = nr.getLastColumn(); diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/NineteenFourRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NineteenFourRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/NineteenFourRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NineteenFourRecord.java index d87052b..3372e1a 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/NineteenFourRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NineteenFourRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * A record which indicates whether or the 1904 date system is diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/NumberFormatRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NumberFormatRecord.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/write/biff/NumberFormatRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NumberFormatRecord.java index c918c83..80907e9 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/NumberFormatRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NumberFormatRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.FormatRecord; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.biff.FormatRecord; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * A class which contains a number format diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/NumberRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NumberRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/NumberRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NumberRecord.java index 49f771f..fbad5f3 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/NumberRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/NumberRecord.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.text.DecimalFormat; import java.text.NumberFormat; -import jxl.CellType; -import jxl.NumberCell; -import jxl.biff.DoubleHelper; -import jxl.biff.Type; -import jxl.biff.XFRecord; -import jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; /** * The record which contains numerical values. All values are stored diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ObjProjRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ObjProjRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/ObjProjRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ObjProjRecord.java index c5d7010..7ccdae7 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ObjProjRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ObjProjRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record containing the obj proj record diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ObjectProtectRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ObjectProtectRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/ObjectProtectRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ObjectProtectRecord.java index dd58911..699d89f 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ObjectProtectRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ObjectProtectRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The protection state for a sheet or workbook diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/PLSRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PLSRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/PLSRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PLSRecord.java index 45bf80e..d2031eb 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/PLSRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PLSRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which specifies a print header for a work sheet @@ -36,7 +36,7 @@ class PLSRecord extends WritableRecordData { * * @param hr the read header record */ - public PLSRecord(jxl.read.biff.PLSRecord hr) { + public PLSRecord(org.xbib.datastructures.xslx.jxl.read.biff.PLSRecord hr) { super(Type.PLS); data = hr.getData(); diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/PaletteRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PaletteRecord.java similarity index 84% rename from datastructures-xslx/src/main/java/jxl/write/biff/PaletteRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PaletteRecord.java index f5b983a..005bb82 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/PaletteRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PaletteRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the colour palette @@ -36,7 +36,7 @@ class PaletteRecord extends WritableRecordData { * * @param p the palette record */ - public PaletteRecord(jxl.read.biff.PaletteRecord p) { + public PaletteRecord(org.xbib.datastructures.xslx.jxl.read.biff.PaletteRecord p) { super(Type.PALETTE); data = p.getData(); diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/PaneRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PaneRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/PaneRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PaneRecord.java index 45da541..e38313a 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/PaneRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PaneRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Contains the window attributes for a worksheet diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/PasswordRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PasswordRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/PasswordRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PasswordRecord.java index 958cae9..665804b 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/PasswordRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PasswordRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * A password record. Thanks to Michael Matthews for sending me the diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/PrecisionRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PrecisionRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/PrecisionRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PrecisionRecord.java index c20ecfd..f3cbd96 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/PrecisionRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PrecisionRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the Precision As Displayed option from the dialog box diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/PrintGridLinesRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PrintGridLinesRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/PrintGridLinesRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PrintGridLinesRecord.java index a5c5489..cf5e7ed 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/PrintGridLinesRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PrintGridLinesRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The grid lines option from the Page Setup dialog box diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/PrintHeadersRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PrintHeadersRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/PrintHeadersRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PrintHeadersRecord.java index 253cd43..3ab12b5 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/PrintHeadersRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/PrintHeadersRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The headings options from the Page Setup dialog box diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/Prot4RevPassRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Prot4RevPassRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/Prot4RevPassRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Prot4RevPassRecord.java index fe785d0..100c218 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/Prot4RevPassRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Prot4RevPassRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the shared workbook protection flag diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/Prot4RevRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Prot4RevRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/Prot4RevRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Prot4RevRecord.java index 133a4b6..1e83d3a 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/Prot4RevRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Prot4RevRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The shared workbook protection flag diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ProtectRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ProtectRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/ProtectRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ProtectRecord.java index e08e067..33ee4d9 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ProtectRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ProtectRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The protection state for a sheet or workbook diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ReadBooleanFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadBooleanFormulaRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/ReadBooleanFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadBooleanFormulaRecord.java index ff700fe..ff86f90 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ReadBooleanFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadBooleanFormulaRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.BooleanFormulaCell; -import jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.BooleanFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; /** * Class for read number formula records diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ReadDateFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadDateFormulaRecord.java similarity index 92% rename from datastructures-xslx/src/main/java/jxl/write/biff/ReadDateFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadDateFormulaRecord.java index 66580f5..43da711 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ReadDateFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadDateFormulaRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.text.DateFormat; import java.util.Date; -import jxl.DateFormulaCell; -import jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.DateFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; /** * Class for read number formula records diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ReadErrorFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadErrorFormulaRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/ReadErrorFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadErrorFormulaRecord.java index c03ce5e..ac7ac9f 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ReadErrorFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadErrorFormulaRecord.java @@ -17,15 +17,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.ErrorFormulaCell; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.formula.FormulaErrorCode; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.ErrorFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaErrorCode; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ReadFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadFormulaRecord.java similarity index 93% rename from datastructures-xslx/src/main/java/jxl/write/biff/ReadFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadFormulaRecord.java index 9a5e075..780ac8d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ReadFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadFormulaRecord.java @@ -17,24 +17,24 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.CellReferenceHelper; -import jxl.CellType; -import jxl.FormulaCell; -import jxl.Sheet; -import jxl.WorkbookSettings; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WorkbookMethods; -import jxl.biff.formula.ExternalSheet; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.FormulaCell; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; /** * A formula record. This is invoked when copying a formula from a diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ReadNumberFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadNumberFormulaRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/ReadNumberFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadNumberFormulaRecord.java index 9304be6..c615b16 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ReadNumberFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadNumberFormulaRecord.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.text.NumberFormat; -import jxl.NumberFormulaCell; -import jxl.biff.DoubleHelper; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.NumberFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Class for read number formula records diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ReadStringFormulaRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadStringFormulaRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/ReadStringFormulaRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadStringFormulaRecord.java index b2fc7b3..7c0ea0f 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ReadStringFormulaRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ReadStringFormulaRecord.java @@ -17,15 +17,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.StringFormulaCell; -import jxl.biff.FormulaData; -import jxl.biff.IntegerHelper; -import jxl.biff.formula.FormulaException; -import jxl.biff.formula.FormulaParser; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.StringFormulaCell; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaParser; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Class for read number formula records diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/RefModeRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RefModeRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/RefModeRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RefModeRecord.java index aff642b..6e45c2d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/RefModeRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RefModeRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the reference style option from the options dialog box diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/RefreshAllRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RefreshAllRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/RefreshAllRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RefreshAllRecord.java index 3764fe9..487f8bb 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/RefreshAllRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RefreshAllRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which indicates whether or not data ranges and pivot tables diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/RightMarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RightMarginRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/RightMarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RightMarginRecord.java index 8a9b903..013d756 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/RightMarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RightMarginRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * The settings for the left margin diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/RowRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RowRecord.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/write/biff/RowRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RowRecord.java index 8a794ac..455776d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/RowRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RowRecord.java @@ -17,23 +17,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import jxl.CellType; -import jxl.SheetSettings; -import jxl.biff.CellReferenceHelper; -import jxl.biff.IndexMapping; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.biff.XFRecord; -import jxl.common.Logger; -import jxl.write.Number; -import jxl.write.WritableCellFeatures; -import jxl.write.WritableSheet; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.SheetSettings; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.IndexMapping; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.Number; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFeatures; +import org.xbib.datastructures.xslx.jxl.write.WritableSheet; /** * Contains all the cells for a given row in a sheet diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/RowsExceededException.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RowsExceededException.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/write/biff/RowsExceededException.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RowsExceededException.java index b1762e4..d65f9df 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/RowsExceededException.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/RowsExceededException.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; /** * Exception thrown when attempting to add a row to a spreadsheet which diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SCLRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SCLRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/SCLRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SCLRecord.java index 122e43c..4657e59 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SCLRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SCLRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which specifies a margin value diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SSTContinueRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SSTContinueRecord.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/write/biff/SSTContinueRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SSTContinueRecord.java index 37d27b3..f7df7bf 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SSTContinueRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SSTContinueRecord.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.util.ArrayList; import java.util.Iterator; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * A continuation of a shared string table record. diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SSTRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SSTRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/write/biff/SSTRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SSTRecord.java index 2dd5d9e..b09ec1c 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SSTRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SSTRecord.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.util.ArrayList; import java.util.Iterator; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * A shared string table record. diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SaveRecalcRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SaveRecalcRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/SaveRecalcRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SaveRecalcRecord.java index dce67f2..8231c6b 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SaveRecalcRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SaveRecalcRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the recalculate before save flag as set in the options dialog box diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/ScenarioProtectRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ScenarioProtectRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/ScenarioProtectRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ScenarioProtectRecord.java index 17dcd31..4d1366d 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/ScenarioProtectRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/ScenarioProtectRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The protection state for a sheet or workbook diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SelectionRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SelectionRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/SelectionRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SelectionRecord.java index 31acc7a..3d71579 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SelectionRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SelectionRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the current selection diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SetupRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SetupRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/SetupRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SetupRecord.java index 242d2a1..865d12a 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SetupRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SetupRecord.java @@ -17,17 +17,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.SheetSettings; -import jxl.biff.DoubleHelper; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Logger; -import jxl.format.PageOrder; -import jxl.format.PageOrientation; -import jxl.format.PaperSize; +import org.xbib.datastructures.xslx.jxl.SheetSettings; +import org.xbib.datastructures.xslx.jxl.biff.DoubleHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.PageOrder; +import org.xbib.datastructures.xslx.jxl.format.PageOrientation; +import org.xbib.datastructures.xslx.jxl.format.PaperSize; /** * Stores the options and measurements from the Page Setup dialog box diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SharedStrings.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SharedStrings.java similarity index 99% rename from datastructures-xslx/src/main/java/jxl/write/biff/SharedStrings.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SharedStrings.java index 2b9a2cd..7779ac9 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SharedStrings.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SharedStrings.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.IOException; import java.util.ArrayList; diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SheetCopier.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SheetCopier.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/SheetCopier.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SheetCopier.java index 3419945..7f8d4c4 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SheetCopier.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SheetCopier.java @@ -17,54 +17,58 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.TreeSet; -import jxl.BooleanCell; -import jxl.Cell; -import jxl.CellType; -import jxl.DateCell; -import jxl.Hyperlink; -import jxl.LabelCell; -import jxl.NumberCell; -import jxl.Range; -import jxl.Sheet; -import jxl.WorkbookSettings; -import jxl.biff.AutoFilter; -import jxl.biff.CellReferenceHelper; -import jxl.biff.ConditionalFormat; -import jxl.biff.DataValidation; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.NumFormatRecordsException; -import jxl.biff.SheetRangeImpl; -import jxl.biff.XFRecord; -import jxl.biff.drawing.Chart; -import jxl.biff.drawing.ComboBox; -import jxl.biff.drawing.DrawingGroupObject; -import jxl.biff.formula.FormulaException; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.CellFormat; -import jxl.read.biff.NameRecord; -import jxl.read.biff.SheetImpl; -import jxl.read.biff.WorkbookParser; -import jxl.write.Blank; -import jxl.write.Boolean; -import jxl.write.DateTime; -import jxl.write.Formula; -import jxl.write.Label; -import jxl.write.Number; -import jxl.write.WritableCell; -import jxl.write.WritableCellFormat; -import jxl.write.WritableHyperlink; -import jxl.write.WritableImage; -import jxl.write.WritableSheet; -import jxl.write.WritableWorkbook; -import jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.BooleanCell; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.DateCell; +import org.xbib.datastructures.xslx.jxl.Hyperlink; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.AutoFilter; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.ConditionalFormat; +import org.xbib.datastructures.xslx.jxl.biff.DataValidation; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.NumFormatRecordsException; +import org.xbib.datastructures.xslx.jxl.biff.SheetRangeImpl; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Button; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Chart; +import org.xbib.datastructures.xslx.jxl.biff.drawing.CheckBox; +import org.xbib.datastructures.xslx.jxl.biff.drawing.ComboBox; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingGroupObject; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.read.biff.NameRecord; +import org.xbib.datastructures.xslx.jxl.read.biff.SheetImpl; +import org.xbib.datastructures.xslx.jxl.read.biff.WorkbookParser; +import org.xbib.datastructures.xslx.jxl.write.Blank; +import org.xbib.datastructures.xslx.jxl.write.Boolean; +import org.xbib.datastructures.xslx.jxl.write.DateTime; +import org.xbib.datastructures.xslx.jxl.write.Formula; +import org.xbib.datastructures.xslx.jxl.write.Label; +import org.xbib.datastructures.xslx.jxl.write.Number; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFormat; +import org.xbib.datastructures.xslx.jxl.write.WritableHyperlink; +import org.xbib.datastructures.xslx.jxl.write.WritableImage; +import org.xbib.datastructures.xslx.jxl.write.WritableSheet; +import org.xbib.datastructures.xslx.jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Comment; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Drawing; /** * A transient utility object used to copy sheets. This @@ -188,10 +192,10 @@ class SheetCopier { shallowCopyCells(); // Copy the column info records - jxl.read.biff.ColumnInfoRecord[] readCirs = fromSheet.getColumnInfos(); + org.xbib.datastructures.xslx.jxl.read.biff.ColumnInfoRecord[] readCirs = fromSheet.getColumnInfos(); for (int i = 0; i < readCirs.length; i++) { - jxl.read.biff.ColumnInfoRecord rcir = readCirs[i]; + org.xbib.datastructures.xslx.jxl.read.biff.ColumnInfoRecord rcir = readCirs[i]; for (int j = rcir.getStartColumn(); j <= rcir.getEndColumn(); j++) { ColumnInfoRecord cir = new ColumnInfoRecord(rcir, j, formatRecords); @@ -217,7 +221,7 @@ class SheetCopier { // Copy the row properties try { - jxl.read.biff.RowRecord[] rowprops = fromSheet.getRowProperties(); + org.xbib.datastructures.xslx.jxl.read.biff.RowRecord[] rowprops = fromSheet.getRowProperties(); for (int i = 0; i < rowprops.length; i++) { RowRecord rr = toSheet.getRowRecord(rowprops[i].getRowNumber()); @@ -264,14 +268,14 @@ class SheetCopier { // Copy the drawings DrawingGroupObject[] dr = fromSheet.getDrawings(); for (int i = 0; i < dr.length; i++) { - if (dr[i] instanceof jxl.biff.drawing.Drawing) { + if (dr[i] instanceof Drawing) { WritableImage wi = new WritableImage (dr[i], toSheet.getWorkbook().getDrawingGroup()); drawings.add(wi); images.add(wi); - } else if (dr[i] instanceof jxl.biff.drawing.Comment) { - jxl.biff.drawing.Comment c = - new jxl.biff.drawing.Comment(dr[i], + } else if (dr[i] instanceof Comment) { + Comment c = + new Comment(dr[i], toSheet.getWorkbook().getDrawingGroup(), workbookSettings); drawings.add(c); @@ -281,23 +285,23 @@ class SheetCopier { c.getRow()); Assert.verify(cv.getCellFeatures() != null); cv.getWritableCellFeatures().setCommentDrawing(c); - } else if (dr[i] instanceof jxl.biff.drawing.Button) { - jxl.biff.drawing.Button b = - new jxl.biff.drawing.Button + } else if (dr[i] instanceof Button) { + Button b = + new Button (dr[i], toSheet.getWorkbook().getDrawingGroup(), workbookSettings); drawings.add(b); - } else if (dr[i] instanceof jxl.biff.drawing.ComboBox) { - jxl.biff.drawing.ComboBox cb = - new jxl.biff.drawing.ComboBox + } else if (dr[i] instanceof ComboBox) { + ComboBox cb = + new ComboBox (dr[i], toSheet.getWorkbook().getDrawingGroup(), workbookSettings); drawings.add(cb); - } else if (dr[i] instanceof jxl.biff.drawing.CheckBox) { - jxl.biff.drawing.CheckBox cb = - new jxl.biff.drawing.CheckBox + } else if (dr[i] instanceof CheckBox) { + CheckBox cb = + new CheckBox (dr[i], toSheet.getWorkbook().getDrawingGroup(), workbookSettings); @@ -477,10 +481,10 @@ class SheetCopier { deepCopyCells(); // Copy the column info records - jxl.read.biff.ColumnInfoRecord[] readCirs = fromSheet.getColumnInfos(); + org.xbib.datastructures.xslx.jxl.read.biff.ColumnInfoRecord[] readCirs = fromSheet.getColumnInfos(); for (int i = 0; i < readCirs.length; i++) { - jxl.read.biff.ColumnInfoRecord rcir = readCirs[i]; + org.xbib.datastructures.xslx.jxl.read.biff.ColumnInfoRecord rcir = readCirs[i]; for (int j = rcir.getStartColumn(); j <= rcir.getEndColumn(); j++) { ColumnInfoRecord cir = new ColumnInfoRecord(rcir, j); int xfIndex = cir.getXfIndex(); @@ -514,12 +518,12 @@ class SheetCopier { // Copy the row properties try { - jxl.read.biff.RowRecord[] rowprops = fromSheet.getRowProperties(); + org.xbib.datastructures.xslx.jxl.read.biff.RowRecord[] rowprops = fromSheet.getRowProperties(); for (int i = 0; i < rowprops.length; i++) { RowRecord rr = toSheet.getRowRecord(rowprops[i].getRowNumber()); XFRecord format = null; - jxl.read.biff.RowRecord rowrec = rowprops[i]; + org.xbib.datastructures.xslx.jxl.read.biff.RowRecord rowrec = rowprops[i]; if (rowrec.hasDefaultFormat()) { format = (WritableCellFormat) xfRecords.get(new Integer(rowrec.getXFIndex())); @@ -616,7 +620,7 @@ class SheetCopier { } for (int i = 0; i < dr.length; i++) { - if (dr[i] instanceof jxl.biff.drawing.Drawing) { + if (dr[i] instanceof Drawing) { WritableImage wi = new WritableImage (dr[i].getX(), dr[i].getY(), dr[i].getWidth(), dr[i].getHeight(), @@ -624,9 +628,9 @@ class SheetCopier { toSheet.getWorkbook().addDrawing(wi); drawings.add(wi); images.add(wi); - } else if (dr[i] instanceof jxl.biff.drawing.Comment) { - jxl.biff.drawing.Comment c = - new jxl.biff.drawing.Comment(dr[i], + } else if (dr[i] instanceof Comment) { + Comment c = + new Comment(dr[i], toSheet.getWorkbook().getDrawingGroup(), workbookSettings); drawings.add(c); @@ -636,16 +640,16 @@ class SheetCopier { c.getRow()); Assert.verify(cv.getCellFeatures() != null); cv.getWritableCellFeatures().setCommentDrawing(c); - } else if (dr[i] instanceof jxl.biff.drawing.Button) { - jxl.biff.drawing.Button b = - new jxl.biff.drawing.Button + } else if (dr[i] instanceof Button) { + Button b = + new Button (dr[i], toSheet.getWorkbook().getDrawingGroup(), workbookSettings); drawings.add(b); - } else if (dr[i] instanceof jxl.biff.drawing.ComboBox) { - jxl.biff.drawing.ComboBox cb = - new jxl.biff.drawing.ComboBox + } else if (dr[i] instanceof ComboBox) { + ComboBox cb = + new ComboBox (dr[i], toSheet.getWorkbook().getDrawingGroup(), workbookSettings); @@ -906,7 +910,7 @@ class SheetCopier { WorkbookParser fromWorkbook = fromSheet.getWorkbook(); WritableWorkbook toWorkbook = toSheet.getWorkbook(); int fromSheetIndex = fromWorkbook.getIndex(fromSheet); - NameRecord[] nameRecords = fromWorkbook.getNameRecords(); + org.xbib.datastructures.xslx.jxl.read.biff.NameRecord[] nameRecords = fromWorkbook.getNameRecords(); String[] names = toWorkbook.getRangeNames(); for (int i = 0; i < nameRecords.length; i++) { diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SheetWriter.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SheetWriter.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/write/biff/SheetWriter.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SheetWriter.java index 062f326..86bc759 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SheetWriter.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SheetWriter.java @@ -17,35 +17,35 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.TreeSet; -import jxl.Cell; -import jxl.CellFeatures; -import jxl.Range; -import jxl.SheetSettings; -import jxl.WorkbookSettings; -import jxl.biff.AutoFilter; -import jxl.biff.ConditionalFormat; -import jxl.biff.DataValidation; -import jxl.biff.DataValiditySettingsRecord; -import jxl.biff.WorkspaceInformationRecord; -import jxl.biff.XFRecord; -import jxl.biff.drawing.Chart; -import jxl.biff.drawing.SheetDrawingWriter; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.Border; -import jxl.format.BorderLineStyle; -import jxl.format.Colour; -import jxl.write.Blank; -import jxl.write.WritableCell; -import jxl.write.WritableCellFormat; -import jxl.write.WritableHyperlink; -import jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.SheetSettings; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.AutoFilter; +import org.xbib.datastructures.xslx.jxl.biff.ConditionalFormat; +import org.xbib.datastructures.xslx.jxl.biff.DataValidation; +import org.xbib.datastructures.xslx.jxl.biff.DataValiditySettingsRecord; +import org.xbib.datastructures.xslx.jxl.biff.WorkspaceInformationRecord; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Chart; +import org.xbib.datastructures.xslx.jxl.biff.drawing.SheetDrawingWriter; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.Border; +import org.xbib.datastructures.xslx.jxl.format.BorderLineStyle; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.write.Blank; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFormat; +import org.xbib.datastructures.xslx.jxl.write.WritableHyperlink; +import org.xbib.datastructures.xslx.jxl.write.WriteException; /** * Contains the functionality necessary for writing out a sheet. Originally diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SortRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SortRecord.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/write/biff/SortRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SortRecord.java index 12b8c12..033a845 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SortRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SortRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which specifies sort dialog box values diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/StringRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/StringRecord.java similarity index 85% rename from datastructures-xslx/src/main/java/jxl/write/biff/StringRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/StringRecord.java index ef3e3d5..1032c4c 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/StringRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/StringRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the string result of a formula calculation. This record diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/StyleXFRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/StyleXFRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/StyleXFRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/StyleXFRecord.java index 8f5370f..ac7e3f6 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/StyleXFRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/StyleXFRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.DisplayFormat; -import jxl.biff.FontRecord; -import jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.biff.DisplayFormat; +import org.xbib.datastructures.xslx.jxl.biff.FontRecord; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; /** * A style XF Record diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/Styles.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Styles.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/Styles.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Styles.java index a7a468d..4f538e4 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/Styles.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Styles.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.XFRecord; -import jxl.common.Logger; -import jxl.write.DateFormat; -import jxl.write.DateFormats; -import jxl.write.NumberFormats; -import jxl.write.WritableCellFormat; -import jxl.write.WritableFont; -import jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.write.DateFormat; +import org.xbib.datastructures.xslx.jxl.write.DateFormats; +import org.xbib.datastructures.xslx.jxl.write.NumberFormats; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFormat; +import org.xbib.datastructures.xslx.jxl.write.WritableFont; +import org.xbib.datastructures.xslx.jxl.write.WritableWorkbook; /** * A structure containing the styles used by this workbook. This is used diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/SupbookRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SupbookRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/SupbookRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SupbookRecord.java index d2c130a..c92ad58 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/SupbookRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/SupbookRecord.java @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.WorkbookSettings; -import jxl.biff.EncodedURLHelper; -import jxl.biff.IntegerHelper; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; -import jxl.common.Assert; -import jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.EncodedURLHelper; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; /** * Stores the supporting workbook information. For files written by @@ -106,14 +106,14 @@ class SupbookRecord extends WritableRecordData { /** * Constructor used when copying from an external workbook */ - public SupbookRecord(jxl.read.biff.SupbookRecord sr, WorkbookSettings ws) { + public SupbookRecord(org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord sr, WorkbookSettings ws) { super(Type.SUPBOOK); workbookSettings = ws; - if (sr.getType() == jxl.read.biff.SupbookRecord.INTERNAL) { + if (sr.getType() == org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord.INTERNAL) { type = INTERNAL; numSheets = sr.getNumberOfSheets(); - } else if (sr.getType() == jxl.read.biff.SupbookRecord.EXTERNAL) { + } else if (sr.getType() == org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord.EXTERNAL) { type = EXTERNAL; numSheets = sr.getNumberOfSheets(); fileName = sr.getFileName(); @@ -124,7 +124,7 @@ class SupbookRecord extends WritableRecordData { } } - if (sr.getType() == jxl.read.biff.SupbookRecord.ADDIN) { + if (sr.getType() == org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord.ADDIN) { logger.warn("Supbook type is addin"); } } @@ -134,7 +134,7 @@ class SupbookRecord extends WritableRecordData { * * @param sr the read supbook record to copy from */ - private void initInternal(jxl.read.biff.SupbookRecord sr) { + private void initInternal(org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord sr) { numSheets = sr.getNumberOfSheets(); initInternal(); } diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/TabIdRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/TabIdRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/TabIdRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/TabIdRecord.java index 7a74d09..b07c9d9 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/TabIdRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/TabIdRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Contains an array of sheet tab index numbers diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/TemplateRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/TemplateRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/TemplateRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/TemplateRecord.java index 9501d55..6ce743a 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/TemplateRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/TemplateRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Record which indicates whether or not this file is a template (Usually saved with .xlt file name extension) diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/TopMarginRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/TopMarginRecord.java similarity index 91% rename from datastructures-xslx/src/main/java/jxl/write/biff/TopMarginRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/TopMarginRecord.java index 3c47191..46a4752 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/TopMarginRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/TopMarginRecord.java @@ -17,9 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.Type; /** * The settings for the left margin diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/UsesElfsRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/UsesElfsRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/UsesElfsRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/UsesElfsRecord.java index d2c31fc..a8d98ca 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/UsesElfsRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/UsesElfsRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores the flag which indicates whether the version of excel can diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/VerticalCentreRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/VerticalCentreRecord.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/VerticalCentreRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/VerticalCentreRecord.java index 9fd32e7..d934cce 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/VerticalCentreRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/VerticalCentreRecord.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Indicates whether the centre vertically on page option has been diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/VerticalPageBreaksRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/VerticalPageBreaksRecord.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/VerticalPageBreaksRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/VerticalPageBreaksRecord.java index e61d24f..14af6a2 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/VerticalPageBreaksRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/VerticalPageBreaksRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Contains the list of explicit horizontal page breaks on the current sheet diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/Weird1Record.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Weird1Record.java similarity index 89% rename from datastructures-xslx/src/main/java/jxl/write/biff/Weird1Record.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Weird1Record.java index 5431987..82132e8 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/Weird1Record.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Weird1Record.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Don't know what this does - something to do with freezing panes I think diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/Window1Record.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Window1Record.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/Window1Record.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Window1Record.java index 2ed5ce5..da3835e 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/Window1Record.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Window1Record.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Contains workbook level windowing attributes diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/Window2Record.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Window2Record.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/Window2Record.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Window2Record.java index f0281c3..673d715 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/Window2Record.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/Window2Record.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.SheetSettings; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.SheetSettings; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Contains the window attributes for a worksheet diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/WindowProtectRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WindowProtectRecord.java similarity index 87% rename from datastructures-xslx/src/main/java/jxl/write/biff/WindowProtectRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WindowProtectRecord.java index 2041ab7..b4721d7 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/WindowProtectRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WindowProtectRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.IntegerHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * Stores an option from the Protect Workbook dialog box diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/WritableFontRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableFontRecord.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/write/biff/WritableFontRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableFontRecord.java index b87ea45..eb3d7fa 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/WritableFontRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableFontRecord.java @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.FontRecord; -import jxl.format.Font; -import jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.biff.FontRecord; +import org.xbib.datastructures.xslx.jxl.format.Font; +import org.xbib.datastructures.xslx.jxl.write.WriteException; /** * A writable Font record. This class intercepts any set accessor calls diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/WritableFonts.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableFonts.java similarity index 90% rename from datastructures-xslx/src/main/java/jxl/write/biff/WritableFonts.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableFonts.java index 190f2b3..6f586f2 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/WritableFonts.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableFonts.java @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Fonts; -import jxl.write.WritableFont; +import org.xbib.datastructures.xslx.jxl.biff.Fonts; +import org.xbib.datastructures.xslx.jxl.write.WritableFont; /** * A container for the list of fonts used in this workbook The writable diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/WritableFormattingRecords.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableFormattingRecords.java similarity index 94% rename from datastructures-xslx/src/main/java/jxl/write/biff/WritableFormattingRecords.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableFormattingRecords.java index 294c560..9fdb806 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/WritableFormattingRecords.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableFormattingRecords.java @@ -17,14 +17,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.biff.Fonts; -import jxl.biff.FormattingRecords; -import jxl.biff.NumFormatRecordsException; -import jxl.common.Assert; -import jxl.write.NumberFormats; -import jxl.write.WritableCellFormat; +import org.xbib.datastructures.xslx.jxl.biff.Fonts; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.NumFormatRecordsException; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.write.NumberFormats; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFormat; /** diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/WritableSheetCopier.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableSheetCopier.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/WritableSheetCopier.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableSheetCopier.java index d43c8ca..643cb50 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/WritableSheetCopier.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableSheetCopier.java @@ -17,45 +17,46 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.TreeSet; -import jxl.BooleanCell; -import jxl.Cell; -import jxl.CellType; -import jxl.DateCell; -import jxl.LabelCell; -import jxl.NumberCell; -import jxl.Range; -import jxl.WorkbookSettings; -import jxl.biff.CellReferenceHelper; -import jxl.biff.DataValidation; -import jxl.biff.FormattingRecords; -import jxl.biff.FormulaData; -import jxl.biff.NumFormatRecordsException; -import jxl.biff.SheetRangeImpl; -import jxl.biff.WorkspaceInformationRecord; -import jxl.biff.XFRecord; -import jxl.biff.formula.FormulaException; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.CellFormat; -import jxl.write.Blank; -import jxl.write.Boolean; -import jxl.write.DateTime; -import jxl.write.Formula; -import jxl.write.Label; -import jxl.write.Number; -import jxl.write.WritableCell; -import jxl.write.WritableCellFormat; -import jxl.write.WritableHyperlink; -import jxl.write.WritableImage; -import jxl.write.WritableSheet; -import jxl.write.WritableWorkbook; -import jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.BooleanCell; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.DateCell; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.NumberCell; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.DataValidation; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.FormulaData; +import org.xbib.datastructures.xslx.jxl.biff.NumFormatRecordsException; +import org.xbib.datastructures.xslx.jxl.biff.SheetRangeImpl; +import org.xbib.datastructures.xslx.jxl.biff.WorkspaceInformationRecord; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.biff.formula.FormulaException; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.write.Blank; +import org.xbib.datastructures.xslx.jxl.write.Boolean; +import org.xbib.datastructures.xslx.jxl.write.DateTime; +import org.xbib.datastructures.xslx.jxl.write.Formula; +import org.xbib.datastructures.xslx.jxl.write.Label; +import org.xbib.datastructures.xslx.jxl.write.Number; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFormat; +import org.xbib.datastructures.xslx.jxl.write.WritableHyperlink; +import org.xbib.datastructures.xslx.jxl.write.WritableImage; +import org.xbib.datastructures.xslx.jxl.write.WritableSheet; +import org.xbib.datastructures.xslx.jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Drawing; /** * A transient utility object used to copy sheets. This @@ -257,9 +258,9 @@ class WritableSheetCopier { // Copy the drawings for (Iterator i = fromDrawings.iterator(); i.hasNext(); ) { Object o = i.next(); - if (o instanceof jxl.biff.drawing.Drawing) { + if (o instanceof Drawing) { WritableImage wi = new WritableImage - ((jxl.biff.drawing.Drawing) o, + ((Drawing) o, toSheet.getWorkbook().getDrawingGroup()); toDrawings.add(wi); toImages.add(wi); diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/WritableSheetImpl.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableSheetImpl.java similarity index 96% rename from datastructures-xslx/src/main/java/jxl/write/biff/WritableSheetImpl.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableSheetImpl.java index e4478ba..b078f43 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/WritableSheetImpl.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableSheetImpl.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.IOException; import java.util.ArrayList; @@ -25,51 +25,51 @@ import java.util.Comparator; import java.util.Iterator; import java.util.TreeSet; import java.util.regex.Pattern; -import jxl.Cell; -import jxl.CellFeatures; -import jxl.CellReferenceHelper; -import jxl.CellType; -import jxl.CellView; -import jxl.HeaderFooter; -import jxl.Hyperlink; -import jxl.Image; -import jxl.LabelCell; -import jxl.Range; -import jxl.Sheet; -import jxl.SheetSettings; -import jxl.WorkbookSettings; -import jxl.biff.AutoFilter; -import jxl.biff.CellFinder; -import jxl.biff.ConditionalFormat; -import jxl.biff.DVParser; -import jxl.biff.DataValidation; -import jxl.biff.EmptyCell; -import jxl.biff.FormattingRecords; -import jxl.biff.IndexMapping; -import jxl.biff.NumFormatRecordsException; -import jxl.biff.SheetRangeImpl; -import jxl.biff.WorkspaceInformationRecord; -import jxl.biff.XFRecord; -import jxl.biff.drawing.Chart; -import jxl.biff.drawing.ComboBox; -import jxl.biff.drawing.Drawing; -import jxl.biff.drawing.DrawingGroupObject; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.CellFormat; -import jxl.format.Font; -import jxl.format.PageOrientation; -import jxl.format.PaperSize; -import jxl.write.Blank; -import jxl.write.Label; -import jxl.write.WritableCell; -import jxl.write.WritableCellFeatures; -import jxl.write.WritableCellFormat; -import jxl.write.WritableHyperlink; -import jxl.write.WritableImage; -import jxl.write.WritableSheet; -import jxl.write.WritableWorkbook; -import jxl.write.WriteException; +import org.xbib.datastructures.xslx.jxl.Cell; +import org.xbib.datastructures.xslx.jxl.CellFeatures; +import org.xbib.datastructures.xslx.jxl.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.CellType; +import org.xbib.datastructures.xslx.jxl.CellView; +import org.xbib.datastructures.xslx.jxl.HeaderFooter; +import org.xbib.datastructures.xslx.jxl.Hyperlink; +import org.xbib.datastructures.xslx.jxl.Image; +import org.xbib.datastructures.xslx.jxl.LabelCell; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.SheetSettings; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.AutoFilter; +import org.xbib.datastructures.xslx.jxl.biff.CellFinder; +import org.xbib.datastructures.xslx.jxl.biff.ConditionalFormat; +import org.xbib.datastructures.xslx.jxl.biff.DVParser; +import org.xbib.datastructures.xslx.jxl.biff.DataValidation; +import org.xbib.datastructures.xslx.jxl.biff.EmptyCell; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IndexMapping; +import org.xbib.datastructures.xslx.jxl.biff.NumFormatRecordsException; +import org.xbib.datastructures.xslx.jxl.biff.SheetRangeImpl; +import org.xbib.datastructures.xslx.jxl.biff.WorkspaceInformationRecord; +import org.xbib.datastructures.xslx.jxl.biff.XFRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Chart; +import org.xbib.datastructures.xslx.jxl.biff.drawing.ComboBox; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Drawing; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingGroupObject; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.CellFormat; +import org.xbib.datastructures.xslx.jxl.format.Font; +import org.xbib.datastructures.xslx.jxl.format.PageOrientation; +import org.xbib.datastructures.xslx.jxl.format.PaperSize; +import org.xbib.datastructures.xslx.jxl.write.Blank; +import org.xbib.datastructures.xslx.jxl.write.Label; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFeatures; +import org.xbib.datastructures.xslx.jxl.write.WritableCellFormat; +import org.xbib.datastructures.xslx.jxl.write.WritableHyperlink; +import org.xbib.datastructures.xslx.jxl.write.WritableImage; +import org.xbib.datastructures.xslx.jxl.write.WritableSheet; +import org.xbib.datastructures.xslx.jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.write.WriteException; /** * A writable sheet. This class contains implementation of all the diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/WritableWorkbookImpl.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableWorkbookImpl.java similarity index 95% rename from datastructures-xslx/src/main/java/jxl/write/biff/WritableWorkbookImpl.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableWorkbookImpl.java index 54625b7..2635abe 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/WritableWorkbookImpl.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WritableWorkbookImpl.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; import java.io.FileOutputStream; import java.io.IOException; @@ -25,33 +25,33 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import jxl.Range; -import jxl.Sheet; -import jxl.Workbook; -import jxl.WorkbookSettings; -import jxl.biff.BuiltInName; -import jxl.biff.CellReferenceHelper; -import jxl.biff.CountryCode; -import jxl.biff.Fonts; -import jxl.biff.FormattingRecords; -import jxl.biff.IndexMapping; -import jxl.biff.IntegerHelper; -import jxl.biff.RangeImpl; -import jxl.biff.WorkbookMethods; -import jxl.biff.XCTRecord; -import jxl.biff.drawing.Drawing; -import jxl.biff.drawing.DrawingGroup; -import jxl.biff.drawing.DrawingGroupObject; -import jxl.biff.drawing.Origin; -import jxl.biff.formula.ExternalSheet; -import jxl.common.Assert; -import jxl.common.Logger; -import jxl.format.Colour; -import jxl.format.RGB; -import jxl.read.biff.WorkbookParser; -import jxl.write.WritableCell; -import jxl.write.WritableSheet; -import jxl.write.WritableWorkbook; +import org.xbib.datastructures.xslx.jxl.Range; +import org.xbib.datastructures.xslx.jxl.Sheet; +import org.xbib.datastructures.xslx.jxl.Workbook; +import org.xbib.datastructures.xslx.jxl.WorkbookSettings; +import org.xbib.datastructures.xslx.jxl.biff.BuiltInName; +import org.xbib.datastructures.xslx.jxl.biff.CellReferenceHelper; +import org.xbib.datastructures.xslx.jxl.biff.CountryCode; +import org.xbib.datastructures.xslx.jxl.biff.Fonts; +import org.xbib.datastructures.xslx.jxl.biff.FormattingRecords; +import org.xbib.datastructures.xslx.jxl.biff.IndexMapping; +import org.xbib.datastructures.xslx.jxl.biff.IntegerHelper; +import org.xbib.datastructures.xslx.jxl.biff.RangeImpl; +import org.xbib.datastructures.xslx.jxl.biff.WorkbookMethods; +import org.xbib.datastructures.xslx.jxl.biff.XCTRecord; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Drawing; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingGroup; +import org.xbib.datastructures.xslx.jxl.biff.drawing.DrawingGroupObject; +import org.xbib.datastructures.xslx.jxl.biff.drawing.Origin; +import org.xbib.datastructures.xslx.jxl.biff.formula.ExternalSheet; +import org.xbib.datastructures.xslx.jxl.common.Assert; +import org.xbib.datastructures.xslx.jxl.common.Logger; +import org.xbib.datastructures.xslx.jxl.format.Colour; +import org.xbib.datastructures.xslx.jxl.format.RGB; +import org.xbib.datastructures.xslx.jxl.read.biff.WorkbookParser; +import org.xbib.datastructures.xslx.jxl.write.WritableCell; +import org.xbib.datastructures.xslx.jxl.write.WritableSheet; +import org.xbib.datastructures.xslx.jxl.write.WritableWorkbook; /** @@ -259,16 +259,16 @@ public class WritableWorkbookImpl extends WritableWorkbook externSheet = new ExternalSheetRecord(wp.getExternalSheetRecord()); // Get the associated supbooks - jxl.read.biff.SupbookRecord[] readsr = wp.getSupbookRecords(); + org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord[] readsr = wp.getSupbookRecords(); supbooks = new ArrayList(readsr.length); for (int i = 0; i < readsr.length; i++) { - jxl.read.biff.SupbookRecord readSupbook = readsr[i]; - if (readSupbook.getType() == jxl.read.biff.SupbookRecord.INTERNAL || - readSupbook.getType() == jxl.read.biff.SupbookRecord.EXTERNAL) { + org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord readSupbook = readsr[i]; + if (readSupbook.getType() == org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord.INTERNAL || + readSupbook.getType() == org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord.EXTERNAL) { supbooks.add(new SupbookRecord(readSupbook, settings)); } else { - if (readSupbook.getType() != jxl.read.biff.SupbookRecord.ADDIN) { + if (readSupbook.getType() != org.xbib.datastructures.xslx.jxl.read.biff.SupbookRecord.ADDIN) { logger.warn("unsupported supbook type - ignoring"); } } @@ -289,7 +289,7 @@ public class WritableWorkbookImpl extends WritableWorkbook // Copy any names if (!settings.getNamesDisabled()) { - jxl.read.biff.NameRecord[] na = wp.getNameRecords(); + org.xbib.datastructures.xslx.jxl.read.biff.NameRecord[] na = wp.getNameRecords(); names = new ArrayList(na.length); for (int i = 0; i < na.length; i++) { @@ -996,7 +996,7 @@ public class WritableWorkbookImpl extends WritableWorkbook * * @return the BOF record, which */ - public jxl.read.biff.BOFRecord getWorkbookBof() { + public org.xbib.datastructures.xslx.jxl.read.biff.BOFRecord getWorkbookBof() { return null; } diff --git a/datastructures-xslx/src/main/java/jxl/write/biff/WriteAccessRecord.java b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WriteAccessRecord.java similarity index 88% rename from datastructures-xslx/src/main/java/jxl/write/biff/WriteAccessRecord.java rename to datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WriteAccessRecord.java index 9d0c840..9c4a71c 100755 --- a/datastructures-xslx/src/main/java/jxl/write/biff/WriteAccessRecord.java +++ b/datastructures-xslx/src/main/java/org/xbib/datastructures/xslx/jxl/write/biff/WriteAccessRecord.java @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -package jxl.write.biff; +package org.xbib.datastructures.xslx.jxl.write.biff; -import jxl.Workbook; -import jxl.biff.StringHelper; -import jxl.biff.Type; -import jxl.biff.WritableRecordData; +import org.xbib.datastructures.xslx.jxl.Workbook; +import org.xbib.datastructures.xslx.jxl.biff.StringHelper; +import org.xbib.datastructures.xslx.jxl.biff.Type; +import org.xbib.datastructures.xslx.jxl.biff.WritableRecordData; /** * The name used when Excel was installed. diff --git a/datastructures-xslx/src/test/java/org/xbib/datastructures/xslx/SimpleWriterTest.java b/datastructures-xslx/src/test/java/org/xbib/datastructures/xslx/SimpleWriterTest.java new file mode 100644 index 0000000..8a5adc3 --- /dev/null +++ b/datastructures-xslx/src/test/java/org/xbib/datastructures/xslx/SimpleWriterTest.java @@ -0,0 +1,28 @@ +package org.xbib.datastructures.xslx; + +import org.junit.jupiter.api.Test; + +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +public class SimpleWriterTest { + + @Test + public void testXLSXWrite() throws Exception { + Path path = Paths.get("build/test.xlsx"); + SimpleXLSXWorkbook workbook = new SimpleXLSXWorkbook(); + Sheet sheet = workbook.getSheet(0); + int columnCount = 5; + int rowCount = 10; + int offset = 0; + for (int r = offset; r < offset + rowCount; r++) { + for (int c = 0; c < columnCount; c++) { + sheet.modify(r, c, "Text " + r + "," + c, null); + } + } + OutputStream outputStream = Files.newOutputStream(path); + workbook.commit(outputStream); + } +} diff --git a/datastructures-xslx/src/test/java/org/xbib/datastructures/xslx/TestSJXLSX.java b/datastructures-xslx/src/test/java/org/xbib/datastructures/xslx/TestSJXLSX.java index 95f7f24..c3126e7 100644 --- a/datastructures-xslx/src/test/java/org/xbib/datastructures/xslx/TestSJXLSX.java +++ b/datastructures-xslx/src/test/java/org/xbib/datastructures/xslx/TestSJXLSX.java @@ -1,20 +1,14 @@ package org.xbib.datastructures.xslx; -import com.incesoft.tools.excel.xlsx.Cell; -import com.incesoft.tools.excel.xlsx.CellStyle; -import com.incesoft.tools.excel.xlsx.Fill; -import com.incesoft.tools.excel.xlsx.Font; -import com.incesoft.tools.excel.xlsx.RichText; -import com.incesoft.tools.excel.xlsx.Sheet; -import com.incesoft.tools.excel.xlsx.SimpleXLSXWorkbook; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.OutputStream; import java.util.List; -import com.incesoft.tools.excel.xlsx.Sheet.SheetRowReader; -import com.incesoft.tools.excel.xlsx.SimpleXLSXWorkbook.Commiter; +import org.xbib.datastructures.xslx.Sheet.SheetRowReader; +import org.xbib.datastructures.xslx.SimpleXLSXWorkbook.Commiter; public class TestSJXLSX { @@ -58,7 +52,7 @@ public class TestSJXLSX { } } - public static void testLoadALL(SimpleXLSXWorkbook workbook) { + public static void testLoadALL(SimpleXLSXWorkbook workbook) throws IOException { // medium data set,just load all at a time Sheet sheetToRead = workbook.getSheet(0); List rows = sheetToRead.getRows(); @@ -69,7 +63,7 @@ public class TestSJXLSX { } } - public static void testIterateALL(SimpleXLSXWorkbook workbook) { + public static void testIterateALL(SimpleXLSXWorkbook workbook) throws IOException { // here we assume that the sheet contains too many rows which will leads // to memory overflow; // So we get sheet without loading all records @@ -161,8 +155,7 @@ public class TestSJXLSX { } private static SimpleXLSXWorkbook newWorkbook() { - return new SimpleXLSXWorkbook(new File("/1.xlsx")); - // return new SimpleXLSXWorkbook(new File("/sample_no_rel.xlsx")); + return new SimpleXLSXWorkbook(); } private static OutputStream newOutput(String suffix) throws Exception { diff --git a/gradle.properties b/gradle.properties index 19ae290..25ab0cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group = org.xbib name = datastructures -version = 5.0.7 +version = 5.1.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6aba25..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle b/settings.gradle index 800537f..235cd1d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,7 +15,7 @@ pluginManagement { dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '8.5') + version('gradle', '8.7') library('chronicle-core', 'net.openhft', 'chronicle-core').version('2.21ea14') library('affinity', 'net.openhft', 'affinity').version('3.21ea0') library('javassist', 'org.javassist', 'javassist').version('3.29.1-GA')