Changeset 6077

Timestamp:

Nov 24, 2020, 8:44:17 AM (18 months ago)

Author:

Nicklas Nordborg

Message:

Fixes #1279: Switch to BASE 3.17

Also updated some external libraries to match those that are used in BASE 3.17.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• .classpath (modified) (2 diffs)
• META-INF/extensions.xml (modified) (1 diff)
• README (modified) (1 diff)
• build.xml (modified) (1 diff)
• lib/compile/jdom-2.0.5.jar (deleted)
• lib/compile/jdom-2.0.6.jar (added)
• lib/compile/poi-4.0.1.jar (deleted)
• lib/compile/poi-4.1.2.jar (added)
• lib/compile/slf4j-api-1.6.4.jar (deleted)
• lib/compile/slf4j-api-1.7.25.jar (added)
• src/net/sf/basedb/reggie/plugins/TMASpecimenImporter.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/.classpath

@@ -3 +3 @@
   <classpathentry kind="src" path="src"/>
   <classpathentry kind="lib" path="lib/compile/servlet-api.jar"/>
-  <classpathentry kind="lib" path="lib/compile/slf4j-api-1.6.4.jar"/>
-  <classpathentry kind="lib" path="lib/compile/jdom-2.0.5.jar"/>
   <classpathentry kind="lib" path="META-INF/lib/zip4j_1.3.2.jar"/>
   <classpathentry kind="lib" path="lib/compile/opengrid.jar"/>
   <classpathentry kind="lib" path="lib/compile/commons-io-1.4.jar"/>
   <classpathentry kind="lib" path="lib/compile/json-simple-1.1.1-1.jar"/>
-  <classpathentry kind="lib" path="lib/compile/base-core-3.16.0.jar"/>
-  <classpathentry kind="lib" path="lib/compile/base-coreplugins-3.16.0.jar"/>
-  <classpathentry kind="lib" path="lib/compile/base-webclient-3.16.0.jar"/>
+  <classpathentry kind="lib" path="lib/compile/base-core-3.17.0.jar"/>
+  <classpathentry kind="lib" path="lib/compile/base-coreplugins-3.17.0.jar"/>
+  <classpathentry kind="lib" path="lib/compile/base-webclient-3.17.0.jar"/>
   <classpathentry kind="lib" path="META-INF/lib/io-7.1.13.jar"/>
   <classpathentry kind="lib" path="META-INF/lib/kernel-7.1.13.jar"/>
   <classpathentry kind="lib" path="META-INF/lib/barcodes-7.1.13.jar"/>
   <classpathentry kind="lib" path="META-INF/lib/svg-7.1.13.jar"/>
+  <classpathentry kind="lib" path="lib/compile/poi-4.1.2.jar"/>
+  <classpathentry kind="lib" path="lib/compile/jdom-2.0.6.jar"/>
+  <classpathentry kind="lib" path="lib/compile/slf4j-api-1.7.25.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
     <attributes>
@@ -22 +23 @@
   </classpathentry>
   <classpathentry kind="lib" path="lib/compile/commons-math3-3.6.1.jar"/>
-  <classpathentry kind="lib" path="lib/compile/poi-4.0.1.jar"/>
   <classpathentry kind="output" path=".build"/>
 </classpath>

extensions/net.sf.basedb.reggie/trunk/META-INF/extensions.xml

@@ -8 +8 @@
     </description>
     <version>4.28-dev</version>
-    <min-base-version>3.16.0</min-base-version>
+    <min-base-version>3.17.0</min-base-version>
     <copyright>BASE development team</copyright>
     <email>basedb-users@lists.sourceforge.net</email>

extensions/net.sf.basedb.reggie/trunk/README

@@ -1 +1 @@
 == Requirements ==
 
- 1. BASE 3.16
+ 1. BASE 3.17
  2. Open Grid Scheduler extension 1.2 must be installed
  3. Thumbnails extension 1.2 must be installed

extensions/net.sf.basedb.reggie/trunk/build.xml

@@ -23 +23 @@
   <property name="javac.encoding" value="UTF-8" />
   <property name="depend.base-version" 
-    value="3.16.0" 
+    value="3.17.0" 
     description="The BASE version that this project depends on."
   />

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/plugins/TMASpecimenImporter.java

@@ -7 +7 @@
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import net.sf.basedb.core.BaseException;
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.File;
-import net.sf.basedb.core.IntegerUtil;
 import net.sf.basedb.core.InvalidDataException;
 import net.sf.basedb.core.Item;
@@ -488 +486 @@
   } 
 
-  private FlatFileParser getInitializedFlatFileParser(ParameterValues parameters)
-    throws BaseException
-  {
-    FlatFileParser ffp = new FlatFileParser();
-    ffp.setDataHeaderRegexp(getPattern(parameters, dataHeaderRegexpParameter.getName()));
-    ffp.setDataSplitterRegexp(getPattern(parameters, dataSplitterRegexpParameter.getName()));
-    Boolean trimQuotes = (Boolean)parameters.getValue(trimQuotesParameter.getName());
-    if (trimQuotes != null) ffp.setTrimQuotes(trimQuotes);
-    ffp.setIgnoreRegexp(getPattern(parameters, ignoreRegexpParameter.getName()));
-    ffp.setDataFooterRegexp(getPattern(parameters, dataFooterRegexpParameter.getName()));
-    ffp.setMinDataColumns(IntegerUtil.getInt((Integer)parameters.getValue(minDataColumnsParameter.getName())));
-    ffp.setMaxDataColumns(IntegerUtil.getInt((Integer)parameters.getValue(maxDataColumnsParameter.getName())));
-    ffp.setExcelSheet(parameters.getValue(excelSheetParameter.getName()));
-    return ffp;
-  } 
-  
-  private Pattern getPattern(ParameterValues parameters, String name)
-    throws BaseException
-  {
-    String regexp = (String)parameters.getValue(name);
-    return regexp != null ? Pattern.compile(regexp) : null;
-  }
-
 }