#89:(v1) Canvas: read/write the right encoding of .canvas files.

Author: PhaserEditor2D

source/phasereditor/phasereditor.canvas.core/src/phasereditor/canvas/core/CanvasCore.java

@@ -24,7 +24,6 @@
 import static java.lang.System.out;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
@@ -85,7 +84,7 @@ public class CanvasCore {
 		ScriptEngineManager m = new ScriptEngineManager();
 		scriptEngine = m.getEngineByName("nashorn");
 	}
-	
+
 	public static Double scriptEngineEval(String value) {
 		try {
 			return Double.valueOf(value);
@@ -98,7 +97,7 @@ public static Double scriptEngineEval(String value) {
 			}
 		}
 	}
-	
+
 	public static String scriptEngineValidate(Object value) {
 		if (value instanceof String) {
 			String script = (String) value;
@@ -118,7 +117,7 @@ public static String scriptEngineValidate(Object value) {
 		}
 		return null;
 	}
-	
+
 	public static void logError(Exception e) {
 		e.printStackTrace();
 		StatusManager.getManager().handle(new Status(IStatus.ERROR, CanvasCore.PLUGIN_ID, e.getMessage(), e));
@@ -234,8 +233,8 @@ public IFile getFile() {
 
 	public static List<PrefabReference> findPrefabReferencesInFileContent(Prefab prefab, IFile file) {
 		CanvasModel canvasModel = new CanvasModel(file);
-		try (InputStream contents = file.getContents()) {
-			canvasModel.read(new JSONObject(new JSONTokener(contents)));
+		try {
+			canvasModel.read(file);
 			return findPrefabReferenceInModelContent(prefab, canvasModel.getWorld());
 		} catch (Exception e) {
 			logError(e);
@@ -317,8 +316,8 @@ public String getId() {
 
 	public static List<IAssetReference> findAssetKeyReferencesInFileContent(IAssetKey assetKey, IFile file) {
 		CanvasModel canvasModel = new CanvasModel(file);
-		try (InputStream contents = file.getContents()) {
-			canvasModel.read(new JSONObject(new JSONTokener(contents)));
+		try {
+			canvasModel.read(file);
 			return findAssetKeyReferenceInModelContent(assetKey, canvasModel.getWorld());
 		} catch (Exception e) {
 			logError(e);
@@ -374,8 +373,8 @@ public static List<IAssetReference> findAssetKeyReferenceInModelContent(IAssetKe
 
 	public static List<IAssetReference> findAssetReferencesInFileContent(AssetModel asset, IFile file) {
 		CanvasModel canvasModel = new CanvasModel(file);
-		try (InputStream contents = file.getContents()) {
-			canvasModel.read(new JSONObject(new JSONTokener(contents)));
+		try {
+			canvasModel.read(file);
 			return findAssetReferenceInModelContent(asset, canvasModel.getWorld());
 		} catch (Exception e) {
 			logError(e);
@@ -420,10 +419,10 @@ public static List<IFile> getCanvasDereivedFiles(IFile canvasFile) {
 
 		CanvasModel model = new CanvasModel(canvasFile);
 		SourceLang lang;
-		try (InputStream contents = canvasFile.getContents()) {
-			model.read(new JSONObject(new JSONTokener(contents)));
+		try {
+			model.read(canvasFile);
 			lang = model.getSettings().getLang();
-		} catch (IOException | CoreException e) {
+		} catch (Exception e) {
 			logError(e);
 			throw new RuntimeException(e);
 		}

source/phasereditor/phasereditor.canvas.core/src/phasereditor/canvas/core/CanvasFile.java

@@ -95,10 +95,7 @@ public String toString() {
 
 	public CanvasModel newModel() throws Exception {
 		CanvasModel model = new CanvasModel(_file);
-		try (InputStream contents = _file.getContents()) {
-			JSONObject data = new JSONObject(new JSONTokener(contents));
-			model.read(data);
-		}
+		model.read(_file);
 		return model;
 	}
 

source/phasereditor/phasereditor.canvas.core/src/phasereditor/canvas/core/CanvasModel.java

@@ -22,12 +22,17 @@
 package phasereditor.canvas.core;
 
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONTokener;
 
 /**
  * @author arian
@@ -71,15 +76,27 @@ public void setType(CanvasType type) {
 		_type = type;
 	}
 
-	public void read(JSONObject data) {
+	public void read(IFile file) throws Exception {
+		try (InputStream contents = file.getContents();) {
+			String charset = file.getCharset();
+			if (charset == null) {
+				charset = "UTF-8";
+			}
+			InputStreamReader reader = new InputStreamReader(contents, charset);
+			JSONObject data = new JSONObject(new JSONTokener(reader));
+			read(data);
+		}
+	}
+
+	private void read(JSONObject data) {
 		// version 1 did not write it explicitly
 		_version = data.optInt("canvas-version", 1);
 
 		{
 			String name = data.optString("type", CanvasType.GROUP.name());
 			_type = CanvasType.valueOf(name);
 		}
-		
+
 		_settings.read(data.getJSONObject("settings"));
 		{
 			JSONObject data2 = data.optJSONObject("stateSettings");
@@ -164,9 +181,27 @@ public void save(IFile file, IProgressMonitor monitor) throws JSONException, Cor
 
 		_world.setAssetTable(new AssetTable(_world));
 		_world.setPrefabTable(new PrefabTable(_world));
-		
+
 		write(data, true);
 
-		file.setContents(new ByteArrayInputStream(data.toString(2).getBytes()), true, false, monitor);
+		Charset charset;
+
+		if (file.exists()) {
+			charset = Charset.forName(file.getCharset());
+		} else {
+			charset = Charset.forName("UTF-8");
+		}
+
+		String content = data.toString(2);
+
+		ByteArrayInputStream stream = new ByteArrayInputStream(content.getBytes(charset));
+
+		if (file.exists()) {
+			file.setContents(stream, IResource.NONE, monitor);
+		} else {
+			file.create(stream, false, monitor);
+			file.setCharset(charset.name(), monitor);
+		}
+
 	}
 }

source/phasereditor/phasereditor.canvas.core/src/phasereditor/canvas/core/Prefab.java

@@ -21,13 +21,11 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 package phasereditor.canvas.core;
 
-import java.io.InputStream;
 import java.security.InvalidParameterException;
 import java.util.UUID;
 
 import org.eclipse.core.resources.IFile;
 import org.json.JSONObject;
-import org.json.JSONTokener;
 
 /**
  * @author arian
@@ -66,10 +64,10 @@ public JSONObject newInstance() {
 	public JSONObject newInstance(JSONObject initInfo) {
 		IFile file = getFile();
 		CanvasModel model = new CanvasModel(file);
-		try (InputStream contents = file.getContents()) {
-			JSONObject data = new JSONObject(new JSONTokener(contents));
-
-			model.read(data);
+		try {
+			
+			model.read(file);
+			
 			BaseObjectModel objModel;
 			if (model.getType() == CanvasType.SPRITE) {
 				objModel = model.getWorld().findFirstSprite();

source/phasereditor/phasereditor.canvas.ui/src/phasereditor/canvas/ui/CanvasAssetReplacer.java

@@ -22,14 +22,12 @@
 package phasereditor.canvas.ui;
 
 import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorPart;
 import org.json.JSONObject;
-import org.json.JSONTokener;
 
 import phasereditor.assetpack.core.FindAssetReferencesResult;
 import phasereditor.assetpack.core.IAssetKey;
@@ -87,9 +85,7 @@ public void replace_ResourceThread(FindAssetReferencesResult result, IAssetKey k
 		for (IFile file : result.getFiles()) {
 			CanvasModel canvasModel = new CanvasModel(file);
 
-			try (InputStream contents = file.getContents()) {
-				canvasModel.read(new JSONObject(new JSONTokener(contents)));
-			}
+			canvasModel.read(file);
 
 			boolean changed = false;
 

source/phasereditor/phasereditor.canvas.ui/src/phasereditor/canvas/ui/CanvasUI.java

@@ -27,7 +27,6 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -63,7 +62,6 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.statushandlers.StatusManager;
 import org.json.JSONObject;
-import org.json.JSONTokener;
 
 import com.subshell.snippets.jface.tooltip.tooltipsupport.ICustomInformationControlCreator;
 import com.subshell.snippets.jface.tooltip.tooltipsupport.TableViewerInformationProvider;
@@ -470,9 +468,9 @@ public void run() {
 
 		javafx.scene.image.Image[] result = new javafx.scene.image.Image[1];
 
-		try (InputStream contents = file.getContents()) {
+		try {
 			CanvasModel model = new CanvasModel(file);
-			model.read(new JSONObject(new JSONTokener(contents)));
+			model.read(file);
 			GroupControl worldControl = new GroupControl(null, model.getWorld());
 			GroupNode node = worldControl.getNode();
 			node.setBackground(

source/phasereditor/phasereditor.canvas.ui/src/phasereditor/canvas/ui/editors/CanvasEditor.java

@@ -23,7 +23,6 @@
 
 import static phasereditor.ui.PhaserEditorUI.swtRun;
 
-import java.io.InputStream;
 import java.util.Arrays;
 
 import org.eclipse.core.commands.operations.IUndoContext;
@@ -74,7 +73,6 @@
 import org.eclipse.ui.part.MultiPageEditorPart;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.json.JSONTokener;
 
 import javafx.geometry.Point2D;
 import phasereditor.canvas.core.CanvasCore;
@@ -196,31 +194,29 @@ protected void setInput(IEditorInput input) {
 		super.setInput(input);
 		IFileEditorInput fileInput = (IFileEditorInput) input;
 		IFile file = fileInput.getFile();
-		try (InputStream contents = file.getContents();) {
-			JSONObject data = new JSONObject(new JSONTokener(contents));
-			_model = new CanvasModel(file);
-			try {
-				_model.read(data);
-			} catch (Exception e) {
-				e.printStackTrace();
-				_model = new CanvasModel(file);
-				Display.getDefault().asyncExec(new Runnable() {
-
-					@Override
-					public void run() {
-						Shell shell = Display.getDefault().getActiveShell();
-						MessageDialog.openError(shell, "Error", "The scene data cannot ve loaded.\n" + e.getMessage());
-					}
-				});
-			}
-			_model.getWorld().addPropertyChangeListener(WorldModel.PROP_STRUCTURE, arg -> {
-				firePropertyChange(PROP_DIRTY);
-			});
-			swtRun(this::updateTitle);
+
+		_model = new CanvasModel(file);
+		
+		try {
+			_model.read(file);
 		} catch (Exception e) {
 			e.printStackTrace();
-			throw new RuntimeException(e);
+			_model = new CanvasModel(file);
+			Display.getDefault().asyncExec(new Runnable() {
+
+				@Override
+				public void run() {
+					Shell shell = Display.getDefault().getActiveShell();
+					MessageDialog.openError(shell, "Error", "The scene data cannot ve loaded.\n" + e.getMessage());
+				}
+			});
 		}
+		
+		_model.getWorld().addPropertyChangeListener(WorldModel.PROP_STRUCTURE, arg -> {
+			firePropertyChange(PROP_DIRTY);
+		});
+		
+		swtRun(this::updateTitle);
 	}
 
 	@Override
@@ -406,7 +402,6 @@ private void afterCreateWidgets() {
 	private void initPalette() {
 		_paletteComp.setProject(getEditorInputFile().getProject());
 	}
-	
 
 	private void initContexts() {
 		getContextService().activateContext(EDITOR_CONTEXT_ID);