From 0667b90ac4b41c7a7927c47753f1db487e442743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Thu, 16 May 2024 16:33:21 +0200 Subject: [PATCH] working on xslx --- build.gradle | 13 +- .../src/main/java/jxl/CellFormat.java | 28 --- .../src/main/java/module-info.java | 4 + .../xbib/datastructures/xslx}/Cell.java | 2 +- .../xbib/datastructures/xslx}/CellFormat.java | 2 +- .../xbib/datastructures/xslx}/CellStyle.java | 2 +- .../datastructures/xslx/ExcelRowIterator.java | 17 +- .../xbib/datastructures/xslx}/Fill.java | 2 +- .../xbib/datastructures/xslx}/Font.java | 2 +- .../xbib/datastructures/xslx}/FontRegion.java | 2 +- .../datastructures/xslx}/IndexedObject.java | 2 +- .../datastructures/xslx}/ParsableEntry.java | 2 +- .../datastructures/xslx/ReaderSupport.java | 7 +- .../xbib/datastructures/xslx}/RichText.java | 2 +- .../xslx}/SerializableEntry.java | 2 +- .../xslx}/SharedStringText.java | 2 +- .../xbib/datastructures/xslx}/Sheet.java | 82 ++++---- .../xslx}/SheetCommentWriter.java | 4 +- .../xslx}/SimpleXLSXWorkbook.java | 190 +++++++----------- .../datastructures/xslx/WriterSupport.java | 16 +- .../xslx}/XLSReaderSupport.java | 15 +- .../xslx}/XLSWriterSupport.java | 24 +-- .../xslx}/XLSXReaderSupport.java | 26 ++- .../xslx}/XLSXWriterSupport.java | 24 +-- .../datastructures/xslx}/jxl/BooleanCell.java | 2 +- .../xslx}/jxl/BooleanFormulaCell.java | 2 +- .../xbib/datastructures/xslx}/jxl/Cell.java | 4 +- .../xslx}/jxl/CellFeatures.java | 4 +- .../xslx}/jxl/CellReferenceHelper.java | 43 ++-- .../datastructures/xslx}/jxl/CellType.java | 2 +- .../datastructures/xslx}/jxl/CellView.java | 4 +- .../datastructures/xslx}/jxl/DateCell.java | 2 +- .../xslx}/jxl/DateFormulaCell.java | 2 +- .../datastructures/xslx}/jxl/ErrorCell.java | 2 +- .../xslx}/jxl/ErrorFormulaCell.java | 2 +- .../datastructures/xslx}/jxl/FormulaCell.java | 4 +- .../xslx}/jxl/HeaderFooter.java | 14 +- .../datastructures/xslx}/jxl/Hyperlink.java | 2 +- .../xbib/datastructures/xslx}/jxl/Image.java | 4 +- .../xslx}/jxl/JXLException.java | 2 +- .../datastructures/xslx}/jxl/LabelCell.java | 2 +- .../datastructures/xslx}/jxl/NumberCell.java | 2 +- .../xslx}/jxl/NumberFormulaCell.java | 2 +- .../xbib/datastructures/xslx}/jxl/Range.java | 2 +- .../xbib/datastructures/xslx}/jxl/Sheet.java | 4 +- .../xslx}/jxl/SheetSettings.java | 12 +- .../xslx}/jxl/StringFormulaCell.java | 2 +- .../datastructures/xslx}/jxl/Workbook.java | 14 +- .../xslx}/jxl/WorkbookSettings.java | 8 +- .../xslx}/jxl/biff/AutoFilter.java | 4 +- .../xslx}/jxl/biff/AutoFilterInfoRecord.java | 6 +- .../xslx}/jxl/biff/AutoFilterRecord.java | 6 +- .../xslx}/jxl/biff/BaseCellFeatures.java | 16 +- .../xslx}/jxl/biff/BaseCompoundFile.java | 6 +- .../xslx}/jxl/biff/BuiltInFormat.java | 4 +- .../xslx}/jxl/biff/BuiltInName.java | 2 +- .../xslx}/jxl/biff/BuiltInStyle.java | 2 +- .../xslx}/jxl/biff/ByteArray.java | 2 +- .../xslx}/jxl/biff/ByteData.java | 2 +- .../xslx}/jxl/biff/CellFinder.java | 10 +- .../xslx}/jxl/biff/CellReferenceHelper.java | 6 +- .../xslx}/jxl/biff/ConditionalFormat.java | 4 +- .../biff/ConditionalFormatRangeRecord.java | 6 +- .../jxl/biff/ConditionalFormatRecord.java | 6 +- .../xslx}/jxl/biff/ContinueRecord.java | 4 +- .../xslx}/jxl/biff/CountryCode.java | 4 +- .../xslx}/jxl/biff/DVParser.java | 16 +- .../xslx}/jxl/biff/DValParser.java | 4 +- .../xslx}/jxl/biff/DataValidation.java | 12 +- .../jxl/biff/DataValidityListRecord.java | 6 +- .../jxl/biff/DataValiditySettingsRecord.java | 14 +- .../xslx}/jxl/biff/DisplayFormat.java | 2 +- .../xslx}/jxl/biff/DoubleHelper.java | 2 +- .../xslx}/jxl/biff/EmptyCell.java | 29 +-- .../xslx}/jxl/biff/EncodedURLHelper.java | 6 +- .../xslx}/jxl/biff/FilterModeRecord.java | 6 +- .../xslx}/jxl/biff/FontRecord.java | 18 +- .../datastructures/xslx}/jxl/biff/Fonts.java | 6 +- .../xslx}/jxl/biff/FormatRecord.java | 10 +- .../xslx}/jxl/biff/FormattingRecords.java | 12 +- .../xslx}/jxl/biff/FormulaData.java | 6 +- .../xslx}/jxl/biff/HeaderFooter.java | 4 +- .../xslx}/jxl/biff/IndexMapping.java | 4 +- .../xslx}/jxl/biff/IntegerHelper.java | 2 +- .../xslx}/jxl/biff/NameRangeException.java | 4 +- .../jxl/biff/NumFormatRecordsException.java | 2 +- .../xslx}/jxl/biff/PaletteRecord.java | 8 +- .../xslx}/jxl/biff/RangeImpl.java | 10 +- .../xslx}/jxl/biff/RecordData.java | 4 +- .../xslx}/jxl/biff/SheetRangeImpl.java | 8 +- .../xslx}/jxl/biff/StringHelper.java | 6 +- .../datastructures/xslx}/jxl/biff/Type.java | 2 +- .../xslx}/jxl/biff/WorkbookMethods.java | 4 +- .../jxl/biff/WorkspaceInformationRecord.java | 6 +- .../xslx}/jxl/biff/WritableRecordData.java | 6 +- .../xslx}/jxl/biff/XCTRecord.java | 4 +- .../xslx}/jxl/biff/XFRecord.java | 30 +-- .../jxl/biff/drawing/BStoreContainer.java | 4 +- .../jxl/biff/drawing/BlipStoreEntry.java | 8 +- .../xslx}/jxl/biff/drawing/BlipType.java | 2 +- .../xslx}/jxl/biff/drawing/Button.java | 16 +- .../xslx}/jxl/biff/drawing/Chart.java | 18 +- .../xslx}/jxl/biff/drawing/CheckBox.java | 12 +- .../xslx}/jxl/biff/drawing/Chunk.java | 2 +- .../xslx}/jxl/biff/drawing/ChunkType.java | 2 +- .../xslx}/jxl/biff/drawing/ClientAnchor.java | 6 +- .../xslx}/jxl/biff/drawing/ClientData.java | 4 +- .../xslx}/jxl/biff/drawing/ClientTextBox.java | 4 +- .../xslx}/jxl/biff/drawing/ComboBox.java | 10 +- .../xslx}/jxl/biff/drawing/Comment.java | 16 +- .../xslx}/jxl/biff/drawing/Dg.java | 4 +- .../xslx}/jxl/biff/drawing/DgContainer.java | 2 +- .../xslx}/jxl/biff/drawing/Dgg.java | 6 +- .../xslx}/jxl/biff/drawing/DggContainer.java | 2 +- .../xslx}/jxl/biff/drawing/Drawing.java | 18 +- .../xslx}/jxl/biff/drawing/Drawing2.java | 8 +- .../xslx}/jxl/biff/drawing/DrawingData.java | 6 +- .../biff/drawing/DrawingDataException.java | 2 +- .../xslx}/jxl/biff/drawing/DrawingGroup.java | 10 +- .../jxl/biff/drawing/DrawingGroupObject.java | 4 +- .../xslx}/jxl/biff/drawing/EscherAtom.java | 4 +- .../jxl/biff/drawing/EscherContainer.java | 4 +- .../xslx}/jxl/biff/drawing/EscherDisplay.java | 2 +- .../xslx}/jxl/biff/drawing/EscherRecord.java | 4 +- .../jxl/biff/drawing/EscherRecordData.java | 6 +- .../jxl/biff/drawing/EscherRecordType.java | 2 +- .../xslx}/jxl/biff/drawing/EscherStream.java | 2 +- .../biff/drawing/MsoDrawingGroupRecord.java | 8 +- .../jxl/biff/drawing/MsoDrawingRecord.java | 10 +- .../xslx}/jxl/biff/drawing/NoteRecord.java | 12 +- .../xslx}/jxl/biff/drawing/ObjRecord.java | 14 +- .../xslx}/jxl/biff/drawing/Opt.java | 8 +- .../xslx}/jxl/biff/drawing/Origin.java | 2 +- .../xslx}/jxl/biff/drawing/PNGReader.java | 2 +- .../xslx}/jxl/biff/drawing/ShapeType.java | 2 +- .../jxl/biff/drawing/SheetDrawingWriter.java | 10 +- .../xslx}/jxl/biff/drawing/Sp.java | 6 +- .../xslx}/jxl/biff/drawing/SpContainer.java | 2 +- .../xslx}/jxl/biff/drawing/Spgr.java | 2 +- .../xslx}/jxl/biff/drawing/SpgrContainer.java | 4 +- .../jxl/biff/drawing/SplitMenuColors.java | 2 +- .../jxl/biff/drawing/TextObjectRecord.java | 12 +- .../xslx}/jxl/biff/formula/Add.java | 2 +- .../xslx}/jxl/biff/formula/Area.java | 10 +- .../xslx}/jxl/biff/formula/Area3d.java | 10 +- .../jxl/biff/formula/ArgumentSeparator.java | 2 +- .../xslx}/jxl/biff/formula/Attribute.java | 8 +- .../jxl/biff/formula/BinaryOperator.java | 4 +- .../xslx}/jxl/biff/formula/BooleanValue.java | 2 +- .../jxl/biff/formula/BuiltInFunction.java | 10 +- .../xslx}/jxl/biff/formula/CellReference.java | 10 +- .../jxl/biff/formula/CellReference3d.java | 10 +- .../jxl/biff/formula/CellReferenceError.java | 4 +- .../jxl/biff/formula/CloseParentheses.java | 2 +- .../xslx}/jxl/biff/formula/ColumnRange.java | 8 +- .../xslx}/jxl/biff/formula/ColumnRange3d.java | 8 +- .../xslx}/jxl/biff/formula/Concatenate.java | 2 +- .../xslx}/jxl/biff/formula/Divide.java | 2 +- .../xslx}/jxl/biff/formula/DoubleValue.java | 6 +- .../xslx}/jxl/biff/formula/Equal.java | 2 +- .../xslx}/jxl/biff/formula/ErrorConstant.java | 2 +- .../xslx}/jxl/biff/formula/ExternalSheet.java | 4 +- .../jxl/biff/formula/FormulaErrorCode.java | 2 +- .../jxl/biff/formula/FormulaException.java | 4 +- .../xslx}/jxl/biff/formula/FormulaParser.java | 12 +- .../xslx}/jxl/biff/formula/Function.java | 6 +- .../xslx}/jxl/biff/formula/FunctionNames.java | 4 +- .../xslx}/jxl/biff/formula/GreaterEqual.java | 2 +- .../xslx}/jxl/biff/formula/GreaterThan.java | 2 +- .../xslx}/jxl/biff/formula/IntegerValue.java | 6 +- .../xslx}/jxl/biff/formula/LessEqual.java | 2 +- .../xslx}/jxl/biff/formula/LessThan.java | 2 +- .../xslx}/jxl/biff/formula/MemArea.java | 4 +- .../xslx}/jxl/biff/formula/MemFunc.java | 2 +- .../xslx}/jxl/biff/formula/Minus.java | 4 +- .../xslx}/jxl/biff/formula/MissingArg.java | 2 +- .../xslx}/jxl/biff/formula/Multiply.java | 2 +- .../xslx}/jxl/biff/formula/Name.java | 2 +- .../xslx}/jxl/biff/formula/NameRange.java | 12 +- .../xslx}/jxl/biff/formula/NotEqual.java | 2 +- .../xslx}/jxl/biff/formula/NumberValue.java | 2 +- .../jxl/biff/formula/OpenParentheses.java | 2 +- .../xslx}/jxl/biff/formula/Operand.java | 2 +- .../xslx}/jxl/biff/formula/Operator.java | 2 +- .../xslx}/jxl/biff/formula/Parenthesis.java | 2 +- .../xslx}/jxl/biff/formula/ParseContext.java | 2 +- .../xslx}/jxl/biff/formula/ParseItem.java | 4 +- .../xslx}/jxl/biff/formula/ParsedThing.java | 2 +- .../xslx}/jxl/biff/formula/Parser.java | 2 +- .../xslx}/jxl/biff/formula/Percent.java | 2 +- .../xslx}/jxl/biff/formula/Plus.java | 2 +- .../xslx}/jxl/biff/formula/Power.java | 2 +- .../jxl/biff/formula/RangeSeparator.java | 4 +- .../jxl/biff/formula/SharedFormulaArea.java | 8 +- .../formula/SharedFormulaCellReference.java | 10 +- .../jxl/biff/formula/StringFormulaParser.java | 8 +- .../jxl/biff/formula/StringFunction.java | 6 +- .../jxl/biff/formula/StringOperator.java | 4 +- .../jxl/biff/formula/StringParseItem.java | 2 +- .../xslx}/jxl/biff/formula/StringValue.java | 8 +- .../xslx}/jxl/biff/formula/SubExpression.java | 4 +- .../xslx}/jxl/biff/formula/Subtract.java | 2 +- .../xslx}/jxl/biff/formula/Token.java | 2 +- .../jxl/biff/formula/TokenFormulaParser.java | 12 +- .../xslx}/jxl/biff/formula/UnaryMinus.java | 2 +- .../xslx}/jxl/biff/formula/UnaryOperator.java | 2 +- .../xslx}/jxl/biff/formula/UnaryPlus.java | 2 +- .../xslx}/jxl/biff/formula/Union.java | 2 +- .../jxl/biff/formula/VariableArgFunction.java | 8 +- .../xslx}/jxl/biff/formula/Yylex.java | 4 +- .../xslx}/jxl/common/Assert.java | 2 +- .../xslx}/jxl/common/AssertionFailed.java | 2 +- .../xslx}/jxl/common/BaseUnit.java | 2 +- .../xslx}/jxl/common/LengthConverter.java | 2 +- .../xslx}/jxl/common/LengthUnit.java | 2 +- .../xslx}/jxl/common/Logger.java | 17 +- .../xslx}/jxl/common/log/LoggerName.java | 2 +- .../xslx}/jxl/common/log/SimpleLogger.java | 4 +- .../jxl/common/log/SimpleLoggerName.java | 2 +- .../xslx}/jxl/format/Alignment.java | 2 +- .../xslx}/jxl/format/BoldStyle.java | 2 +- .../xslx}/jxl/format/Border.java | 2 +- .../xslx}/jxl/format/BorderLineStyle.java | 2 +- .../xslx}/jxl/format/CellFormat.java | 2 +- .../xslx}/jxl/format/Colour.java | 2 +- .../datastructures/xslx}/jxl/format/Font.java | 2 +- .../xslx}/jxl/format/Format.java | 2 +- .../xslx}/jxl/format/Orientation.java | 2 +- .../xslx}/jxl/format/PageOrder.java | 2 +- .../xslx}/jxl/format/PageOrientation.java | 2 +- .../xslx}/jxl/format/PaperSize.java | 2 +- .../xslx}/jxl/format/Pattern.java | 2 +- .../datastructures/xslx}/jxl/format/RGB.java | 2 +- .../xslx}/jxl/format/ScriptStyle.java | 2 +- .../xslx}/jxl/format/UnderlineStyle.java | 2 +- .../xslx}/jxl/format/VerticalAlignment.java | 2 +- .../xslx}/jxl/read/biff/BOFRecord.java | 8 +- .../read/biff/BaseSharedFormulaRecord.java | 14 +- .../xslx}/jxl/read/biff/BiffException.java | 4 +- .../xslx}/jxl/read/biff/BiffRecordReader.java | 2 +- .../xslx}/jxl/read/biff/BlankCell.java | 6 +- .../jxl/read/biff/BooleanFormulaRecord.java | 22 +- .../xslx}/jxl/read/biff/BooleanRecord.java | 10 +- .../jxl/read/biff/BottomMarginRecord.java | 4 +- .../xslx}/jxl/read/biff/BoundsheetRecord.java | 10 +- .../read/biff/ButtonPropertySetRecord.java | 6 +- .../xslx}/jxl/read/biff/CalcModeRecord.java | 8 +- .../jxl/read/biff/CellFeaturesAccessor.java | 4 +- .../xslx}/jxl/read/biff/CellValue.java | 18 +- .../xslx}/jxl/read/biff/CentreRecord.java | 6 +- .../xslx}/jxl/read/biff/CodepageRecord.java | 8 +- .../xslx}/jxl/read/biff/ColumnInfoRecord.java | 8 +- .../xslx}/jxl/read/biff/CompoundFile.java | 10 +- .../xslx}/jxl/read/biff/CountryRecord.java | 8 +- .../jxl/read/biff/DateFormulaRecord.java | 20 +- .../xslx}/jxl/read/biff/DateRecord.java | 18 +- .../read/biff/DefaultColumnWidthRecord.java | 6 +- .../jxl/read/biff/DefaultRowHeightRecord.java | 6 +- .../xslx}/jxl/read/biff/DimensionRecord.java | 8 +- .../jxl/read/biff/ErrorFormulaRecord.java | 24 +-- .../xslx}/jxl/read/biff/ErrorRecord.java | 8 +- .../xslx}/jxl/read/biff/Excel9FileRecord.java | 6 +- .../jxl/read/biff/ExternalNameRecord.java | 12 +- .../jxl/read/biff/ExternalSheetRecord.java | 10 +- .../xslx}/jxl/read/biff/File.java | 12 +- .../xslx}/jxl/read/biff/FooterRecord.java | 10 +- .../xslx}/jxl/read/biff/Formula.java | 4 +- .../xslx}/jxl/read/biff/FormulaRecord.java | 20 +- .../xslx}/jxl/read/biff/GuttersRecord.java | 6 +- .../xslx}/jxl/read/biff/HeaderRecord.java | 12 +- .../xslx}/jxl/read/biff/HideobjRecord.java | 8 +- .../read/biff/HorizontalPageBreaksRecord.java | 8 +- .../xslx}/jxl/read/biff/HyperlinkRecord.java | 22 +- .../xslx}/jxl/read/biff/LabelRecord.java | 14 +- .../xslx}/jxl/read/biff/LabelSSTRecord.java | 10 +- .../xslx}/jxl/read/biff/LeftMarginRecord.java | 4 +- .../xslx}/jxl/read/biff/MarginRecord.java | 8 +- .../jxl/read/biff/MergedCellsRecord.java | 12 +- .../xslx}/jxl/read/biff/MulBlankCell.java | 14 +- .../xslx}/jxl/read/biff/MulBlankRecord.java | 8 +- .../xslx}/jxl/read/biff/MulRKRecord.java | 8 +- .../xslx}/jxl/read/biff/NameRecord.java | 16 +- .../jxl/read/biff/NineteenFourRecord.java | 4 +- .../jxl/read/biff/NumberFormulaRecord.java | 24 +-- .../xslx}/jxl/read/biff/NumberRecord.java | 12 +- .../xslx}/jxl/read/biff/NumberValue.java | 12 +- .../xslx}/jxl/read/biff/PLSRecord.java | 4 +- .../xslx}/jxl/read/biff/PaletteRecord.java | 4 +- .../xslx}/jxl/read/biff/PaneRecord.java | 8 +- .../jxl/read/biff/PasswordException.java | 2 +- .../xslx}/jxl/read/biff/PasswordRecord.java | 8 +- .../jxl/read/biff/PrintGridLinesRecord.java | 4 +- .../jxl/read/biff/PrintHeadersRecord.java | 4 +- .../xslx}/jxl/read/biff/ProtectRecord.java | 6 +- .../xslx}/jxl/read/biff/RKHelper.java | 2 +- .../xslx}/jxl/read/biff/RKRecord.java | 12 +- .../xslx}/jxl/read/biff/RStringRecord.java | 14 +- .../xslx}/jxl/read/biff/Record.java | 8 +- .../xslx}/jxl/read/biff/RefreshAllRecord.java | 8 +- .../jxl/read/biff/RightMarginRecord.java | 4 +- .../xslx}/jxl/read/biff/RowRecord.java | 8 +- .../xslx}/jxl/read/biff/SCLRecord.java | 8 +- .../xslx}/jxl/read/biff/SSTRecord.java | 12 +- .../xslx}/jxl/read/biff/SaveRecalcRecord.java | 8 +- .../xslx}/jxl/read/biff/SetupRecord.java | 12 +- .../read/biff/SharedBooleanFormulaRecord.java | 24 +-- .../read/biff/SharedDateFormulaRecord.java | 20 +- .../read/biff/SharedErrorFormulaRecord.java | 26 +-- .../jxl/read/biff/SharedFormulaRecord.java | 16 +- .../read/biff/SharedNumberFormulaRecord.java | 26 +-- .../read/biff/SharedStringFormulaRecord.java | 32 +-- .../xslx}/jxl/read/biff/SheetImpl.java | 52 ++--- .../xslx}/jxl/read/biff/SheetReader.java | 86 ++++---- .../xslx}/jxl/read/biff/SortRecord.java | 8 +- .../jxl/read/biff/StringFormulaRecord.java | 32 +-- .../xslx}/jxl/read/biff/SupbookRecord.java | 12 +- .../xslx}/jxl/read/biff/TemplateRecord.java | 6 +- .../xslx}/jxl/read/biff/TopMarginRecord.java | 4 +- .../read/biff/VerticalPageBreaksRecord.java | 8 +- .../xslx}/jxl/read/biff/Window2Record.java | 8 +- .../jxl/read/biff/WindowProtectedRecord.java | 8 +- .../xslx}/jxl/read/biff/WorkbookParser.java | 58 +++--- .../jxl/read/biff/WriteAccessRecord.java | 10 +- .../xslx}/jxl/write/Alignment.java | 4 +- .../datastructures/xslx}/jxl/write/Blank.java | 8 +- .../xslx}/jxl/write/BoldStyle.java | 4 +- .../xslx}/jxl/write/Boolean.java | 8 +- .../xslx}/jxl/write/Border.java | 4 +- .../xslx}/jxl/write/BorderLineStyle.java | 4 +- .../xslx}/jxl/write/Colour.java | 4 +- .../xslx}/jxl/write/DateFormat.java | 6 +- .../xslx}/jxl/write/DateFormats.java | 4 +- .../xslx}/jxl/write/DateTime.java | 8 +- .../datastructures/xslx}/jxl/write/Font.java | 8 +- .../xslx}/jxl/write/Formula.java | 6 +- .../datastructures/xslx}/jxl/write/Label.java | 8 +- .../xslx}/jxl/write/Number.java | 8 +- .../xslx}/jxl/write/NumberFormat.java | 6 +- .../xslx}/jxl/write/NumberFormats.java | 6 +- .../xslx}/jxl/write/Pattern.java | 4 +- .../xslx}/jxl/write/VerticalAlignment.java | 4 +- .../xslx}/jxl/write/WritableCell.java | 6 +- .../xslx}/jxl/write/WritableCellFeatures.java | 6 +- .../xslx}/jxl/write/WritableCellFormat.java | 32 +-- .../xslx}/jxl/write/WritableFont.java | 26 +-- .../xslx}/jxl/write/WritableHyperlink.java | 6 +- .../xslx}/jxl/write/WritableImage.java | 8 +- .../xslx}/jxl/write/WritableSheet.java | 16 +- .../xslx}/jxl/write/WritableWorkbook.java | 12 +- .../xslx}/jxl/write/WriteException.java | 4 +- .../xslx}/jxl/write/biff/ArbitraryRecord.java | 8 +- .../xslx}/jxl/write/biff/BOFRecord.java | 6 +- .../xslx}/jxl/write/biff/BackupRecord.java | 8 +- .../xslx}/jxl/write/biff/BlankRecord.java | 12 +- .../xslx}/jxl/write/biff/BookboolRecord.java | 8 +- .../xslx}/jxl/write/biff/BooleanRecord.java | 10 +- .../jxl/write/biff/BottomMarginRecord.java | 4 +- .../jxl/write/biff/BoundsheetRecord.java | 8 +- .../write/biff/ButtonPropertySetRecord.java | 8 +- .../xslx}/jxl/write/biff/CalcCountRecord.java | 8 +- .../xslx}/jxl/write/biff/CalcModeRecord.java | 8 +- .../xslx}/jxl/write/biff/CellValue.java | 43 ++-- .../xslx}/jxl/write/biff/CellXFRecord.java | 26 +-- .../xslx}/jxl/write/biff/CodepageRecord.java | 6 +- .../jxl/write/biff/ColumnInfoRecord.java | 18 +- .../write/biff/ColumnsExceededException.java | 2 +- .../xslx}/jxl/write/biff/CompoundFile.java | 16 +- .../xslx}/jxl/write/biff/CompoundFile.java3 | 0 .../xslx}/jxl/write/biff/CompoundFile.java4 | 0 .../CopyAdditionalPropertySetsException.java | 2 +- .../xslx}/jxl/write/biff/CountryRecord.java | 12 +- .../xslx}/jxl/write/biff/DBCellRecord.java | 8 +- .../xslx}/jxl/write/biff/DSFRecord.java | 6 +- .../jxl/write/biff/DateFormatRecord.java | 4 +- .../xslx}/jxl/write/biff/DateRecord.java | 18 +- .../jxl/write/biff/DefaultColumnWidth.java | 8 +- .../write/biff/DefaultRowHeightRecord.java | 8 +- .../xslx}/jxl/write/biff/DeltaRecord.java | 8 +- .../xslx}/jxl/write/biff/DimensionRecord.java | 8 +- .../xslx}/jxl/write/biff/EOFRecord.java | 6 +- .../jxl/write/biff/Excel9FileRecord.java | 6 +- .../xslx}/jxl/write/biff/ExcelDataOutput.java | 2 +- .../jxl/write/biff/ExtendedSSTRecord.java | 8 +- .../jxl/write/biff/ExternalNameRecord.java | 10 +- .../jxl/write/biff/ExternalSheetRecord.java | 10 +- .../xslx}/jxl/write/biff/File.java | 12 +- .../xslx}/jxl/write/biff/FileDataOutput.java | 4 +- .../xslx}/jxl/write/biff/FooterRecord.java | 10 +- .../xslx}/jxl/write/biff/FormulaRecord.java | 34 ++-- .../write/biff/FunctionGroupCountRecord.java | 8 +- .../xslx}/jxl/write/biff/GridSetRecord.java | 6 +- .../xslx}/jxl/write/biff/GuttersRecord.java | 8 +- .../xslx}/jxl/write/biff/HeaderRecord.java | 10 +- .../xslx}/jxl/write/biff/HideobjRecord.java | 8 +- .../write/biff/HorizontalCentreRecord.java | 6 +- .../biff/HorizontalPageBreaksRecord.java | 8 +- .../xslx}/jxl/write/biff/HyperlinkRecord.java | 34 ++-- .../xslx}/jxl/write/biff/IndexRecord.java | 8 +- .../jxl/write/biff/InterfaceEndRecord.java | 6 +- .../jxl/write/biff/InterfaceHeaderRecord.java | 6 +- .../xslx}/jxl/write/biff/IterationRecord.java | 6 +- .../jxl/write/biff/JxlWriteException.java | 4 +- .../xslx}/jxl/write/biff/LabelRecord.java | 18 +- .../jxl/write/biff/LeftMarginRecord.java | 4 +- .../xslx}/jxl/write/biff/MMSRecord.java | 6 +- .../xslx}/jxl/write/biff/MarginRecord.java | 8 +- .../jxl/write/biff/MemoryDataOutput.java | 4 +- .../xslx}/jxl/write/biff/MergedCells.java | 22 +- .../jxl/write/biff/MergedCellsRecord.java | 12 +- .../xslx}/jxl/write/biff/MulRKRecord.java | 10 +- .../xslx}/jxl/write/biff/NameRecord.java | 20 +- .../jxl/write/biff/NineteenFourRecord.java | 8 +- .../jxl/write/biff/NumberFormatRecord.java | 6 +- .../xslx}/jxl/write/biff/NumberRecord.java | 14 +- .../xslx}/jxl/write/biff/ObjProjRecord.java | 6 +- .../jxl/write/biff/ObjectProtectRecord.java | 8 +- .../xslx}/jxl/write/biff/PLSRecord.java | 8 +- .../xslx}/jxl/write/biff/PaletteRecord.java | 8 +- .../xslx}/jxl/write/biff/PaneRecord.java | 8 +- .../xslx}/jxl/write/biff/PasswordRecord.java | 8 +- .../xslx}/jxl/write/biff/PrecisionRecord.java | 8 +- .../jxl/write/biff/PrintGridLinesRecord.java | 6 +- .../jxl/write/biff/PrintHeadersRecord.java | 6 +- .../jxl/write/biff/Prot4RevPassRecord.java | 6 +- .../xslx}/jxl/write/biff/Prot4RevRecord.java | 8 +- .../xslx}/jxl/write/biff/ProtectRecord.java | 8 +- .../write/biff/ReadBooleanFormulaRecord.java | 6 +- .../jxl/write/biff/ReadDateFormulaRecord.java | 6 +- .../write/biff/ReadErrorFormulaRecord.java | 16 +- .../jxl/write/biff/ReadFormulaRecord.java | 34 ++-- .../write/biff/ReadNumberFormulaRecord.java | 16 +- .../write/biff/ReadStringFormulaRecord.java | 16 +- .../xslx}/jxl/write/biff/RefModeRecord.java | 6 +- .../jxl/write/biff/RefreshAllRecord.java | 8 +- .../jxl/write/biff/RightMarginRecord.java | 4 +- .../xslx}/jxl/write/biff/RowRecord.java | 26 +-- .../jxl/write/biff/RowsExceededException.java | 2 +- .../xslx}/jxl/write/biff/SCLRecord.java | 8 +- .../jxl/write/biff/SSTContinueRecord.java | 10 +- .../xslx}/jxl/write/biff/SSTRecord.java | 10 +- .../jxl/write/biff/SaveRecalcRecord.java | 6 +- .../jxl/write/biff/ScenarioProtectRecord.java | 8 +- .../xslx}/jxl/write/biff/SelectionRecord.java | 8 +- .../xslx}/jxl/write/biff/SetupRecord.java | 20 +- .../xslx}/jxl/write/biff/SharedStrings.java | 2 +- .../xslx}/jxl/write/biff/SheetCopier.java | 152 +++++++------- .../xslx}/jxl/write/biff/SheetWriter.java | 48 ++--- .../xslx}/jxl/write/biff/SortRecord.java | 8 +- .../xslx}/jxl/write/biff/StringRecord.java | 10 +- .../xslx}/jxl/write/biff/StyleXFRecord.java | 8 +- .../xslx}/jxl/write/biff/Styles.java | 18 +- .../xslx}/jxl/write/biff/SupbookRecord.java | 28 +-- .../xslx}/jxl/write/biff/TabIdRecord.java | 8 +- .../xslx}/jxl/write/biff/TemplateRecord.java | 6 +- .../xslx}/jxl/write/biff/TopMarginRecord.java | 4 +- .../xslx}/jxl/write/biff/UsesElfsRecord.java | 6 +- .../jxl/write/biff/VerticalCentreRecord.java | 6 +- .../write/biff/VerticalPageBreaksRecord.java | 8 +- .../xslx}/jxl/write/biff/Weird1Record.java | 6 +- .../xslx}/jxl/write/biff/Window1Record.java | 8 +- .../xslx}/jxl/write/biff/Window2Record.java | 10 +- .../jxl/write/biff/WindowProtectRecord.java | 8 +- .../jxl/write/biff/WritableFontRecord.java | 8 +- .../xslx}/jxl/write/biff/WritableFonts.java | 6 +- .../write/biff/WritableFormattingRecords.java | 14 +- .../jxl/write/biff/WritableSheetCopier.java | 73 +++---- .../jxl/write/biff/WritableSheetImpl.java | 92 ++++----- .../jxl/write/biff/WritableWorkbookImpl.java | 70 +++---- .../jxl/write/biff/WriteAccessRecord.java | 10 +- .../datastructures/xslx/SimpleWriterTest.java | 28 +++ .../xbib/datastructures/xslx/TestSJXLSX.java | 19 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 +- settings.gradle | 2 +- 476 files changed, 2227 insertions(+), 2317 deletions(-) delete mode 100755 datastructures-xslx/src/main/java/jxl/CellFormat.java create mode 100644 datastructures-xslx/src/main/java/module-info.java rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/Cell.java (96%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/support => org/xbib/datastructures/xslx}/CellFormat.java (95%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/CellStyle.java (97%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/Fill.java (97%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/Font.java (97%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/FontRegion.java (93%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/IndexedObject.java (78%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/ParsableEntry.java (74%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/RichText.java (98%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/SerializableEntry.java (83%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/SharedStringText.java (95%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/Sheet.java (90%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/SheetCommentWriter.java (98%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/xlsx => org/xbib/datastructures/xslx}/SimpleXLSXWorkbook.java (89%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/support => org/xbib/datastructures/xslx}/XLSReaderSupport.java (90%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/support => org/xbib/datastructures/xslx}/XLSWriterSupport.java (83%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/support => org/xbib/datastructures/xslx}/XLSXReaderSupport.java (79%) rename datastructures-xslx/src/main/java/{com/incesoft/tools/excel/support => org/xbib/datastructures/xslx}/XLSXWriterSupport.java (70%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/BooleanCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/BooleanFormulaCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/Cell.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/CellFeatures.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/CellReferenceHelper.java (78%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/CellType.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/CellView.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/DateCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/DateFormulaCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/ErrorCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/ErrorFormulaCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/FormulaCell.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/HeaderFooter.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/Hyperlink.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/Image.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/JXLException.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/LabelCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/NumberCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/NumberFormulaCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/Range.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/Sheet.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/SheetSettings.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/StringFormulaCell.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/Workbook.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/WorkbookSettings.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/AutoFilter.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/AutoFilterInfoRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/AutoFilterRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/BaseCellFeatures.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/BaseCompoundFile.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/BuiltInFormat.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/BuiltInName.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/BuiltInStyle.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/ByteArray.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/ByteData.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/CellFinder.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/CellReferenceHelper.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/ConditionalFormat.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/ConditionalFormatRangeRecord.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/ConditionalFormatRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/ContinueRecord.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/CountryCode.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/DVParser.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/DValParser.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/DataValidation.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/DataValidityListRecord.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/DataValiditySettingsRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/DisplayFormat.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/DoubleHelper.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/EmptyCell.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/EncodedURLHelper.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/FilterModeRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/FontRecord.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/Fonts.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/FormatRecord.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/FormattingRecords.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/FormulaData.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/HeaderFooter.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/IndexMapping.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/IntegerHelper.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/NameRangeException.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/NumFormatRecordsException.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/PaletteRecord.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/RangeImpl.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/RecordData.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/SheetRangeImpl.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/StringHelper.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/Type.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/WorkbookMethods.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/WorkspaceInformationRecord.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/WritableRecordData.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/XCTRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/XFRecord.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/BStoreContainer.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/BlipStoreEntry.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/BlipType.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Button.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Chart.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/CheckBox.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Chunk.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/ChunkType.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/ClientAnchor.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/ClientData.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/ClientTextBox.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/ComboBox.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Comment.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Dg.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/DgContainer.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Dgg.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/DggContainer.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Drawing.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Drawing2.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/DrawingData.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/DrawingDataException.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/DrawingGroup.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/DrawingGroupObject.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/EscherAtom.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/EscherContainer.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/EscherDisplay.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/EscherRecord.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/EscherRecordData.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/EscherRecordType.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/EscherStream.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/MsoDrawingGroupRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/MsoDrawingRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/NoteRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/ObjRecord.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Opt.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Origin.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/PNGReader.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/ShapeType.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/SheetDrawingWriter.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Sp.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/SpContainer.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/Spgr.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/SpgrContainer.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/SplitMenuColors.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/drawing/TextObjectRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Add.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Area.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Area3d.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/ArgumentSeparator.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Attribute.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/BinaryOperator.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/BooleanValue.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/BuiltInFunction.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/CellReference.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/CellReference3d.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/CellReferenceError.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/CloseParentheses.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/ColumnRange.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/ColumnRange3d.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Concatenate.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Divide.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/DoubleValue.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Equal.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/ErrorConstant.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/ExternalSheet.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/FormulaErrorCode.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/FormulaException.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/FormulaParser.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Function.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/FunctionNames.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/GreaterEqual.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/GreaterThan.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/IntegerValue.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/LessEqual.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/LessThan.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/MemArea.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/MemFunc.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Minus.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/MissingArg.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Multiply.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Name.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/NameRange.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/NotEqual.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/NumberValue.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/OpenParentheses.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Operand.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Operator.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Parenthesis.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/ParseContext.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/ParseItem.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/ParsedThing.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Parser.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Percent.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Plus.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Power.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/RangeSeparator.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/SharedFormulaArea.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/SharedFormulaCellReference.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/StringFormulaParser.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/StringFunction.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/StringOperator.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/StringParseItem.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/StringValue.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/SubExpression.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Subtract.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Token.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/TokenFormulaParser.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/UnaryMinus.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/UnaryOperator.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/UnaryPlus.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Union.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/VariableArgFunction.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/biff/formula/Yylex.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/common/Assert.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/common/AssertionFailed.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/common/BaseUnit.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/common/LengthConverter.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/common/LengthUnit.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/common/Logger.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/common/log/LoggerName.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/common/log/SimpleLogger.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/common/log/SimpleLoggerName.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/Alignment.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/BoldStyle.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/Border.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/BorderLineStyle.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/CellFormat.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/Colour.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/Font.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/Format.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/Orientation.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/PageOrder.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/PageOrientation.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/PaperSize.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/Pattern.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/RGB.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/ScriptStyle.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/UnderlineStyle.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/format/VerticalAlignment.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/BOFRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/BaseSharedFormulaRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/BiffException.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/BiffRecordReader.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/BlankCell.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/BooleanFormulaRecord.java (86%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/BooleanRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/BottomMarginRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/BoundsheetRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/ButtonPropertySetRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/CalcModeRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/CellFeaturesAccessor.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/CellValue.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/CentreRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/CodepageRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/ColumnInfoRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/CompoundFile.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/CountryRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/DateFormulaRecord.java (86%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/DateRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/DefaultColumnWidthRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/DefaultRowHeightRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/DimensionRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/ErrorFormulaRecord.java (85%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/ErrorRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/Excel9FileRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/ExternalNameRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/ExternalSheetRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/File.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/FooterRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/Formula.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/FormulaRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/GuttersRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/HeaderRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/HideobjRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/HorizontalPageBreaksRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/HyperlinkRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/LabelRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/LabelSSTRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/LeftMarginRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/MarginRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/MergedCellsRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/MulBlankCell.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/MulBlankRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/MulRKRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/NameRecord.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/NineteenFourRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/NumberFormulaRecord.java (86%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/NumberRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/NumberValue.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/PLSRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/PaletteRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/PaneRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/PasswordException.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/PasswordRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/PrintGridLinesRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/PrintHeadersRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/ProtectRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/RKHelper.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/RKRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/RStringRecord.java (85%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/Record.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/RefreshAllRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/RightMarginRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/RowRecord.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SCLRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SSTRecord.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SaveRecalcRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SetupRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SharedBooleanFormulaRecord.java (86%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SharedDateFormulaRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SharedErrorFormulaRecord.java (86%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SharedFormulaRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SharedNumberFormulaRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SharedStringFormulaRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SheetImpl.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SheetReader.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SortRecord.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/StringFormulaRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/SupbookRecord.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/TemplateRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/TopMarginRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/VerticalPageBreaksRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/Window2Record.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/WindowProtectedRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/WorkbookParser.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/read/biff/WriteAccessRecord.java (86%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Alignment.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Blank.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/BoldStyle.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Boolean.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Border.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/BorderLineStyle.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Colour.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/DateFormat.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/DateFormats.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/DateTime.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Font.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Formula.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Label.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Number.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/NumberFormat.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/NumberFormats.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/Pattern.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/VerticalAlignment.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/WritableCell.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/WritableCellFeatures.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/WritableCellFormat.java (82%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/WritableFont.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/WritableHyperlink.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/WritableImage.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/WritableSheet.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/WritableWorkbook.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/WriteException.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ArbitraryRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/BOFRecord.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/BackupRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/BlankRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/BookboolRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/BooleanRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/BottomMarginRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/BoundsheetRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ButtonPropertySetRecord.java (85%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CalcCountRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CalcModeRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CellValue.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CellXFRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CodepageRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ColumnInfoRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ColumnsExceededException.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CompoundFile.java (98%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CompoundFile.java3 (100%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CompoundFile.java4 (100%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CopyAdditionalPropertySetsException.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/CountryRecord.java (83%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/DBCellRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/DSFRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/DateFormatRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/DateRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/DefaultColumnWidth.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/DefaultRowHeightRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/DeltaRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/DimensionRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/EOFRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/Excel9FileRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ExcelDataOutput.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ExtendedSSTRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ExternalNameRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ExternalSheetRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/File.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/FileDataOutput.java (97%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/FooterRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/FormulaRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/FunctionGroupCountRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/GridSetRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/GuttersRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/HeaderRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/HideobjRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/HorizontalCentreRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/HorizontalPageBreaksRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/HyperlinkRecord.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/IndexRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/InterfaceEndRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/InterfaceHeaderRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/IterationRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/JxlWriteException.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/LabelRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/LeftMarginRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/MMSRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/MarginRecord.java (86%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/MemoryDataOutput.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/MergedCells.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/MergedCellsRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/MulRKRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/NameRecord.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/NineteenFourRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/NumberFormatRecord.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/NumberRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ObjProjRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ObjectProtectRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/PLSRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/PaletteRecord.java (84%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/PaneRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/PasswordRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/PrecisionRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/PrintGridLinesRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/PrintHeadersRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/Prot4RevPassRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/Prot4RevRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ProtectRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ReadBooleanFormulaRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ReadDateFormulaRecord.java (92%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ReadErrorFormulaRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ReadFormulaRecord.java (93%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ReadNumberFormulaRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ReadStringFormulaRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/RefModeRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/RefreshAllRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/RightMarginRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/RowRecord.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/RowsExceededException.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SCLRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SSTContinueRecord.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SSTRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SaveRecalcRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/ScenarioProtectRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SelectionRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SetupRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SharedStrings.java (99%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SheetCopier.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SheetWriter.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SortRecord.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/StringRecord.java (85%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/StyleXFRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/Styles.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/SupbookRecord.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/TabIdRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/TemplateRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/TopMarginRecord.java (91%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/UsesElfsRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/VerticalCentreRecord.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/VerticalPageBreaksRecord.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/Weird1Record.java (89%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/Window1Record.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/Window2Record.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/WindowProtectRecord.java (87%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/WritableFontRecord.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/WritableFonts.java (90%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/WritableFormattingRecords.java (94%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/WritableSheetCopier.java (88%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/WritableSheetImpl.java (96%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/WritableWorkbookImpl.java (95%) rename datastructures-xslx/src/main/java/{ => org/xbib/datastructures/xslx}/jxl/write/biff/WriteAccessRecord.java (88%) create mode 100644 datastructures-xslx/src/test/java/org/xbib/datastructures/xslx/SimpleWriterTest.java 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 d64cd4917707c1f8861d8cb53dd15194d4248596..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644 GIT binary patch delta 34118 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 delta 34176 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 SGW6ptSs!X7{rG*o_g?|vpSEZK 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')