vergnet/tp2-web-sem
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed encoding issue on windows

Browse source
This commit is contained in:
Nicolas Seydoux 2020-11-30 09:35:09 +01:00
parent fa152be94e
commit d830284ed2
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/semantic/model/IModelFunctions.java
View file

@ -6,7 +6,7 @@ package semantic.model;
public interface IModelFunctions public interface IModelFunctions
{ {
/** /**
* Creates an instance of the class "Lieu" of your ontology * Creates an instance of the class "Place" of your ontology
* @param name * @param name
* @return the URI of the instance * @return the URI of the instance
*/ */

22
src/main/java/semantic/model/SemanticModel.java
View file

@ -1,10 +1,14 @@
package semantic.model; package semantic.model;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.AbstractMap; import java.util.AbstractMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -296,17 +300,17 @@ public class SemanticModel implements IConvenienceInterface
void loadFromFile(String path, String base, String lang, boolean supportObjectProperties) void loadFromFile(String path, String base, String lang, boolean supportObjectProperties)
{ {
Model tmpModel = ModelFactory.createDefaultModel(); Model tmpModel = ModelFactory.createDefaultModel();
FileReader f = null; try (FileInputStream fis = new FileInputStream(path);
try InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8);
{ BufferedReader reader = new BufferedReader(isr)
f = new FileReader(new File(path)); ) {
}
catch (FileNotFoundException e) tmpModel.read(reader, base, lang);
{ this.writeFromModel(tmpModel, supportObjectProperties);
} catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
tmpModel.read(f, base, lang);
this.writeFromModel(tmpModel, supportObjectProperties);
} }
@Override @Override