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

Conflicts:
	ffffDozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
	Dozentenmodul/bin/gui/image/SearchImage_GUI.class
	Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
	Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
	Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
	Dozentenmodul/src/models/Links.java

1 files changed, 16 insertions, 20 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index c0c362f9..a5f64d90 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -3,7 +3,6 @@ package gui.image;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.EventQueue;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.SystemColor;
@@ -80,22 +79,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JButton finishButton = new JButton("Fertigstellen");
 	JButton btnZurck = new JButton("Zur\u00FCck");
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					FTPEditUploader_GUI frame = new FTPEditUploader_GUI();
-					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
+	
 	/**
 	 * Create the frame.
 	 */
@@ -313,7 +297,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) {
 
@@ -425,7 +409,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 			progressBar.setValue(progress);
 			
 			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
-			if (progress == 0 || progress == 100) {
+			if (progress == 100) {
 				// not uploading currently
 				btnZurck.setEnabled(true);
 			} else {
@@ -484,12 +468,24 @@ public class FTPEditUploader_GUI extends JFrame implements
 		try {
 			System.out.println("NewName="+Image.image.getNewName());
 			System.out.println("OldName="+Image.image.getImagename());
+			if(Image.image.getNewName().isEmpty()){
+				client.updateImageData(Image.image.getImagename(),
+						Image.image.getImagename(),Image.image.getImagepath(), Image.image.isLicensed(),
+						Image.image.isInternet(), Image.image.getRam(),
+						Image.image.getCpu(), Image.image.getImageId(),
+						Image.image.getVersion(), false,Image.image.getFilesize(),Image.image.getShareMode());
+				client.startFileCopy(Image.image.getNewName());
+			}
+			else{
+				
+			
 			client.updateImageData(Image.image.getImagename(),
 					Image.image.getImagename(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(),
 					Image.image.isInternet(), Image.image.getRam(),
 					Image.image.getCpu(), Image.image.getImageId(),
-					Image.image.getVersion(), false,Image.image.getFilesize());
+					Image.image.getVersion(), false,Image.image.getFilesize(),Image.image.getShareMode());
 			client.startFileCopy(Image.image.getNewName());
+			}
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();