100.8

Wisser · Nov 20, 2023 · c5f1b07 · c5f1b07
1 parent 566a6ac
commit c5f1b07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/main/engine/net/sf/jailer/JailerVersion.java b/src/main/engine/net/sf/jailer/JailerVersion.java
@@ -25,7 +25,7 @@ public class JailerVersion {
 	/**
 	 * The Jailer version.
 	 */
-	public static final String VERSION = "100.7";
+	public static final String VERSION = "100.8";
 
 	/**
 	 * The Jailer working tables version.

diff --git a/src/main/engine/net/sf/jailer/enhancer/FileBasedScriptEnhancer.java b/src/main/engine/net/sf/jailer/enhancer/FileBasedScriptEnhancer.java
@@ -25,13 +25,13 @@
 import java.util.TreeSet;
 
 import net.sf.jailer.ExecutionContext;
-import net.sf.jailer.configuration.Configuration;
 import net.sf.jailer.configuration.DBMS;
 import net.sf.jailer.database.Session;
 import net.sf.jailer.datamodel.Table;
 import net.sf.jailer.entitygraph.EntityGraph;
 import net.sf.jailer.subsetting.ScriptFormat;
 import net.sf.jailer.subsetting.ScriptType;
+import net.sf.jailer.ui.Environment;
 
 /**
  * Inserts the content of the files
@@ -59,7 +59,7 @@ public void addComments(Writer script, ScriptType scriptType, Session session, D
 	@Override
 	public void addEpilog(Writer script, ScriptType scriptType, Session session, DBMS targetDBMSConfiguration, EntityGraph entityGraph,
 			Set<Table> progress, ExecutionContext executionContext) throws IOException, SQLException {
-		File dir = newWorkingFolderFile("epilog" + File.separatorChar + scriptType);
+		File dir = Environment.newFile("epilog" + File.separatorChar + scriptType);
 		addEnhancement(script, progress, dir, executionContext);
 		addEnhancement(script, dir, "EPILOG.sql");
 	}
@@ -69,7 +69,7 @@ public void addEpilog(Writer script, ScriptType scriptType, Session session, DBM
 	@Override
 	public void addProlog(Writer script, ScriptType scriptType, Session session, DBMS targetDBMSConfiguration, EntityGraph entityGraph,
 			Set<Table> progress, ExecutionContext executionContext) throws IOException, SQLException {
-		File dir = newWorkingFolderFile("prolog" + File.separatorChar + scriptType);
+		File dir = Environment.newFile("prolog" + File.separatorChar + scriptType);
 		addEnhancement(script, dir, "PROLOG.sql");
 		addEnhancement(script, progress, dir, executionContext);
 	}
@@ -108,13 +108,5 @@ private void addEnhancement(Writer script, File dir, String fileName)
 			in.close();
 		}
 	}
-
-	private static File newWorkingFolderFile(String name) {
-		if (Configuration.applicationBase == null || new File(name).isAbsolute()) {
-			return new File(name);
-		}
-		return new File(Configuration.applicationBase, name);
-	}
-
 }