Updated for release 4.13.0

rmraya · Nov 30, 2021 · 9d656e7 · 9d656e7
1 parent fa7e658
commit 9d656e7
Show file tree

Hide file tree

Showing 8 changed files with 672 additions and 135 deletions.
diff --git a/jars/openxliff.jar b/jars/openxliff.jar
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "swordfish",
     "productName": "Swordfish",
-    "version": "4.12.1",
+    "version": "4.13.0",
     "description": "Swordfish Translation Editor",
     "main": "js/App.js",
     "scripts": {
@@ -20,7 +20,7 @@
         "url": "https://github.com/rmraya/Swordfish.git"
     },
     "devDependencies": {
-        "electron": "^16.0.1",
+        "electron": "^16.0.2",
         "typescript": "^4.5.2"
     }
 }
diff --git a/src/com/maxprograms/swordfish/Constants.java b/src/com/maxprograms/swordfish/Constants.java
@@ -19,8 +19,8 @@ private Constants() {
 	}
 
 	public static final String APPNAME = "Swordfish";
-	public static final String VERSION = "4.12.1";
-	public static final String BUILD = "20211123_1340";
+	public static final String VERSION = "4.13.0";
+	public static final String BUILD = "20211130_1106";
 
 	public static final String REASON = "reason";
 	public static final String STATUS = "status";

diff --git a/src/com/maxprograms/swordfish/ProjectsHandler.java b/src/com/maxprograms/swordfish/ProjectsHandler.java
@@ -1403,7 +1403,7 @@ private JSONObject exportHTML(String request) {
 			}
 			String export = projectStores.get(project).exportHTML(prj.getDescription());
 			result.put("export", export);
-		} catch (SQLException | IOException | SAXException | ParserConfigurationException e) {
+		} catch (SQLException | IOException | SAXException | ParserConfigurationException | DataFormatException e) {
 			logger.log(Level.ERROR, e);
 			result.put(Constants.REASON, e.getMessage());
 		}

diff --git a/src/com/maxprograms/swordfish/xliff/XliffStore.java b/src/com/maxprograms/swordfish/xliff/XliffStore.java
diff --git a/src/module-info.java b/src/module-info.java
@@ -1,26 +1,25 @@
 /*******************************************************************************
  * Copyright (c) 2007-2021 Maxprograms.
  *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 1.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/org/documents/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 1.0 which accompanies this distribution,
+ * and is available at https://www.eclipse.org/org/documents/epl-v10.html
  *
- * Contributors:
- *     Maxprograms - initial API and implementation
+ * Contributors: Maxprograms - initial API and implementation
  *******************************************************************************/
 
 module swordfish {
-	
+
 	exports com.maxprograms.swordfish;
 	exports com.maxprograms.swordfish.models;
 	exports com.maxprograms.swordfish.tm;
-	
+
 	opens com.maxprograms.swordfish to mapdb;
 	opens com.maxprograms.swordfish.models to mapdb;
 	opens com.maxprograms.swordfish.xliff to mapdb;
 
 	requires mapdb;
+	requires jsoup;
 	requires java.base;
 	requires java.xml;
 	requires java.sql;

diff --git a/swordfish.pdf b/swordfish.pdf
diff --git a/ts/App.ts b/ts/App.ts
@@ -10,11 +10,11 @@
  *     Maxprograms - initial API and implementation
  *******************************************************************************/
 
-import { execFileSync, spawn, ChildProcessWithoutNullStreams } from "child_process";
-import { app, clipboard, BrowserWindow, dialog, ipcMain, Menu, MenuItem, shell, nativeTheme, Rectangle, IpcMainEvent, screen, Size, net, ClientRequest, session } from "electron";
-import { existsSync, mkdirSync, readFile, readFileSync, writeFileSync, lstatSync, appendFileSync, unlinkSync } from "fs";
-import { Locations, Point } from "./locations";
+import { ChildProcessWithoutNullStreams, execFileSync, spawn } from "child_process";
+import { app, BrowserWindow, ClientRequest, clipboard, dialog, ipcMain, IpcMainEvent, Menu, MenuItem, nativeTheme, net, Rectangle, screen, session, shell, Size } from "electron";
 import { IncomingMessage } from "electron/main";
+import { appendFileSync, existsSync, lstatSync, mkdirSync, readFile, readFileSync, unlinkSync, writeFileSync } from "fs";
+import { Locations, Point } from "./locations";
 
 class Swordfish {
 
@@ -239,6 +239,12 @@ class Swordfish {
                 if (Swordfish.currentPreferences.showGuide) {
                     Swordfish.showGettingStarted();
                 }
+                if (process.platform === 'darwin' && app.runningUnderARM64Translation) {
+                    Swordfish.showMessage({
+                        type: 'warning',
+                        message: 'You are running a version for Macs with Intel processors on a Mac with Apple M1 chipset.'
+                    });
+                }        
             });
         });
 
@@ -4314,6 +4320,7 @@ class Swordfish {
         htmlViewerWindow.on('close', () => {
             this.concordanceSearchWindow.focus();
         });
+
     }
 
     static showTermSearch(arg: any): any {
@@ -4381,6 +4388,7 @@ class Swordfish {
                 htmlViewerWindow.on('close', () => {
                     this.termSearchWindow.focus();
                 });
+
             },
             (reason: string) => {
                 Swordfish.showMessage({ type: 'error', message: reason });