Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
üpo

1 files changed, 55 insertions, 49 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index cc143924..17b7449d 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -85,7 +85,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JButton finishButton = new JButton("Fertigstellen");
 	JButton btnZurck = new JButton("Zur\u00FCck");
 
-	
 	/**
 	 * Create the frame.
 	 */
@@ -120,7 +119,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		// filename=name;
 		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul *Prototyp* - Image bearbeiten");
+		setTitle("Dozentenmodul - Image bearbeiten");
 
 		setBounds(0, 0, 603, 722);
 		GuiOrganizer.centerGUI(this);
@@ -302,7 +301,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 			getContentPane().add(buttonPane, BorderLayout.SOUTH);
 			{
 
-				//finishButton.setEnabled(false);
+				// finishButton.setEnabled(false);
 				finishButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
@@ -318,13 +317,16 @@ public class FTPEditUploader_GUI extends JFrame implements
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
-								JOptionPane.showMessageDialog(null,
-										e1.getCause()+"\n"+e1.getStackTrace(),
-										"Debug-Message", JOptionPane.ERROR_MESSAGE);
+								JOptionPane.showMessageDialog(
+										null,
+										e1.getCause() + "\n"
+												+ e1.getStackTrace(),
+										"Debug-Message",
+										JOptionPane.ERROR_MESSAGE);
 							}
 							task.cancel(true);
 						}
-						
+
 					}
 				});
 				btnZurck.addActionListener(new ActionListener() {
@@ -344,58 +346,56 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
-		
+
 		JMenu menu = new JMenu("Hilfe");
 		menuBar.add(menu);
-		
+
 		JMenuItem menuItem = new JMenuItem("FAQ");
 		menuItem.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				
+
 				OpenLinks open = new OpenLinks();
-				
+
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-					
+
 					open.openWebpage(windows);
-					
+
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				
-				
+
 			}
 		});
 
 		menu.add(menuItem);
-		
+
 		JMenuItem menuItem_1 = new JMenuItem("OTRS");
 		menuItem_1.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
 				OpenLinks open = new OpenLinks();
-				
+
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					
+
 					open.openWebpage(windows);
-					
+
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				
 
 			}
 		});
 
 		menu.add(menuItem_1);
-		
+
 		JMenuItem mntmAbout = new JMenuItem("About");
 		mntmAbout.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@@ -416,24 +416,28 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		try {
 			user = client.getFtpUser();
-			System.out.println("FTP name" + user.userName);
-			System.out.println("FTP path" + user.path);
-			System.out.println("FTP pass" + user.password);
+			System.out.println("FTP name: " + user.userName);
+			System.out.println("FTP path: " + user.path);
+			System.out.println("FTP pass: " + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause()+"\n"+e.getStackTrace(),
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
-		
+
+		System.out.println("Setting new Name: " + formatter.format(new Date())
+				+ "_" + person.verantwortlicher.getHochschule() + "_"
+				+ person.verantwortlicher.getUsername() + "_"
+				+ Image.image.getImagename() + ".vmdk");
 		Image.image.setNewName(formatter.format(new Date()) + "_"
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
-				+ Image.image.getImagename()+ ".vmdk");
+				+ Image.image.getImagename() + ".vmdk");
 		task = new UploadTask(host, port, user.userName, user.password,
-				user.path+"temp/", uploadFile);
+				user.path + "temp/", uploadFile);
 
 		task.addPropertyChangeListener(this);
 		task.execute();
@@ -445,7 +449,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 		if ("progress" == arg0.getPropertyName()) {
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
-			
+
 			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
 			if (progress == 100) {
 				// not uploading currently
@@ -463,8 +467,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 			}
 		}
 
-		
-
 		if ("speed" == arg0.getPropertyName()) {
 			speed = (double) arg0.getNewValue();
 			// if(speed<=1){
@@ -504,32 +506,36 @@ public class FTPEditUploader_GUI extends JFrame implements
 	public boolean updateData() {
 
 		try {
-			System.out.println("NewName="+Image.image.getNewName());
-			System.out.println("OldName="+Image.image.getImagename());
-			if(Image.image.getNewName()!=null){
+			System.out.println("NewName=" + Image.image.getNewName());
+			System.out.println("OldName=" + Image.image.getImagename());
+			if (Image.image.getNewName() != null) {
 				client.updateImageData(Image.image.getImagename(),
-						Image.image.getImagename(),Image.image.getDesc(),Image.image.getImagepath(), Image.image.isLicensed(),
+						Image.image.getImagename(), Image.image.getDesc(),
+						Image.image.getImagepath(), Image.image.isLicensed(),
 						Image.image.isInternet(), Image.image.getRam(),
 						Image.image.getCpu(), Image.image.getImageId(),
-						Image.image.getVersion(), Image.image.isVorlage(),Image.image.getFilesize(),Image.image.getShareMode(),Image.image.getOS());
+						Image.image.getVersion(), Image.image.isVorlage(),
+						Image.image.getFilesize(), Image.image.getShareMode(),
+						Image.image.getOS());
+				client.startFileCopy(Image.image.getNewName());
+			} else {
+
+				client.updateImageData(Image.image.getImagename(),
+						Image.image.getImagename(), Image.image.getDesc(),
+						"temp/" + Image.image.getNewName(),
+						Image.image.isLicensed(), Image.image.isInternet(),
+						Image.image.getRam(), Image.image.getCpu(),
+						Image.image.getImageId(), Image.image.getVersion(),
+						Image.image.isVorlage(), Image.image.getFilesize(),
+						Image.image.getShareMode(), Image.image.getOS());
 				client.startFileCopy(Image.image.getNewName());
-			}
-			else{
-				
-			
-			client.updateImageData(Image.image.getImagename(),
-					Image.image.getImagename(),Image.image.getDesc(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(),
-					Image.image.isInternet(), Image.image.getRam(),
-					Image.image.getCpu(), Image.image.getImageId(),
-					Image.image.getVersion(), Image.image.isVorlage(),Image.image.getFilesize(),Image.image.getShareMode(),Image.image.getOS());
-			client.startFileCopy(Image.image.getNewName());
 			}
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause()+"\n"+e.getStackTrace(),
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					JOptionPane.ERROR_MESSAGE);
 			return false;
 		}
 		return true;