16.4.2.22

Wisser · Oct 5, 2024 · fddd496 · fddd496
1 parent 04d09d4
commit fddd496
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 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 = "16.4.2.20";
+	public static final String VERSION = "16.4.2.22";
 
 	/**
 	 * The Jailer working tables version.

diff --git a/src/main/gui/net/sf/jailer/ui/Environment.java b/src/main/gui/net/sf/jailer/ui/Environment.java
@@ -233,7 +233,6 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e)
 				// + 4 no longer used
 				+ (!testCreateTempFile() ? 8 : 0)
 				+ (isJPacked() ? 1000 : 0)
-				+ rpmOffset()
 				+ stateOffset;
 		AWTWatchdog.start();
 		LogUtil.setWarn(new LogUtil.Warn() {
@@ -252,19 +251,10 @@ public void warn(Throwable t) {
 		if (toBeLogged != null) {
 			LogUtil.warn(toBeLogged);
 		}
-		state += rpmOffset();
 		return args;
 	}
 
-	private static boolean rpm;
-
-	private static int rpmOffset() {
-		int offset = 0;
-		if (rpm) {
-			offset = -100;
-		}
-		return offset;
-	}
+	public static boolean rpm;
 
 	private static File applicationBase = null;
 

diff --git a/src/main/gui/net/sf/jailer/ui/util/UpdateInfoManager.java b/src/main/gui/net/sf/jailer/ui/util/UpdateInfoManager.java
@@ -84,19 +84,14 @@ public void run() {
 					startShutdownHook();
 					String param = "?r=" + URLEncoder.encode(System.getProperty("os.arch"), "UTF-8")
 							+ "&jversion=" + URLEncoder.encode(System.getProperty("java.version") + "/" + System.getProperty("java.vm.vendor") + "/" + System.getProperty("java.vm.name") + "/" + System.getProperty("os.name"), "UTF-8") + "/(" + Environment.state + ")"
-							+ "&modul=" + URLEncoder.encode((DataModelManagerDialog.lastSessionRestored? modul.toLowerCase() : modul) + (UIUtil.subModule != 0? UIUtil.subModule : "") + (UIUtil.plaf == PLAF.FLATDARK? "d" : ""), "UTF-8")
+							+ "&modul=" + URLEncoder.encode((DataModelManagerDialog.lastSessionRestored? modul.toLowerCase() : modul) + (UIUtil.subModule != 0? UIUtil.subModule : "") + (UIUtil.plaf == PLAF.FLATDARK? "d" : "") + (Environment.rpm? "r" : ""), "UTF-8")
 							+ "&ts=" + URLEncoder.encode(new Date().toString(), "UTF-8")
 							+ "&uuid=" + URLEncoder.encode(uuid.toString(), "UTF-8")
 							+ "&version=" + URLEncoder.encode(JailerVersion.VERSION, "UTF-8")
 							+ (stat0 != null? "&s=" + stat0 : "")
 							+ ("&c=" + uimCnt)
 							+ UISettings.restoreStats();
 
-
-					// TODO
-	        		JOptionPane.showMessageDialog(null, param, "Error", JOptionPane.ERROR_MESSAGE);
-
-
 					String inputLine = null;
 					for (int i = 0; i < versionURL.length; ++i) {
 						try {