From 32dd662857871d8479abb765b712dc4c3d73d73a Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Thu, 20 Nov 2014 19:05:38 +0100 Subject: • replaced getText() with getText().trim() --- .../java/gui/image/CreateImageAllgemein_GUI.java | 26 +++++++++++----------- .../src/main/java/gui/image/DeleteImage_GUI.java | 2 +- .../java/gui/image/EditImageAllgemein_GUI.java | 24 ++++++++++---------- .../main/java/gui/image/FTPCreateUploader_GUI.java | 10 ++++----- .../main/java/gui/image/FTPEditDownloader_GUI.java | 10 ++++----- .../main/java/gui/image/FTPEditUploader_GUI.java | 12 +++++----- .../java/gui/image/FTPSearchDownloader_GUI.java | 12 +++++----- .../main/java/gui/image/SearchEditImage_GUI.java | 6 ++--- .../src/main/java/gui/image/SearchImage_GUI.java | 6 ++--- 9 files changed, 54 insertions(+), 54 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image') diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java index e40a2a1e..5d72fc36 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java @@ -312,8 +312,8 @@ public class CreateImageAllgemein_GUI extends JFrame { JButton backButton = new JButton("Zurück"); backButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - Image.image.setImagename(imagename.getText()); - Image.image.setDesc(textAreadesc.getText()); + Image.image.setImagename(imagename.getText().trim()); + Image.image.setDesc(textAreadesc.getText().trim()); MainMenue_GUI sr = new MainMenue_GUI(c); sr.setVisible(true); dispose(); @@ -329,8 +329,8 @@ public class CreateImageAllgemein_GUI extends JFrame { // Prüfe Eingabe if (validateContent()) { // Schreibt die Daten in das Model - Image.image.setImagename(imagename.getText()); - Image.image.setDesc(textAreadesc.getText()); + Image.image.setImagename(imagename.getText().trim()); + Image.image.setDesc(textAreadesc.getText().trim()); //LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" // + Image.image.getImagename() @@ -432,12 +432,12 @@ public class CreateImageAllgemein_GUI extends JFrame { */ private boolean validateContent() { // check if any text field is empty - if (imagename.getText().isEmpty() - || textAreadesc.getText().isEmpty() - || Vorname.getText().isEmpty() - || Nachname.getText().isEmpty() - || Hochschule.getText().isEmpty() - || EMail.getText().isEmpty()) { + if (imagename.getText().trim().isEmpty() + || textAreadesc.getText().trim().isEmpty() + || Vorname.getText().trim().isEmpty() + || Nachname.getText().trim().isEmpty() + || Hochschule.getText().trim().isEmpty() + || EMail.getText().trim().isEmpty()) { // missing some fields //LOGGER.info("Form has missing fields, warning user."); JOptionPane.showMessageDialog(c, @@ -450,7 +450,7 @@ public class CreateImageAllgemein_GUI extends JFrame { // only allow letter from alphabet and numbers for the image name and certain special chars // x2B= "+" x2C="-" x3A=":" x5F="_" // - if (!imagename.getText().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) { + if (!imagename.getText().trim().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) { //LOGGER.info("Image name not alpha-numerical, warn user."); JOptionPane.showMessageDialog( c, @@ -461,9 +461,9 @@ public class CreateImageAllgemein_GUI extends JFrame { } // max length for image description is 254 chars - if (textAreadesc.getText().length() >= MAX_DESCRIPTION_LENGTH) { + if (textAreadesc.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) { JOptionPane.showMessageDialog(c, - "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().length()+".", + "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().trim().length()+".", "Beschreibung zu umfangreich", JOptionPane.ERROR_MESSAGE); return false; diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index 1fafb46b..e32de026 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -289,7 +289,7 @@ public class DeleteImage_GUI extends JFrame { public void keyReleased(KeyEvent e) { // Textfield eingabe auslesen - String stext = textFieldName.getText(); + String stext = textFieldName.getText().trim(); // Wenn Textfield nicht leer if (stext != "") diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index 89548a9b..a848c805 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -317,7 +317,7 @@ public class EditImageAllgemein_GUI extends JFrame { // Setzen der Eingabe im Model, dadurch bleiben die // Daten bei einem erneuten Aufruf verfuegbar - // Image.image.setImagename(imagename.getText()); + // Image.image.setImagename(imagename.getText().trim()); SearchEditImage_GUI se = new SearchEditImage_GUI(c); se.setVisible(true); @@ -337,8 +337,8 @@ public class EditImageAllgemein_GUI extends JFrame { if (checkContent() == true && checkNameIsLettersOrNumbers() == true && descriptionLenghtOK()== true) { // setze Namen, egal ob alt oder nicht - Image.image.setImagename(imagename.getText()); - Image.image.setDesc(textAreadesc.getText()); + Image.image.setImagename(imagename.getText().trim()); + Image.image.setDesc(textAreadesc.getText().trim()); // Info //LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" // + Image.image.getImagename() @@ -485,7 +485,7 @@ public class EditImageAllgemein_GUI extends JFrame { nameIsOK = false; //only allow letter from alphabet and nothing else - if (imagename.getText().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) { + if (imagename.getText().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) { nameIsOK = true; } else { JOptionPane @@ -503,12 +503,12 @@ public class EditImageAllgemein_GUI extends JFrame { textfieldsHaveContent=false; //check if any textfield is empty - if(imagename.getText().isEmpty() == false - && textAreadesc.getText().isEmpty() == false - && Vorname.getText().isEmpty() == false - && Nachname.getText().isEmpty() == false - && Hochschule.getText().isEmpty() == false - && EMail.getText().isEmpty() == false) { + if(imagename.getText().trim().isEmpty() == false + && textAreadesc.getText().trim().isEmpty() == false + && Vorname.getText().trim().isEmpty() == false + && Nachname.getText().trim().isEmpty() == false + && Hochschule.getText().trim().isEmpty() == false + && EMail.getText().trim().isEmpty() == false) { //all textfields have content textfieldsHaveContent = true; } else { @@ -527,11 +527,11 @@ public class EditImageAllgemein_GUI extends JFrame { descriptionLengthOK=false; //max length is 254 chars - if (textAreadesc.getText().length() >= MAX_DESCRIPTION_LENGTH) { + if (textAreadesc.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) { descriptionLengthOK=false; JOptionPane .showMessageDialog(c, - "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().length()+".", + "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().trim().length()+".", "Beschreibung zu umfangreich", JOptionPane.ERROR_MESSAGE); }else { diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 579ff3c2..80c88c98 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -224,8 +224,8 @@ public class FTPCreateUploader_GUI extends JFrame implements lblPath.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent arg0) { - if (lblPath.getText() == null - || !lblPath.getText().endsWith(".vmdk")) { + if (lblPath.getText().trim() == null + || !lblPath.getText().trim().endsWith(".vmdk")) { // Keine Auswahl oder Auswahl ist keine vmdk btnUploadStarten.setEnabled(false); btnUploadStarten.setText("Kein Image!"); @@ -427,7 +427,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JOptionPane.ERROR_MESSAGE); } - File f = new File(lblPath.getText()); + File f = new File(lblPath.getText().trim()); if (f.isDirectory()) { // shouldn't be a directory, but let's check that // case anyway @@ -760,8 +760,8 @@ public class FTPCreateUploader_GUI extends JFrame implements public boolean isCurrentlyLoading() { isCurrentlyLoading = false; - if (lblVerbleibend.getText().equals("0 MB") - || lblVerbleibend.getText().equals("0")) { + if (lblVerbleibend.getText().trim().equals("0 MB") + || lblVerbleibend.getText().trim().equals("0")) { isCurrentlyLoading = false; } else { isCurrentlyLoading = true; diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java index c435cf45..a3e4c6cf 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java @@ -205,7 +205,7 @@ public class FTPEditDownloader_GUI extends JFrame implements lblPath.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent arg0) { - if (lblPath.getText() == null) { + if (lblPath.getText().trim().trim() == null) { // wenn leer, dann upload button nicht freigeben btnDownloadStarten.setEnabled(false); btnDownloadStarten.setText("Bitte warten"); @@ -480,7 +480,7 @@ public class FTPEditDownloader_GUI extends JFrame implements }// end else // always save download path - File f = new File(lblPath.getText()); + File f = new File(lblPath.getText().trim().trim()); if (f.isDirectory()) { Config.setLastDownloadPath(f.toString()); } else if (f.getParentFile().isDirectory()) { @@ -534,7 +534,7 @@ public class FTPEditDownloader_GUI extends JFrame implements } task = new DownloadTask(host, port, user.userName, user.password, - downloadFile, lblPath.getText()); + downloadFile, lblPath.getText().trim().trim()); task.addPropertyChangeListener(this); task.execute(); taskrun = true; @@ -598,8 +598,8 @@ public class FTPEditDownloader_GUI extends JFrame implements public boolean isCurrentlyLoading() { isCurrentlyLoading = false; - if (lblVerbleibend.getText().equals("0 MB") - || lblVerbleibend.getText().equals("0")) { + if (lblVerbleibend.getText().trim().trim().equals("0 MB") + || lblVerbleibend.getText().trim().trim().equals("0")) { isCurrentlyLoading = false; } else { isCurrentlyLoading = true; diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index c534c228..d0a42e4b 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -211,11 +211,11 @@ public class FTPEditUploader_GUI extends JFrame implements lblPath.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent arg0) { - if (lblPath.getText().isEmpty()) { + if (lblPath.getText().trim().isEmpty()) { // wenn leer, dann upload button nicht freigeben btnUploadStarten.setEnabled(false); btnUploadStarten.setText("Bitte warten"); - } else if (lblPath.getText().endsWith(".vmdk")) { + } else if (lblPath.getText().trim().endsWith(".vmdk")) { // wenn leer, dann upload button freigeben btnUploadStarten.setEnabled(true); btnUploadStarten.setText("Upload auf Server starten"); @@ -398,8 +398,8 @@ public class FTPEditUploader_GUI extends JFrame implements "Fehler", JOptionPane.ERROR_MESSAGE); } - if (lblPath.getText().length() > 0) { - File f = new File(lblPath.getText()); + if (lblPath.getText().trim().length() > 0) { + File f = new File(lblPath.getText().trim()); if (f.isDirectory()) { Config.setLastUploadPath(f.toString()); @@ -752,8 +752,8 @@ public class FTPEditUploader_GUI extends JFrame implements public boolean isCurrentlyLoading() { isCurrentlyLoading = false; - if (lblVerbleibend.getText().equals("0 MB") - || lblVerbleibend.getText().equals("0")) { + if (lblVerbleibend.getText().trim().equals("0 MB") + || lblVerbleibend.getText().trim().equals("0")) { isCurrentlyLoading = false; } else { isCurrentlyLoading = true; diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java index bce6e3f5..88ac00a6 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java @@ -204,7 +204,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements lblPath.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent arg0) { - if (lblPath.getText() == null) { + if (lblPath.getText().trim() == null) { // wenn leer, dann upload button nicht freigeben btnDownloadStarten.setEnabled(false); btnDownloadStarten.setText("Bitte warten"); @@ -487,7 +487,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements dispose(); }// end else // save config in any case - Config.setLastDownloadPath(lblPath.getText()); + Config.setLastDownloadPath(lblPath.getText().trim()); Config.store(); }// end action }); @@ -497,7 +497,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements btnMainMenu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - Config.setLastDownloadPath(lblPath.getText()); + Config.setLastDownloadPath(lblPath.getText().trim()); Config.store(); MainMenue_GUI mm = new MainMenue_GUI(c); @@ -547,7 +547,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements } task = new DownloadTask(host, port, user.userName, user.password, - downloadFile, lblPath.getText()); + downloadFile, lblPath.getText().trim()); task.addPropertyChangeListener(this); task.execute(); taskrun = true; @@ -613,8 +613,8 @@ public class FTPSearchDownloader_GUI extends JFrame implements public boolean isCurrentlyLoading() { isCurrentlyLoading = false; - if (lblVerbleibend.getText().equals("0 MB") - || lblVerbleibend.getText().equals("0")) { + if (lblVerbleibend.getText().trim().equals("0 MB") + || lblVerbleibend.getText().trim().equals("0")) { isCurrentlyLoading = false; } else { isCurrentlyLoading = true; diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index d0a0780d..38dbe075 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -272,7 +272,7 @@ public class SearchEditImage_GUI extends JFrame { public void keyReleased(KeyEvent e) { // Textfield eingabe auslesen - String stext = textFieldName.getText(); + String stext = textFieldName.getText().trim(); //System.out.println("Help, I don't want to be filtered yet...."); @@ -857,9 +857,9 @@ public class SearchEditImage_GUI extends JFrame { labelWeitereVerantwortliche.setText(""); for (int i = 0; i < contacts.size(); i++) { - labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText()+(contacts.get(i))); + labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText().trim()+(contacts.get(i))); } - labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText()); + labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText().trim()); } catch (TException | ParseException e1) { diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index dd66bf38..77ed56a4 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -362,7 +362,7 @@ public class SearchImage_GUI extends JFrame { @Override public void keyReleased(KeyEvent e) { // Textfield eingabe auslesen - String stext = textFieldName.getText().trim(); + String stext = textFieldName.getText().trim().trim(); // Wenn Textfield nicht leer if (stext != "") @@ -1208,9 +1208,9 @@ public class SearchImage_GUI extends JFrame { labelWeitereVerantwortliche.setText(""); for (int i = 0; i < contacts.size(); i++) { - labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText()+(contacts.get(i))); + labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText().trim()+(contacts.get(i))); } - labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText()); + labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText().trim()); if(person.verantwortlicher.getRole().equals("Student") && res.get("license").equals("1")) { -- cgit v1.2.3-55-g7522