mirror of
https://github.com/OMGeeky/ATCS.git
synced 2026-01-10 13:34:24 +01:00
Fixed issues in i18n tools. Added beanshell worker indicator.
Added resources compression tools too.
This commit is contained in:
@@ -22,6 +22,7 @@ import bsh.EvalError;
|
||||
import bsh.Interpreter;
|
||||
|
||||
import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
|
||||
import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
|
||||
import com.jidesoft.swing.JideBoxLayout;
|
||||
|
||||
public class BeanShellView extends JFrame {
|
||||
@@ -85,17 +86,29 @@ public class BeanShellView extends JFrame {
|
||||
run.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Interpreter shInt = new Interpreter();
|
||||
PrintStream printOut = new PrintStream(new AreaOutputStream(outArea));
|
||||
final Interpreter shInt = new Interpreter();
|
||||
final PrintStream printOut = new PrintStream(new AreaOutputStream(outArea));
|
||||
shInt.setOut(printOut);
|
||||
PrintStream printErr = new PrintStream(new AreaOutputStream(errArea));
|
||||
final PrintStream printErr = new PrintStream(new AreaOutputStream(errArea));
|
||||
shInt.setErr(printErr);
|
||||
|
||||
try {
|
||||
shInt.eval(shArea.getText());
|
||||
} catch (EvalError e1) {
|
||||
e1.printStackTrace(printErr);
|
||||
}
|
||||
WorkerDialog.showTaskMessage("Running your script...", null, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
try {
|
||||
shInt.eval(shArea.getText());
|
||||
} catch (EvalError e1) {
|
||||
e1.printStackTrace(printErr);
|
||||
}
|
||||
printOut.flush();
|
||||
printErr.flush();
|
||||
printOut.close();
|
||||
printErr.close();
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -1,86 +0,0 @@
|
||||
package com.gpl.rpg.atcontentstudio.ui.tools.i18n;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.Writer;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class PoPotWriter {
|
||||
|
||||
Map<String, List<String>> stringsResources = new LinkedHashMap<String, List<String>>();
|
||||
Map<String, String> translations = new LinkedHashMap<String, String>();
|
||||
File f;
|
||||
|
||||
public static void writePoFile(Map<String, List<String>> stringsResources, Map<String, String> translations, File destination) {
|
||||
try {
|
||||
FileWriter fw = new FileWriter(destination);
|
||||
if (translations.get("") != null) {
|
||||
fw.write(translations.get(""));
|
||||
writeEndOfEntry(fw);
|
||||
}
|
||||
if (translations.get("translator-credits") != null) {
|
||||
List<String> refs = new LinkedList<String>();
|
||||
refs.add("[none]");
|
||||
writeReferences(fw, refs);
|
||||
writeMsgId(fw, "translator-credits");
|
||||
writeMsgStr(fw, translations.get("translator-credits"));
|
||||
writeEndOfEntry(fw);
|
||||
}
|
||||
for (String msg : stringsResources.keySet()) {
|
||||
writeReferences(fw, stringsResources.get(msg));
|
||||
writeMsgId(fw, msg);
|
||||
writeMsgStr(fw, translations.get(msg));
|
||||
writeEndOfEntry(fw);
|
||||
}
|
||||
fw.flush();
|
||||
fw.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public static void writePotFile(Map<String, List<String>> stringsResources, File destination) {
|
||||
try {
|
||||
FileWriter fw = new FileWriter(destination);
|
||||
for (String msg : stringsResources.keySet()) {
|
||||
writeReferences(fw, stringsResources.get(msg));
|
||||
writeMsgId(fw, msg);
|
||||
writeMsgStr(fw, "");
|
||||
writeEndOfEntry(fw);
|
||||
}
|
||||
fw.flush();
|
||||
fw.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private static void writeReferences(Writer w, List<String> references) throws IOException {
|
||||
for (String ref : references) {
|
||||
w.write("#: ");
|
||||
w.write(ref);
|
||||
w.write("\n");
|
||||
}
|
||||
}
|
||||
|
||||
private static void writeMsgId(Writer w, String msg) throws IOException {
|
||||
w.write("msgid \"");
|
||||
w.write(msg);
|
||||
w.write("\"\n");
|
||||
}
|
||||
|
||||
private static void writeMsgStr(Writer w, String translation) throws IOException {
|
||||
w.write("msgstr \"");
|
||||
w.write(translation == null ? "" : translation);
|
||||
w.write("\"\n");
|
||||
}
|
||||
|
||||
private static void writeEndOfEntry(Writer w) throws IOException {
|
||||
w.write("\n");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,310 +0,0 @@
|
||||
package com.gpl.rpg.atcontentstudio.ui.tools.i18n;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileFilter;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Vector;
|
||||
|
||||
import javax.swing.JOptionPane;
|
||||
|
||||
import com.gpl.rpg.atcontentstudio.model.Project;
|
||||
|
||||
import net.launchpad.tobal.poparser.POEntry;
|
||||
import net.launchpad.tobal.poparser.POFile;
|
||||
import net.launchpad.tobal.poparser.POParser;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Kevin
|
||||
*
|
||||
* To use this, paste the following script in the beanshell console of ATCS.
|
||||
* Don't forget to change the project number to suit your needs.
|
||||
*
|
||||
* import com.gpl.rpg.atcontentstudio.model.Workspace;
|
||||
* import com.gpl.rpg.atcontentstudio.ui.tools.i18n.PotGenerator;
|
||||
* import com.gpl.rpg.atcontentstudio.ui.tools.i18n.PotComparator;
|
||||
*
|
||||
* proj = Workspace.activeWorkspace.projects.get(7);
|
||||
* PotGenerator.generatePotFileForProject(proj);
|
||||
* comp = new PotComparator(proj);
|
||||
* comp.compare();
|
||||
* comp.updatePoFiles(proj);
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
public class PotComparator {
|
||||
|
||||
Map<String, List<String>> stringsResourcesNew = new LinkedHashMap<String, List<String>>();
|
||||
Map<String, String> resourcesStringsNew = new LinkedHashMap<String, String>();
|
||||
|
||||
Map<String, List<String>> stringsResourcesOld = new LinkedHashMap<String, List<String>>();
|
||||
Map<String, String> resourcesStringsOld = new LinkedHashMap<String, String>();
|
||||
|
||||
Map<String, String> msgIdToReplace = new LinkedHashMap<String, String>();
|
||||
List<String> msgIdToReview = new LinkedList<String>();
|
||||
List<String> msgIdOutdated = new LinkedList<String>();
|
||||
|
||||
|
||||
public PotComparator(Project proj) {
|
||||
POParser parser = new POParser();
|
||||
|
||||
POFile newPot = parser.parseFile(new File(proj.alteredContent.baseFolder.getAbsolutePath()+File.separator+"english.pot"));
|
||||
if (newPot == null) {
|
||||
System.err.println("Cannot locate new english.pot file at "+proj.alteredContent.baseFolder.getAbsolutePath()+File.separator);
|
||||
}
|
||||
extractFromPoFile(newPot, stringsResourcesNew, resourcesStringsNew);
|
||||
|
||||
POFile oldPot = parser.parseFile(new File(proj.baseContent.baseFolder.getAbsolutePath()+File.separator+"assets"+File.separator+"translation"+File.separator+"english.pot"));
|
||||
if (oldPot == null) {
|
||||
System.err.println("Cannot locate old english.pot file at "+proj.baseContent.baseFolder.getAbsolutePath()+File.separator+"assets"+File.separator+"translations"+File.separator);
|
||||
}
|
||||
extractFromPoFile(oldPot, stringsResourcesOld, resourcesStringsOld);
|
||||
}
|
||||
|
||||
|
||||
private void extractFromPoFile(POFile po, Map<String, List<String>> stringsResources, Map<String, String> resourcesStrings) {
|
||||
for (POEntry entry : po.getEntryArray()) {
|
||||
Vector<String> resources = entry.getStringsByType(POEntry.StringType.REFERENCE);
|
||||
Vector<String> msgids = entry.getStringsByType(POEntry.StringType.MSGID);
|
||||
if (resources == null || resources.size() == 0 || msgids == null || msgids.size() == 0) continue;
|
||||
String msgid = msgids.get(0);
|
||||
if (msgids.size() > 1) {
|
||||
for (int i = 1; i < msgids.size(); i++) {
|
||||
msgid += msgids.get(i);
|
||||
}
|
||||
}
|
||||
if (msgid.contains("\\n")) {
|
||||
msgid = msgid.replaceAll("\\\\n", "\\\\n\"\n\"");
|
||||
msgid = "\"\n\""+msgid;
|
||||
}
|
||||
for (String resLine : resources) {
|
||||
String[] resArray = resLine.split(" ");
|
||||
for (String res : resArray) {
|
||||
resourcesStrings.put(res, msgid);
|
||||
if (stringsResources.get(msgid) == null) {
|
||||
stringsResources.put(msgid, new LinkedList<String>());
|
||||
}
|
||||
stringsResources.get(msgid).add(res);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void compare() {
|
||||
for (String oldRes : resourcesStringsOld.keySet()) {
|
||||
String newString = resourcesStringsNew.get(oldRes);
|
||||
String oldString = resourcesStringsOld.get(oldRes);
|
||||
if (newString != null) {
|
||||
if (!newString.equals(oldString)) {
|
||||
List<String> allOldResources = stringsResourcesOld.get(oldString);
|
||||
List<String> allNewResources = stringsResourcesNew.get(oldString);
|
||||
StringBuffer sb = new StringBuffer();
|
||||
sb.append("---------------------------------------------\n");
|
||||
sb.append("--- TYPO CHECK ------------------------------\n");
|
||||
sb.append("---------------------------------------------\n");
|
||||
sb.append("String at: "+oldRes+"\n");
|
||||
if (allOldResources.size() > 1) {
|
||||
sb.append("Also present at:\n");
|
||||
for (String res : allOldResources) {
|
||||
if (!res.equals(oldRes)) {
|
||||
sb.append("- "+res+"\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (allNewResources != null) {
|
||||
sb.append("Still present at: \n");
|
||||
for (String res : allNewResources) {
|
||||
sb.append("- "+res+"\n");
|
||||
}
|
||||
}
|
||||
sb.append("Was : \""+oldString+"\"\n");
|
||||
sb.append("Now : \""+newString+"\"\n");
|
||||
System.out.println(sb.toString());
|
||||
showTypoDialog(oldString, newString, sb.toString());
|
||||
}
|
||||
} else {
|
||||
List<String> allOldResources = stringsResourcesOld.get(oldString);
|
||||
List<String> allNewResources = stringsResourcesNew.get(oldString);
|
||||
if (allOldResources.size() >= 1) {
|
||||
System.out.println("---------------------------------------------");
|
||||
System.out.println("--- REMOVED RESOURCE ------------------------");
|
||||
System.out.println("---------------------------------------------");
|
||||
System.out.println("String at: "+oldRes);
|
||||
if (allOldResources.size() > 1) {
|
||||
System.out.println("And also at:");
|
||||
for (String res : allOldResources) {
|
||||
if (!res.equals(oldRes)) {
|
||||
System.out.println("- "+res);
|
||||
}
|
||||
}
|
||||
}
|
||||
System.out.println("Was: \""+oldString+"\"");
|
||||
if (allNewResources == null) {
|
||||
System.out.println("Absent from new.");
|
||||
} else {
|
||||
System.out.println("Still present at: ");
|
||||
for (String res : allNewResources) {
|
||||
System.out.println("- "+res);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
removedStrings: for (String oldString : stringsResourcesOld.keySet()) {
|
||||
if (stringsResourcesNew.get(oldString) == null) {
|
||||
List<String> allOldResources = stringsResourcesOld.get(oldString);
|
||||
if (allOldResources.size() >= 1) {
|
||||
if (allOldResources.size() > 0) {
|
||||
for (String res : allOldResources) {
|
||||
String newString = resourcesStringsNew.get(res);
|
||||
if (newString != null) {
|
||||
continue removedStrings;
|
||||
}
|
||||
}
|
||||
}
|
||||
System.out.println("---------------------------------------------");
|
||||
System.out.println("--- REMOVED STRING --------------------------");
|
||||
System.out.println("---------------------------------------------");
|
||||
System.out.println("String: \""+oldString+"\"");
|
||||
if (allOldResources.size() > 0) {
|
||||
System.out.println("Was at:");
|
||||
for (String res : allOldResources) {
|
||||
System.out.println("- "+res);
|
||||
}
|
||||
}
|
||||
System.out.println("This string is absent from the new file, and its attached resources are missing too.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void showTypoDialog(String oldMsg, String newMsg, String checkReport) {
|
||||
String typo = "Typo";
|
||||
String review = "Review";
|
||||
String outdated = "Outdated";
|
||||
String none = "None";
|
||||
Object[] options = new Object[] {typo, review, outdated, none};
|
||||
|
||||
int result = JOptionPane.showOptionDialog(null, checkReport, "Choose action", JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, typo);
|
||||
|
||||
if (result < 0 || result >= options.length) {
|
||||
System.out.println("No decision");
|
||||
return;
|
||||
}
|
||||
|
||||
System.out.println("Decision: "+options[result]);
|
||||
|
||||
if (options[result] != none) {
|
||||
msgIdToReplace.put(oldMsg, newMsg);
|
||||
if (options[result] == review) {
|
||||
msgIdToReview.add(newMsg);
|
||||
} else if (options[result] == outdated) {
|
||||
msgIdOutdated.add(newMsg);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void updatePoFiles(Project proj) {
|
||||
File poFolder = new File(proj.baseContent.baseFolder.getAbsolutePath()+File.separator+"assets"+File.separator+"translation");
|
||||
File[] poFiles = poFolder.listFiles(new FileFilter() {
|
||||
@Override
|
||||
public boolean accept(File arg0) {
|
||||
return arg0.isFile() && arg0.getName().endsWith(".po");
|
||||
}
|
||||
});
|
||||
|
||||
for (File f : poFiles) {
|
||||
updatePoFile(proj, f);
|
||||
}
|
||||
}
|
||||
|
||||
private void updatePoFile(Project proj, File f) {
|
||||
POParser parser = new POParser();
|
||||
POFile poFile = parser.parseFile(f);
|
||||
|
||||
Map<String, String> translations = new LinkedHashMap<String, String>();
|
||||
|
||||
//Collect existing translations
|
||||
if (poFile.getHeader() != null) {
|
||||
Vector<String> msgstrs = poFile.getHeader().getStringsByType(POEntry.StringType.HEADER);
|
||||
String header = "";
|
||||
if (!msgstrs.isEmpty()) {
|
||||
if (msgstrs.size() == 1) {
|
||||
header = msgstrs.get(0);
|
||||
} else {
|
||||
for (String msgstr : msgstrs) {
|
||||
header += msgstr;
|
||||
header += "\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
translations.put("", header);
|
||||
}
|
||||
|
||||
for (POEntry entry : poFile.getEntryArray()) {
|
||||
Vector<String> msgids = entry.getStringsByType(POEntry.StringType.MSGID);
|
||||
Vector<String> msgstrs = entry.getStringsByType(POEntry.StringType.MSGSTR);
|
||||
if (msgids == null || msgids.size() == 0) continue;
|
||||
String msgid = msgids.get(0);
|
||||
if (msgids.size() > 1) {
|
||||
for (int i = 1; i < msgids.size(); i++) {
|
||||
msgid += msgids.get(i);
|
||||
}
|
||||
}
|
||||
if (msgid.contains("\\n")) {
|
||||
msgid = msgid.replaceAll("\\\\n", "\\\\n\"\n\"");
|
||||
msgid = "\"\n\""+msgid;
|
||||
}
|
||||
String translation = "";
|
||||
if (!msgstrs.isEmpty()) {
|
||||
if (msgstrs.size() == 1) {
|
||||
translation = msgstrs.get(0);
|
||||
} else {
|
||||
for (String msgstr : msgstrs) {
|
||||
translation += msgstr;
|
||||
}
|
||||
}
|
||||
if (translation.contains("\\n")) {
|
||||
translation = translation.replaceAll("\\\\n", "\\\\n\"\n\"");
|
||||
translation = "\"\n\""+translation;
|
||||
}
|
||||
}
|
||||
translations.put(msgid, translation);
|
||||
}
|
||||
|
||||
//Patch data
|
||||
for (String oldId : msgIdToReplace.keySet()) {
|
||||
String newId = msgIdToReplace.get(oldId);
|
||||
if (translations.containsKey(oldId)) {
|
||||
String trans = translations.get(oldId);
|
||||
translations.remove(oldId);
|
||||
translations.put(newId, trans);
|
||||
}
|
||||
}
|
||||
|
||||
for (String msgid : msgIdToReview) {
|
||||
if (translations.containsKey(msgid)) {
|
||||
String trans = translations.get(msgid);
|
||||
if (trans != null && trans.length() >= 1) translations.put(msgid, "[REVIEW]"+trans);
|
||||
}
|
||||
}
|
||||
|
||||
for (String msgid : msgIdOutdated) {
|
||||
if (translations.containsKey(msgid)) {
|
||||
String trans = translations.get(msgid);
|
||||
if (trans != null && trans.length() >= 1) translations.put(msgid, "[OUTDATED]"+trans);
|
||||
}
|
||||
}
|
||||
|
||||
PoPotWriter.writePoFile(stringsResourcesNew, translations, new File(proj.alteredContent.baseFolder.getAbsolutePath()+File.separator+f.getName()));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,100 +0,0 @@
|
||||
package com.gpl.rpg.atcontentstudio.ui.tools.i18n;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.gpl.rpg.atcontentstudio.model.GameSource;
|
||||
import com.gpl.rpg.atcontentstudio.model.Project;
|
||||
import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
|
||||
import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
|
||||
import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
|
||||
import com.gpl.rpg.atcontentstudio.model.gamedata.ItemCategory;
|
||||
import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
|
||||
import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
|
||||
import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
|
||||
import com.gpl.rpg.atcontentstudio.model.gamedata.QuestStage;
|
||||
import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
|
||||
|
||||
public class PotGenerator {
|
||||
|
||||
public static void generatePotFileForProject(Project proj) {
|
||||
Map<String, List<String>> stringsResources = new LinkedHashMap<String, List<String>>();
|
||||
Map<String, String> resourcesStrings = new LinkedHashMap<String, String>();
|
||||
|
||||
GameSource gsrc = proj.baseContent;
|
||||
|
||||
for (ActorCondition ac : gsrc.gameData.actorConditions) {
|
||||
pushString(stringsResources, resourcesStrings, ac.display_name, getPotContextComment(ac));
|
||||
}
|
||||
|
||||
for (Dialogue d : gsrc.gameData.dialogues ) {
|
||||
pushString(stringsResources, resourcesStrings, d.message, getPotContextComment(d));
|
||||
if (d.replies == null) continue;
|
||||
for (Dialogue.Reply r : d.replies) {
|
||||
if (r.text != null && !r.text.equals(Dialogue.Reply.GO_NEXT_TEXT) ) {
|
||||
pushString(stringsResources, resourcesStrings, r.text, getPotContextComment(d)+":"+d.replies.indexOf(r));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (ItemCategory ic : gsrc.gameData.itemCategories) {
|
||||
pushString(stringsResources, resourcesStrings, ic.name, getPotContextComment(ic));
|
||||
}
|
||||
|
||||
for (Item i : gsrc.gameData.items) {
|
||||
pushString(stringsResources, resourcesStrings, i.name, getPotContextComment(i));
|
||||
pushString(stringsResources, resourcesStrings, i.description, getPotContextComment(i)+":description");
|
||||
}
|
||||
|
||||
for (NPC npc : gsrc.gameData.npcs ) {
|
||||
pushString(stringsResources, resourcesStrings, npc.name, getPotContextComment(npc));
|
||||
}
|
||||
|
||||
for (Quest q : gsrc.gameData.quests) {
|
||||
if (q.visible_in_log != null && q.visible_in_log != 0) {
|
||||
pushString(stringsResources, resourcesStrings, q.name, getPotContextComment(q));
|
||||
for (QuestStage qs : q.stages) {
|
||||
pushString(stringsResources, resourcesStrings, qs.log_text, getPotContextComment(q)+":"+Integer.toString(qs.progress));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (WorldmapSegment ws : gsrc.worldmap) {
|
||||
for (WorldmapSegment.NamedArea area : ws.labels.values()) {
|
||||
pushString(stringsResources, resourcesStrings, area.name, gsrc.worldmap.worldmapFile.getName()+":"+ws.id+":"+area.id);
|
||||
}
|
||||
}
|
||||
|
||||
File f = new File(proj.alteredContent.baseFolder, "english.pot");
|
||||
PoPotWriter.writePotFile(stringsResources, f);
|
||||
|
||||
}
|
||||
|
||||
private static void pushString (Map<String, List<String>> stringsResources, Map<String, String> resourcesStrings, String translatableString, String resourceIdentifier) {
|
||||
if (translatableString == null) return;
|
||||
if (translatableString.length() == 0) return;
|
||||
if (translatableString.contains("\"")) {
|
||||
translatableString = translatableString.replaceAll("\"", "\\\\\"");
|
||||
}
|
||||
if (translatableString.contains("\n")) {
|
||||
translatableString = translatableString.replaceAll("\n", "\\\\n\"\n\"");
|
||||
translatableString = "\"\n\""+translatableString;
|
||||
}
|
||||
resourcesStrings.put(resourceIdentifier, translatableString);
|
||||
List<String> resourceIdentifiers = stringsResources.get(translatableString);
|
||||
if (resourceIdentifiers == null) {
|
||||
resourceIdentifiers = new LinkedList<String>();
|
||||
stringsResources.put(translatableString, resourceIdentifiers);
|
||||
}
|
||||
resourceIdentifiers.add(resourceIdentifier);
|
||||
}
|
||||
|
||||
private static String getPotContextComment(JSONElement e) {
|
||||
return e.jsonFile.getName()+":"+e.id;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user