Better error message when setting cannot be loaded

Author: mgmax

src/main/java/de/thomas_oster/visicut/VisicutModel.java

@@ -527,7 +527,7 @@ public PlfFile loadPlfFile(MappingManager mm, File f, List<String> warnings) thr
       }
       else if (name.equals((i > 0 ? i+"/" : "")+"mappings.xml"))
       {
-        MappingSet map = mm.loadFromFile(zip.getInputStream(entry));
+        MappingSet map = mm.loadFromFile(zip.getInputStream(entry), name);
         if (map != null)
         {
           mappings.put(i, map);

src/main/java/de/thomas_oster/visicut/managers/FilebasedManager.java

@@ -228,7 +228,7 @@ public void save(T mp, File f) throws FileNotFoundException, IOException
   public T loadFromFile(File f) throws FileNotFoundException, IOException
   {
     FileInputStream fin = new FileInputStream(f);
-    T result = this.loadFromFile(fin);
+    T result = this.loadFromFile(fin, f.getPath());
     fin.close();
     if (result == null)
     {
@@ -245,11 +245,11 @@ public T loadFromFile(File f) throws FileNotFoundException, IOException
     return result;
   }
 
-  public T loadFromFile(InputStream in)
+  public T loadFromFile(InputStream in, String humanReadableName)
   {
     try
     {
-      return (T) readObjectFromXmlStream(in, getXStream(true));
+      return (T) readObjectFromXmlStream(in, getXStream(true), humanReadableName);
     }
     catch (Exception e)
     {
@@ -265,14 +265,15 @@ public T loadFromFile(InputStream in)
    * Convert serialized XML file to Object
    * @param in input stream which reads from XML file
    * @param xStream XStream instance
+   * @param humanReadableName File name or comment for printing an error message
    * @return deserialized Object
    */
-  public static Object readObjectFromXmlStream(InputStream in, XStream xStream) {
+  public static Object readObjectFromXmlStream(InputStream in, XStream xStream, String humanReadableName) {
     try {
       VersionedDocument.xstream = xStream;
       return VersionedDocument.fromXML(IOUtils.toString(in, StandardCharsets.UTF_8)).toBean();
     } catch (Exception e) {
-        Logger.getLogger(FilebasedManager.class.getName()).log(Level.WARNING, "Failed to load object from XML.");
+        Logger.getLogger(FilebasedManager.class.getName()).log(Level.WARNING, "Failed to load object from XML: " + humanReadableName);
         return null;
     }
   }
@@ -286,7 +287,7 @@ public static Object readObjectFromXmlStream(InputStream in, XStream xStream) {
    * @throws java.io.FileNotFoundException
    */
   public static Object readObjectFromXmlFile(File f, XStream xStream) throws FileNotFoundException {
-    Object o = readObjectFromXmlStream(new FileInputStream(f), xStream);
+    Object o = readObjectFromXmlStream(new FileInputStream(f), xStream, f.getPath());
     if (o != null) {
       return o;
     }

src/main/java/de/thomas_oster/visicut/model/graphicelements/psvgsupport/ParametricPlfPart.java

@@ -73,7 +73,7 @@ public static void serializeParameterValues(Map<String, Parameter> parameters, O
   static void unserializeParameterValues(Map<String, Parameter> parameters, FileInputStream in)
   {
     XStream xstream = getXStream();
-    Map<String, Object> values = (Map<String, Object>) FilebasedManager.readObjectFromXmlStream(in, xstream);
+    Map<String, Object> values = (Map<String, Object>) FilebasedManager.readObjectFromXmlStream(in, xstream, "parametric PLF part");
     for (Entry<String, Object> e : values.entrySet())
     {
       if (parameters.containsKey(e.getKey()))