Alle Abfragen und Abbrüche für während Up/Downloads implementiert

1 files changed, 21 insertions, 43 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index a0d679fb..9e5b7db8 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -87,7 +87,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	JButton btnUploadStarten = new JButton("Upload auf Server starten");
 	JButton btnZurck = new JButton("Zur\u00FCck");
 	int progress = 0; // progress of upload
-	private boolean isCurrentlyLoading = false; // currently up or downloading file
+	private boolean isCurrentlyLoading = false; // currently up or downloading
+												// file
 
 	/**
 	 * Create the frame.
@@ -166,7 +167,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 										"C:\\Users\\"
 												+ System.getProperty("user.name")
 												+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
-						fc = new JFileChooser(ini.get("main", "Letzter Uploadpfad",String.class));
+						fc = new JFileChooser(ini.get("main",
+								"Letzter Uploadpfad", String.class));
 					} catch (InvalidFileFormatException e2) {
 						// TODO Auto-generated catch block
 						e2.printStackTrace();
@@ -174,7 +176,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						// TODO Auto-generated catch block
 						e2.printStackTrace();
 					}
-					
+
 					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
 
 					fc.showOpenDialog(getParent());
@@ -216,8 +218,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					// wenn leer, dann upload button nicht freigeben
 					btnUploadStarten.setEnabled(false);
 					btnUploadStarten.setText("Bitte warten");
-				} else {
-					// wenn leer, dann upload button nicht freigeben
+				} else if (lblPath.getText().endsWith(".vmdk")) {
+					// wenn leer, dann upload button freigeben
 					btnUploadStarten.setEnabled(true);
 					btnUploadStarten.setText("Upload auf Server starten");
 				}
@@ -431,18 +433,16 @@ public class FTPCreateUploader_GUI extends JFrame implements
 								task.cancel(true);
 								// not loading files, go back one page
 								dispose();
-
 								PermissionCreateImage_GUI m = new PermissionCreateImage_GUI();
 								m.setVisible(true);
 
-							}
+							}// end if choice
 						} else {
 							dispose();
-
 							PermissionCreateImage_GUI m = new PermissionCreateImage_GUI();
 							m.setVisible(true);
-						}
-					}
+						}// end else
+					}// end action
 				});
 				btnZurck.setActionCommand("Cancel");
 				buttonPane.add(btnZurck);
@@ -461,20 +461,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		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();
 				}
-
 			}
 		});
 
@@ -484,20 +479,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		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);
@@ -560,25 +550,14 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
 
-			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
-			if (progress == 0 || progress == 100) {
-				// not uploading currently
-				// btnZurck.setEnabled(true);
-			} else {
-				// currently uploading, don't let user interact
-				// btnZurck.setEnabled(false);
-			}
-
-			// Fertigstellen erlauben wenn upload abgeschlossen
-			if (progress == 100) {
-				isCurrentlyLoading();
-				finishButton.setEnabled(true);
-
-			} else {
-				finishButton.setEnabled(false);
-
-			}
+		}
 
+		// Fertigstellen erlauben wenn upload abgeschlossen
+		if (isCurrentlyLoading() == false) {			
+			// isCurrentlyLoading();
+			finishButton.setEnabled(true);
+		} else {
+			finishButton.setEnabled(false);
 		}
 
 		if ("speed" == arg0.getPropertyName()) {
@@ -636,9 +615,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					Image.image.isVorlage(), Image.image.getFilesize(),
 					Image.image.getShareMode(), Image.image.getOS());
 
-						client.startFileCopy(Image.image.getNewName());
+			client.startFileCopy(Image.image.getNewName());
 
-			
 			client.writeImageRights(Image.image.getImagename(),
 					person.verantwortlicher.getUsername(),
 					person.verantwortlicher.getName(),
@@ -661,13 +639,13 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	public boolean isCurrentlyLoading() {
 		isCurrentlyLoading = false;
 
-		if (labelverbleibend.getText().equals("0")) {
+		if (labelverbleibend.getText().equals("0 MB") || labelverbleibend.getText().equals("0")) {
 			isCurrentlyLoading = false;
 		} else {
 			isCurrentlyLoading = true;
 		}
-		System.out.println("isCurrentlyLoading"+isCurrentlyLoading);
+		
 		return isCurrentlyLoading;
 	}// end isCurrentlyLoading()
 
-}// end class
+}// end class
\ No newline at end of file