[client] rebasing the whole app...

1 files changed, 10 insertions, 2 deletions

diff --git a/dozentenmodul/src/main/java/ftp/DownloadTask.java b/dozentenmodul/src/main/java/ftp/DownloadTask.java
index 95e74169..481ea75a 100644
--- a/dozentenmodul/src/main/java/ftp/DownloadTask.java
+++ b/dozentenmodul/src/main/java/ftp/DownloadTask.java
@@ -13,8 +13,8 @@ import java.util.Map;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 
-import models.Image;
-import models.SessionData;
+import org.openslx.bwlp.thrift.iface.*;
+
 
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
@@ -191,6 +191,9 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 	 * @return true|false indicating the success of the file creation
 	 */
 	private boolean generateVmx() {
+		return false;
+		
+		/* BROKEN CODE - FIXME class imports
 		String vmxTemplate = ResourceLoader.getTextFile("/txt/vmx_template");
 		// TODO: sanity checks on vmxTemplate would be good here... just to be safe
 
@@ -198,6 +201,7 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 		// for this, we first need to get the image information from the server
 		LOGGER.debug("Image's ID: " + Image.ImageId);
 		Map<String, String> imageData = null;
+
 		try {
 			imageData = ThriftManager.getSatClient().getImageData(Image.ImageId, Image.Version,
 					SessionData.authToken);
@@ -213,6 +217,8 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 			LOGGER.error("Image's version: " + Image.Version);
 			return false;
 		}
+
+		
 		int hardwareVersion = extractHardwareVersion(saveDir + File.separator
 				+ imageData.get("path").replaceFirst("^prod/", ""));
 		if (hardwareVersion == 0) {
@@ -242,6 +248,8 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 			return false;
 		}
 		return true;
+		 * BROKEN CODE - FIXME
+		 */
 	}
 
 	/**