Skip to content

Update Apache POI and ensure specs all pass with JRuby #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
autotelik wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Apache POI and ensure specs all pass with JRuby #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/applications/hssf_row_extensions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
if DataShift::Guards.jruby?

# Extend the Poi classes with some syntactic sugar

java_import 'org.apache.poi.ss.util.CellReference'

module Java

module OrgApachePoiHssfUsermodel
Expand Down
15 changes: 4 additions & 11 deletions lib/applications/apache_poi_extensions.rb → lib/applications/hssf_sheet_extensions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
# Copyright:: Autotelik Media Ltd
# Copyright:: Autotelik Media Ltd 2016
# Author :: Tom Statter
# Date :: July 2010
# Date :: April 2016
# License::
#
#
if DataShift::Guards.jruby?

require 'java'
require 'poi-3.7-20101029.jar'

# Extend the Poi classes with some syntactic sugar

java_import 'org.apache.poi.ss.util.CellReference'

module Java

module OrgApachePoiHssfUsermodel

class HSSFSheet
def name
getSheetName
Expand All @@ -26,6 +18,7 @@ def num_rows
end

end

end
end
end
31 changes: 16 additions & 15 deletions lib/applications/jexcel_file.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# Copyright:: Autotelik Media Ltd
# Author :: Tom Statter
# Date :: July 2010
# Date :: April 2016
# License::
#
# A wrapper around creating and directly manipulating Excel files.
#
# i.e Create and populate XSL files
# A wrapper around Apache POI - creating and directly manipulating Excel files.
#
# jar added to class path in manifest - 'poi-3.5-beta4-20081128.jar'
#
Expand All @@ -15,6 +13,19 @@
require 'poi-3.7-20101029.jar'

require_relative 'ruby_poi_translations'
require_relative 'hssf_row_extensions'
require_relative 'hssf_sheet_extensions'

java_import 'org.apache.poi.hssf.util.HSSFColor'
java_import 'org.apache.poi.poifs.filesystem.POIFSFileSystem'

java_import 'org.apache.poi.hssf.usermodel.HSSFCell'
java_import 'org.apache.poi.hssf.usermodel.HSSFWorkbook'
java_import 'org.apache.poi.hssf.usermodel.HSSFCellStyle'
java_import 'org.apache.poi.hssf.usermodel.HSSFDataFormat'
java_import 'org.apache.poi.hssf.usermodel.HSSFClientAnchor'
java_import 'org.apache.poi.hssf.usermodel.HSSFRichTextString'
java_import 'org.apache.poi.ss.util.CellReference'

class JExcelFile

Expand All @@ -23,16 +34,6 @@ class JExcelFile

include Enumerable

java_import 'org.apache.poi.hssf.util.HSSFColor'
java_import 'org.apache.poi.poifs.filesystem.POIFSFileSystem'

java_import 'org.apache.poi.hssf.usermodel.HSSFCell'
java_import 'org.apache.poi.hssf.usermodel.HSSFWorkbook'
java_import 'org.apache.poi.hssf.usermodel.HSSFCellStyle'
java_import 'org.apache.poi.hssf.usermodel.HSSFDataFormat'
java_import 'org.apache.poi.hssf.usermodel.HSSFClientAnchor'
java_import 'org.apache.poi.hssf.usermodel.HSSFRichTextString'

attr_accessor :workbook, :row, :date_style
attr_reader :sheet, :current_sheet_index

Expand Down Expand Up @@ -227,6 +228,6 @@ def create_sheet_and_set_styles( sheet_name )
end

require 'jexcel_file_extensions'
require 'apache_poi_extensions'
require 'hssf_sheet_extensions'

end