updated to 2.2.3

protegeproject · Oct 19, 2023 · 2c2e44a · 2c2e44a
1 parent 80661db
commit 2c2e44a
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
    <groupId>edu.stanford.protege</groupId>
    <artifactId>cellfie</artifactId>
-   <version>2.2.2</version>
+   <version>2.2.3</version>
    <packaging>bundle</packaging>
 
    <name>Cellfie Protege 5.5+ Plugin</name>
@@ -43,8 +43,52 @@
       <dependency>
          <groupId>edu.stanford.protege</groupId>
          <artifactId>mapping-master</artifactId>
-         <version>2.1.1</version>
+         <version>2.2.3</version>
       </dependency>
+
+ <dependency>
+         <groupId>org.apache.poi</groupId>
+         <artifactId>poi</artifactId>
+         <version>5.2.4</version>
+      </dependency>
+
+      <dependency>
+         <groupId>org.apache.poi</groupId>
+         <artifactId>poi-ooxml</artifactId>
+         <version>5.2.4</version>
+      </dependency>
+
+<dependency>
+    <groupId>org.apache.poi</groupId>
+    <artifactId>poi-ooxml-lite</artifactId>
+         <version>5.2.4</version>
+</dependency>
+
+
+<dependency>
+    <groupId>org.apache.logging.log4j</groupId>
+    <artifactId>log4j-api</artifactId>
+    <version>2.20.0</version>
+</dependency>
+
+<dependency>
+    <groupId>org.apache.logging.log4j</groupId>
+    <artifactId>log4j-core</artifactId>
+    <version>2.20.0</version>
+</dependency>
+
+<dependency>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-compress</artifactId>
+    <version>1.24.0</version>
+</dependency>
+
+<dependency>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-collections4</artifactId>
+    <version>4.4</version>
+</dependency>
+
    </dependencies>
 
    <build>
@@ -72,10 +116,14 @@
                   <Embed-Transitive>true</Embed-Transitive>
                   <Embed-Dependency>
                      commons-codec,
+                     commons-io,
+                     commons-compress,
+                     commons-collections4,
+                     log4j-api, 
+                     log4j-core,
                      poi,
                      poi-ooxml,
-                     poi-ooxml-schemas,
-                     ooxml-schemas,
+                     poi-ooxml-lite,
                      xmlbeans,
                      gson,
                      mapping-master
@@ -105,6 +153,16 @@
                      org.openxmlformats.*;resolution:=optional,
                      schemasMicrosoftCom*;resolution:=optional,
                      com.sun.*;resolution:=optional,
+                     com.github.javaparser.*;resolution:=optional,
+                     com.graphbuilder.curve.*;resolution:=optional,
+                     com.graphbuilder.geom.*;resolution:=optional,
+                     com.microsoft.schemas.compatibility.*;resolution:=optional,
+                     com.microsoft.schemas.office.*;resolution:=optional,
+                     com.microsoft.schemas.vml.*;resolution:=optional,
+                     com.zaxxer.sparsebits.*;resolution:=optional,
+                     de.rototor.pdfbox.graphics2d.*;resolution:=optional,
+                     net.sf.saxon.*;resolution:=optional,
+                     org.w3c.dom.svg.*;resolution:=optional,
                      javax.*;resolution:=optional,
                      *
                   </Import-Package>

diff --git a/src/main/java/org/mm/cellfie/ui/view/Sheet.java b/src/main/java/org/mm/cellfie/ui/view/Sheet.java
@@ -1,6 +1,6 @@
 package org.mm.cellfie.ui.view;
 
-import org.apache.poi.hssf.util.CellReference;
+import org.apache.poi.ss.util.CellReference;
 
 public class Sheet
 {

diff --git a/src/main/java/org/mm/cellfie/ui/view/SheetPanel.java b/src/main/java/org/mm/cellfie/ui/view/SheetPanel.java
@@ -152,11 +152,11 @@ public Object getValueAt(int row, int column) {
          try {
             Cell cell = sheet.getRow(row).getCell(column);
             switch (cell.getCellType()) {
-               case Cell.CELL_TYPE_BLANK :
+               case BLANK :
                   return "";
-               case Cell.CELL_TYPE_STRING :
+               case STRING :
                   return cell.getStringCellValue();
-            case Cell.CELL_TYPE_NUMERIC :
+            case NUMERIC :
                // Check if the numeric is an integer or double or a date
                if (isDateFormatted(cell)) {
                   return dataFormatter.formatCellValue(cell);
@@ -165,9 +165,9 @@ public Object getValueAt(int row, int column) {
                } else {
                   return Double.toString(cell.getNumericCellValue());
                }
-               case Cell.CELL_TYPE_BOOLEAN :
+               case BOOLEAN :
                   return cell.getBooleanCellValue();
-               case Cell.CELL_TYPE_FORMULA :
+               case FORMULA :
                   return cell.getNumericCellValue();
                default :
                   return "";