From 20730f37f213a07f990bcb928a9e23f871d49d29 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Apr 2014 17:37:51 +0200 Subject: Diverse kleine Bugfixes --- Dozentenmodul/src/GUI/FTPUploader_GUI.java | 93 +++++++++++++++++++----------- 1 file changed, 59 insertions(+), 34 deletions(-) (limited to 'Dozentenmodul/src/GUI/FTPUploader_GUI.java') diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java index 25fd436f..f435f3ff 100644 --- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java +++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java @@ -128,31 +128,38 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { getContentPane().add(contentPanel, BorderLayout.CENTER); contentPanel.setLayout(null); { - JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen"); + JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); btnSpeicherortAuswhlen.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { JFileChooser fc = new JFileChooser(); fc.setFileSelectionMode(JFileChooser.FILES_ONLY); fc.showOpenDialog(getParent()); - File dir = fc.getSelectedFile(); - uploadFile = dir; - filename = uploadFile.getName(); - lblNewLabel.setText(dir.getAbsolutePath()); + File file = fc.getSelectedFile(); + //check if a file is selected and exists + if (file != null) { + System.out.println("File to upload exists"); + uploadFile = file; + filename = uploadFile.getName(); + lblNewLabel.setText(file.getAbsolutePath()); + } else { + System.out.println("No file selected"); + lblNewLabel.setText(""); + }//end if } }); - btnSpeicherortAuswhlen.setBounds(57, 124, 117, 23); + btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23); btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); - btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT); contentPanel.add(btnSpeicherortAuswhlen); } lblNewLabel = new JLabel(""); - lblNewLabel.setBounds(191, 124, 255, 23); + lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT); + lblNewLabel.setBounds(285, 124, 302, 23); contentPanel.add(lblNewLabel); - JButton btnUploadStarten = new JButton("Upload starten"); + JButton btnUploadStarten = new JButton("Upload auf Server starten"); btnUploadStarten.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { buttonUploadActionPerformed(arg0); @@ -160,53 +167,58 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { } }); - btnUploadStarten.setBounds(57, 168, 141, 23); + btnUploadStarten.setBounds(102, 168, 173, 23); contentPanel.add(btnUploadStarten); progressBar = new JProgressBar(0, 100); progressBar.setStringPainted(true); - progressBar.setBounds(57, 202, 497, 30); + progressBar.setBounds(102, 202, 485, 30); contentPanel.add(progressBar); JLabel label = new JLabel("Downloadgeschwindigkeit:"); - label.setBounds(57, 243, 141, 14); + label.setBounds(102, 243, 141, 14); contentPanel.add(label); JLabel label_1 = new JLabel("Fertig:"); - label_1.setBounds(57, 293, 46, 14); + label_1.setBounds(102, 293, 46, 14); contentPanel.add(label_1); labelfertig = new JLabel("0"); - labelfertig.setBounds(113, 293, 71, 14); + labelfertig.setHorizontalAlignment(SwingConstants.LEFT); + labelfertig.setBounds(183, 293, 108, 14); contentPanel.add(labelfertig); UpSpeed = new JLabel("0"); - UpSpeed.setBounds(329, 243, 95, 14); + UpSpeed.setHorizontalAlignment(SwingConstants.LEFT); + UpSpeed.setBounds(374, 243, 117, 14); contentPanel.add(UpSpeed); JLabel label_4 = new JLabel("von:"); - label_4.setBounds(184, 293, 46, 14); + label_4.setBounds(318, 293, 46, 14); contentPanel.add(label_4); labelfilesize = new JLabel("0"); - labelfilesize.setBounds(240, 293, 108, 14); + labelfilesize.setHorizontalAlignment(SwingConstants.LEFT); + labelfilesize.setBounds(374, 293, 117, 14); contentPanel.add(labelfilesize); JLabel label_6 = new JLabel("Verbleibend:"); - label_6.setBounds(57, 318, 71, 14); + label_6.setBounds(102, 318, 71, 14); contentPanel.add(label_6); JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:"); - label_7.setBounds(57, 268, 150, 14); + label_7.setBounds(102, 268, 150, 14); contentPanel.add(label_7); labelZeit = new JLabel("0"); - labelZeit.setBounds(329, 268, 117, 14); + labelZeit.setHorizontalAlignment(SwingConstants.LEFT); + labelZeit.setBounds(374, 268, 117, 14); contentPanel.add(labelZeit); labelverbleibend = new JLabel("0"); - labelverbleibend.setBounds(138, 318, 108, 14); + labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT); + labelverbleibend.setBounds(183, 318, 108, 14); contentPanel.add(labelverbleibend); JPanel panel = new JPanel(); @@ -221,7 +233,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { panel.add(lblUploadIhresImage); JTextPane txtpnFhreSieBitte = new JTextPane(); - txtpnFhreSieBitte.setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden."); + txtpnFhreSieBitte + .setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden."); txtpnFhreSieBitte.setEditable(false); txtpnFhreSieBitte.setBackground(SystemColor.menu); txtpnFhreSieBitte.setBounds(10, 36, 509, 32); @@ -261,6 +274,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { btnCopyFileTo.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { + System.out.println("Copying file to "+ user.path + "/" + uploadFile.getName()); client.startFileCopy(user.path + "/" + uploadFile.getName()); } catch (TException e1) { // TODO Auto-generated catch block @@ -268,24 +282,24 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { } } }); - btnCopyFileTo.setBounds(57, 343, 217, 23); + btnCopyFileTo.setBounds(102, 343, 173, 23); contentPanel.add(btnCopyFileTo); - JLabel label_8 = new JLabel("1."); - label_8.setBounds(24, 128, 23, 14); - contentPanel.add(label_8); + JLabel lblShritt = new JLabel("Schritt 1:"); + lblShritt.setBounds(24, 128, 57, 14); + contentPanel.add(lblShritt); - JLabel label_9 = new JLabel("2."); - label_9.setBounds(24, 172, 23, 14); - contentPanel.add(label_9); + JLabel lblSchritt = new JLabel("Schritt 2:"); + lblSchritt.setBounds(24, 172, 57, 14); + contentPanel.add(lblSchritt); - JLabel label_10 = new JLabel("3."); - label_10.setBounds(20, 391, 23, 14); - contentPanel.add(label_10); + JLabel lblSchritt_1 = new JLabel("Schritt 3:"); + lblSchritt_1.setBounds(20, 391, 57, 14); + contentPanel.add(lblSchritt_1); JLabel lblKlickenSieAuf = new JLabel( "Klicken Sie auf \"Fertigstellen\"."); - lblKlickenSieAuf.setBounds(53, 391, 241, 14); + lblKlickenSieAuf.setBounds(98, 391, 241, 14); contentPanel.add(lblKlickenSieAuf); { JPanel buttonPane = new JPanel(); @@ -326,6 +340,17 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { } }); + JButton btnZurck = new JButton("Zur\u00FCck"); + btnZurck.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + dispose(); + EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI(); + m.setVisible(true); + } + }); + btnZurck.setActionCommand("Cancel"); + buttonPane.add(btnZurck); + cancelButton.setActionCommand("Cancel"); buttonPane.add(cancelButton); finishButton.setActionCommand("Cancel"); @@ -400,7 +425,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { progress = (Integer) arg0.getNewValue(); progressBar.setValue(progress); - // Button zum Fertigstellen freischalten + // Button zum Fertigstellen freischalten, wenn 100% erreicht sind if (progress == 100) { finishButton.setEnabled(true); } -- cgit v1.2.3-55-g7522