Allow a file to be loaded if it references a missing component property,

but show a warning.

diylc/diylc-core/src/org/diylc/presenter/ProjectFileManager.java

@@ -32,6 +32,7 @@ import java.io.Writer;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -51,6 +52,7 @@ import org.xml.sax.SAXException;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.mapper.MapperWrapper;
 
 public class ProjectFileManager {
 
@@ -68,9 +70,27 @@ public class ProjectFileManager {
 
   private List<IOldFileParser> parsers;
   
+  private Set<String> missingFields = new HashSet<String>();
+
   public ProjectFileManager(MessageDispatcher<EventType> messageDispatcher) {
     super();
-    this.xStream = new XStream(new DomDriver("UTF-8"));
+    this.xStream = new XStream(new DomDriver("UTF-8")) {
+      
+      @Override
+      protected MapperWrapper wrapMapper(MapperWrapper next) {
+          return new MapperWrapper(next) {
+              @SuppressWarnings("rawtypes")
+              @Override
+              public boolean shouldSerializeMember(Class definedIn, String fieldName) {
+                  if (definedIn == Object.class) {
+                      missingFields.add(definedIn.getName() + "." + fieldName);
+                      return false;
+                  }
+                  return super.shouldSerializeMember(definedIn, fieldName);
+              }
+          };
+      }
+    };
     xStream.autodetectAnnotations(true);
     xStream.registerConverter(new PointConverter());
     this.xStreamOld = new XStream(new DomDriver());
@@ -131,7 +151,7 @@ public class ProjectFileManager {
     Document doc = db.parse(new InputSource(new InputStreamReader(new FileInputStream(file))));
     doc.getDocumentElement().normalize();
     if (doc.getDocumentElement().getNodeName().equalsIgnoreCase(Project.class.getName())) {
-      project = parseV3File(fileName);
+      project = parseV3File(fileName, warnings);
     } else {
       if (!doc.getDocumentElement().getNodeName().equalsIgnoreCase("layout")) {
         throw new IllegalArgumentException("Could not open DIY file. Root node is not named 'Layout'.");
@@ -171,9 +191,10 @@ public class ProjectFileManager {
     messageDispatcher.dispatchMessage(EventType.FILE_STATUS_CHANGED, getCurrentFileName(), isModified());
   }
 
-  private Project parseV3File(String fileName) throws IOException {
+  private Project parseV3File(String fileName, List<String> warnings) throws IOException {
     Project project;
     FileInputStream fis = new FileInputStream(fileName);
+    missingFields.clear();
     try {
       Reader reader = new InputStreamReader(fis, "UTF-8");
       project = (Project) xStream.fromXML(reader);
@@ -183,6 +204,9 @@ public class ProjectFileManager {
       fis = new FileInputStream(fileName);
       project = (Project) xStreamOld.fromXML(fis);
     }
+    if (!missingFields.isEmpty()) {
+      warnings.add("The project references unknown component properties, most likely because it was created with a newer version of DIYLC.");
+    }
     fis.close();
     return project;
   }

diylc/diylc-swing/update.xml

@@ -2461,5 +2461,21 @@
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>	
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>3</major>
+				<minor>54</minor>
+				<build>0</build>
+			</versionNumber>
+			<releaseDate>2019-02-03 00:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>				
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Allow a file to be loaded if it references a missing component property, but show a warning.</description>
+				</org.diylc.appframework.update.Change>											
+			</changes>
+			<url>https://github.com/bancika/diy-layout-creator/releases</url>
+		</org.diylc.appframework.update.Version>	
 	</a>
 </java.util.Arrays_-ArrayList>