summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNino Breuer2014-11-17 19:37:51 +0100
committerNino Breuer2014-11-17 19:37:51 +0100
commit48ffc3d241e820a99a3af2179cceedc818be0391 (patch)
treedfac73310bc7339ee2ee7613af62aa4cd82c8366
parent• fixed bug where the os name was not set to the correct value while editin... (diff)
parent• Images can now be updated without destroying everything... (diff)
downloadtutor-module-48ffc3d241e820a99a3af2179cceedc818be0391.tar.gz
tutor-module-48ffc3d241e820a99a3af2179cceedc818be0391.tar.xz
tutor-module-48ffc3d241e820a99a3af2179cceedc818be0391.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java238
-rw-r--r--dozentenmodulserver/src/main/java/sql/SQL.java26
2 files changed, 133 insertions, 131 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index e4cfb8fa..95f261c2 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -15,7 +15,6 @@ import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
-import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.text.DateFormat;
@@ -41,7 +40,6 @@ import javax.swing.border.EmptyBorder;
import javax.swing.filechooser.FileNameExtensionFilter;
import models.Image;
-import models.ImageRights;
import models.Links;
import models.RightsManagement;
import models.SessionData;
@@ -49,18 +47,14 @@ import models.person;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
-import org.ini4j.InvalidFileFormatException;
-import org.ini4j.Wini;
import server.generated.Server.Client;
import thrift.ThriftConnection;
-import util.GuiOrganizer;
import util.OpenLinks;
+import config.Config;
import ftp.UploadTask;
import gui.intro.About_GUI;
-import gui.intro.Login_GUI;
import gui.intro.MainMenue_GUI;
-import config.Config;
@SuppressWarnings("serial")
public class FTPEditUploader_GUI extends JFrame implements
@@ -107,12 +101,12 @@ public class FTPEditUploader_GUI extends JFrame implements
// file
private boolean isAborted = false; // down- or upload was manually aborted
Component c = null;
- private static final String HELP_MESSAGE = "<html><div align = \"center\">" +
- "Laden Sie hier Ihre bearbeitete .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.<br />" +
- "Wichtig ist, dass Sie zum Schluss auf \"Fertigstellen\" klicken, damit die Daten übernommen werden.<br />" +
- "Wenn Sie die Datei hochgeladen haben, dann aber auf \"zurück\" klicken, oder die Anwendung beenden,<br />" +
- "werden die Änderungen NICHT übernommen und auch die .vmdk-Datei wird nicht aktiv geschaltet." +
- "</div></html>";
+ private static final String HELP_MESSAGE = "<html><div align = \"center\">"
+ + "Laden Sie hier Ihre bearbeitete .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.<br />"
+ + "Wichtig ist, dass Sie zum Schluss auf \"Fertigstellen\" klicken, damit die Daten übernommen werden.<br />"
+ + "Wenn Sie die Datei hochgeladen haben, dann aber auf \"zurück\" klicken, oder die Anwendung beenden,<br />"
+ + "werden die Änderungen NICHT übernommen und auch die .vmdk-Datei wird nicht aktiv geschaltet."
+ + "</div></html>";
/**
* Create the frame.
@@ -140,7 +134,6 @@ public class FTPEditUploader_GUI extends JFrame implements
try {
client.DeleteFtpUser(user.userName);
} catch (TException e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
}
task.cancel(true);
@@ -161,7 +154,6 @@ public class FTPEditUploader_GUI extends JFrame implements
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (ClassNotFoundException | InstantiationException
| IllegalAccessException | UnsupportedLookAndFeelException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
@@ -183,7 +175,8 @@ public class FTPEditUploader_GUI extends JFrame implements
public void actionPerformed(ActionEvent arg0) {
fc = new JFileChooser(Config.getLastUploadPath());
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
- FileNameExtensionFilter filter = new FileNameExtensionFilter("VMDK-Container", "vmdk");
+ FileNameExtensionFilter filter = new FileNameExtensionFilter(
+ "VMDK-Container", "vmdk");
fc.setFileFilter(filter);
fc.showOpenDialog(getParent());
@@ -354,7 +347,6 @@ public class FTPEditUploader_GUI extends JFrame implements
client.DeleteFtpUser(user.userName);
LOGGER.info("Deleted FTP user.");
} catch (TException e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
}
task.cancel(true);
@@ -380,22 +372,26 @@ public class FTPEditUploader_GUI extends JFrame implements
btnFinish.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- //save data
- boolean success=updateData();
- if (success==true){
- JOptionPane.showMessageDialog(c,
- "Die Änderungen wurden erfolgreich gespeichert.", "Änderungen gespeichert",
- JOptionPane.INFORMATION_MESSAGE);
+ // save data
+ boolean success = updateData();
+ if (success == true) {
+ JOptionPane
+ .showMessageDialog(
+ c,
+ "Die Änderungen wurden erfolgreich gespeichert.",
+ "Änderungen gespeichert",
+ JOptionPane.INFORMATION_MESSAGE);
} else {
- JOptionPane.showMessageDialog(c,
- "Die Änderungen konnten nicht gespeichert werden.", "Fehler",
- JOptionPane.ERROR_MESSAGE);
+ JOptionPane
+ .showMessageDialog(
+ c,
+ "Die Änderungen konnten nicht gespeichert werden.",
+ "Fehler", JOptionPane.ERROR_MESSAGE);
}
-
- if(lblPath.getText().length() > 0)
- {
+
+ if (lblPath.getText().length() > 0) {
File f = new File(lblPath.getText());
-
+
if (f.isDirectory()) {
Config.setLastUploadPath(f.toString());
} else if (f.getParentFile().isDirectory()) {
@@ -403,7 +399,7 @@ public class FTPEditUploader_GUI extends JFrame implements
.toString());
}
}
-
+
Config.store();
dispose();
@@ -415,12 +411,9 @@ public class FTPEditUploader_GUI extends JFrame implements
client.DeleteFtpUser(user.userName);
} catch (TException e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
- JOptionPane.showMessageDialog(
- c,
- e1.getCause() + "\n"
- + e1.getStackTrace(),
+ JOptionPane.showMessageDialog(c, e1.getCause()
+ + "\n" + e1.getStackTrace(),
"Debug-Message",
JOptionPane.ERROR_MESSAGE);
}
@@ -447,35 +440,33 @@ public class FTPEditUploader_GUI extends JFrame implements
try {
client.DeleteFtpUser(user.userName);
} catch (TException e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
}
task.cancel(true);
// not loading files, go back one page
dispose();
- PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c);
+ PermissionEditImage_GUI ei = new PermissionEditImage_GUI(
+ c);
ei.setVisible(true);
}// end if coice
} else {
-
- int selectedOption = JOptionPane.showConfirmDialog(c,
- "<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>",
- "Abbrechen und zurück",
- JOptionPane.YES_NO_OPTION);
- if (selectedOption == JOptionPane.YES_OPTION)
- {
- dispose();
- PermissionEditImage_GUI m = new PermissionEditImage_GUI(c);
+ int selectedOption = JOptionPane
+ .showConfirmDialog(
+ c,
+ "<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>",
+ "Abbrechen und zurück",
+ JOptionPane.YES_NO_OPTION);
+ if (selectedOption == JOptionPane.YES_OPTION) {
+ dispose();
+ PermissionEditImage_GUI m = new PermissionEditImage_GUI(
+ c);
m.setVisible(true);
+ } else {
+ // for actions if "no" is selected. tbd.
}
- else
- {
- //for actions if "no" is selected. tbd.
- }
-
-
+
}// end else
}// end action
});
@@ -502,7 +493,6 @@ public class FTPEditUploader_GUI extends JFrame implements
windows = new URI(Links.getFAQ());
OpenLinks.openWebpage(windows);
} catch (URISyntaxException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
@@ -520,7 +510,6 @@ public class FTPEditUploader_GUI extends JFrame implements
windows = new URI(Links.getOTRS());
OpenLinks.openWebpage(windows);
} catch (URISyntaxException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
@@ -537,21 +526,19 @@ public class FTPEditUploader_GUI extends JFrame implements
}
});
menu.add(mntmAbout);
-
-
+
JMenu mnNewMenu_Info = new JMenu("Info");
mnNewMenu_Info.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent arg0) {
- JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(c, HELP_MESSAGE,
+ "Hilfe zu dieser Oberfläche",
+ JOptionPane.INFORMATION_MESSAGE);
}
});
menuBar.add(mnNewMenu_Info);
-
-
+
setVisible(true);
-
-
}
@@ -570,7 +557,6 @@ public class FTPEditUploader_GUI extends JFrame implements
LOGGER.debug("FTP path: " + user.path);
LOGGER.debug("FTP pass: " + user.password);
} catch (TException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
JOptionPane.showMessageDialog(c,
"Konnte vom Satelliten keine FTP-User erhalten!",
@@ -578,7 +564,11 @@ public class FTPEditUploader_GUI extends JFrame implements
}
DateFormat formatter = new SimpleDateFormat("yyyMMddHHmmss");
- LOGGER.info("Setting new Name: " + formatter.format(new Date()) + "_"
+ // set new file name and path only when uploading a new file. else use
+ // old filename and path
+ LOGGER.info("Getting imagePath: "+Image.image.getImagepath());
+ LOGGER.info("Getting old 'newName': "+Image.image.getNewName());
+ LOGGER.info("Setting new File-Name: " + formatter.format(new Date()) + "_"
+ person.verantwortlicher.getHochschule() + "_"
+ person.verantwortlicher.getUsername() + "_"
+ Image.image.getImagename() + ".vmdk");
@@ -586,6 +576,7 @@ public class FTPEditUploader_GUI extends JFrame implements
+ person.verantwortlicher.getHochschule() + "_"
+ person.verantwortlicher.getUsername() + "_"
+ Image.image.getImagename() + ".vmdk");
+
task = new UploadTask(host, port, user.userName, user.password,
user.path + "temp/", uploadFile);
@@ -605,9 +596,10 @@ public class FTPEditUploader_GUI extends JFrame implements
}
// Fertigstellen erlauben wenn upload abgeschlossen
- if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) {
+ if (isCurrentlyLoading() == false
+ || progressBar.getPercentComplete() == 1.0) {
// no upload
- //LOGGER.info("finished uploading file");
+ // LOGGER.info("finished uploading file");
btnUploadStoppen.setEnabled(false);
btnFinish.setEnabled(true);
} else {
@@ -654,31 +646,45 @@ public class FTPEditUploader_GUI extends JFrame implements
public boolean updateData() {
try {
- LOGGER.debug("NewName: " + Image.image.getNewName());
- LOGGER.debug("OldName: " + Image.image.getImagename());
-
- if (Image.image.getNewName() != null)
- {
- client.updateImageData(Image.image.getImagename(),
- Image.image.getImagename(), Image.image.getDesc(),
- Image.image.getImagepath(), Image.image.isLicensed(),
- Image.image.isInternet(), Image.image.getRam(),
- Image.image.getCpu(), Image.image.getImageId(),
- Image.image.getVersion(), Image.image.isVorlage(),
- Image.image.getFilesize(), Image.image.getShareMode(),
+ LOGGER.debug("NewFileName: " + Image.image.getNewName());
+ LOGGER.debug("ImageName: " + Image.image.getImagename());
+
+ //if a new file has been uploaded and new filename is set
+ if (Image.image.getNewName() != null) {
+ LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath="
+ + Image.image.getImagepath());
+ client.updateImageData(
+ Image.image.getImagename(),
+ Image.image.getImagename(),
+ Image.image.getDesc(),
+ //Image.image.getImagepath(),
+ "temp/"+Image.image.getNewName(),
+
+ Image.image.isLicensed(),
+ Image.image.isInternet(),
+ Image.image.getRam(),
+ Image.image.getCpu(),
+ Image.image.getImageId(),
+ Image.image.getVersion(),
+ Image.image.isVorlage(),
+ Image.image.getFilesize(),
+ Image.image.getShareMode(),
Image.image.getOS());
if (fileupload == true) {
client.startFileCopy(Image.image.getNewName());
}
- }
- else
- {
-
- client.updateImageData(Image.image.getImagename(),
- Image.image.getImagename(), Image.image.getDesc(),
- "temp/" + Image.image.getNewName(),
- //"temp/" + Image.image.getImagename(),
+ } else { //no new file uploaded and old file name stays
+ LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath());
+
+ client.updateImageData(
+ Image.image.getImagename(),
+ Image.image.getImagename(),
+ Image.image.getDesc(),
+
+ //"temp/" + Image.image.getNewName(), //wrong
+ Image.image.getImagepath(),
+
Image.image.isLicensed(), Image.image.isInternet(),
Image.image.getRam(), Image.image.getCpu(),
Image.image.getImageId(), Image.image.getVersion(),
@@ -687,33 +693,45 @@ public class FTPEditUploader_GUI extends JFrame implements
if (fileupload == true) {
client.startFileCopy(Image.image.getNewName());
- //client.startFileCopy(Image.image.getImagename());
+ // client.startFileCopy(Image.image.getImagename());
}
}
-
- //set additional user rights - quick and dirty TODO refactor
-
- //remove all additional user permissions on first stage
-
- client.deleteAllAdditionalImagePermissions(Image.image.getImageId(),person.verantwortlicher.getUserID());
-
- //then, add user permissions as they have been set new
- for(int i=0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++){
- System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
- client.writeAdditionalImageRights(
- Image.image.getImagename(),
- RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
- RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(),
- RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(),
- RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(),
- RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()
- );
-
- }//end for
-
-
+
+ // set additional user rights - quick and dirty TODO refactor
+
+ // remove all additional user permissions on first stage
+
+ client.deleteAllAdditionalImagePermissions(
+ Image.image.getImageId(),
+ person.verantwortlicher.getUserID());
+
+ // then, add user permissions as they have been set new
+ for (int i = 0; i < RightsManagement.rightsManagement
+ .getPermittedUserList().size(); i++) {
+ System.out.println("Writing additional rights for user "
+ + RightsManagement.rightsManagement
+ .getPermittedUserList().get(i).getUserID()
+ + ", User "
+ + i
+ + "/"
+ + RightsManagement.rightsManagement
+ .getPermittedUserList().size());
+ client.writeAdditionalImageRights(Image.image.getImagename(),
+ RightsManagement.rightsManagement
+ .getPermittedUserList().get(i).getUserID(),
+ RightsManagement.rightsManagement
+ .getPermittedUserList().get(i).isImageRead(),
+ RightsManagement.rightsManagement
+ .getPermittedUserList().get(i).isImageWrite(),
+ RightsManagement.rightsManagement
+ .getPermittedUserList().get(i)
+ .isImageLinkAllowed(),
+ RightsManagement.rightsManagement
+ .getPermittedUserList().get(i).isImageAdmin());
+
+ }// end for
+
} catch (TException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
JOptionPane
.showMessageDialog(
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index 2551df4c..10afee96 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -1713,33 +1713,17 @@ public class SQL {
try {
Connection con = getConnection();
Statement stm = con.createStatement();
- String image_path = "prod/" + name;
- /*
- log.info(new Date()
- + " - Updating ImagePath with: UPDATE `bwLehrpool`.`m_VLData_imageInfo` SET `image_path` = '"
- + image_path + "' WHERE `image_path` = '" + "temp/" + name
- + "';");
- */
- /*
- stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_imageInfo` SET `image_path` = '"
- + image_path
- + "' WHERE `image_path` = '"
- + "temp/"
- + name
- + "';");
- */
String sql = "UPDATE bwLehrpool.m_VLData_imageInfo SET image_path = "
- + "?"
- + " WHERE image_path = '"
- + "temp/"
- + "'?"
+ + "?" //prod/+name
+ + " WHERE image_path = "
+ + "?" //temp/+name
+ ";";
PreparedStatement prest = con.prepareStatement(sql);
- prest.setString(1, image_path);
- prest.setString(2, name);
+ prest.setString(1, "prod/"+name);
+ prest.setString(2, "temp/"+name);
prest.executeUpdate();
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 16:59:02 +0100