summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNino Breuer2014-10-21 16:41:55 +0200
committerNino Breuer2014-10-21 16:41:55 +0200
commit514d004c6d6c32fab0fad843c703f1f99f53a5ee (patch)
tree2c02e8bfefc8638f23d2c43cfa2937263f0908be
parent[client] increase buffer for reading file (diff)
downloadtutor-module-514d004c6d6c32fab0fad843c703f1f99f53a5ee.tar.gz
tutor-module-514d004c6d6c32fab0fad843c703f1f99f53a5ee.tar.xz
tutor-module-514d004c6d6c32fab0fad843c703f1f99f53a5ee.zip
fixed some bugs
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java18
-rw-r--r--dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java4
-rw-r--r--dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java2
-rw-r--r--dozentenmodulserver/src/main/java/sql/SQL.java2
4 files changed, 15 insertions, 11 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 2c8a6b16..5bc80241 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -381,13 +381,19 @@ public class FTPEditUploader_GUI extends JFrame implements
public void actionPerformed(ActionEvent e) {
updateData();
- File f = new File(lblPath.getText());
- if (f.isDirectory()) {
- Config.setLastUploadPath(f.toString());
- } else if (f.getParentFile().isDirectory()) {
- Config.setLastUploadPath(f.getParentFile()
- .toString());
+
+ if(lblPath.getText().length() > 0)
+ {
+ File f = new File(lblPath.getText());
+
+ if (f.isDirectory()) {
+ Config.setLastUploadPath(f.toString());
+ } else if (f.getParentFile().isDirectory()) {
+ Config.setLastUploadPath(f.getParentFile()
+ .toString());
+ }
}
+
Config.store();
dispose();
diff --git a/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java b/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java
index a4fa2db7..26b75ee1 100644
--- a/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java
@@ -151,13 +151,11 @@ public class BillOfRights_GUI extends JFrame {
//Beim Akzeptieren der Bestaetigung wird der Weiter-Button verfuegbar gemacht
if(chckbxAkzeptieren.isSelected()==true)
{
-
fwdButton.setEnabled(true);
-
}
else
{
-
+ fwdButton.setEnabled(false);
}
}
});
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 510590e6..04a74ab8 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -369,7 +369,7 @@ public class MainMenue_GUI extends JFrame {
.setText("Um detaillierte Informationen zu erhalten, fahren Sie bitte mit der Maus über die Grafik.");
txtpnUmDetaillierteInformationen.setEditable(false);
txtpnUmDetaillierteInformationen.setBackground(SystemColor.menu);
- txtpnUmDetaillierteInformationen.setBounds(10, 174, 509, 36);
+ txtpnUmDetaillierteInformationen.setBounds(10, 177, 509, 36);
contentPanel.add(txtpnUmDetaillierteInformationen);
{
JPanel buttonPane = new JPanel();
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index c16f451b..7b58fa06 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -1364,7 +1364,7 @@ public List<Image> getImageListPermissionLink(String userID) {
try {
stm = con.createStatement();
- int ret = stm.executeUpdate("DELETE FROM pm_VLData_Image WHERE imageID = '" + imageID + "' AND userID != '" + userID + "';");
+ int ret = stm.executeUpdate("DELETE FROM pm_VLData_image WHERE GUID_imageID = '" + imageID + "' AND userID != '" + userID + "';");
} catch (SQLException e) {
// TODO Auto-generated catch block