Updated for release 2.10.0

html/licenses/electron.txt

@@ -1,3 +1,4 @@
+Copyright (c) Electron contributors
 Copyright (c) 2013-2020 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining

html/licenses/jsoup.txt

@@ -1,7 +1,6 @@
-
 The MIT License
 
-Copyright (c) 2009-2019 Jonathan Hedley <jonathan@hedley.net>
+Copyright (c) 2009-2022 Jonathan Hedley <https://jsoup.org/>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package.json

@@ -1,7 +1,7 @@
 {
     "name": "tmxeditor",
     "productName": "TMXEditor",
-    "version": "2.9.0",
+    "version": "2.10.0",
     "description": "TMX Editor",
     "main": "js/app.js",
     "scripts": {
@@ -19,7 +19,7 @@
         "url": "https://github.com/rmraya/TMXEditor.git"
     },
     "devDependencies": {
-        "electron": "^16.0.3",
-        "typescript": "^4.5.2"
+        "electron": "^18.1.0",
+        "typescript": "^4.6.3"
     }
 }

src/com/maxprograms/tmxserver/CheckURL.java

@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2018-2022 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
+ *
+ * Contributors:
+ *     Maxprograms - initial API and implementation
+ *******************************************************************************/
+
+package com.maxprograms.tmxserver;
+
+import java.io.IOException;
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class CheckURL {
+
+	protected static final Logger LOGGER = System.getLogger(CheckURL.class.getName());
+
+	public static void main(String[] args) {
+		if (args.length < 1) {
+			return;
+		}
+		checkURL(args[0]);
+	}
+
+	protected static void checkURL(String string) {
+		boolean waiting = true;
+		int count = 0;
+		while (waiting && count < 40) {
+			try {
+				connect(string);
+				waiting = false;
+			} catch (IOException e) {
+				try {
+					Thread.sleep(500);
+					count++;
+				} catch (InterruptedException e1) {
+					LOGGER.log(Level.ERROR, e1.getMessage(), e1);
+					Thread.currentThread().interrupt();
+				}
+			}
+		}
+		if (count < 40) {
+			LOGGER.log(Level.INFO, "ready");
+		} else {
+			System.exit(1);
+		}
+	}
+
+	private static void connect(String string) throws IOException {
+		URL url = new URL(string);
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.setConnectTimeout(1000);
+		connection.connect();
+	}
+
+}

src/com/maxprograms/tmxserver/Constants.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0
@@ -19,8 +19,8 @@ private Constants() {
 	}
 
 	public static final String APPNAME = "TMXEditor";
-	public static final String VERSION = "2.9.0";
-	public static final String BUILD = "20211201_0811";
+	public static final String VERSION = "2.10.0";
+	public static final String BUILD = "20220423_1037";
 
 	public static final String REASON = "reason";
 	public static final String STATUS = "status";

src/com/maxprograms/tmxserver/TMXServer.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0
@@ -289,10 +289,6 @@ public void handle(HttpExchange t) throws IOException {
 					}
 				}
 			}
-			if ("stop".equals(command)) {
-				logger.log(Level.INFO, "Stopping server");
-				System.exit(0);
-			}
 		} catch (IOException e) {
 			logger.log(Level.ERROR, e);
 			String message = e.getMessage();

src/com/maxprograms/tmxserver/TMXService.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0
@@ -1592,6 +1592,11 @@ public JSONObject convertCsv(String csvFile, String tmxFile, List<String> langua
 					optionalDelims);
 			result.put(Constants.STATUS, Constants.SUCCESS);
 		} catch (Exception e) {
+			try {
+				Files.deleteIfExists(new File(tmxFile).toPath());
+			} catch (IOException e1) {
+				// do nothing
+			}
 			logger.log(Level.SEVERE, e.getMessage(), e);
 			result.put(Constants.STATUS, Constants.ERROR);
 			result.put(Constants.REASON, e.getMessage());
@@ -1822,6 +1827,11 @@ public JSONObject convertExcel(String excelFile, String tmxFile, String sheetNam
 			}
 			result.put(Constants.STATUS, Constants.SUCCESS);
 		} catch (IOException | SAXException | ParserConfigurationException e) {
+			try {
+				Files.deleteIfExists(new File(tmxFile).toPath());
+			} catch (IOException e1) {
+				// do nothing
+			}
 			logger.log(Level.SEVERE, e.getMessage(), e);
 			result.put(Constants.STATUS, Constants.ERROR);
 			result.put(Constants.REASON, e.getMessage());

src/com/maxprograms/tmxserver/excel/ExcelReader.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/excel/ExcelWriter.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/excel/Sheet.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/models/Language.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/models/TUnit.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/CountStore.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/H2Store.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/LanguagesStore.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/MergeStore.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/Pair.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/SimpleStore.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/SplitStore.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/StoreInterface.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/TMXCleaner.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/TMXContentHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/TMXConverter.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/TMXCopyHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/TMXReader.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/TMXResolver.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/tmx/TmxUtils.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/utils/LangUtils.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/com/maxprograms/tmxserver/utils/TextUtils.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

src/module-info.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

ts/about.ts

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

ts/addLanguage.ts

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

ts/addNote.ts

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0

ts/addProperty.ts

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2021 Maxprograms.
+ * Copyright (c) 2018-2022 Maxprograms.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 1.0