ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From al...@apache.org
Subject svn commit: r1813836 - in /ctakes/trunk: ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/AssertionAnalysisEngineFit.java ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/util/JdbcConnectionFactory.java
Date Mon, 30 Oct 2017 22:47:30 GMT
Author: alexz
Date: Mon Oct 30 22:47:30 2017
New Revision: 1813836

URL: http://svn.apache.org/viewvc?rev=1813836&view=rev
Log:
CTAKES-465: fix deprecated FileLocator.getFullPath

Modified:
    ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/AssertionAnalysisEngineFit.java
    ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/util/JdbcConnectionFactory.java

Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/AssertionAnalysisEngineFit.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/AssertionAnalysisEngineFit.java?rev=1813836&r1=1813835&r2=1813836&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/AssertionAnalysisEngineFit.java
(original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/AssertionAnalysisEngineFit.java
Mon Oct 30 22:47:30 2017
@@ -86,9 +86,9 @@ public class AssertionAnalysisEngineFit
       try {
          assertionModelFile = FileLocator.getFile( _assertionModelPath );
          // assertionModelContents = StringHandling.readEntireContentsBinary(assertionModelFile);
-         scopeModelFilePath = FileLocator.getFullPath( _scopeModelPath );
-         cueModelFilePath = FileLocator.getFullPath( _cueModelPath );
-         posModelFilePath = FileLocator.getFullPath( _posModelPath );
+         scopeModelFilePath = FileLocator.getFile( _scopeModelPath ).getAbsolutePath();
+         cueModelFilePath = FileLocator.getFile( _cueModelPath ).getAbsolutePath();
+         posModelFilePath = FileLocator.getFile( _posModelPath ).getAbsolutePath();
          enabledFeaturesFile = FileLocator.getFile( _enabledFeaturesPath );
       } catch ( FileNotFoundException fnfE ) {
          throw new ResourceInitializationException( fnfE );

Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/util/JdbcConnectionFactory.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/util/JdbcConnectionFactory.java?rev=1813836&r1=1813835&r2=1813836&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/util/JdbcConnectionFactory.java
(original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/util/JdbcConnectionFactory.java
Mon Oct 30 22:47:30 2017
@@ -116,12 +116,6 @@ public enum JdbcConnectionFactory {
       } catch ( FileNotFoundException fnfE ) {
          throw new SQLException( "No Hsql DB exists at Url", fnfE );
       }
-//      try {
-//         final String fullPath = FileLocator.getFullPath( urlFilePath );
-//         return fullPath.substring( 0, fullPath.length() - HSQL_DB_EXT.length() );
-//      } catch ( FileNotFoundException fnfE ) {
-//         throw new SQLException( "No Hsql DB exists at Url", fnfE );
-//      }
    }
 
    static private class DotPlotter extends TimerTask {



Mime
View raw message