From 8379b2e4a5dd76fcbd344b7a152dc14629f64ae9 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 22 Sep 2014 16:55:49 +0200 Subject: [client] do commit the changes :) --- dozentenmodul/src/main/java/App.java | 62 ++++++++++++++++++---- dozentenmodul/src/main/java/config/Config.java | 29 +++++++--- dozentenmodul/src/main/java/ftp/DownloadTask.java | 13 +++-- dozentenmodul/src/main/java/ftp/UploadTask.java | 12 ++++- .../java/gui/image/CreateImageAllgemein_GUI.java | 13 ++++- .../java/gui/image/CreateImageTechnisch_GUI.java | 22 ++++---- .../src/main/java/gui/image/DeleteImage_GUI.java | 17 +----- .../java/gui/image/EditImageAllgemein_GUI.java | 13 +++-- .../java/gui/image/EditImageTechnisch_GUI.java | 28 ++++++---- .../main/java/gui/image/FTPCreateUploader_GUI.java | 26 +++++---- .../main/java/gui/image/FTPEditDownloader_GUI.java | 7 ++- .../main/java/gui/image/FTPEditUploader_GUI.java | 24 ++++++--- .../main/java/gui/image/SearchEditImage_GUI.java | 17 +++--- .../src/main/java/gui/image/SearchImage_GUI.java | 13 ++--- .../src/main/java/gui/intro/Login_GUI.java | 15 ++++-- .../src/main/java/gui/intro/MainMenue_GUI.java | 49 ++++++----------- .../java/gui/lecture/CreateLectureLink_GUI.java | 6 --- .../main/java/gui/lecture/DeleteLecture_GUI.java | 18 ++++--- .../main/java/gui/lecture/EditLectureLink_GUI.java | 6 --- .../java/gui/lecture/EditLectureSearch_GUI.java | 2 - .../main/java/gui/lecture/SearchLecture_GUI.java | 2 - .../main/java/thrift/MasterThriftConnection.java | 7 ++- .../src/main/java/thrift/ThriftConnection.java | 12 +++-- .../src/main/java/util/ResourceLoader.java | 13 ++++- 24 files changed, 261 insertions(+), 165 deletions(-) (limited to 'dozentenmodul/src/main/java') diff --git a/dozentenmodul/src/main/java/App.java b/dozentenmodul/src/main/java/App.java index 10b9a460..0d3e0124 100644 --- a/dozentenmodul/src/main/java/App.java +++ b/dozentenmodul/src/main/java/App.java @@ -1,29 +1,71 @@ import gui.intro.Login_GUI; import java.awt.EventQueue; +import java.io.File; import java.io.IOException; import javax.swing.JOptionPane; +import org.apache.log4j.FileAppender; +import org.apache.log4j.Logger; +import org.apache.log4j.PatternLayout; + import config.Config; public class App { + // Logger + private final static Logger LOGGER = Logger.getLogger(App.class); + + private static void setupLogger() { + + // path to the log file + final String logFilePath = Config.getPath() + System.getProperty("file.separator") + "bwSuite.log"; + + // check if we had an old log file + final File logFile = new File(logFilePath); + if (logFile.exists() && !logFile.isDirectory()) { + // we have one, rename it to 'bwSuite.log.old' + try { + logFile.renameTo(new File(logFilePath + ".old")); + } catch (Exception e) { + LOGGER.error("Could not move '" + logFilePath + + "' to '" + logFilePath + ".old':"); + e.printStackTrace(); + } + } + + // add file appender to global logger + FileAppender fa = null; + try { + fa = new FileAppender(new PatternLayout("%d [%F:%M] %m%n"), Config.getPath() + System.getProperty("file.separator") + "bwSuite.log"); + LOGGER.addAppender(fa); + LOGGER.info("Starting logging to: " + Config.getPath() + System.getProperty("file.separator") + "bwSuite.log"); + } catch (IOException e) { + e.printStackTrace(); + } + LOGGER.info("Logger initialised."); + } + public static void main(String[] args) { + + // Pruefe und Erzeuge gegebenfalls Config + try { + Config.init(); + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(null, e.getMessage(), + "Fehler", JOptionPane.ERROR_MESSAGE); + return; + } + + setupLogger(); + + // start the GUI EventQueue.invokeLater(new Runnable() { public void run() { try { - // Pruefe und Erzeuge gegebenfalls Config - try { - Config.init(); - } catch (IOException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(null, e.getMessage(), - "Fehler", JOptionPane.ERROR_MESSAGE); - return; - } - // Aufruf und Anzeige des Login Fensters Login_GUI frame = new Login_GUI(); frame.setVisible(true); diff --git a/dozentenmodul/src/main/java/config/Config.java b/dozentenmodul/src/main/java/config/Config.java index 95547b5f..547e0ad5 100644 --- a/dozentenmodul/src/main/java/config/Config.java +++ b/dozentenmodul/src/main/java/config/Config.java @@ -1,8 +1,10 @@ package config; + import java.io.File; import java.io.IOException; +import org.apache.log4j.Logger; import org.ini4j.Wini; /** @@ -13,6 +15,11 @@ import org.ini4j.Wini; public class Config { + /** + * Logger for this class + */ + private final static Logger LOGGER = Logger.getLogger(Config.class); + /** * The main configuration object is of type Wini * It contains the content of the config.ini as @@ -39,7 +46,7 @@ public class Config { // Determine OS String OSName = System.getProperty("os.name").toLowerCase(); - System.out.println("Machine's OS: " + OSName); + LOGGER.info("Machine's OS: " + OSName); if (OSName.contains("windows")) { // Windows machine. Use the environment variable 'APPDATA' which // should point to a path similar to: @@ -49,7 +56,7 @@ public class Config { configPath = appDataPath + "\\bwSuite\\config.ini"; } else { // APPDATA was empty, let's build it ourselves... - System.out.println("APPDATA ist leer."); + LOGGER.warn("APPDATA ist leer."); configPath = System.getProperty("user.home") + "\\AppData\\Roaming\\bwSuite\\config.ini"; } @@ -69,7 +76,7 @@ public class Config { // Check if the directory exists. if (!configFile.getParentFile().exists()) { - System.out.println("Ordner " + configFile.getParentFile() + " exisitiert nicht - lege ihn jetzt an."); + LOGGER.info("Ordner " + configFile.getParentFile() + " exisitiert nicht - lege ihn jetzt an."); // Does not, create it if (!configFile.getParentFile().mkdirs()) { throw new IOException("Konnte '" + configFile.getParentFile() + "' nicht erstellen."); @@ -84,7 +91,7 @@ public class Config { // Check if file is writeable if(configFile.canWrite()) { ini = new Wini(configFile); - System.out.println("Erzeuge '" + configFile + "'..."); + LOGGER.info("Erzeuge '" + configFile + "'..."); // write default configuration options and values ini.put("main", "BillOfRights", false); ini.put("main", "vmware", false); @@ -98,7 +105,7 @@ public class Config { throw new IOException("Konnte nicht in '" + configFile + "' schreiben. Haben Sie Rechte dazu?"); } } else { - System.out.println("'" + configFile + "' existiert bereits - keine weitere Aktion."); + LOGGER.info("'" + configFile + "' existiert bereits - keine weitere Aktion."); ini = new Wini(configFile); } } // end constructor. @@ -146,6 +153,17 @@ public class Config { return getString("main", "Letzter Uploadpfad", System.getProperty("user.home")); } + /** + * Query the path of the configuration file + * @return path to the configuration file + */ + public static String getPath() { + if (ini.getFile().getParentFile().isDirectory()) + return ini.getFile().getParentFile().toString(); + else + return null; + } + /** * Sets the value of 'BillOfRights' in the configuration file to 'value' * @return true if it succeeded, false otherwise @@ -199,7 +217,6 @@ public class Config { ini.store(); return true; } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); return false; } diff --git a/dozentenmodul/src/main/java/ftp/DownloadTask.java b/dozentenmodul/src/main/java/ftp/DownloadTask.java index 5592adba..02bfbe4d 100644 --- a/dozentenmodul/src/main/java/ftp/DownloadTask.java +++ b/dozentenmodul/src/main/java/ftp/DownloadTask.java @@ -1,6 +1,7 @@ package ftp; import gui.image.FTPEditDownloader_GUI; +import gui.intro.Login_GUI; import java.io.File; import java.io.FileOutputStream; @@ -9,6 +10,8 @@ import java.io.InputStream; import javax.swing.JOptionPane; import javax.swing.SwingWorker; +import org.apache.log4j.Logger; + /** * Execute file download in a background thread and update the progress. * @@ -17,6 +20,11 @@ import javax.swing.SwingWorker; */ public class DownloadTask extends SwingWorker { + /** + * Logger instance for this class. + */ + private final static Logger LOGGER = Logger.getLogger(DownloadTask.class); + private static final int BUFFER_SIZE = 4096; private String host; @@ -69,7 +77,6 @@ public class DownloadTask extends SwingWorker { && isCancelled() == false) { outputStream.write(buffer, 0, bytesRead); totalBytesRead += bytesRead; - // System.out.println(totalBytesRead); double speed = NANOS_PER_SECOND / BYTES_PER_MIB * totalBytesRead / (System.nanoTime() - start + 1); percentCompleted = (int) (totalBytesRead * 100 / fileSize); @@ -103,12 +110,12 @@ public class DownloadTask extends SwingWorker { @Override protected void done() { if (!isCancelled() && percentCompleted==100) { - System.out.println("Datei erfolgreich heruntergeladen"); + LOGGER.info("Datei erfolgreich heruntergeladen."); JOptionPane.showMessageDialog(null, "Datei erfolgreich heruntergeladen.", "Message", JOptionPane.INFORMATION_MESSAGE); } else if(!isCancelled() && percentCompleted != 100){ - System.out.println("Datein wurde unvollständig heruntergeladen"); + LOGGER.error("Datei wurde unvollständig heruntergeladen."); JOptionPane.showMessageDialog(null, "Datei wurde unvollständig heruntergeladen. Bitte wiederholen.", "Message", JOptionPane.INFORMATION_MESSAGE); diff --git a/dozentenmodul/src/main/java/ftp/UploadTask.java b/dozentenmodul/src/main/java/ftp/UploadTask.java index e7ebe43b..8fe60320 100644 --- a/dozentenmodul/src/main/java/ftp/UploadTask.java +++ b/dozentenmodul/src/main/java/ftp/UploadTask.java @@ -6,6 +6,8 @@ import java.io.FileInputStream; import javax.swing.JOptionPane; import javax.swing.SwingWorker; +import org.apache.log4j.Logger; + import models.Image; /** @@ -16,6 +18,12 @@ import models.Image; * */ public class UploadTask extends SwingWorker { + + /** + * Logger instance for this class. + */ + private final static Logger LOGGER = Logger.getLogger(UploadTask.class); + private static final int BUFFER_SIZE = 4096; private String host; @@ -94,12 +102,12 @@ public class UploadTask extends SwingWorker { @Override protected void done() { if (!isCancelled() && percentCompleted==100) { - System.out.println("Datei erfolgreich hochgeladen"); + LOGGER.info("Datei erfolgreich hochgeladen."); JOptionPane.showMessageDialog(null, "Datei erfolgreich hochgeladen.", "Message", JOptionPane.INFORMATION_MESSAGE); } else if(!isCancelled() && percentCompleted != 100){ - System.out.println("Datein wurde unvollständig hochgeladen"); + LOGGER.error("Datei wurde unvollständig hochgeladen."); JOptionPane.showMessageDialog(null, "Datei wurde unvollständig hochgeladen. Bitte wiederholen.", "Message", JOptionPane.INFORMATION_MESSAGE); diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java index d5247c7e..cf5345fb 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java @@ -1,6 +1,7 @@ package gui.image; import gui.intro.About_GUI; +import gui.intro.Login_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -38,7 +39,11 @@ import models.Links; import models.person; import util.GuiOrganizer; import util.OpenLinks; + import javax.swing.JScrollPane; + +import org.apache.log4j.Logger; + import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -46,6 +51,11 @@ import java.awt.event.KeyEvent; @SuppressWarnings("serial") public class CreateImageAllgemein_GUI extends JFrame { + /** + * Logger instance for this class. + */ + private final static Logger LOGGER = Logger.getLogger(CreateImageAllgemein_GUI.class); + private final JPanel contentPanel = new JPanel(); String[] result; private JTextField Vorname; @@ -323,8 +333,7 @@ public class CreateImageAllgemein_GUI extends JFrame { Image.image.setImagename(imagename.getText()); Image.image.setDesc(textAreadesc.getText()); // Info - System.out - .println("Alle Eingaben in Ordnung. Imagename= \"" + LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" + Image.image.getImagename() + "\", Imagebeschreibung=\"" + Image.image.getDesc()+"\""); diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java index ecf5b9df..57192b97 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java @@ -2,6 +2,7 @@ package gui.image; import gui.intro.About_GUI; +import gui.intro.Login_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -44,26 +45,27 @@ import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; + import javax.swing.JComboBox; +import org.apache.log4j.Logger; import org.apache.thrift.TException; @SuppressWarnings("serial") public class CreateImageTechnisch_GUI extends JFrame { + /** + * Logger instance for this class. + */ + private final static Logger LOGGER = Logger.getLogger(CreateImageTechnisch_GUI.class); + private final JPanel contentPanel = new JPanel(); String[] result; JSpinner spinnerCPU; JSpinner spinnerRam; - //JRadioButton rdbtnlicenseJa; - //JRadioButton rdbtnlicenseNein; - //JRadioButton rdbtnInternetJa; - //JRadioButton rdbtnInternetNein; - //JRadioButton radioButtonVorlageJa; - //JRadioButton radioButtonVorlageNein; - private JCheckBox chckbxIsTemplate; - private JCheckBox chckbxIsLicensed; - private JCheckBox chckbxIsInternetBlocked; + private JCheckBox chckbxIsTemplate; + private JCheckBox chckbxIsLicensed; + private JCheckBox chckbxIsInternetBlocked; JComboBox comboBox; private final ButtonGroup buttonGrouplicense = new ButtonGroup(); private final ButtonGroup buttonGroupInternet = new ButtonGroup(); @@ -389,7 +391,7 @@ public class CreateImageTechnisch_GUI extends JFrame { Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); Image.image.setOS(comboBox.getSelectedItem().toString()); - System.out.println("Betriebssystem: "+Image.image.getOS()+", istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+", RAM: "+Image.image.getRam()); + LOGGER.info("Betriebssystem: "+Image.image.getOS()+", istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+", RAM: "+Image.image.getRam()); CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI(); ea.setVisible(true); dispose(); diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index 008183ef..2f6ca6f3 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -412,7 +412,6 @@ public class DeleteImage_GUI extends JFrame { tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - // System.out.println(tabbedPane.getSelectedIndex()); if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) { String username = person.verantwortlicher.getName() + " " @@ -444,13 +443,11 @@ public class DeleteImage_GUI extends JFrame { .convertRowIndexToModel(tablemyImages .getSelectedRow()), 6) .toString(); - // System.out.println(imageid); String version = modelMyImages.getValueAt( tablemyImages .convertRowIndexToModel(tablemyImages .getSelectedRow()), 7) .toString(); - // System.out.println(version); writeImageData(imageid, version); } }); @@ -487,14 +484,12 @@ public class DeleteImage_GUI extends JFrame { .convertRowIndexToModel(tablePublicVorlagen .getSelectedRow()), 6) .toString(); - // System.out.println(imageid); String version = modelPublicVorlagen .getValueAt( tablePublicVorlagen .convertRowIndexToModel(tablePublicVorlagen .getSelectedRow()), 7) .toString(); - // System.out.println(version); writeImageData(imageid, version); } }); @@ -522,13 +517,11 @@ public class DeleteImage_GUI extends JFrame { .convertRowIndexToModel(tableAllImages .getSelectedRow()), 6) .toString(); - // System.out.println(imageid); String version = modelAll.getValueAt( tableAllImages .convertRowIndexToModel(tableAllImages .getSelectedRow()), 7) .toString(); - // System.out.println(version); writeImageData(imageid, version); } @@ -587,8 +580,6 @@ public class DeleteImage_GUI extends JFrame { try { if (!client.connectedToLecture(imageid, imageversion)) { - // System.out.println(imageid); - // System.out.println(imageversion); try { client.deleteImageServer(imageid, imageversion); @@ -694,8 +685,6 @@ public class DeleteImage_GUI extends JFrame { try { if (!client.connectedToLecture(imageid, imageversion)) { - // System.out.println(imageid); - // System.out.println(imageversion); try { client.deleteImageServer(imageid, imageversion); @@ -798,8 +787,6 @@ public class DeleteImage_GUI extends JFrame { try { if (!client.connectedToLecture(imageid, imageversion)) { - // System.out.println(imageid); - // System.out.println(imageversion); try { client.deleteImageServer(imageid, imageversion); @@ -1111,10 +1098,8 @@ public class DeleteImage_GUI extends JFrame { int x = 0; SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); - while (i.hasNext()) { - - // System.out.println(out.format(in.parse(images.get(x).updateTime))); + while (i.hasNext()) { // erzeuge Objekte fuer die Tabelle Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(), diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index e4f6e0cf..d3e83bea 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -1,6 +1,7 @@ package gui.image; import gui.intro.About_GUI; +import gui.intro.Login_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -38,17 +39,24 @@ import models.Image; import models.Links; import models.person; +import org.apache.log4j.Logger; import org.apache.thrift.TException; import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; + import javax.swing.JScrollPane; @SuppressWarnings("serial") public class EditImageAllgemein_GUI extends JFrame { + /** + * Logger instance for this class. + */ + private final static Logger LOGGER = Logger.getLogger(EditImageAllgemein_GUI.class); + private final JPanel contentPanel = new JPanel(); String[] result; private JTextField Vorname; @@ -321,8 +329,7 @@ public class EditImageAllgemein_GUI extends JFrame { Image.image.setImagename(imagename.getText()); Image.image.setDesc(textAreadesc.getText()); // Info - System.out - .println("Alle Eingaben in Ordnung. Imagename= \"" + LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" + Image.image.getImagename() + "\", Imagebeschreibung=\"" + Image.image.getDesc()+"\""); @@ -436,7 +443,7 @@ public class EditImageAllgemein_GUI extends JFrame { } else { Image.image.setLicensed(true); } - System.out.println(map.get("template")); + LOGGER.debug(map.get("template")); if (map.get("template").equals("false")) { Image.image.setVorlage(false); } else { diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index a86b0a58..d8df52c7 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -1,13 +1,13 @@ package gui.image; import gui.intro.About_GUI; +import gui.intro.Login_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -18,7 +18,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; - import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; @@ -44,24 +43,26 @@ import util.GuiOrganizer; import util.OpenLinks; import models.Image; import models.Links; + import javax.swing.JComboBox; +import org.apache.log4j.Logger; import org.apache.thrift.TException; + import javax.swing.JCheckBox; @SuppressWarnings("serial") public class EditImageTechnisch_GUI extends JFrame { + /** + * Logger instance for this class. + */ + private final static Logger LOGGER = Logger.getLogger(EditImageTechnisch_GUI.class); + private final JPanel contentPanel = new JPanel(); String[] result; JSpinner spinnerCPU; JSpinner spinnerRam; - //JRadioButton rdbtnlicenseJa; - //JRadioButton rdbtnlicenseNein; - //JRadioButton rdbtnInternetJa; - //JRadioButton rdbtnInternetNein; - //JRadioButton radioButtonVorlageJa; - //JRadioButton radioButtonVorlageNein; private JCheckBox chckbxIsTemplate; private JCheckBox chckbxIsLicensed; private JCheckBox chckbxIsInternetBlocked; @@ -223,7 +224,7 @@ public class EditImageTechnisch_GUI extends JFrame { // TODO Auto-generated catch block e1.printStackTrace(); } - System.out.println("OS Model:" + Image.image.getOS()); + LOGGER.info("OS of this image: " + Image.image.getOS()); for(int i =0;i