Merge pull request #5 from JamzTheMan/1.4.1-dev-branch

Feature Enhancements to support Campaign Exports

build.gradle

@@ -48,7 +48,7 @@ configurations {
 
 
 task wrapper(type: Wrapper) {
-	gradleVersion='2.1'
+	gradleVersion='2.12'
 }
 
 install {
@@ -88,7 +88,7 @@ buildscript {
 dependencies {
 	compile 'antlr:antlr:2.7.6'
 	compile 'commons-io:commons-io:2.4'
-	compile 'com.thoughtworks.xstream:xstream:1.4.1'
+	compile 'com.thoughtworks.xstream:xstream:1.4.9'
 	compile 'commons-lang:commons-lang:2.6'
 	compile 'commons-logging:commons-logging:1.1.1'
 	compile 'commons-net:commons-net:3.2'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Sep 17 23:43:06 ACST 2015
+#Mon Jun 13 17:10:57 CDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

src/main/java/net/rptools/lib/io/PackedFile.java

@@ -228,6 +228,7 @@ public Object getContent(ModelVersionManager versionManager, String fileVersion)
 				r = getFileAsReader(CONTENT_FILE);
 				String xml = IOUtils.toString(r);
 				xml = versionManager.transform(xml, fileVersion);
+				xstream.ignoreUnknownElements(); // Jamz: Should we use this? This will ignore new classes/fields added.
 				return xstream.fromXML(xml);
 			} else {
 				return getFileObject(CONTENT_FILE);
@@ -406,10 +407,6 @@ public void setContent(Object content) throws IOException {
 		putFile(CONTENT_FILE, content);
 	}
 
-	public void setContent(Object content, Class omittedClass, String omittedField) throws IOException {
-		putFileWithOmissions(CONTENT_FILE, content, omittedClass, omittedField);
-	}
-
 	/**
 	 * Does the work of preparing for output to a temporary file, returning the {@link File} object associated with the
 	 * temporary location. The caller is then expected to open and write their data to the file which will later be
@@ -494,20 +491,6 @@ public void putFile(String path, Object obj) throws IOException {
 		IOUtils.closeQuietly(bw);
 	}
 
-	// This method can remove a Class.field for backwards compatibility, i.e. LightSource.lumens for b89 compatibility
-	public void putFileWithOmissions(String path, Object obj, Class omittedClass, String omittedField) throws IOException {
-		File explodedFile = putFileImpl(path);
-		FileOutputStream fos = new FileOutputStream(explodedFile);
-		OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF-8");
-		BufferedWriter bw = new BufferedWriter(osw);
-
-		xstream.omitField(omittedClass, omittedField);
-		xstream.toXML(obj, bw);
-
-		bw.newLine(); // Not necessary but editing the file looks nicer. ;-)
-		IOUtils.closeQuietly(bw);
-	}
-
 	/**
 	 * Write the data from the given URL to the path in the ZIP file; as the data is presumed binary there is no
 	 * {@link Charset} conversion.
@@ -572,6 +555,7 @@ public Object getFileObject(String path) throws IOException {
 		LineNumberReader r = getFileAsReader(path);
 		Object o = null;
 		try {
+			xstream.ignoreUnknownElements(); // Jamz: Should we use this? This will ignore new classes/fields added.		
 			o = xstream.fromXML(r);
 		} catch (InstantiationError ie) {
 			log.error("Found at line number " + r.getLineNumber());